diff --git a/ports/zephyr/bacport.h b/ports/zephyr/bacport.h
index 6ba4f1e5..f29bc9e6 100644
--- a/ports/zephyr/bacport.h
+++ b/ports/zephyr/bacport.h
@@ -29,7 +29,7 @@
 #include <net/net_ip.h>
 #include <net/socket.h>
 #include <zephyr.h>
-#include "bacnet/basic/object/device.h"
+#include <bacnet/basic/object/device.h>
 
 static inline char *inet_ntoa(struct in_addr in) {
     return "(inet_ntoa() to be implemented)";
@@ -71,7 +71,7 @@ STRUCT_SECTION_ITERABLE(object_functions, table_name) = {   \
                             _read_property, _write_property, _RPM_list, \
                             _RR_info, _iterator, _value_list, _COV, \
                             _COV_clear, _intrinsic_reporting) \
-    /* empty define */
+    while{}(0)
 
 #endif
 
diff --git a/test/bacnet/include/bacport.h b/test/bacnet/include/bacport.h
index fe56cfc9..08d7639e 100644
--- a/test/bacnet/include/bacport.h
+++ b/test/bacnet/include/bacport.h
@@ -33,6 +33,6 @@
                             _read_property, _write_property, _RPM_list,     \
                             _RR_info, _iterator, _value_list, _COV,         \
                             _COV_clear, _intrinsic_reporting)               \
-    /* Empty define */
+    while{}(0)
 
 #endif