diff --git a/build/libupnp.bpf b/build/libupnp.bpf
index be3e6ab..5b12438 100644
--- a/build/libupnp.bpf
+++ b/build/libupnp.bpf
@@ -43,6 +43,7 @@ USEUNIT("..\upnp\src\urlconfig\urlconfig.c");
 USEUNIT("..\upnp\src\uuid\uuid.c");
 USEUNIT("..\upnp\src\uuid\md5.c");
 USEUNIT("..\upnp\src\uuid\sysdep.c");
+USELIB("..\..\..\pthreads-w32-1-10-0-release\pthreadBC1.lib");
 //---------------------------------------------------------------------------
 This file is used by the project manager only and should be treated like the project file
 
diff --git a/build/libupnp.bpr b/build/libupnp.bpr
index cd4a4a1..06938c1 100644
--- a/build/libupnp.bpr
+++ b/build/libupnp.bpr
@@ -34,7 +34,7 @@
     <RESFILES value=""/>
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
-    <LIBFILES value=""/>
+    <LIBFILES value="..\..\..\pthreads-w32-1-10-0-release\pthreadBC1.lib"/>
     <LIBRARIES value=""/>
     <SPARELIBS value=""/>
     <PACKAGES value=""/>
@@ -45,7 +45,7 @@
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
     <LINKER value="tlink32"/>
-    <USERDEFINES value="WIN32;EXPORT_SPEC"/>
+    <USERDEFINES value="WIN32;LIBUPNP_EXPORTS"/>
     <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
     <MAINSOURCE value="libupnp.bpf"/>
     <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"/>
@@ -53,8 +53,8 @@
     <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"/>
+    <CFLAG1 value="-WD -O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -fp -ff -X- -a4 -6 -b- -k- -vi 
+      -tWD -tWM -c"/>
     <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
     <RFLAGS value=""/>
     <AFLAGS value="/mx /w2 /zd"/>
@@ -106,9 +106,10 @@ Count=1
 Item0=$(BCB)\source\vcl
 
 [HistoryLists\hlConditionals]
-Count=2
-Item0=WIN32;EXPORT_SPEC
-Item1=WIN32
+Count=3
+Item0=WIN32;LIBUPNP_EXPORTS
+Item1=WIN32;EXPORT_SPEC
+Item2=WIN32
 
 [Debugging]
 DebugSourceDirs=$(BCB)\source\vcl
diff --git a/upnp/src/genlib/net/http/httpparser.c b/upnp/src/genlib/net/http/httpparser.c
index cfb7210..a13d51b 100644
--- a/upnp/src/genlib/net/http/httpparser.c
+++ b/upnp/src/genlib/net/http/httpparser.c
@@ -973,21 +973,21 @@ skip_to_end_of_header( INOUT scanner_t * scanner )
 }
 
 /************************************************************************
-* Function: match_char													
-*																		
-* Parameters:															
-*	INOUT scanner_t* scanner ;  Scanner Object											
-*	IN char c ;					Character to be compared with 															
-*	IN xboolean case_sensitive; Flag indicating whether comparison should 
+* Function: match_char
+*
+* Parameters:
+*	INOUT scanner_t* scanner ;  Scanner Object
+*	IN char c ;					Character to be compared with
+*	IN xboolean case_sensitive; Flag indicating whether comparison should
 *								be case sensitive
-*																		
-* Description: Compares a character to the next char in the scanner;	
-*	on error, scanner chars are not restored							
-*																		
-* Returns:																
-*   PARSE_OK															
-*   PARSE_NO_MATCH														
-*   PARSE_INCOMPLETE													
+*
+* Description: Compares a character to the next char in the scanner;
+*	on error, scanner chars are not restored
+*
+* Returns:
+*   PARSE_OK
+*   PARSE_NO_MATCH
+*   PARSE_INCOMPLETE
 ************************************************************************/
 static XINLINE parse_status_t
 match_char( INOUT scanner_t * scanner,
diff --git a/upnp/src/genlib/net/http/webserver.c b/upnp/src/genlib/net/http/webserver.c
index 6c0a1af..0155a94 100644
--- a/upnp/src/genlib/net/http/webserver.c
+++ b/upnp/src/genlib/net/http/webserver.c
@@ -751,15 +751,15 @@ isFileInVirtualDir( IN char *filePath )
 }
 
 /************************************************************************
-* Function: ToUpperCase													
-*																		
-* Parameters:															
-*	INOUT char * Str ; Input string to be converted					
-*																		
-* Description: Converts input string to upper case						
-*																		
-* Returns:																
-*	int																	
+* Function: ToUpperCase
+*
+* Parameters:
+*	INOUT char * Str ; Input string to be converted
+*
+* Description: Converts input string to upper case
+*
+* Returns:
+*	int
 ************************************************************************/
 int
 ToUpperCase( char *Str )
@@ -773,15 +773,15 @@ ToUpperCase( char *Str )
 }
 
 /************************************************************************
-* Function: StrStr														
-*																		
-* Parameters:															
+* Function: StrStr
+*
+* Parameters:
 *	IN char * S1 ; Input string
-*	IN char * S2 ; Input sub-string										
-*																		
-* Description: Finds a substring from a string							
-*																		
-* Returns:																
+*	IN char * S2 ; Input sub-string
+*
+* Description: Finds a substring from a string
+*
+* Returns:
 *	char * ptr - pointer to the first occurence of S2 in S1				
 ************************************************************************/
 char *