diff --git a/bacnet-stack/demo/router/ipmodule.h b/bacnet-stack/demo/router/ipmodule.h
index 3c3fab84..9e6b51c4 100644
--- a/bacnet-stack/demo/router/ipmodule.h
+++ b/bacnet-stack/demo/router/ipmodule.h
@@ -36,8 +36,12 @@
 
 #define MAX_BIP_APDU	1476
 #define MAX_BIP_PDU		(MAX_NPDU + MAX_BIP_APDU)
-#define MAX_BIP_MPDU	(MAX_HEADER + MAX_BIP_PDU)          /* Yes, we know this is longer than an Ethernet Frame, a UDP payload and an IPv6 packet. Grandfathered in from BACnet Ethernet days,    */
-                                                            /* and we can rely on the lower layers of the Ethernet stack to fragment/reassemble the BACnet MPDUs                                    */
+#define MAX_BIP_MPDU	(MAX_HEADER + MAX_BIP_PDU)
+/* Yes, we know this is longer than an Ethernet Frame,
+   a UDP payload and an IPv6 packet.
+   Grandfathered in from BACnet Ethernet days,
+   and we can rely on the lower layers of the
+   Ethernet stack to fragment/reassemble the BACnet MPDUs */
 
 typedef struct ip_data {
     int socket;
diff --git a/bacnet-stack/demo/router/main.c b/bacnet-stack/demo/router/main.c
index 39d95a36..a26a52f4 100644
--- a/bacnet-stack/demo/router/main.c
+++ b/bacnet-stack/demo/router/main.c
@@ -52,8 +52,6 @@
 #include "network_layer.h"
 #include "ipmodule.h"
 #include "mstpmodule.h"
-#include "bip.h"
-#include "dlmstp.h"
 
 #define KEY_ESC 27