diff --git a/bacnet-stack/demo/object/ai.c b/bacnet-stack/demo/object/ai.c
index b25fef83..e67be315 100644
--- a/bacnet-stack/demo/object/ai.c
+++ b/bacnet-stack/demo/object/ai.c
@@ -38,7 +38,6 @@
 #include "device.h"
 #include "handlers.h"
 #include "timestamp.h"
-#include "nc.h"
 #include "ai.h"
 
 
diff --git a/bacnet-stack/demo/object/ai.h b/bacnet-stack/demo/object/ai.h
index 03513ae7..621d51ab 100644
--- a/bacnet-stack/demo/object/ai.h
+++ b/bacnet-stack/demo/object/ai.h
@@ -111,9 +111,11 @@ extern "C" {
         uint32_t object_instance,
         float value);
 
-#if defined(INTRINSIC_REPORTING)
+    /* note: header of Intrinsic_Reporting function is required
+             even when INTRINSIC_REPORTING is not defined */
     void Analog_Input_Intrinsic_Reporting(uint32_t object_instance);
 
+#if defined(INTRINSIC_REPORTING)
     int Analog_Input_Event_Information(unsigned index,
         BACNET_GET_EVENT_INFORMATION_DATA * getevent_data);
 
diff --git a/bacnet-stack/demo/object/av.c b/bacnet-stack/demo/object/av.c
index f156f923..bb49d6ef 100644
--- a/bacnet-stack/demo/object/av.c
+++ b/bacnet-stack/demo/object/av.c
@@ -37,14 +37,10 @@
 #include "bacapp.h"
 #include "bactext.h"
 #include "config.h"     /* the custom stuff */
-#include "alarm_ack.h"
-#include "getevent.h"
-#include "wp.h"
-#include "rp.h"
-#include "nc.h"
-#include "av.h"
 #include "device.h"
 #include "handlers.h"
+#include "av.h"
+
 
 #ifndef MAX_ANALOG_VALUES
 #define MAX_ANALOG_VALUES 4
diff --git a/bacnet-stack/demo/object/av.h b/bacnet-stack/demo/object/av.h
index 325bffea..649c4572 100644
--- a/bacnet-stack/demo/object/av.h
+++ b/bacnet-stack/demo/object/av.h
@@ -32,7 +32,11 @@
 #include "bacerror.h"
 #include "wp.h"
 #include "rp.h"
+#if defined(INTRINSIC_REPORTING)
 #include "nc.h"
+#include "alarm_ack.h"
+#include "getevent.h"
+#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -96,14 +100,18 @@ extern "C" {
     float Analog_Value_Present_Value(
         uint32_t object_instance);
 
+    /* note: header of Intrinsic_Reporting function is required
+             even when INTRINSIC_REPORTING is not defined */
     void Analog_Value_Intrinsic_Reporting(
         uint32_t object_instance);
 
+#if defined(INTRINSIC_REPORTING)
     int Analog_Value_Event_Information(unsigned index,
         BACNET_GET_EVENT_INFORMATION_DATA * getevent_data);
 
     int Analog_Value_Alarm_Ack(BACNET_ALARM_ACK_DATA * alarmack_data,
         BACNET_ERROR_CODE * error_code);
+#endif
 
     void Analog_Value_Init(
         void);
diff --git a/bacnet-stack/demo/object/device.c b/bacnet-stack/demo/object/device.c
index dec497e0..31f4dc4e 100644
--- a/bacnet-stack/demo/object/device.c
+++ b/bacnet-stack/demo/object/device.c
@@ -58,11 +58,13 @@
 #include "lsp.h"
 #include "mso.h"
 #include "ms-input.h"
-#include "nc.h"
 #include "trendlog.h"
+#if defined(INTRINSIC_REPORTING)
+#include "nc.h"
+#endif /* defined(INTRINSIC_REPORTING) */
 #if defined(BACFILE)
 #include "bacfile.h"
-#endif
+#endif /* defined(BACFILE) */
 
 
 #if defined(__BORLANDC__)
diff --git a/bacnet-stack/demo/object/nc.h b/bacnet-stack/demo/object/nc.h
index fb8ac9f7..235edee7 100644
--- a/bacnet-stack/demo/object/nc.h
+++ b/bacnet-stack/demo/object/nc.h
@@ -45,7 +45,8 @@ typedef enum {
 } NC_RECIPIENT_TYPE;
 
 
-/* BACnetRecipient sructuer*/
+#if defined(INTRINSIC_REPORTING)
+/* BACnetRecipient structure */
 /*
 BACnetRecipient ::= CHOICE {
     device [0] BACnetObjectIdentifier,
@@ -126,6 +127,7 @@ typedef struct Ack_Notification {
             BACNET_EVENT_NOTIFICATION_DATA * event_data);
 
     void Notification_Class_find_recipient(void);
+#endif /* defined(INTRINSIC_REPORTING) */
 
 
 #ifdef __cplusplus
diff --git a/bacnet-stack/demo/server/main.c b/bacnet-stack/demo/server/main.c
index 0975ed95..fdedd579 100644
--- a/bacnet-stack/demo/server/main.c
+++ b/bacnet-stack/demo/server/main.c
@@ -62,11 +62,13 @@
 #include "lsp.h"
 #include "mso.h"
 #include "ms-input.h"
-#include "nc.h"
 #include "trendlog.h"
+#if defined(INTRINSIC_REPORTING)
+#include "nc.h"
+#endif /* defined(INTRINSIC_REPORTING) */
 #if defined(BACFILE)
 #include "bacfile.h"
-#endif
+#endif /* defined(BACFILE) */
 
 
 /** @file server/main.c  Example server application using the BACnet Stack. */