diff --git a/bacnet-stack/config.h b/bacnet-stack/config.h
index cc742d75..e42cfb48 100644
--- a/bacnet-stack/config.h
+++ b/bacnet-stack/config.h
@@ -37,6 +37,7 @@
     #define MAX_APDU 480
     /* #define MAX_APDU 1476 */
 #endif
+
 /* for confirmed messages, this is the number of transactions */
 /* that we hold in a queue waiting for timeout. */
 /* Configure to zero if you don't want any confirmed messages */
diff --git a/bacnet-stack/demo/dcc/Makefile b/bacnet-stack/demo/dcc/Makefile
index e8472f08..424d91c6 100644
--- a/bacnet-stack/demo/dcc/Makefile
+++ b/bacnet-stack/demo/dcc/Makefile
@@ -7,10 +7,10 @@ BASEDIR = .
 # Note: you can strip out symbols using the strip command
 # to get an idea of how big the compile really is.
 
-BACNET_DEFINES=-DBACFILE=1 -DTSM_ENABLED=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1
+BACNET_DEFINES=-DBACFILE -DPRINT_ENABLED=1
 #BACDL_DEFINE=-DBACDL_ETHERNET=1
 #BACDL_DEFINE=-DBACDL_ARCNET=1
-BACDL_DEFINE=-DBACDL_BIP=1
+BACDL_DEFINE=-DBACDL_BIP
 DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE)
 
 BACNET_PORT = ../../ports/linux
diff --git a/bacnet-stack/demo/dcc/makefile.b32 b/bacnet-stack/demo/dcc/makefile.b32
index e54e7079..d5742699 100644
--- a/bacnet-stack/demo/dcc/makefile.b32
+++ b/bacnet-stack/demo/dcc/makefile.b32
@@ -15,7 +15,7 @@ PRODUCT = bacdcc
 PRODUCT_EXE = $(PRODUCT).exe
 
 # Choose the Data Link Layer to Enable
-DEFINES = -DBACDL_BIP=1;TSM_ENABLED=1;USE_INADDR=1;BIP_DEBUG;BIG_ENDIAN=0;PRINT_ENABLED=1
+DEFINES = -DBACDL_BIP=1;USE_INADDR=1;BIP_DEBUG;PRINT_ENABLED=1
 
 SRCS = main.c \
        ..\..\ports\win32\bip-init.c \
diff --git a/bacnet-stack/demo/epics/Makefile b/bacnet-stack/demo/epics/Makefile
index 4ba40671..65810edb 100644
--- a/bacnet-stack/demo/epics/Makefile
+++ b/bacnet-stack/demo/epics/Makefile
@@ -7,7 +7,7 @@ BASEDIR = .
 # Note: you can strip out symbols using the strip command
 # to get an idea of how big the compile really is.
 
-BACNET_DEFINES=-DBACFILE=1 -DTSM_ENABLED=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1
+BACNET_DEFINES= -DPRINT_ENABLED=1
 #BACDL_DEFINE=-DBACDL_ETHERNET=1
 #BACDL_DEFINE=-DBACDL_ARCNET=1
 BACDL_DEFINE=-DBACDL_BIP=1
diff --git a/bacnet-stack/demo/epics/makefile.b32 b/bacnet-stack/demo/epics/makefile.b32
index 99e464c8..612f015c 100644
--- a/bacnet-stack/demo/epics/makefile.b32
+++ b/bacnet-stack/demo/epics/makefile.b32
@@ -15,7 +15,7 @@ PRODUCT = bacepics
 PRODUCT_EXE = $(PRODUCT).exe
 
 # Choose the Data Link Layer to Enable
-DEFINES = -DBACDL_BIP=1;TSM_ENABLED=1;BIG_ENDIAN=0;PRINT_ENABLED=1;BIP_DEBUG=0
+DEFINES = -DBACDL_BIP=1;PRINT_ENABLED=1;BIP_DEBUG=0
 
 SRCS = main.c \
        ..\..\ports\win32\bip-init.c \
diff --git a/bacnet-stack/demo/object/bacfile.c b/bacnet-stack/demo/object/bacfile.c
index 948dd672..96d793b3 100644
--- a/bacnet-stack/demo/object/bacfile.c
+++ b/bacnet-stack/demo/object/bacfile.c
@@ -337,7 +337,7 @@ uint32_t bacfile_instance(char *filename)
     return instance;
 }
 
