diff --git a/build/libupnp.bpf b/build/libupnp.bpf
index 74318f1..be3e6ab 100644
--- a/build/libupnp.bpf
+++ b/build/libupnp.bpf
@@ -1,3 +1,49 @@
+USEUNIT("..\ixml\src\nodeList.c");
+USEUNIT("..\ixml\src\attr.c");
+USEUNIT("..\ixml\src\document.c");
+USEUNIT("..\ixml\src\element.c");
+USEUNIT("..\ixml\src\ixml.c");
+USEUNIT("..\ixml\src\ixmlmembuf.c");
+USEUNIT("..\ixml\src\ixmlparser.c");
+USEUNIT("..\ixml\src\namedNodeMap.c");
+USEUNIT("..\ixml\src\node.c");
+USEUNIT("..\threadutil\src\TimerThread.c");
+USEUNIT("..\threadutil\src\FreeList.c");
+USEUNIT("..\threadutil\src\iasnprintf.c");
+USEUNIT("..\threadutil\src\LinkedList.c");
+USEUNIT("..\threadutil\src\ThreadPool.c");
+USEUNIT("..\upnp\src\win_dll.c");
+USEUNIT("..\upnp\src\inet_pton.c");
+USEUNIT("..\upnp\src\api\upnptools.c");
+USEUNIT("..\upnp\src\api\upnpapi.c");
+USEUNIT("..\upnp\src\gena\gena_device.c");
+USEUNIT("..\upnp\src\gena\gena_callback2.c");
+USEUNIT("..\upnp\src\gena\gena_ctrlpt.c");
+USEUNIT("..\upnp\src\genlib\client_table\client_table.c");
+USEUNIT("..\upnp\src\genlib\miniserver\miniserver.c");
+USEUNIT("..\upnp\src\genlib\net\sock.c");
+USEUNIT("..\upnp\src\genlib\net\http\webserver.c");
+USEUNIT("..\upnp\src\genlib\net\http\httpparser.c");
+USEUNIT("..\upnp\src\genlib\net\http\httpreadwrite.c");
+USEUNIT("..\upnp\src\genlib\net\http\parsetools.c");
+USEUNIT("..\upnp\src\genlib\net\http\statcodes.c");
+USEUNIT("..\upnp\src\genlib\net\uri\uri.c");
+USEUNIT("..\upnp\src\genlib\service_table\service_table.c");
+USEUNIT("..\upnp\src\genlib\util\util.c");
+USEUNIT("..\upnp\src\genlib\util\membuffer.c");
+USEUNIT("..\upnp\src\genlib\util\strintmap.c");
+USEUNIT("..\upnp\src\genlib\util\upnp_timeout.c");
+USEUNIT("..\upnp\src\soap\soap_device.c");
+USEUNIT("..\upnp\src\soap\soap_common.c");
+USEUNIT("..\upnp\src\soap\soap_ctrlpt.c");
+USEUNIT("..\upnp\src\ssdp\ssdp_server.c");
+USEUNIT("..\upnp\src\ssdp\ssdp_ctrlpt.c");
+USEUNIT("..\upnp\src\ssdp\ssdp_device.c");
+USEUNIT("..\upnp\src\urlconfig\urlconfig.c");
+USEUNIT("..\upnp\src\uuid\uuid.c");
+USEUNIT("..\upnp\src\uuid\md5.c");
+USEUNIT("..\upnp\src\uuid\sysdep.c");
+//---------------------------------------------------------------------------
 This file is used by the project manager only and should be treated like the project file
 
 
DllEntryPoint
\ No newline at end of file
diff --git a/build/libupnp.bpr b/build/libupnp.bpr
index 597cd75..cd4a4a1 100644
--- a/build/libupnp.bpr
+++ b/build/libupnp.bpr
@@ -10,24 +10,27 @@
       ..\ixml\src\node.obj ..\threadutil\src\TimerThread.obj 
       ..\threadutil\src\FreeList.obj ..\threadutil\src\iasnprintf.obj 
       ..\threadutil\src\LinkedList.obj ..\threadutil\src\ThreadPool.obj 
-      ..\upnp\src\api\upnpapi.obj ..\upnp\src\api\upnptools.obj 
+      ..\upnp\src\win_dll.obj ..\upnp\src\inet_pton.obj 
+      ..\upnp\src\api\upnptools.obj ..\upnp\src\api\upnpapi.obj 
       ..\upnp\src\gena\gena_device.obj ..\upnp\src\gena\gena_callback2.obj 
       ..\upnp\src\gena\gena_ctrlpt.obj 
       ..\upnp\src\genlib\client_table\client_table.obj 
       ..\upnp\src\genlib\miniserver\miniserver.obj 
