Added an extern "C" safeguard.

include/commctrl.h

@@ -8,6 +8,10 @@
 #include "windows.h"
 #include "imagelist.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 BOOL32 WINAPI ShowHideMenuCtl (HWND32, UINT32, LPINT32);
 VOID WINAPI GetEffectiveClientRect (HWND32, LPRECT32, LPINT32);
 VOID WINAPI InitCommonControls (VOID);
@@ -2484,5 +2488,8 @@ LRESULT WINAPI COMCTL32_SendNotify (HWND32, HWND32, UINT32, LPNMHDR);
 /* type and functionality of last parameter is still unknown */
 LRESULT WINAPI COMCTL32_SendNotifyEx (HWND32, HWND32, UINT32, LPNMHDR, DWORD);
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif  /* __WINE_COMMCTRL_H */

include/winbase.h

@@ -3,6 +3,10 @@
 
 #include "windows.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define WAIT_FAILED		0xffffffff
 #define WAIT_OBJECT_0		0
 #define WAIT_ABANDONED		STATUS_ABANDONED_WAIT_0
@@ -195,4 +199,8 @@ void      WINAPI RaiseException(DWORD,DWORD,DWORD,const LPDWORD);
 BOOL32    WINAPI TerminateProcess(HANDLE32,DWORD);
 BOOL32    WINAPI TerminateThread(HANDLE32,DWORD);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif  /* __WINE_WINBASE_H */

include/wintypes.h

@@ -12,6 +12,10 @@
 # undef UNICODE
 #endif  /* __WINE__ */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Macros to map Winelib names to the correct implementation name */
 /* depending on __WINE__ and UNICODE macros.                      */
 /* Note that Winelib is purely Win32.                             */
@@ -378,4 +382,8 @@ DECL_WINELIB_TYPE(HWND)
 extern int __winelib;
 #endif  /* __WINE__ */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __WINE_WINTYPES_H */