diff --git a/bacnet-stack/demo/server/Makefile b/bacnet-stack/demo/server/Makefile
index 25d60267..2e26c759 100644
--- a/bacnet-stack/demo/server/Makefile
+++ b/bacnet-stack/demo/server/Makefile
@@ -9,7 +9,27 @@ TARGET = bacserv
 
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = main.c
+SRC = main.c
+
+OBJECT_SRC = \
+	$(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
+
+SRCS = ${SRC} ${OBJECT_SRC}
 
 OBJS = ${SRCS:.c=.o}
 
diff --git a/bacnet-stack/lib/Makefile b/bacnet-stack/lib/Makefile
index 8bd60710..ff0bffba 100644
--- a/bacnet-stack/lib/Makefile
+++ b/bacnet-stack/lib/Makefile
@@ -125,24 +125,6 @@ HANDLER_SRC = \
 	$(BACNET_HANDLER)/s_upt.c \
 	$(BACNET_HANDLER)/s_wp.c
 
-OBJECT_SRC = \
-	$(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
-
 PORT_ARCNET_SRC = \
 	$(BACNET_PORT_DIR)/arcnet.c
 
@@ -197,7 +179,7 @@ ifneq (,$(findstring -DBAC_UCI,$(BACNET_DEFINES)))
 UCI_SRC = $(BACNET_CORE)/ucix.c
 endif
 
-SRCS = ${CORE_SRC} ${PORT_SRC} ${HANDLER_SRC} ${OBJECT_SRC}
+SRCS = ${CORE_SRC} ${PORT_SRC} ${HANDLER_SRC}
 
 OBJS = ${SRCS:.c=.o}