diff --git a/bacnet-stack/bacapp.h b/bacnet-stack/bacapp.h
index 88ed4dc3..4c007ec3 100644
--- a/bacnet-stack/bacapp.h
+++ b/bacnet-stack/bacapp.h
@@ -110,6 +110,7 @@ extern "C" {
 
 #ifdef TEST
 #include "ctest.h"
+#include "datetime.h"
     bool bacapp_same_value(BACNET_APPLICATION_DATA_VALUE * value,
         BACNET_APPLICATION_DATA_VALUE * test_value);
 
diff --git a/bacnet-stack/demo/handler/h_wp.c b/bacnet-stack/demo/handler/h_wp.c
index 4f9c2f09..ce19570e 100644
--- a/bacnet-stack/demo/handler/h_wp.c
+++ b/bacnet-stack/demo/handler/h_wp.c
@@ -309,7 +309,7 @@ void handler_write_property(uint8_t * service_request,
 #endif
             }
             break;
-#endif
+#endif /* BACFILE */
         default:
             len =
                 bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
diff --git a/bacnet-stack/ports/pic18f6720/BACnet-Server.mcw b/bacnet-stack/ports/pic18f6720/BACnet-Server.mcw
index ea7c8ae3..c130c93a 100644
Binary files a/bacnet-stack/ports/pic18f6720/BACnet-Server.mcw and b/bacnet-stack/ports/pic18f6720/BACnet-Server.mcw differ