diff --git a/include/objbase.h b/include/objbase.h
index 339db84da46..4c46c276537 100644
--- a/include/objbase.h
+++ b/include/objbase.h
@@ -26,8 +26,16 @@
 #include <stdlib.h>
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 HRESULT WINAPI GetClassFile(LPOLESTR filePathName,CLSID *pclsid);
 
+#ifdef __cplusplus
+}
+#endif
+
 
 /*    These macros are msdev's way of defining COM objects. They are provided 
  * here for use by winelib users.
diff --git a/include/oleauto.h b/include/oleauto.h
index 21471e2002b..cf97fdf0e76 100644
--- a/include/oleauto.h
+++ b/include/oleauto.h
@@ -516,10 +516,6 @@ HRESULT WINAPI VarCmp(LPVARIANT,LPVARIANT,LCID,ULONG);
 
 
 
-#ifdef __cplusplus
-} /* extern "C" */
-#endif 
-
 typedef struct tagPARAMDATA {
     OLECHAR * szName;   /* parameter name */
     VARTYPE vt;         /* parameter type */
@@ -585,5 +581,9 @@ HRESULT WINAPI QueryPathOfRegTypeLib(REFGUID,WORD,WORD,LCID,LPBSTR);
 HRESULT WINAPI RegisterTypeLib(ITypeLib*,OLECHAR*,OLECHAR*);
 HRESULT WINAPI UnRegisterTypeLib(REFGUID,WORD,WORD,LCID,SYSKIND);
 
+#ifdef __cplusplus
+} /* extern "C" */
+#endif 
+
 
 #endif /*__WINE_OLEAUTO_H*/
diff --git a/include/olectl.h b/include/olectl.h
index 9c02ca5fc9e..73dd1aa0c60 100644
--- a/include/olectl.h
+++ b/include/olectl.h
@@ -4,6 +4,11 @@
 #include "windef.h"
 #include "ocidl.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 
 /*
  * Ole Control Interfaces
@@ -256,6 +261,13 @@ HRESULT WINAPI OleTranslateColor( OLE_COLOR clr, HPALETTE hpal,
 #define CONNECT_E_CANNOTCONNECT     (CONNECT_E_FIRST+2)
 #define CONNECT_E_OVERRIDDEN        (CONNECT_E_FIRST+3)
 
+#define SELFREG_E_FIRST             MAKE_SCODE(SEVERITY_ERROR,   FACILITY_ITF, 0x0200)
+#define SELFREG_E_LAST              MAKE_SCODE(SEVERITY_ERROR,   FACILITY_ITF, 0x020F)
+#define SELFREG_S_FIRST             MAKE_SCODE(SEVERITY_SUCCESS, FACILITY_ITF, 0x0200)
+#define SELFREG_S_LAST              MAKE_SCODE(SEVERITY_SUCCESS, FACILITY_ITF, 0x020F)
+#define SELFREG_E_TYPELIB           (SELFREG_E_FIRST+0)
+#define SELFREG_E_CLASS             (SELFREG_E_FIRST+1)
+
 #ifndef FACILITY_CONTROL
 #define FACILITY_CONTROL 0xa
 #endif
@@ -315,6 +327,11 @@ HRESULT WINAPI OleTranslateColor( OLE_COLOR clr, HPALETTE hpal,
 
 #define PERPROP_E_NOPAGEAVAILABLE   (PERPROP_E_FIRST+0)
 
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /*  __WINE_OLECTL_H */
 
 
diff --git a/include/wine/obj_base.h b/include/wine/obj_base.h
index 64585598228..6afd576c2cc 100644
--- a/include/wine/obj_base.h
+++ b/include/wine/obj_base.h
@@ -34,6 +34,11 @@
 #include "wtypes.h"
 #include "guiddef.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 #ifndef NONAMELESSSTRUCT
 #define LISet32(li, v)   ((li).HighPart = (v) < 0 ? -1 : 0, (li).LowPart = (v))
 #define ULISet32(li, v)  ((li).HighPart = 0, (li).LowPart = (v))
@@ -661,10 +666,6 @@ ICOM_DEFINE(IMalloc,IUnknown)
 #define IMalloc_HeapMinimize(p) ICOM_CALL (HeapMinimize,p)
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 HRESULT WINAPI CoGetMalloc(DWORD dwMemContext,LPMALLOC* lpMalloc);
 
 LPVOID WINAPI CoTaskMemAlloc(ULONG size);
diff --git a/include/wininet.h b/include/wininet.h
index c4695656125..9a8da6f1ee7 100644
--- a/include/wininet.h
+++ b/include/wininet.h
@@ -1,7 +1,7 @@
 #ifndef _WINE_WININET_H_
 #define _WINE_WININET_H_
 
-#if defined(__cplusplus)
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -1399,7 +1399,7 @@ BOOLAPI InternetCheckConnectionA(LPCSTR lpszUrl,DWORD dwFlags,DWORD dwReserved);
 BOOLAPI InternetCheckConnectionW(LPCWSTR lpszUrl,DWORD dwFlags,DWORD dwReserved); 
 #define InternetCheckConnection WINELIB_NAME_AW(InternetCheckConnection)
 
-#if defined(__cplusplus)
+#ifdef __cplusplus
 }
 #endif