diff --git a/build/cbuilder.bpf b/build/cbuilder.bpf
deleted file mode 100644
index 9c04818..0000000
--- a/build/cbuilder.bpf
+++ /dev/null
@@ -1,45 +0,0 @@
-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\api\upnpapi.c");
-USEUNIT("..\upnp\src\api\upnptools.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\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\net\sock.c");
-USEUNIT("..\upnp\src\genlib\service_table\service_table.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");
-USEUNIT("..\upnp\src\win_dll.c");
-USEUNIT("..\upnp\src\inet_pton.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/inc/config.h b/build/inc/config.h
index 91b704b..b4118a5 100644
--- a/build/inc/config.h
+++ b/build/inc/config.h
@@ -305,13 +305,11 @@
   */
 
 //@{
-#ifndef WIN32
- #ifdef DEBUG
-  #define DBGONLY(x) x
- #else
-  #define DBGONLY(x)
- #endif
-#endif
+#ifdef DEBUG
+ #define DBGONLY(x) x
+#else
+ #define DBGONLY(x)
+#endif
 //@}
 
 
diff --git a/build/libupnp.bpf b/build/libupnp.bpf
new file mode 100644
index 0000000..74318f1
--- /dev/null
+++ b/build/libupnp.bpf
@@ -0,0 +1,3 @@
+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/cbuilder.bpr b/build/libupnp.bpr
similarity index 51%
rename from build/cbuilder.bpr
rename to build/libupnp.bpr
index b565542..597cd75 100644
--- a/build/cbuilder.bpr
+++ b/build/libupnp.bpr
@@ -3,7 +3,7 @@
 <PROJECT>
   <MACROS>
     <VERSION value="BCB.05.03"/>
-    <PROJECT value="..\cbuilder.dll"/>
+    <PROJECT value="libupnp.dll"/>
     <OBJFILES value="..\ixml\src\nodeList.obj ..\ixml\src\attr.obj ..\ixml\src\document.obj 
       ..\ixml\src\element.obj ..\ixml\src\ixml.obj ..\ixml\src\ixmlmembuf.obj 
       ..\ixml\src\ixmlparser.obj ..\ixml\src\namedNodeMap.obj 
@@ -44,18 +44,18 @@
     <LINKER value="tlink32"/>
     <USERDEFINES value="WIN32"/>
     <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
-    <MAINSOURCE value="cbuilder.bpf"/>
+    <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="..\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)\lib\obj;$(BCB)\lib"/>
+    <LIBPATH value="$(BCB)\lib\obj;$(BCB)\lib"/>
     <WARNINGS value="-w-par"/>
   </MACROS>
   <OPTIONS>
-    <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"/>
+    <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"/>
     <RFLAGS value=""/>
     <AFLAGS value="/mx /w2 /zd"/>
-    <LFLAGS value="-l&quot;D:\DEVELOP\pupnp\trunk\&quot; -D&quot;&quot; -aa -Tpd -x -Gn -Gi"/>
+    <LFLAGS value="-Tpd -aa -Gi -D&quot;&quot; -x -Gn -v"/>
   </OPTIONS>
   <LINKER>
     <ALLOBJ value="c0d32.obj $(OBJFILES)"/>
@@ -90,34 +90,6 @@ ProductName=
 ProductVersion=1.0.0.0
 Comments=
 
-[HistoryLists\hlIncludePath]
-Count=5
-Item0=..\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
-Item1=..\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;D:\DEVELOP\pupnp\trunk\ixml\src\inc;D:\DEVELOP\pupnp\trunk\upnp\src\inc
-Item2=..\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
-Item3=..\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;D:\DEVELOP\pupnp\trunk\ixml\inc;D:\DEVELOP\pupnp\trunk\threadutil\inc;D:\DEVELOP\pupnp\trunk\upnp\inc;D:\DEVELOP\pupnp\trunk\build\inc
-Item4=..\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
-
-[HistoryLists\hlLibraryPath]
-Count=1
-Item0=..\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)\lib\obj;$(BCB)\lib
-
-[HistoryLists\hlDebugSourcePath]
-Count=1
-Item0=$(BCB)\source\vcl
-
-[HistoryLists\hlConditionals]
-Count=1
-Item0=WIN32
-
-[HistoryLists\hlFinalOutputDir]
-Count=1
-Item0=D:\DEVELOP\pupnp\trunk
-
-[HistoryLists\hIBPIOutputDir]
-Count=1
-Item0=D:\DEVELOP\pupnp\trunk
-
 [Debugging]
 DebugSourceDirs=$(BCB)\source\vcl