diff --git a/bacnet-stack/demo/dcc/Makefile b/bacnet-stack/demo/dcc/Makefile
index 22d4fef3..1fd0346b 100644
--- a/bacnet-stack/demo/dcc/Makefile
+++ b/bacnet-stack/demo/dcc/Makefile
@@ -6,9 +6,13 @@ BASEDIR = .
 #CFLAGS  = -Wall -I. -O2 -g
 # Note: you can strip out symbols using the strip command
 # to get an idea of how big the compile really is.
-#DEFINES = -DBACFILE=1 -DTSM_ENABLED=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1 -DBACDL_ETHERNET=1
-#DEFINES = -DBACFILE=1 -DTSM_ENABLED=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1 -DBACDL_ARCNET=1
-DEFINES = -DBACFILE=1 -DTSM_ENABLED=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1 -DBACDL_BIP=1
+
+BACNET_DEFINES=-DBACFILE=1 -DTSM_ENABLED=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1
+#BACDL_DEFINE=-DBACDL_ETHERNET=1
+#BACDL_DEFINE=-DBACDL_ARCNET=1
+BACDL_DEFINE=-DBACDL_BIP=1
+DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE)
+
 BACNET_PORT = ../../ports/linux
 BACNET_OBJECT = ../object
 BACNET_HANDLER = ../handler
diff --git a/bacnet-stack/demo/readfile/Makefile b/bacnet-stack/demo/readfile/Makefile
index ebe7772d..5f4f72e6 100644
--- a/bacnet-stack/demo/readfile/Makefile
+++ b/bacnet-stack/demo/readfile/Makefile
@@ -6,10 +6,13 @@ BASEDIR = .
 #CFLAGS  = -Wall -I. -O2 -g
 # Note: you can strip out symbols using the strip command
 # to get an idea of how big the compile really is.
-#DEFINES = -DBACFILE=1 -DBACDL_ETHERNET=1
-#DEFINES = -DBACFILE=1 -DBACDL_ARCNET=1
-#DEFINES = -DBACFILE=1 -DBACDL_MSTP=1 
-DEFINES = -DBACFILE=1 -DTSM_ENABLED=1 -DBACDL_BIP=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1
+
+BACNET_DEFINES=-DBACFILE=1 -DTSM_ENABLED=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1
+#BACDL_DEFINE=-DBACDL_ETHERNET=1
+#BACDL_DEFINE=-DBACDL_ARCNET=1
+BACDL_DEFINE=-DBACDL_BIP=1
+DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE)
+
 BACNET_PORT = ../../ports/linux
 BACNET_OBJECT = ../object
 BACNET_HANDLER = ../handler
@@ -22,6 +25,8 @@ TARGET = bacarf
 
 SRCS = main.c \
        $(BACNET_PORT)/bip-init.c \
+       $(BACNET_PORT)/ethernet.c \
+       $(BACNET_PORT)/arcnet.c \
        $(BACNET_ROOT)/bip.c \
        $(BACNET_HANDLER)/txbuf.c \
        $(BACNET_HANDLER)/noserv.c \
diff --git a/bacnet-stack/demo/readprop/Makefile b/bacnet-stack/demo/readprop/Makefile
index ca60dbf3..1eb4784c 100644
--- a/bacnet-stack/demo/readprop/Makefile
+++ b/bacnet-stack/demo/readprop/Makefile
@@ -6,10 +6,13 @@ BASEDIR = .
 #CFLAGS  = -Wall -I. -O2 -g
 # Note: you can strip out symbols using the strip command
 # to get an idea of how big the compile really is.
-#DEFINES = -DBACFILE=1 -DTSM_ENABLED=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1 -DBACDL_ETHERNET=1
-#DEFINES = -DBACFILE=1 -DTSM_ENABLED=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1 -DBACDL_ARCNET=1
-#DEFINES = -DBACFILE=1 -DTSM_ENABLED=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1 -DBACDL_MSTP=1 
-DEFINES = -DBACFILE=1 -DTSM_ENABLED=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1 -DBACDL_BIP=1
+
+BACNET_DEFINES=-DBACFILE=1 -DTSM_ENABLED=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1
+#BACDL_DEFINE=-DBACDL_ETHERNET=1
+#BACDL_DEFINE=-DBACDL_ARCNET=1
+BACDL_DEFINE=-DBACDL_BIP=1
+DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE)
+
 BACNET_PORT = ../../ports/linux
 BACNET_OBJECT = ../object
 BACNET_HANDLER = ../handler
diff --git a/bacnet-stack/demo/reinit/Makefile b/bacnet-stack/demo/reinit/Makefile
index afe96b16..f2ede560 100644
--- a/bacnet-stack/demo/reinit/Makefile
+++ b/bacnet-stack/demo/reinit/Makefile
@@ -6,10 +6,13 @@ BASEDIR = .
 #CFLAGS  = -Wall -I. -O2 -g
 # Note: you can strip out symbols using the strip command
 # to get an idea of how big the compile really is.
