diff --git a/upnp/src/inc/inet_pton.h b/upnp/src/inc/inet_pton.h
index 60fa16b..df59b6d 100644
--- a/upnp/src/inc/inet_pton.h
+++ b/upnp/src/inc/inet_pton.h
@@ -51,7 +51,7 @@ extern const char * inet_ntop6(src, dst, size);
  * author:
  *	Paul Vixie, 1996.
  */
-extern int inet_pton4(src, dst);
+extern inet_pton4(const char *src,u_char *dst);
 
 /* int
  * inet_pton6(src, dst)
@@ -83,7 +83,7 @@ extern int inet_pton6(src, dst);
  * author:
  *	Paul Vixie, 1996.
  */
-extern const char * inet_ntop(af, src, dst, size);
+extern const char *inet_ntop(int af,const void *src,char *dst,socklen_t size);
 
 
 /* int
@@ -97,7 +97,7 @@ extern const char * inet_ntop(af, src, dst, size);
  * author:
  *	Paul Vixie, 1996.
  */
-extern int inet_pton(af, src, dst);
+extern int inet_pton(int af,const char *src,void *dst);
 
 #endif
 #endif
diff --git a/upnp/src/inet_pton.c b/upnp/src/inet_pton.c
index b46c354..4f931c6 100644
--- a/upnp/src/inet_pton.c
+++ b/upnp/src/inet_pton.c
@@ -193,9 +193,7 @@ inet_ntop6(src, dst, size)
  *	Paul Vixie, 1996.
  */
 static int
-inet_pton4(src, dst)
-	const char *src;
-	u_char *dst;
+inet_pton4(const char *src,u_char *dst)
 {
 	int saw_digit, octets, ch;
 	u_char tmp[4], *tp;
@@ -345,12 +343,7 @@ inet_pton6(src, dst)
  * author:
  *	Paul Vixie, 1996.
  */
-extern const char *
-inet_ntop(af, src, dst, size)
-	int af;
-	const void *src;
-	char *dst;
-	socklen_t size;
+extern const char *inet_ntop(int af,const void *src,char *dst,socklen_t size)
 {
 	switch (af) {
 	case AF_INET:
@@ -378,11 +371,7 @@ inet_ntop(af, src, dst, size)
  * author:
  *	Paul Vixie, 1996.
  */
-extern int
-inet_pton(af, src, dst)
-	int af;
-	const char *src;
-	void *dst;
+int inet_pton(int af,const char *src,void *dst)
 {
 	switch (af) {
 	case AF_INET:
diff --git a/upnp/src/soap/soap_device.c b/upnp/src/soap/soap_device.c
index bcb0176..ed8138f 100644
--- a/upnp/src/soap/soap_device.c
+++ b/upnp/src/soap/soap_device.c
@@ -34,7 +34,11 @@
 #if EXCLUDE_SOAP == 0
 
 #define SOAP_BODY "Body"
-#define SOAP_URN "http://schemas.xmlsoap.org/soap/envelope/"
+#ifdef WIN32 // escaping necessary for CBuilder
+ #define SOAP_URN "http:\/\/schemas.xmlsoap.org/soap/envelope/"
+#else
+ #define SOAP_URN "http://schemas.xmlsoap.org/soap/envelope/"
+#endif
 
 #define QUERY_STATE_VAR_URN "urn:schemas-upnp-org:control-1-0"