-#if TSM_ENABLED
+#if MAX_TSM_TRANSACTIONS
 /* this is one way to match up the invoke ID with */
 /* the file ID from the AtomicReadFile request. */
 /* Another way would be to store the */
diff --git a/bacnet-stack/demo/readfile/Makefile b/bacnet-stack/demo/readfile/Makefile
index 8574eb5b..5542e538 100644
--- a/bacnet-stack/demo/readfile/Makefile
+++ b/bacnet-stack/demo/readfile/Makefile
@@ -7,7 +7,7 @@ BASEDIR = .
 # Note: you can strip out symbols using the strip command
 # to get an idea of how big the compile really is.
 
-BACNET_DEFINES=-DBACFILE=1 -DTSM_ENABLED=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1
+BACNET_DEFINES=-DPRINT_ENABLED=1
 #BACDL_DEFINE=-DBACDL_ETHERNET=1
 #BACDL_DEFINE=-DBACDL_ARCNET=1
 BACDL_DEFINE=-DBACDL_BIP=1
diff --git a/bacnet-stack/demo/readfile/makefile.b32 b/bacnet-stack/demo/readfile/makefile.b32
index 1d8e21c7..731f0a11 100644
--- a/bacnet-stack/demo/readfile/makefile.b32
+++ b/bacnet-stack/demo/readfile/makefile.b32
@@ -15,7 +15,7 @@ PRODUCT = bacarf
 PRODUCT_EXE = $(PRODUCT).exe
 
 # Choose the Data Link Layer to Enable
-DEFINES = -DBACDL_BIP=1;TSM_ENABLED=1;BIG_ENDIAN=0;PRINT_ENABLED=1
+DEFINES = -DBACDL_BIP=1;PRINT_ENABLED=1
 
 SRCS = main.c \
        ..\..\ports\win32\bip-init.c \
diff --git a/bacnet-stack/demo/readprop/Makefile b/bacnet-stack/demo/readprop/Makefile
index 3d9b3ae7..d7e882f5 100644
--- a/bacnet-stack/demo/readprop/Makefile
+++ b/bacnet-stack/demo/readprop/Makefile
@@ -7,7 +7,7 @@ BASEDIR = .
 # Note: you can strip out symbols using the strip command
 # to get an idea of how big the compile really is.
 
-BACNET_DEFINES=-DBACFILE=1 -DTSM_ENABLED=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1
+BACNET_DEFINES=-DPRINT_ENABLED=1
 #BACDL_DEFINE=-DBACDL_ETHERNET=1
 #BACDL_DEFINE=-DBACDL_ARCNET=1
 BACDL_DEFINE=-DBACDL_BIP=1
diff --git a/bacnet-stack/demo/readprop/bacrp.cbp b/bacnet-stack/demo/readprop/bacrp.cbp
index 570a5ad0..ab77e519 100644
--- a/bacnet-stack/demo/readprop/bacrp.cbp
+++ b/bacnet-stack/demo/readprop/bacrp.cbp
@@ -1,369 +1,221 @@
-<?xml version="1.0"?>
-<!DOCTYPE CodeBlocks_project_file>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_project_file>
-	<FileVersion major="1" minor="1"/>
+	<FileVersion major="1" minor="6" />
 	<Project>
-		<Option title="BACnet Read Property Demo"/>
-		<Option makefile="Makefile"/>
-		<Option makefile_is_custom="0"/>
-		<Option compiler="2"/>
+		<Option title="BACnet Read Property Demo" />
+		<Option pch_mode="0" />
+		<Option compiler="gcc" />
 		<Build>
 			<Target title="default">
-				<Option output="C:\code\bacnet-stack\demo\readprop\bacrp.exe"/>
-				<Option working_dir="."/>
-				<Option object_output=".objs"/>
-				<Option deps_output=".deps"/>
-				<Option type="1"/>
-				<Option compiler="2"/>
-				<Option projectResourceIncludeDirsRelation="1"/>
+				<Option output="C:\code\bacnet-stack\demo\readprop\bacrp.exe" prefix_auto="0" extension_auto="0" />
+				<Option type="1" />
+				<Option compiler="gcc" />
+				<Option projectResourceIncludeDirsRelation="1" />
 				<Compiler>