-#DEFINES = -DBACFILE=1 -DBACDL_ETHERNET=1
-#DEFINES = -DBACFILE=1 -DBACDL_ARCNET=1
-#DEFINES = -DBACFILE=1 -DBACDL_MSTP=1 
-DEFINES = -DBACFILE=1 -DTSM_ENABLED=1 -DBACDL_BIP=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1
+
+BACNET_DEFINES=-DBACFILE=1 -DTSM_ENABLED=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1
+#BACDL_DEFINE=-DBACDL_ETHERNET=1
+#BACDL_DEFINE=-DBACDL_ARCNET=1
+BACDL_DEFINE=-DBACDL_BIP=1
+DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE)
+
 BACNET_PORT = ../../ports/linux
 BACNET_OBJECT = ../object
 BACNET_HANDLER = ../handler
@@ -23,6 +26,8 @@ TARGET = bacrd
 SRCS = main.c \
        $(BACNET_ROOT)/rd.c \
        $(BACNET_PORT)/bip-init.c \
+       $(BACNET_PORT)/ethernet.c \
+       $(BACNET_PORT)/arcnet.c \
        $(BACNET_ROOT)/bip.c \
        $(BACNET_HANDLER)/txbuf.c \
        $(BACNET_HANDLER)/noserv.c \
diff --git a/bacnet-stack/demo/timesync/Makefile b/bacnet-stack/demo/timesync/Makefile
index d4976676..d1b7b1c1 100644
--- a/bacnet-stack/demo/timesync/Makefile
+++ b/bacnet-stack/demo/timesync/Makefile
@@ -6,10 +6,14 @@ BASEDIR = .
 #CFLAGS  = -Wall -I. -O2 -g
 # Note: you can strip out symbols using the strip command
 # to get an idea of how big the compile really is.
-#DEFINES = -DBACFILE=1 -DBACDL_ETHERNET=1
-#DEFINES = -DBACFILE=1 -DBACDL_ARCNET=1
-#DEFINES = -DBACFILE=1 -DBACDL_MSTP=1 
-DEFINES = -DBACFILE=1 -DTSM_ENABLED=0 -DBACDL_BIP=1 -DUSE_INADDR=0 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1
+
+# Configure the BACnet Datalink Layer
+#BACDL_DEFINE=-DBACDL_ETHERNET=1
+#BACDL_DEFINE=-DBACDL_ARCNET=1
+BACDL_DEFINE=-DBACDL_BIP=1
+BACNET_DEFINES=-DBACFILE=1 -DTSM_ENABLED=0 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1
+DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE)
+
 BACNET_PORT = ../../ports/linux
 BACNET_OBJECT = ../object
 BACNET_HANDLER = ../handler
@@ -22,6 +26,8 @@ TARGET = bacts
 
 SRCS = main.c \
        $(BACNET_PORT)/bip-init.c \
+       $(BACNET_PORT)/ethernet.c \
+       $(BACNET_PORT)/arcnet.c \
        $(BACNET_ROOT)/bip.c \
        $(BACNET_HANDLER)/txbuf.c \
        $(BACNET_HANDLER)/noserv.c \
diff --git a/bacnet-stack/demo/ucov/Makefile b/bacnet-stack/demo/ucov/Makefile
index 11dfcbb1..ec29af06 100644
--- a/bacnet-stack/demo/ucov/Makefile
+++ b/bacnet-stack/demo/ucov/Makefile
@@ -6,10 +6,14 @@ BASEDIR = .
 #CFLAGS  = -Wall -I. -O2 -g
 # Note: you can strip out symbols using the strip command
 # to get an idea of how big the compile really is.
-#DEFINES = -DBACFILE=1 -DBACDL_ETHERNET=1
-#DEFINES = -DBACFILE=1 -DBACDL_ARCNET=1
-#DEFINES = -DBACFILE=1 -DBACDL_MSTP=1 
-DEFINES = -DBACFILE=1 -DTSM_ENABLED=0 -DBACDL_BIP=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1
+
+# Configure the BACnet Datalink Layer
+#BACDL_DEFINE=-DBACDL_ETHERNET=1
+#BACDL_DEFINE=-DBACDL_ARCNET=1
+BACDL_DEFINE=-DBACDL_BIP=1
+BACNET_DEFINES=-DBACFILE=1 -DTSM_ENABLED=0 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1
+DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE)
+
 BACNET_PORT = ../../ports/linux
 BACNET_OBJECT = ../object
 BACNET_HANDLER = ../handler
@@ -22,6 +26,8 @@ TARGET = bacucov
 
 SRCS = main.c \
        $(BACNET_PORT)/bip-init.c \
+       $(BACNET_PORT)/ethernet.c \
+       $(BACNET_PORT)/arcnet.c \
        $(BACNET_ROOT)/bip.c \
        $(BACNET_HANDLER)/txbuf.c \
        $(BACNET_HANDLER)/noserv.c \
diff --git a/bacnet-stack/demo/whohas/Makefile b/bacnet-stack/demo/whohas/Makefile
index 9fb81dc7..19f6a34a 100644
--- a/bacnet-stack/demo/whohas/Makefile
+++ b/bacnet-stack/demo/whohas/Makefile
@@ -6,10 +6,13 @@ BASEDIR = .
 #CFLAGS  = -Wall -I. -O2 -g
 # Note: you can strip out symbols using the strip command
 # to get an idea of how big the compile really is.
