diff --git a/Makefile b/Makefile
index 26d26a95..b4131925 100644
--- a/Makefile
+++ b/Makefile
@@ -45,6 +45,10 @@ getevent:
 gateway:
 	$(MAKE) -s -C apps $@
 
+.PHONY: gateway-win32
+gateway-win32:
+	$(MAKE) BACNET_PORT=win32 -C apps gateway
+
 .PHONY: server
 server:
 	$(MAKE) -s -C apps $@
diff --git a/apps/Makefile b/apps/Makefile
index 0e221792..4edf751b 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -212,7 +212,7 @@ $(foreach TGT, $(TARGETS), $(patsubst %, %.$(TGT), $(SUBDIRS))):
 
 .PHONY: gateway
 gateway:
-	$(MAKE) -s -b -C gateway
+	$(MAKE) -b -C gateway
 
 .PHONY: server
 server:
diff --git a/apps/gateway/Makefile b/apps/gateway/Makefile
index 3999a1e0..0592ce73 100644
--- a/apps/gateway/Makefile
+++ b/apps/gateway/Makefile
@@ -9,64 +9,75 @@ TARGET = bacgateway
 
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-# put any overloaded or special built src files here,
-# so the linker uses these instead of the functions in the library
-SRCS = main.c \
-	$(BACNET_OBJECT)/gw_device.c \
-	$(BACNET_HANDLER)/h_routed_npdu.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)/channel.c \
-	$(BACNET_OBJECT)/command.c \
-	$(BACNET_OBJECT)/csv.c \
-	$(BACNET_OBJECT)/iv.c \
-	$(BACNET_OBJECT)/lc.c \
-	$(BACNET_OBJECT)/lo.c \
-	$(BACNET_OBJECT)/lsp.c \
-	$(BACNET_OBJECT)/ms-input.c \
-	$(BACNET_OBJECT)/mso.c \
-	$(BACNET_OBJECT)/msv.c \
-	$(BACNET_OBJECT)/nc.c  \
-	$(BACNET_OBJECT)/netport.c \
-	$(BACNET_OBJECT)/osv.c \
-	$(BACNET_OBJECT)/piv.c \
-	$(BACNET_OBJECT)/schedule.c \
-	$(BACNET_OBJECT)/trendlog.c \
-	$(BACNET_OBJECT)/bacfile.c
+BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
+SRC = main.c \
+	$(BACNET_OBJECT_DIR)/gateway/gw_device.c \
+	$(BACNET_OBJECT_DIR)/ai.c \
+	$(BACNET_OBJECT_DIR)/ao.c \
+	$(BACNET_OBJECT_DIR)/av.c \
+	$(BACNET_OBJECT_DIR)/bi.c \
+	$(BACNET_OBJECT_DIR)/bo.c \
+	$(BACNET_OBJECT_DIR)/bv.c \
+	$(BACNET_OBJECT_DIR)/channel.c \
+	$(BACNET_OBJECT_DIR)/command.c \
+	$(BACNET_OBJECT_DIR)/csv.c \
+	$(BACNET_OBJECT_DIR)/device.c \
+	$(BACNET_OBJECT_DIR)/iv.c \
+	$(BACNET_OBJECT_DIR)/lc.c \
+	$(BACNET_OBJECT_DIR)/lo.c \
+	$(BACNET_OBJECT_DIR)/lsp.c \
+	$(BACNET_OBJECT_DIR)/ms-input.c \
+	$(BACNET_OBJECT_DIR)/mso.c \
+	$(BACNET_OBJECT_DIR)/msv.c \
+	$(BACNET_OBJECT_DIR)/osv.c \
+	$(BACNET_OBJECT_DIR)/piv.c \
+	$(BACNET_OBJECT_DIR)/nc.c  \
+	$(BACNET_OBJECT_DIR)/netport.c  \
+	$(BACNET_OBJECT_DIR)/trendlog.c \
+	$(BACNET_OBJECT_DIR)/schedule.c \
+	$(BACNET_OBJECT_DIR)/access_credential.c \
+	$(BACNET_OBJECT_DIR)/access_door.c \
+	$(BACNET_OBJECT_DIR)/access_point.c \
+	$(BACNET_OBJECT_DIR)/access_rights.c \
+	$(BACNET_OBJECT_DIR)/access_user.c \
+	$(BACNET_OBJECT_DIR)/access_zone.c \
+	$(BACNET_OBJECT_DIR)/credential_data_input.c \
+	$(BACNET_OBJECT_DIR)/bacfile.c
 
-OBJS = ${SRCS:.c=.o}
+BACNET_BASIC_SRC = \
+	$(wildcard $(BACNET_SRC_DIR)/bacnet/basic/*.c) \
+	$(wildcard $(BACNET_SRC_DIR)/bacnet/basic/binding/*.c) \
+	$(wildcard $(BACNET_SRC_DIR)/bacnet/basic/sys/*.c) \
+	$(BACNET_SRC_DIR)/bacnet/basic/npdu/h_routed_npdu.c \
+	$(BACNET_SRC_DIR)/bacnet/basic/npdu/s_router.c \
+	$(BACNET_SRC_DIR)/bacnet/basic/tsm/tsm.c \
+	$(wildcard $(BACNET_SRC_DIR)/bacnet/basic/service/*.c)
 
-DEFINES += -DBAC_ROUTING
+SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
 
-CFLAGS  = $(WARNINGS) $(DEBUGGING) $(OPTIMIZATION) $(STANDARDS) $(INCLUDES) $(DEFINES)
+OBJS += ${SRCS:.c=.o}
 
-all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
+CFLAGS += -DBAC_ROUTING
 
-${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
+.PHONY: all
+all: Makefile ${TARGET_BIN}
+
+${TARGET_BIN}: ${OBJS}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
-lib: ${BACNET_LIB_TARGET}
-
-${BACNET_LIB_TARGET}:
-	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) )
-
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
+.PHONY: depend
 depend:
 	rm -f .depend
 	${CC} -MM ${CFLAGS} *.c >> .depend
 
+.PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} ${BACNET_LIB_TARGET} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
 
+.PHONY: include
 include: .depend
-
diff --git a/apps/gateway/main.c b/apps/gateway/main.c
index 9c8b24cb..56d7998f 100644
--- a/apps/gateway/main.c
+++ b/apps/gateway/main.c
@@ -48,7 +48,6 @@
 #include "bacnet/basic/object/bacfile.h"
 #include "bacnet/datalink/datalink.h"
 #include "bacnet/dcc.h"
-#include "bacport.h"
 #include "bacnet/basic/tsm/tsm.h"
 #include "bacnet/basic/object/lc.h"
 #include "bacnet/basic/sys/debug.h"
diff --git a/apps/server/Makefile b/apps/server/Makefile
index 6107727a..aa63741a 100644
--- a/apps/server/Makefile
+++ b/apps/server/Makefile
@@ -37,14 +37,14 @@ SRC = main.c \
 	$(BACNET_OBJECT_DIR)/bacfile.c
 
 BACNET_BASIC_SRC += \
-	$(wildcard $(BACNET_SRC_DIR)/bacnet/basic/service/*.c) \
+	$(wildcard $(BACNET_SRC_DIR)/bacnet/basic/service/*.c)
 
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
 SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
 
-OBJS += ${SRCS:.c=.o}
+OBJS = ${SRCS:.c=.o}
 
 .PHONY: all
 all: Makefile ${TARGET_BIN}