diff --git a/bacnet-stack/demo/writefile/Makefile b/bacnet-stack/demo/writefile/Makefile
index 476ccddc..5fb2f7cf 100644
--- a/bacnet-stack/demo/writefile/Makefile
+++ b/bacnet-stack/demo/writefile/Makefile
@@ -9,44 +9,48 @@ BASEDIR = .
 #DEFINES = -DBACFILE=1 -DBACDL_ETHERNET=1
 #DEFINES = -DBACFILE=1 -DBACDL_ARCNET=1
 #DEFINES = -DBACFILE=1 -DBACDL_MSTP=1 
-DEFINES = -DBACFILE=1 -DBACDL_BIP=1 
-INCLUDES = -I. -I../../ports/linux -I../object -I../handler
+DEFINES = -DBACFILE=1 -DTSM_ENABLED=1 -DBACDL_BIP=1
+BACNET_PORT = ../../ports/linux
+BACNET_OBJECT = ../object
+BACNET_HANDLER = ../handler
+BACNET_ROOT = ../..
+INCLUDES = -I$(BACNET_ROOT) -I$(BACNET_PORT) -I$(BACNET_OBJECT) -I$(BACNET_HANDLER) 
 
 CFLAGS  = -Wall -g $(INCLUDES) $(DEFINES)
 
 TARGET = bacawf
 
 SRCS = writefile.c \
-       ../../ports/linux/bip-init.c \
-       bip.c \
-       ../handler/txbuf.c \
-       ../handler/noserv.c \
-       ../handler/h_whois.c \
-       ../handler/h_rp.c \
-       rp.c \
-       bacdcode.c \
-       bacapp.c \
-       bacprop.c \
-       bacstr.c \
-       bactext.c \
-       indtext.c \
-       bigend.c \
-       whois.c \
-       iam.c \
-       tsm.c \
-       datalink.c \
-       address.c \
-       ../object/device.c \
-       ../object/ai.c \
-       ../object/ao.c \
-       ../object/bacfile.c \
-       arf.c \
-       awf.c \
-       abort.c \
-       reject.c \
-       bacerror.c \
-       apdu.c \
-       npdu.c
+       $(BACNET_PORT)/bip-init.c \
+       $(BACNET_ROOT)/bip.c \
+       $(BACNET_HANDLER)/txbuf.c \
+       $(BACNET_HANDLER)/noserv.c \
+       $(BACNET_HANDLER)/h_whois.c \
+       $(BACNET_HANDLER)/h_rp.c \
+       $(BACNET_ROOT)/rp.c \
+       $(BACNET_ROOT)/bacdcode.c \
+       $(BACNET_ROOT)/bacapp.c \
+       $(BACNET_ROOT)/bacprop.c \
+       $(BACNET_ROOT)/bacstr.c \
+       $(BACNET_ROOT)/bactext.c \
+       $(BACNET_ROOT)/indtext.c \
+       $(BACNET_ROOT)/bigend.c \
+       $(BACNET_ROOT)/whois.c \
+       $(BACNET_ROOT)/iam.c \
+       $(BACNET_ROOT)/tsm.c \
+       $(BACNET_ROOT)/datalink.c \
+       $(BACNET_ROOT)/address.c \
+       $(BACNET_OBJECT)/device.c \
+       $(BACNET_OBJECT)/ai.c \
+       $(BACNET_OBJECT)/ao.c \
+       $(BACNET_OBJECT)/bacfile.c \
+       $(BACNET_ROOT)/arf.c \
+       $(BACNET_ROOT)/awf.c \
+       $(BACNET_ROOT)/abort.c \
+       $(BACNET_ROOT)/reject.c \
+       $(BACNET_ROOT)/bacerror.c \
+       $(BACNET_ROOT)/apdu.c \
+       $(BACNET_ROOT)/npdu.c
 
 OBJS = ${SRCS:.c=.o}