diff --git a/bacnet-stack/demo/BACnetDemo.workspace b/bacnet-stack/demo/BACnetDemo.workspace
index 903aef37..e329a2e6 100644
--- a/bacnet-stack/demo/BACnetDemo.workspace
+++ b/bacnet-stack/demo/BACnetDemo.workspace
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_workspace_file>
 	<Workspace title="Workspace">
-		<Project filename="../lib/bacnet.cbp" active="1" />
-		<Project filename="server/bacserv.cbp" />
-		<Project filename="epics/bacepics.cbp" />
-		<Project filename="readprop/bacrp.cbp" />
-		<Project filename="../ports/win32/bacnet.cbp" />
-		<Project filename="../ports/win32/rs485.cbp" />
+		<Project filename="..\lib\bacnet.cbp" />
+		<Project filename="server\bacserv.cbp" />
+		<Project filename="epics\bacepics.cbp" />
+		<Project filename="readprop\bacrp.cbp" />
+		<Project filename="..\ports\win32\bacnet.cbp" />
+		<Project filename="..\ports\win32\rs485.cbp" active="1" />
 	</Workspace>
 </CodeBlocks_workspace_file>
diff --git a/bacnet-stack/demo/epics/bacepics.cbp b/bacnet-stack/demo/epics/bacepics.cbp
index 3733fdeb..fc8d4782 100644
--- a/bacnet-stack/demo/epics/bacepics.cbp
+++ b/bacnet-stack/demo/epics/bacepics.cbp
@@ -48,9 +48,63 @@
 		<Unit filename="main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\object\device-client.c">
+		<Unit filename="..\object\ai.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\object\ai.h" />
+		<Unit filename="..\object\ao.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<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" />
+		</Unit>
+		<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" />
+		</Unit>
+		<Unit filename="..\object\device.h" />
+		<Unit filename="..\object\lc.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\object\lc.h" />
+		<Unit filename="..\object\lo.h" />
+		<Unit filename="..\object\lsp.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\object\lsp.h" />
+		<Unit filename="..\object\ms-input.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\object\ms-input.h" />
+		<Unit filename="..\object\mso.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\object\mso.h" />
+		<Unit filename="..\object\nc.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\object\nc.h" />
+		<Unit filename="..\object\trendlog.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\object\trendlog.h" />
 		<Extensions>
 			<code_completion />
 			<envvars />
diff --git a/bacnet-stack/demo/readprop/bacrp.cbp b/bacnet-stack/demo/readprop/bacrp.cbp
index c32197f5..baa81a4a 100644
--- a/bacnet-stack/demo/readprop/bacrp.cbp
+++ b/bacnet-stack/demo/readprop/bacrp.cbp
@@ -43,6 +43,9 @@
 			<Add library="ws2_32" />
 			<Add library="iphlpapi" />
 		</Linker>
+		<Unit filename="..\object\device-client.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="main.c">
 			<Option compilerVar="CC" />
 		</Unit>
diff --git a/bacnet-stack/demo/server/bacserv.cbp b/bacnet-stack/demo/server/bacserv.cbp
index c9704387..d26ba3f3 100644
--- a/bacnet-stack/demo/server/bacserv.cbp
+++ b/bacnet-stack/demo/server/bacserv.cbp
@@ -57,6 +57,63 @@
 			<Add library="ws2_32" />
 			<Add library="iphlpapi" />
 		</Linker>
+		<Unit filename="..\object\ai.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\object\ai.h" />
+		<Unit filename="..\object\ao.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<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" />
+		</Unit>
+		<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" />
+		</Unit>
+		<Unit filename="..\object\device.h" />
+		<Unit filename="..\object\lc.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\object\lc.h" />
+		<Unit filename="..\object\lo.h" />
+		<Unit filename="..\object\lsp.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\object\lsp.h" />
+		<Unit filename="..\object\ms-input.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\object\ms-input.h" />
+		<Unit filename="..\object\mso.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\object\mso.h" />
+		<Unit filename="..\object\nc.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\object\nc.h" />
+		<Unit filename="..\object\trendlog.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\object\trendlog.h" />
 		<Unit filename="main.c">
 			<Option compilerVar="CC" />
 		</Unit>
diff --git a/bacnet-stack/lib/bacnet.cbp b/bacnet-stack/lib/bacnet.cbp
index 97d27a74..7c95eaa2 100644
--- a/bacnet-stack/lib/bacnet.cbp
+++ b/bacnet-stack/lib/bacnet.cbp
@@ -127,6 +127,9 @@
 		<Unit filename="..\demo\handler\h_wp.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\demo\handler\h_wpm.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\demo\handler\noserv.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -196,42 +199,6 @@
 		<Unit filename="..\demo\handler\txbuf.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\demo\object\ai.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\demo\object\ao.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\demo\object\av.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\demo\object\bacfile.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\demo\object\bi.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\demo\object\bo.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\demo\object\bv.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\demo\object\device.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\demo\object\lc.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\demo\object\lsp.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\demo\object\mso.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\demo\object\trendlog.c">
-			<Option compilerVar="CC" />
-		</Unit>
 		<Unit filename="..\include\abort.h" />
 		<Unit filename="..\include\address.h" />
 		<Unit filename="..\include\ai.h" />
@@ -304,9 +271,6 @@
 		<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" />
@@ -374,9 +338,6 @@
 		<Unit filename="..\src\cov.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\src\crc.c">
-			<Option compilerVar="CC" />
-		</Unit>
 		<Unit filename="..\src\datetime.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -470,6 +431,9 @@
 		<Unit filename="..\src\wp.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\src\wpm.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Extensions>
 			<code_completion />
 			<envvars />