-					<Add option="-DBACDL_BIP=1;TSM_ENABLED=1"/>
-					<Add directory="..\handler"/>
-					<Add directory="..\object"/>
-					<Add directory="..\..\..\bacnet-stack"/>
-					<Add directory="..\..\ports\win32"/>
+					<Add option="-DBACDL_BIP=1;TSM_ENABLED=1" />
+					<Add directory="..\handler" />
+					<Add directory="..\object" />
+					<Add directory="..\..\..\bacnet-stack" />
+					<Add directory="..\..\ports\win32" />
 				</Compiler>
-				<Linker>
-					<Add library="..\..\..\..\BCC55\Lib\import32.lib"/>
-					<Add library="..\..\..\..\BCC55\Lib\cw32mt.lib"/>
-				</Linker>
 			</Target>
 		</Build>
+		<VirtualTargets>
+			<Add alias="All" targets="default;" />
+		</VirtualTargets>
+		<Compiler>
+			<Add option="-Wall" />
+		</Compiler>
+		<Linker>
+			<Add library="ws2_32" />
+		</Linker>
 		<Unit filename="..\..\abort.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="..\..\abort.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\..\abort.h" />
 		<Unit filename="..\..\address.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="..\..\address.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\..\address.h" />
 		<Unit filename="..\..\apdu.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="..\..\apdu.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\..\apdu.h" />
 		<Unit filename="..\..\arf.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="..\..\arf.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\..\arf.h" />
 		<Unit filename="..\..\awf.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="..\..\awf.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\..\awf.h" />
 		<Unit filename="..\..\bacapp.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="..\..\bacapp.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\..\bacapp.h" />
 		<Unit filename="..\..\bacdcode.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="..\..\bacdcode.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="..\..\bacdef.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="..\..\bacenum.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\..\bacdcode.h" />
+		<Unit filename="..\..\bacdef.h" />
+		<Unit filename="..\..\bacenum.h" />
 		<Unit filename="..\..\bacerror.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\..\bacerror.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+		<Unit filename="..\..\bacerror.h" />
+		<Unit filename="..\..\bacint.c">
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\..\bacint.h" />
 		<Unit filename="..\..\bacstr.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="..\..\bacstr.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\..\bacstr.h" />
 		<Unit filename="..\..\bactext.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="..\..\bactext.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\..\bactext.h" />
 		<Unit filename="..\..\bigend.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="..\..\bigend.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\..\bigend.h" />
 		<Unit filename="..\..\bip.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\..\bip.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+		<Unit filename="..\..\bip.h" />
+		<Unit filename="..\..\config.h" />
+		<Unit filename="..\..\datalink.h" />
+		<Unit filename="..\..\datetime.c">
+			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\..\config.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="..\..\datalink.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="..\..\datalink.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="..\handler\client.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+		<Unit filename="..\..\datetime.h" />
+		<Unit filename="..\..\dcc.c">
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\..\dcc.h" />
+		<Unit filename="..\handler\client.h" />
 		<Unit filename="..\handler\h_iam.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="..\handler\h_rp.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="..\handler\h_rp_a.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="..\handler\h_whois.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="..\handler\handlers.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\handler\handlers.h" />
 		<Unit filename="..\handler\noserv.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="..\handler\s_rp.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="..\handler\s_whois.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="..\handler\txbuf.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="..\handler\txbuf.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\handler\txbuf.h" />
 		<Unit filename="..\object\ai.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="..\object\ai.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\object\ai.h" />
 		<Unit filename="..\object\ao.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\object\ao.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+		<Unit filename="..\object\ao.h" />
+		<Unit filename="..\object\av.c">
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\object\av.h" />
 		<Unit filename="..\object\bacfile.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\object\bacfile.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+		<Unit filename="..\object\bacfile.h" />
+		<Unit filename="..\object\bi.c">
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\object\bi.h" />
+		<Unit filename="..\object\bo.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\object\bo.h" />
+		<Unit filename="..\object\bv.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\object\bv.h" />
 		<Unit filename="..\object\device.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\object\device.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+		<Unit filename="..\object\device.h" />
