diff --git a/bacnet-stack/demo/epics/bacepics.cbp b/bacnet-stack/demo/epics/bacepics.cbp
index fc8d4782..35feaf9d 100644
--- a/bacnet-stack/demo/epics/bacepics.cbp
+++ b/bacnet-stack/demo/epics/bacepics.cbp
@@ -45,66 +45,12 @@
 			<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>
-		<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/server/bacserv.cbp b/bacnet-stack/demo/server/bacserv.cbp
index d26ba3f3..9b0020f4 100644
--- a/bacnet-stack/demo/server/bacserv.cbp
+++ b/bacnet-stack/demo/server/bacserv.cbp
@@ -85,6 +85,10 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="..\object\bv.h" />
+		<Unit filename="..\object\csv.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\object\csv.h" />
 		<Unit filename="..\object\device.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -106,6 +110,10 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="..\object\mso.h" />
+		<Unit filename="..\object\msv.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\object\msv.h" />
 		<Unit filename="..\object\nc.c">
 			<Option compilerVar="CC" />
 		</Unit>
diff --git a/bacnet-stack/lib/bacnet.cbp b/bacnet-stack/lib/bacnet.cbp
index 7c95eaa2..a6f00b3f 100644
--- a/bacnet-stack/lib/bacnet.cbp
+++ b/bacnet-stack/lib/bacnet.cbp
@@ -201,12 +201,9 @@
 		</Unit>
 		<Unit filename="..\include\abort.h" />
 		<Unit filename="..\include\address.h" />
-		<Unit filename="..\include\ai.h" />
-		<Unit filename="..\include\ao.h" />
 		<Unit filename="..\include\apdu.h" />
 		<Unit filename="..\include\arcnet.h" />
 		<Unit filename="..\include\arf.h" />
-		<Unit filename="..\include\av.h" />
 		<Unit filename="..\include\awf.h" />
 		<Unit filename="..\include\bacaddr.h" />
 		<Unit filename="..\include\bacapp.h" />
@@ -221,12 +218,9 @@
 		<Unit filename="..\include\bacreal.h" />
 		<Unit filename="..\include\bacstr.h" />
 		<Unit filename="..\include\bactext.h" />
-		<Unit filename="..\include\bi.h" />
 		<Unit filename="..\include\bigend.h" />
 		<Unit filename="..\include\bip.h" />
 		<Unit filename="..\include\bits.h" />
-		<Unit filename="..\include\bo.h" />
-		<Unit filename="..\include\bv.h" />
 		<Unit filename="..\include\bvlc.h" />
 		<Unit filename="..\include\bytes.h" />
 		<Unit filename="..\include\client.h" />
@@ -236,7 +230,6 @@
 		<Unit filename="..\include\datalink.h" />
 		<Unit filename="..\include\datetime.h" />
 		<Unit filename="..\include\dcc.h" />
-		<Unit filename="..\include\device.h" />
 		<Unit filename="..\include\dlmstp.h" />
 		<Unit filename="..\include\ethernet.h" />
 		<Unit filename="..\include\filename.h" />
@@ -246,11 +239,8 @@
 		<Unit filename="..\include\indtext.h" />
 		<Unit filename="..\include\key.h" />
 		<Unit filename="..\include\keylist.h" />
-		<Unit filename="..\include\lc.h" />
-		<Unit filename="..\include\lo.h" />
-		<Unit filename="..\include\lsp.h" />
+		<Unit filename="..\include\proplist.h" />
 		<Unit filename="..\include\memcopy.h" />
-		<Unit filename="..\include\mso.h" />
 		<Unit filename="..\include\mstp.h" />
 		<Unit filename="..\include\mstptext.h" />
 		<Unit filename="..\include\npdu.h" />
@@ -374,6 +364,9 @@
 		<Unit filename="..\src\keylist.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\src\proplist.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\src\lso.c">
 			<Option compilerVar="CC" />
 		</Unit>