diff --git a/bacnet-stack/demo/gateway/Makefile b/bacnet-stack/demo/gateway/Makefile
index f74446e1..98381bc1 100644
--- a/bacnet-stack/demo/gateway/Makefile
+++ b/bacnet-stack/demo/gateway/Makefile
@@ -14,7 +14,23 @@ TARGET_BIN = ${TARGET}$(TARGET_EXT)
 SRCS = main.c \
 	$(BACNET_OBJECT)/gw_device.c \
 	$(BACNET_HANDLER)/h_routed_npdu.c \
-	$(BACNET_HANDLER)/s_router.c
+	$(BACNET_HANDLER)/s_router.c \
+	$(BACNET_OBJECT)/device.c \
+	$(BACNET_OBJECT)/ai.c \
+	$(BACNET_OBJECT)/ao.c \
+	$(BACNET_OBJECT)/av.c \
+	$(BACNET_OBJECT)/bi.c \
+	$(BACNET_OBJECT)/bo.c \
+	$(BACNET_OBJECT)/bv.c \
+	$(BACNET_OBJECT)/csv.c \
+	$(BACNET_OBJECT)/lc.c \
+	$(BACNET_OBJECT)/lsp.c \
+	$(BACNET_OBJECT)/ms-input.c \
+	$(BACNET_OBJECT)/mso.c \
+	$(BACNET_OBJECT)/msv.c \
+	$(BACNET_OBJECT)/nc.c  \
+	$(BACNET_OBJECT)/trendlog.c \
+	$(BACNET_OBJECT)/bacfile.c
 
 OBJS = ${SRCS:.c=.o}
 
@@ -24,7 +40,7 @@ CFLAGS  = $(WARNINGS) $(DEBUGGING) $(OPTIMIZATION) $(STANDARDS) $(INCLUDES) $(DE
 
 all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET} 
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
diff --git a/bacnet-stack/demo/gateway/main.c b/bacnet-stack/demo/gateway/main.c
index 7671e758..b48628f1 100644
--- a/bacnet-stack/demo/gateway/main.c
+++ b/bacnet-stack/demo/gateway/main.c
@@ -85,7 +85,7 @@ int DNET_list[2] = {
  * @param first_object_instance Set the first (gateway) Device to this
             instance number, and subsequent devices to incremented values.
  */
-void Devices_Init(
+static void Devices_Init(
     uint32_t first_object_instance)
 {
     int i;
@@ -176,7 +176,7 @@ static void Init_Service_Handlers(
  * device.) This is sure to be unique! The port number stays the same.
  * - For MS/TP, [Steve inserts a good idea here]
  */
-void Initialize_Device_Addresses(
+static void Initialize_Device_Addresses(
     )
 {
     int i = 0;  /* First entry is Gateway Device */