diff --git a/bacnet-stack/demo/epics/bacepics.cbp b/bacnet-stack/demo/epics/bacepics.cbp
index e08d85ac..a0419d1b 100644
--- a/bacnet-stack/demo/epics/bacepics.cbp
+++ b/bacnet-stack/demo/epics/bacepics.cbp
@@ -33,6 +33,7 @@
 			<Add option="-fexceptions" />
 			<Add option="-DBACDL_BIP" />
 			<Add option="-DPRINT_ENABLED=1" />
+			<Add option="-DBACAPP_ALL" />
 			<Add directory="." />
 			<Add directory="..\..\include" />
 			<Add directory="..\handler" />
diff --git a/bacnet-stack/lib/bacnet.cbp b/bacnet-stack/lib/bacnet.cbp
index aaa47a8f..88d780c4 100644
--- a/bacnet-stack/lib/bacnet.cbp
+++ b/bacnet-stack/lib/bacnet.cbp
@@ -213,15 +213,16 @@
 		<Unit filename="..\include\whohas.h" />
 		<Unit filename="..\include\whois.h" />
 		<Unit filename="..\include\wp.h" />
-		<Unit filename="main.c">
-			<Option compilerVar="CC" />
-		</Unit>
 		<Unit filename="..\ports\win32\bip-init.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="..\ports\win32\dlmstp.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\ports\win32\net.h" />
+		<Unit filename="..\ports\win32\rs485.h" />
+		<Unit filename="..\ports\win32\stdbool.h" />
+		<Unit filename="..\ports\win32\stdint.h" />
 		<Unit filename="..\src\abort.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -255,6 +256,9 @@
 		<Unit filename="..\src\bacprop.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\src\bacreal.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\src\bacstr.c">
 			<Option compilerVar="CC" />
 		</Unit>
diff --git a/bacnet-stack/ports/win32/bacnet.cbp b/bacnet-stack/ports/win32/bacnet.cbp
new file mode 100644
index 00000000..79ba58b7
--- /dev/null
+++ b/bacnet-stack/ports/win32/bacnet.cbp
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="bacnet" />
+		<Option makefile="makefile" />
+		<Option pch_mode="2" />
+		<Option compiler="gcc" />
+		<Build>
+			<Target title="Debug">
+				<Option output="bin\Debug\bacnet" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj\Debug\" />
+				<Option type="1" />
+				<Option compiler="gcc" />
+				<Compiler>
+					<Add option="-g" />
+				</Compiler>
+			</Target>
+			<Target title="Release">
+				<Option output="bin\Release\bacnet" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj\Release\" />
+				<Option type="1" />
+				<Option compiler="gcc" />
+				<Compiler>
+					<Add option="-O2" />
+				</Compiler>
+				<Linker>
+					<Add option="-s" />
+				</Linker>
+			</Target>
+		</Build>
+		<Compiler>
+			<Add option="-Wall" />
+			<Add option="-fexceptions" />
+			<Add option="-DBACDL_BIP" />
+			<Add option="-DPRINT_ENABLED=1" />
+			<Add option="-DBACAPP_ALL" />
+			<Add directory="." />
+			<Add directory="..\..\include" />
+			<Add directory="..\..\demo\handler" />
+			<Add directory="..\..\demo\object" />
+		</Compiler>
+		<Linker>
+			<Add library="..\..\lib\libbacnet.a" />
+			<Add library="ws2_32" />
+		</Linker>
+		<Unit filename="..\..\include\bacaddr.h" />
+		<Unit filename="..\..\include\bacdef.h" />
+		<Unit filename="..\..\include\bacint.h" />
+		<Unit filename="..\..\include\crc.h" />
+		<Unit filename="..\..\include\datalink.h" />
+		<Unit filename="..\..\include\indtext.h" />
+		<Unit filename="..\..\include\mstp.h" />
+		<Unit filename="..\..\include\mstptext.h" />
+		<Unit filename="..\..\include\npdu.h" />
+		<Unit filename="main.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Extensions>
+			<code_completion />
+			<envvars />
+			<debugger />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>
diff --git a/bacnet-stack/ports/win32/dlmstp.cbp b/bacnet-stack/ports/win32/dlmstp.cbp
index c26539c1..cf493cab 100644
--- a/bacnet-stack/ports/win32/dlmstp.cbp
+++ b/bacnet-stack/ports/win32/dlmstp.cbp
@@ -40,41 +40,41 @@
 			<Add option="-DPRINT_ENABLED=1" />
 			<Add option="-DCRC_USE_TABLE" />
 			<Add directory="." />
-			<Add directory="..\..\..\bacnet-stack" />
+			<Add directory="..\..\include" />
 			<Add directory="..\..\demo\handler" />
 			<Add directory="..\..\demo\object" />
 		</Compiler>
-		<Unit filename="..\..\bacaddr.c">
+		<Unit filename="..\..\src\bacaddr.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\..\bacaddr.h" />
-		<Unit filename="..\..\bacdef.h" />
-		<Unit filename="..\..\bacint.c">
+		<Unit filename="..\..\include\bacaddr.h" />
+		<Unit filename="..\..\include\bacdef.h" />
+		<Unit filename="..\..\src\bacint.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\..\bacint.h" />
-		<Unit filename="..\..\crc.c">
+		<Unit filename="..\..\include\bacint.h" />
+		<Unit filename="..\..\src\crc.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\..\crc.h" />
-		<Unit filename="..\..\datalink.h" />
-		<Unit filename="..\..\dlmstp.h" />
-		<Unit filename="..\..\indtext.c">
+		<Unit filename="..\..\include\crc.h" />
+		<Unit filename="..\..\include\datalink.h" />
+		<Unit filename="..\..\include\dlmstp.h" />
+		<Unit filename="..\..\src\indtext.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\..\indtext.h" />
-		<Unit filename="..\..\mstp.c">
+		<Unit filename="..\..\include\indtext.h" />
+		<Unit filename="..\..\src\mstp.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\..\mstp.h" />
-		<Unit filename="..\..\mstptext.c">
+		<Unit filename="..\..\include\mstp.h" />
+		<Unit filename="..\..\src\mstptext.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\..\mstptext.h" />
-		<Unit filename="..\..\npdu.c">
+		<Unit filename="..\..\include\mstptext.h" />
+		<Unit filename="..\..\src\npdu.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\..\npdu.h" />
+		<Unit filename="..\..\include\npdu.h" />
 		<Unit filename="dlmstp.c">
 			<Option compilerVar="CC" />
 		</Unit>