diff --git a/bacnet-stack/demo/handler/h_arf.c b/bacnet-stack/demo/handler/h_arf.c
index b51e710a..ffcd80ad 100644
--- a/bacnet-stack/demo/handler/h_arf.c
+++ b/bacnet-stack/demo/handler/h_arf.c
@@ -36,9 +36,6 @@
 #include "abort.h"
 #include "arf.h"
 /* demo objects */
-#include "device.h"
-#include "ai.h"
-#include "ao.h"
 #if defined(BACFILE)
 #include "bacfile.h"
 #endif
diff --git a/bacnet-stack/demo/handler/h_arf_a.c b/bacnet-stack/demo/handler/h_arf_a.c
index 2ef8ce4d..63a52bb4 100644
--- a/bacnet-stack/demo/handler/h_arf_a.c
+++ b/bacnet-stack/demo/handler/h_arf_a.c
@@ -35,7 +35,9 @@
 #include "device.h"
 #include "datalink.h"
 #include "arf.h"
+#if defined(BACFILE)
 #include "bacfile.h"
+#endif
 /* some demo stuff needed */
 #include "handlers.h"
 #include "txbuf.h"