diff --git a/ChangeLog b/ChangeLog
index e0e9ec4..bad0d67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -255,6 +255,9 @@ Version 1.8.0
 Version 1.6.13
 *******************************************************************************
 
+2011-03-08 Iain Denniston <iain.denniston(at)gmail.com>
+	Fixes for headers when compiled under C++
+
 2011-03-08 Iain Denniston <iain.denniston(at)gmail.com>
 	Fix for uuid_unpack incorrect shift precedence.
 
diff --git a/upnp/src/inc/httpreadwrite.h b/upnp/src/inc/httpreadwrite.h
index f1f016c..f48ead8 100644
--- a/upnp/src/inc/httpreadwrite.h
+++ b/upnp/src/inc/httpreadwrite.h
@@ -45,7 +45,7 @@
 #define HTTP_DEFAULT_TIMEOUT	30
 
 #ifdef __cplusplus
-#extern "C" {
+extern "C" {
 #endif
 
 int http_CancelHttpGet(IN void *Handle);
diff --git a/upnp/src/inc/sock.h b/upnp/src/inc/sock.h
index 47d10ef..5a2195e 100644
--- a/upnp/src/inc/sock.h
+++ b/upnp/src/inc/sock.h
@@ -60,7 +60,7 @@ typedef struct
 } SOCKINFO;
 
 #ifdef __cplusplus
-#extern "C" {
+extern "C" {
 #endif
 
 /*!