diff --git a/bacnet-stack/demo/object/device.c b/bacnet-stack/demo/object/device.c
index 31f4dc4e..86130dee 100644
--- a/bacnet-stack/demo/object/device.c
+++ b/bacnet-stack/demo/object/device.c
@@ -1487,9 +1487,9 @@ bool Device_Encode_Value_List(
 }
 
 
+#if defined(INTRINSIC_REPORTING)
 void Device_local_reporting(void)
 {
-#if defined(INTRINSIC_REPORTING)
     struct   object_functions *pObject;
     uint32_t objects_count;
     uint32_t object_instance;
@@ -1515,8 +1515,8 @@ void Device_local_reporting(void)
             }
         }
     }
-#endif
 }
+#endif
 
 /** Looks up the requested Object to see if the functionality is supported.
  * @ingroup ObjHelpers
diff --git a/bacnet-stack/demo/object/device.h b/bacnet-stack/demo/object/device.h
index b559027a..aed558ca 100644
--- a/bacnet-stack/demo/object/device.h
+++ b/bacnet-stack/demo/object/device.h
@@ -337,7 +337,9 @@ extern "C" {
     bool Device_Write_Property_Local(
         BACNET_WRITE_PROPERTY_DATA * wp_data);
 
+#if defined(INTRINSIC_REPORTING)
     void Device_local_reporting(void);
+#endif
 
 /* Prototypes for Routing functionality in the Device Object.
  * Enable by defining BAC_ROUTING in config.h and including gw_device.c
diff --git a/bacnet-stack/demo/server/main.c b/bacnet-stack/demo/server/main.c
index fdedd579..0b3871d4 100644
--- a/bacnet-stack/demo/server/main.c
+++ b/bacnet-stack/demo/server/main.c
@@ -52,16 +52,6 @@
 #include "version.h"
 /* include the device object */
 #include "device.h"
-#include "ai.h"
-#include "ao.h"
-#include "av.h"
-#include "bi.h"
-#include "bo.h"
-#include "bv.h"
-#include "lc.h"
-#include "lsp.h"
-#include "mso.h"
-#include "ms-input.h"
 #include "trendlog.h"
 #if defined(INTRINSIC_REPORTING)
 #include "nc.h"
diff --git a/bacnet-stack/include/bacnet.h b/bacnet-stack/include/bacnet.h
index 70a7556c..3e44b62d 100644
--- a/bacnet-stack/include/bacnet.h
+++ b/bacnet-stack/include/bacnet.h
@@ -100,20 +100,20 @@
 /**
  * @mainpage BACnet-stack API Documentation
  * This documents the BACnet-Stack API, OS ports, and sample applications. <br>
- * 
+ *
  *  - The high-level handler interface can be found in the Modules tab.
  *  - Specifics for each file can be found in the Files tab.
- *  - A full list of all functions is provided in the index of the 
+ *  - A full list of all functions is provided in the index of the
  *  Files->Globals subtab.
- * 
+ *
  * While all the central files are included in the file list, not all important
  * functions have been given the javadoc treatment, nor have Modules (chapters)
  * been created yet for all groupings.  If you are doing work in an under-
  * documented area, please add the javadoc comments at least to the API calls,
  * and consider adding doxygen's module grouping for your area of interest.
- * 
+ *
  * See doc/README.doxygen for notes on building and extending this document. <br>
- * In particular, if you have graphviz installed, you can enhance this 
+ * In particular, if you have graphviz installed, you can enhance this
  * documentation by turning on the function call graphs feature.
  */
 #endif