+		<Unit filename="..\object\lc.c">
+			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="readprop.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
+		<Unit filename="..\object\lc.h" />
+		<Unit filename="..\object\lsp.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\object\lsp.h" />
+		<Unit filename="..\object\mso.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\object\mso.h" />
+		<Unit filename="main.c">
+			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="..\..\filename.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="..\..\filename.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\..\filename.h" />
 		<Unit filename="..\..\iam.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="..\..\iam.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\..\iam.h" />
 		<Unit filename="..\..\indtext.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="..\..\indtext.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\..\indtext.h" />
 		<Unit filename="..\..\npdu.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="..\..\npdu.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\..\npdu.h" />
 		<Unit filename="..\..\ports\win32\bip-init.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\..\ports\win32\net.h" />
+		<Unit filename="..\..\ports\win32\stdbool.h" />
+		<Unit filename="..\..\ports\win32\stdint.h" />
 		<Unit filename="..\..\reject.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="..\..\reject.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\..\reject.h" />
 		<Unit filename="..\..\rp.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="..\..\rp.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\..\rp.h" />
 		<Unit filename="..\..\tsm.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\..\tsm.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+		<Unit filename="..\..\tsm.h" />
+		<Unit filename="..\..\version.c">
+			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="..\..\whois.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="..\..\whois.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\..\whois.h" />
 		<Unit filename="..\..\wp.c">
-			<Option compilerVar="CC"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="..\..\wp.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
+			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\..\wp.h" />
+		<Extensions>
+			<code_completion />
+			<envvars />
+			<debugger />
+		</Extensions>
 	</Project>
 </CodeBlocks_project_file>
diff --git a/bacnet-stack/demo/readprop/main.c b/bacnet-stack/demo/readprop/main.c
index cd71dfbe..d44f4fe4 100644
--- a/bacnet-stack/demo/readprop/main.c
+++ b/bacnet-stack/demo/readprop/main.c
@@ -28,15 +28,19 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <time.h>               /* for time */
 #include <errno.h>
+#include <time.h>               /* for time */
+
+#define PRINT_ENABLED 1
+
+#include "bacdef.h"
+#include "config.h"
 #include "bactext.h"
+#include "bacerror.h"
 #include "iam.h"
 #include "arf.h"
 #include "tsm.h"
 #include "address.h"
-#include "config.h"
-#include "bacdef.h"
 #include "npdu.h"
 #include "apdu.h"
 #include "device.h"
@@ -70,8 +74,8 @@ static void MyErrorHandler(BACNET_ADDRESS * src,
     (void) src;
     (void) invoke_id;
     printf("BACnet Error: %s: %s\r\n",
-        bactext_error_class_name(error_class),
-        bactext_error_code_name(error_code));
+        bactext_error_class_name((int)error_class),
+        bactext_error_code_name((int)error_code));
     Error_Detected = true;
 }
 
@@ -83,7 +87,7 @@ void MyAbortHandler(BACNET_ADDRESS * src,
     (void) invoke_id;
     (void) server;
     printf("BACnet Abort: %s\r\n",
-        bactext_abort_reason_name(abort_reason));
+        bactext_abort_reason_name((int)abort_reason));
     Error_Detected = true;
 }
 
@@ -94,7 +98,7 @@ void MyRejectHandler(BACNET_ADDRESS * src,
     (void) src;
     (void) invoke_id;
     printf("BACnet Reject: %s\r\n",
-        bactext_reject_reason_name(reject_reason));
+        bactext_reject_reason_name((int)reject_reason));
     Error_Detected = true;
 }
 
diff --git a/bacnet-stack/demo/readprop/makefile.b32 b/bacnet-stack/demo/readprop/makefile.b32
index 0373896b..e7640961 100644
--- a/bacnet-stack/demo/readprop/makefile.b32
+++ b/bacnet-stack/demo/readprop/makefile.b32
@@ -15,7 +15,7 @@ PRODUCT = bacrp
 PRODUCT_EXE = $(PRODUCT).exe
 
 # Choose the Data Link Layer to Enable
-DEFINES = -DBACDL_BIP=1;TSM_ENABLED=1;BIG_ENDIAN=0;PRINT_ENABLED=1
+DEFINES = -DBACDL_BIP=1;PRINT_ENABLED=1
 
 SRCS = main.c \
        ..\..\ports\win32\bip-init.c \