-      ..\upnp\src\genlib\net\http\webserver.obj 
+      ..\upnp\src\genlib\net\sock.obj ..\upnp\src\genlib\net\http\webserver.obj 
       ..\upnp\src\genlib\net\http\httpparser.obj 
       ..\upnp\src\genlib\net\http\httpreadwrite.obj 
       ..\upnp\src\genlib\net\http\parsetools.obj 
       ..\upnp\src\genlib\net\http\statcodes.obj 
-      ..\upnp\src\genlib\net\uri\uri.obj ..\upnp\src\genlib\net\sock.obj 
+      ..\upnp\src\genlib\net\uri\uri.obj 
       ..\upnp\src\genlib\service_table\service_table.obj 
-      ..\upnp\src\soap\soap_device.obj ..\upnp\src\soap\soap_common.obj 
-      ..\upnp\src\soap\soap_ctrlpt.obj ..\upnp\src\ssdp\ssdp_server.obj 
-      ..\upnp\src\ssdp\ssdp_ctrlpt.obj ..\upnp\src\ssdp\ssdp_device.obj 
-      ..\upnp\src\urlconfig\urlconfig.obj ..\upnp\src\uuid\uuid.obj 
-      ..\upnp\src\uuid\md5.obj ..\upnp\src\uuid\sysdep.obj 
-      ..\upnp\src\win_dll.obj ..\upnp\src\inet_pton.obj"/>
+      ..\upnp\src\genlib\util\util.obj ..\upnp\src\genlib\util\membuffer.obj 
+      ..\upnp\src\genlib\util\strintmap.obj 
+      ..\upnp\src\genlib\util\upnp_timeout.obj ..\upnp\src\soap\soap_device.obj 
+      ..\upnp\src\soap\soap_common.obj ..\upnp\src\soap\soap_ctrlpt.obj 
+      ..\upnp\src\ssdp\ssdp_server.obj ..\upnp\src\ssdp\ssdp_ctrlpt.obj 
+      ..\upnp\src\ssdp\ssdp_device.obj ..\upnp\src\urlconfig\urlconfig.obj 
+      ..\upnp\src\uuid\uuid.obj ..\upnp\src\uuid\md5.obj 
+      ..\upnp\src\uuid\sysdep.obj"/>
     <RESFILES value=""/>
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
@@ -35,27 +38,27 @@
     <LIBRARIES value=""/>
     <SPARELIBS value=""/>
     <PACKAGES value=""/>
-    <PATHCPP value=".;..\ixml\src;..\threadutil\src;..\upnp\src\api;..\upnp\src\gena;..\upnp\src\genlib\client_table;..\upnp\src\genlib\miniserver;..\upnp\src\genlib\net\http;..\upnp\src\genlib\net\uri;..\upnp\src\genlib\net;..\upnp\src\genlib\service_table;..\upnp\src\soap;..\upnp\src\ssdp;..\upnp\src\urlconfig;..\upnp\src\uuid;..\upnp\src"/>
+    <PATHCPP value=".;..\ixml\src;..\threadutil\src;..\upnp\src;..\upnp\src\api;..\upnp\src\gena;..\upnp\src\genlib\client_table;..\upnp\src\genlib\miniserver;..\upnp\src\genlib\net;..\upnp\src\genlib\net\http;..\upnp\src\genlib\net\uri;..\upnp\src\genlib\service_table;..\upnp\src\genlib\util;..\upnp\src\soap;..\upnp\src\ssdp;..\upnp\src\urlconfig;..\upnp\src\uuid"/>
     <PATHPAS value=".;"/>
     <PATHRC value=".;"/>
     <PATHASM value=".;"/>
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
     <LINKER value="tlink32"/>
-    <USERDEFINES value="WIN32"/>
+    <USERDEFINES value="WIN32;EXPORT_SPEC"/>
     <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
     <MAINSOURCE value="libupnp.bpf"/>
