Added an extern "C" safeguard.
diff --git a/include/commctrl.h b/include/commctrl.h
index 74e17ef..2e6c31c 100644
--- a/include/commctrl.h
+++ b/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 @@
/* 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 */
diff --git a/include/winbase.h b/include/winbase.h
index 47878fe..1f32748 100644
--- a/include/winbase.h
+++ b/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 @@
BOOL32 WINAPI TerminateProcess(HANDLE32,DWORD);
BOOL32 WINAPI TerminateThread(HANDLE32,DWORD);
+#ifdef __cplusplus
+}
+#endif
+
#endif /* __WINE_WINBASE_H */
diff --git a/include/wintypes.h b/include/wintypes.h
index be62f60..5b11c65 100644
--- a/include/wintypes.h
+++ b/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 @@
extern int __winelib;
#endif /* __WINE__ */
+#ifdef __cplusplus
+}
+#endif
+
#endif /* __WINE_WINTYPES_H */