diff --git a/bacnet-stack/demo/reinit/Makefile b/bacnet-stack/demo/reinit/Makefile
index 0fe701bf..2115ed70 100644
--- a/bacnet-stack/demo/reinit/Makefile
+++ b/bacnet-stack/demo/reinit/Makefile
@@ -7,7 +7,7 @@ BASEDIR = .
 # Note: you can strip out symbols using the strip command
 # to get an idea of how big the compile really is.
 
-BACNET_DEFINES=-DBACFILE=1 -DTSM_ENABLED=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1
+BACNET_DEFINES=-DPRINT_ENABLED=1
 #BACDL_DEFINE=-DBACDL_ETHERNET=1
 #BACDL_DEFINE=-DBACDL_ARCNET=1
 BACDL_DEFINE=-DBACDL_BIP=1
diff --git a/bacnet-stack/demo/reinit/makefile.b32 b/bacnet-stack/demo/reinit/makefile.b32
index 87546ff3..4aab68c4 100644
--- a/bacnet-stack/demo/reinit/makefile.b32
+++ b/bacnet-stack/demo/reinit/makefile.b32
@@ -15,7 +15,7 @@ PRODUCT = bacrd
 PRODUCT_EXE = $(PRODUCT).exe
 
 # Choose the Data Link Layer to Enable
-DEFINES = -DBACDL_BIP=1;TSM_ENABLED=1;USE_INADDR=1;BIP_DEBUG;BIG_ENDIAN=0;PRINT_ENABLED=1
+DEFINES = -DBACDL_BIP=1;USE_INADDR=1;BIP_DEBUG;PRINT_ENABLED=1
 
 SRCS = main.c \
        ..\..\rd.c \
diff --git a/bacnet-stack/demo/server/bacserv.cbp b/bacnet-stack/demo/server/bacserv.cbp
index f47d8c4c..96864c63 100644
--- a/bacnet-stack/demo/server/bacserv.cbp
+++ b/bacnet-stack/demo/server/bacserv.cbp
@@ -2,12 +2,12 @@
 <CodeBlocks_project_file>
 	<FileVersion major="1" minor="6" />
 	<Project>
-		<Option title="bacserv" />
+		<Option title="BACnet Server Demo" />
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="bin\Debug\bacserv.exe" prefix_auto="1" extension_auto="1" />
+				<Option output="bin\Debug\bacserv" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj\Debug\" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -22,7 +22,7 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output="bin\Release\bacserv.exe" prefix_auto="1" extension_auto="1" />
+				<Option output="bin\Release\bacserv" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj\Release\" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -49,6 +49,7 @@
 			<Add option="-DUSE_INADDR=1" />
 			<Add option="-DPRINT_ENABLED=1" />
 			<Add option="-DBIG_ENDIAN=0" />
+			<Add option="-DMAX_TSM_TRANSACTIONS=0" />
 			<Add directory="." />
 			<Add directory="..\handler" />
 			<Add directory="..\object" />
@@ -274,6 +275,7 @@
 		<Extensions>
 			<code_completion />
 			<envvars />
+			<debugger />
 		</Extensions>
 	</Project>
 </CodeBlocks_project_file>
diff --git a/bacnet-stack/demo/timesync/Makefile b/bacnet-stack/demo/timesync/Makefile
index 2150aaac..c0a795ad 100644
--- a/bacnet-stack/demo/timesync/Makefile
+++ b/bacnet-stack/demo/timesync/Makefile
@@ -11,7 +11,7 @@ BASEDIR = .
 #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
+BACNET_DEFINES=-DPRINT_ENABLED=1
 DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE)
 
 BACNET_PORT = ../../ports/linux
diff --git a/bacnet-stack/demo/timesync/makefile.b32 b/bacnet-stack/demo/timesync/makefile.b32
index a25fcd77..2f0e3377 100644
--- a/bacnet-stack/demo/timesync/makefile.b32
+++ b/bacnet-stack/demo/timesync/makefile.b32
@@ -15,7 +15,7 @@ PRODUCT = bacts
 PRODUCT_EXE = $(PRODUCT).exe
 
 # Choose the Data Link Layer to Enable