-    <INCLUDEPATH value="..\upnp\src;..\upnp\src\uuid;..\upnp\src\urlconfig;..\upnp\src\ssdp;..\upnp\src\soap;..\upnp\src\genlib\service_table;..\upnp\src\genlib\net;..\upnp\src\genlib\net\uri;..\upnp\src\genlib\net\http;..\upnp\src\genlib\miniserver;..\upnp\src\genlib\client_table;..\upnp\src\gena;..\upnp\src\api;..\threadutil\src;..\ixml\src;$(BCB)\include;$(BCB)\include\vcl;..\ixml\inc;..\threadutil\inc;..\upnp\inc;inc;..\ixml\src\inc;..\upnp\src\inc"/>
-    <LIBPATH value="$(BCB)\lib\obj;$(BCB)\lib"/>
+    <INCLUDEPATH value="..\upnp\src\genlib\util;..\upnp\src;..\upnp\src\uuid;..\upnp\src\urlconfig;..\upnp\src\ssdp;..\upnp\src\soap;..\upnp\src\genlib\service_table;..\upnp\src\genlib\net;..\upnp\src\genlib\net\uri;..\upnp\src\genlib\net\http;..\upnp\src\genlib\miniserver;..\upnp\src\genlib\client_table;..\upnp\src\gena;..\upnp\src\api;..\threadutil\src;..\ixml\src;$(BCB)\include;$(BCB)\include\vcl;..\ixml\inc;..\threadutil\inc;..\upnp\inc;inc;..\ixml\src\inc;..\upnp\src\inc"/>
+    <LIBPATH value="..\upnp\src\uuid;..\upnp\src\urlconfig;..\upnp\src\ssdp;..\upnp\src\soap;..\upnp\src\genlib\util;..\upnp\src\genlib\service_table;..\upnp\src\genlib\net\uri;..\upnp\src\genlib\net\http;..\upnp\src\genlib\net;..\upnp\src\genlib\miniserver;..\upnp\src\genlib\client_table;..\upnp\src\gena;..\upnp\src\api;..\upnp\src;..\threadutil\src;..\ixml\src;$(BCB)\lib\obj;$(BCB)\lib"/>
     <WARNINGS value="-w-par"/>
   </MACROS>
   <OPTIONS>
-    <CFLAG1 value="-tWD -tWM -Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v 
-      -vi- -c"/>
-    <PFLAGS value="-$YD -$W -$O- -v -JPHNE -M"/>
+    <CFLAG1 value="-WD -O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWD 
+      -tWM -c"/>
+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
     <RFLAGS value=""/>
     <AFLAGS value="/mx /w2 /zd"/>
-    <LFLAGS value="-Tpd -aa -Gi -D&quot;&quot; -x -Gn -v"/>
+    <LFLAGS value="-D&quot;&quot; -aa -Tpd -x -Gn -Gi"/>
   </OPTIONS>
   <LINKER>
     <ALLOBJ value="c0d32.obj $(OBJFILES)"/>
@@ -90,6 +93,23 @@ ProductName=
 ProductVersion=1.0.0.0
 Comments=
 
+[HistoryLists\hlIncludePath]
+Count=1
+Item0=..\upnp\src\genlib\util;..\upnp\src;..\upnp\src\uuid;..\upnp\src\urlconfig;..\upnp\src\ssdp;..\upnp\src\soap;..\upnp\src\genlib\service_table;..\upnp\src\genlib\net;..\upnp\src\genlib\net\uri;..\upnp\src\genlib\net\http;..\upnp\src\genlib\miniserver;..\upnp\src\genlib\client_table;..\upnp\src\gena;..\upnp\src\api;..\threadutil\src;..\ixml\src;$(BCB)\include;$(BCB)\include\vcl;..\ixml\inc;..\threadutil\inc;..\upnp\inc;inc;..\ixml\src\inc;..\upnp\src\inc
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=..\upnp\src\uuid;..\upnp\src\urlconfig;..\upnp\src\ssdp;..\upnp\src\soap;..\upnp\src\genlib\util;..\upnp\src\genlib\service_table;..\upnp\src\genlib\net\uri;..\upnp\src\genlib\net\http;..\upnp\src\genlib\net;..\upnp\src\genlib\miniserver;..\upnp\src\genlib\client_table;..\upnp\src\gena;..\upnp\src\api;..\upnp\src;..\threadutil\src;..\ixml\src;$(BCB)\lib\obj;$(BCB)\lib
+
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=$(BCB)\source\vcl
+
+[HistoryLists\hlConditionals]
+Count=2
+Item0=WIN32;EXPORT_SPEC
+Item1=WIN32
+
 [Debugging]
 DebugSourceDirs=$(BCB)\source\vcl