-#DEFINES = -DBACFILE=1 -DBACDL_ETHERNET=1
-#DEFINES = -DBACFILE=1 -DBACDL_ARCNET=1
-#DEFINES = -DBACFILE=1 -DBACDL_MSTP=1 
-DEFINES = -DBACFILE=1 -DTSM_ENABLED=0 -DBACDL_BIP=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1
+
+BACNET_DEFINES=-DBACFILE=1 -DTSM_ENABLED=0 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1
+#BACDL_DEFINE=-DBACDL_ETHERNET=1
+#BACDL_DEFINE=-DBACDL_ARCNET=1
+BACDL_DEFINE=-DBACDL_BIP=1
+DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE)
+
 BACNET_PORT = ../../ports/linux
 BACNET_OBJECT = ../object
 BACNET_HANDLER = ../handler
@@ -23,6 +26,8 @@ TARGET = bacwh
 SRCS = main.c \
        $(BACNET_ROOT)/rd.c \
        $(BACNET_PORT)/bip-init.c \
+       $(BACNET_PORT)/ethernet.c \
+       $(BACNET_PORT)/arcnet.c \
        $(BACNET_ROOT)/bip.c \
        $(BACNET_HANDLER)/txbuf.c \
        $(BACNET_HANDLER)/noserv.c \
diff --git a/bacnet-stack/demo/writefile/Makefile b/bacnet-stack/demo/writefile/Makefile
index 1e6ca1a0..a73ea749 100644
--- a/bacnet-stack/demo/writefile/Makefile
+++ b/bacnet-stack/demo/writefile/Makefile
@@ -6,10 +6,14 @@ BASEDIR = .
 #CFLAGS  = -Wall -I. -O2 -g
 # Note: you can strip out symbols using the strip command
 # to get an idea of how big the compile really is.
-#DEFINES = -DBACFILE=1 -DBACDL_ETHERNET=1
-#DEFINES = -DBACFILE=1 -DBACDL_ARCNET=1
-#DEFINES = -DBACFILE=1 -DBACDL_MSTP=1 
-DEFINES = -DBACFILE=1 -DTSM_ENABLED=1 -DBACDL_BIP=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1
+
+# Configure the BACnet Datalink Layer
+#BACDL_DEFINE=-DBACDL_ETHERNET=1
+#BACDL_DEFINE=-DBACDL_ARCNET=1
+BACDL_DEFINE=-DBACDL_BIP=1
+BACNET_DEFINES=-DBACFILE=1 -DTSM_ENABLED=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1
+DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE)
+
 BACNET_PORT = ../../ports/linux
 BACNET_OBJECT = ../object
 BACNET_HANDLER = ../handler
@@ -22,6 +26,8 @@ TARGET = bacawf
 
 SRCS = main.c \
        $(BACNET_PORT)/bip-init.c \
+       $(BACNET_PORT)/ethernet.c \
+       $(BACNET_PORT)/arcnet.c \
        $(BACNET_ROOT)/bip.c \
        $(BACNET_HANDLER)/txbuf.c \
        $(BACNET_HANDLER)/noserv.c \
diff --git a/bacnet-stack/demo/writeprop/Makefile b/bacnet-stack/demo/writeprop/Makefile
index d69edd8f..36aa1204 100644
--- a/bacnet-stack/demo/writeprop/Makefile
+++ b/bacnet-stack/demo/writeprop/Makefile
@@ -6,10 +6,14 @@ BASEDIR = .
 #CFLAGS  = -Wall -I. -O2 -g
 # Note: you can strip out symbols using the strip command
 # to get an idea of how big the compile really is.
-#DEFINES = -DBACFILE=1 -DBACDL_ETHERNET=1
-#DEFINES = -DBACFILE=1 -DBACDL_ARCNET=1
-#DEFINES = -DBACFILE=1 -DBACDL_MSTP=1 
-DEFINES = -DBACFILE=1 -DTSM_ENABLED=1 -DBACDL_BIP=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1
+
+# Configure the BACnet Datalink Layer
+#BACDL_DEFINE=-DBACDL_ETHERNET=1
+#BACDL_DEFINE=-DBACDL_ARCNET=1
+BACDL_DEFINE=-DBACDL_BIP=1
+BACNET_DEFINES=-DBACFILE=1 -DTSM_ENABLED=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1
+DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE)
+
 BACNET_PORT = ../../ports/linux
 BACNET_OBJECT = ../object
 BACNET_HANDLER = ../handler
@@ -22,6 +26,8 @@ TARGET = bacwp
 
 SRCS = main.c \
        $(BACNET_PORT)/bip-init.c \
+       $(BACNET_PORT)/ethernet.c \
+       $(BACNET_PORT)/arcnet.c \
        $(BACNET_ROOT)/bip.c \
        $(BACNET_HANDLER)/txbuf.c \
        $(BACNET_HANDLER)/noserv.c \