-DEFINES = -DBACDL_BIP=1;TSM_ENABLED=0;USE_INADDR=0;BIG_ENDIAN=0;PRINT_ENABLED=1
+DEFINES = -DBACDL_BIP=1;MAX_TSM_TRANSACTIONS=0;USE_INADDR=0;PRINT_ENABLED=1
 # Directories
 BACNET_PORT = ..\..\ports\win32
 BACNET_OBJECT = ..\object
diff --git a/bacnet-stack/demo/ucov/Makefile b/bacnet-stack/demo/ucov/Makefile
index 47844beb..d7f65001 100644
--- a/bacnet-stack/demo/ucov/Makefile
+++ b/bacnet-stack/demo/ucov/Makefile
@@ -11,7 +11,7 @@ BASEDIR = .
 #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
+BACNET_DEFINES=-DMAX_TSM_TRANSACTIONS=0 -DPRINT_ENABLED=1
 DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE)
 
 BACNET_PORT = ../../ports/linux
diff --git a/bacnet-stack/demo/ucov/makefile.b32 b/bacnet-stack/demo/ucov/makefile.b32
index 9f5def3c..e8ac1c6a 100644
--- a/bacnet-stack/demo/ucov/makefile.b32
+++ b/bacnet-stack/demo/ucov/makefile.b32
@@ -15,7 +15,7 @@ PRODUCT = bacucov
 PRODUCT_EXE = $(PRODUCT).exe
 
 # Choose the Data Link Layer to Enable
-DEFINES = -DBACDL_BIP=1;TSM_ENABLED=0;BIG_ENDIAN=0;PRINT_ENABLED=1
+DEFINES = -DBACDL_BIP=1;MAX_TSM_TRANSACTIONS=0;PRINT_ENABLED=1
 
 SRCS = main.c \
        ..\..\ports\win32\bip-init.c \
diff --git a/bacnet-stack/demo/whohas/Makefile b/bacnet-stack/demo/whohas/Makefile
index c36928f4..06edf987 100644
--- a/bacnet-stack/demo/whohas/Makefile
+++ b/bacnet-stack/demo/whohas/Makefile
@@ -7,7 +7,7 @@ BASEDIR = .
 # Note: you can strip out symbols using the strip command
 # to get an idea of how big the compile really is.
 
-BACNET_DEFINES=-DBACFILE=1 -DTSM_ENABLED=0 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1
+BACNET_DEFINES=-DMAX_TSM_TRANSACTIONS=0 -DPRINT_ENABLED=1
 #BACDL_DEFINE=-DBACDL_ETHERNET=1
 #BACDL_DEFINE=-DBACDL_ARCNET=1
 BACDL_DEFINE=-DBACDL_BIP=1
diff --git a/bacnet-stack/demo/whohas/makefile.b32 b/bacnet-stack/demo/whohas/makefile.b32
index 74c9cc2a..d86607ac 100644
--- a/bacnet-stack/demo/whohas/makefile.b32
+++ b/bacnet-stack/demo/whohas/makefile.b32
@@ -15,7 +15,7 @@ PRODUCT = bacwh
 PRODUCT_EXE = $(PRODUCT).exe
 
 # Choose the Data Link Layer to Enable
-DEFINES = -DBACDL_BIP=1;TSM_ENABLED=0;USE_INADDR=1;BIG_ENDIAN=0;PRINT_ENABLED=1
+DEFINES = -DBACDL_BIP=1;MAX_TSM_TRANSACTIONS=0;USE_INADDR=1;PRINT_ENABLED=1
 
 SRCS = main.c \
        ..\..\rd.c \
diff --git a/bacnet-stack/demo/whois/Makefile b/bacnet-stack/demo/whois/Makefile
index 1aaf5045..3b6e239c 100644
--- a/bacnet-stack/demo/whois/Makefile
+++ b/bacnet-stack/demo/whois/Makefile
@@ -11,7 +11,7 @@ BASEDIR = .
 #BACDL_DEFINE = -DBACDL_ETHERNET=1
 #BACDL_DEFINE = -DBACDL_ARCNET=1
 BACDL_DEFINE = -DBACDL_BIP=1 -DUSE_INADDR=1
-BACNET_DEFINES = -DBACFILE=1 -DTSM_ENABLED=0 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1
+BACNET_DEFINES = -DMAX_TSM_TRANSACTIONS=0 -DPRINT_ENABLED=1
 DEFINES=$(BACDL_DEFINE) $(BACNET_DEFINES)
 
 BACNET_PORT = ../../ports/linux
