diff --git a/bacnet-stack/demo/BACnetDemo.workspace b/bacnet-stack/demo/BACnetDemo.workspace
index a9855f72..1e429525 100644
--- a/bacnet-stack/demo/BACnetDemo.workspace
+++ b/bacnet-stack/demo/BACnetDemo.workspace
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_workspace_file>
 	<Workspace title="Workspace">
-		<Project filename="epics\bacepics.cbp" />
 		<Project filename="..\lib\bacnet.cbp" />
 		<Project filename="server\bacserv.cbp" />
+		<Project filename="epics\bacepics.cbp" />
+		<Project filename="readprop\bacrp.cbp" />
 		<Project filename="whois\bacwi.cbp" active="1" />
 	</Workspace>
 </CodeBlocks_workspace_file>
diff --git a/bacnet-stack/demo/epics/bacepics.cbp b/bacnet-stack/demo/epics/bacepics.cbp
index a0419d1b..db1331bb 100644
--- a/bacnet-stack/demo/epics/bacepics.cbp
+++ b/bacnet-stack/demo/epics/bacepics.cbp
@@ -43,6 +43,7 @@
 		<Linker>
 			<Add library="..\..\lib\libbacnet.a" />
 			<Add library="ws2_32" />
+			<Add library="iphlpapi" />
 		</Linker>
 		<Unit filename="main.c">
 			<Option compilerVar="CC" />
diff --git a/bacnet-stack/demo/readprop/bacrp.cbp b/bacnet-stack/demo/readprop/bacrp.cbp
index 6da2bc52..c32197f5 100644
--- a/bacnet-stack/demo/readprop/bacrp.cbp
+++ b/bacnet-stack/demo/readprop/bacrp.cbp
@@ -41,6 +41,7 @@
 		<Linker>
 			<Add library="..\..\lib\libbacnet.a" />
 			<Add library="ws2_32" />
+			<Add library="iphlpapi" />
 		</Linker>
 		<Unit filename="main.c">
 			<Option compilerVar="CC" />
diff --git a/bacnet-stack/demo/server/bacserv.cbp b/bacnet-stack/demo/server/bacserv.cbp
index acbf8024..c9704387 100644
--- a/bacnet-stack/demo/server/bacserv.cbp
+++ b/bacnet-stack/demo/server/bacserv.cbp
@@ -55,6 +55,7 @@
 		<Linker>
 			<Add library="..\..\lib\libbacnet.a" />
 			<Add library="ws2_32" />
+			<Add library="iphlpapi" />
 		</Linker>
 		<Unit filename="main.c">
 			<Option compilerVar="CC" />
diff --git a/bacnet-stack/lib/bacnet.cbp b/bacnet-stack/lib/bacnet.cbp
index 8bb97579..5f45098a 100644
--- a/bacnet-stack/lib/bacnet.cbp
+++ b/bacnet-stack/lib/bacnet.cbp
@@ -44,6 +44,7 @@
 		</Compiler>
 		<Linker>
 			<Add library="ws2_32" />
+			<Add library="iphlpapi" />
 		</Linker>
 		<Unit filename="..\demo\handler\h_arf.c">
 			<Option compilerVar="CC" />
@@ -308,6 +309,12 @@
 		<Unit filename="..\src\indtext.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="..\src\key.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\src\keylist.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="..\src\mstp.c">
 			<Option compilerVar="CC" />
 		</Unit>