diff --git a/bacnet-stack/demo/whois/makefile.b32 b/bacnet-stack/demo/whois/makefile.b32
index d2e5c65d..018a6285 100644
--- a/bacnet-stack/demo/whois/makefile.b32
+++ b/bacnet-stack/demo/whois/makefile.b32
@@ -15,7 +15,7 @@ PRODUCT = bacwi
 PRODUCT_EXE = $(PRODUCT).exe
 
 # Choose the Data Link Layer to Enable
-DEFINES = -DBACDL_BIP=1;TSM_ENABLED=0;USE_INADDR=1;BIG_ENDIAN=0;PRINT_ENABLED=1;BIP_DEBUG=1
+DEFINES = -DBACDL_BIP=1;MAX_TSM_TRANSACTIONS=0;USE_INADDR=1;PRINT_ENABLED=1;BIP_DEBUG=1
 # Directories
 BACNET_PORT = ..\..\ports\win32
 BACNET_OBJECT = ..\object
diff --git a/bacnet-stack/demo/writefile/Makefile b/bacnet-stack/demo/writefile/Makefile
index b97fe363..1592a840 100644
--- a/bacnet-stack/demo/writefile/Makefile
+++ b/bacnet-stack/demo/writefile/Makefile
@@ -11,7 +11,7 @@ BASEDIR = .
 #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
+BACNET_DEFINES=-DTSM_ENABLED=1 -DPRINT_ENABLED=1
 DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE)
 
 BACNET_PORT = ../../ports/linux
diff --git a/bacnet-stack/demo/writefile/makefile.b32 b/bacnet-stack/demo/writefile/makefile.b32
index 4e6c3751..b2dc7dc3 100644
--- a/bacnet-stack/demo/writefile/makefile.b32
+++ b/bacnet-stack/demo/writefile/makefile.b32
@@ -15,7 +15,7 @@ PRODUCT = bacawf
 PRODUCT_EXE = $(PRODUCT).exe
 
 # Choose the Data Link Layer to Enable
-DEFINES = -DBACDL_BIP=1;TSM_ENABLED=1;BIG_ENDIAN=0;PRINT_ENABLED=1
+DEFINES = -DBACDL_BIP=1;PRINT_ENABLED=1
 
 SRCS = main.c \
        ..\..\ports\win32\bip-init.c \
diff --git a/bacnet-stack/demo/writeprop/Makefile b/bacnet-stack/demo/writeprop/Makefile
index 0f1570ea..bccdba6a 100644
--- a/bacnet-stack/demo/writeprop/Makefile
+++ b/bacnet-stack/demo/writeprop/Makefile
@@ -11,7 +11,7 @@ BASEDIR = .
 #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
+BACNET_DEFINES=-DPRINT_ENABLED=1
 DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE)
 
 BACNET_PORT = ../../ports/linux
diff --git a/bacnet-stack/demo/writeprop/makefile.b32 b/bacnet-stack/demo/writeprop/makefile.b32
index dd12061f..9d29053a 100644
--- a/bacnet-stack/demo/writeprop/makefile.b32
+++ b/bacnet-stack/demo/writeprop/makefile.b32
@@ -15,7 +15,7 @@ PRODUCT = bacwp
 PRODUCT_EXE = $(PRODUCT).exe
 
 # Choose the Data Link Layer to Enable
-DEFINES = -DBACDL_BIP=1;TSM_ENABLED=1;BIG_ENDIAN=0;PRINT_ENABLED=1
+DEFINES = -DBACDL_BIP=1;PRINT_ENABLED=1
 
 SRCS = main.c \
        ..\..\ports\win32\bip-init.c \
diff --git a/bacnet-stack/tsm.h b/bacnet-stack/tsm.h
index c6a4afb7..595400f9 100644
--- a/bacnet-stack/tsm.h
+++ b/bacnet-stack/tsm.h
@@ -42,10 +42,7 @@
 
 /* note: TSM functionality is optional - only needed if we are 
    doing client requests */
-#ifndef TSM_ENABLED
-    #define TSM_ENABLED 0
-#endif
-#if (!TSM_ENABLED)
+#if (!MAX_TSM_TRANSACTIONS)
 #define tsm_free_invoke_id(x) (void)x;
 #else
 typedef enum {