diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 6bf29c493..98ffece47 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-04  Jeff Johnston  <jjohnstn@redhat.com>
+
+        * libc/include/wchar.h: Add extern "C" specifier if C++.
+        * libc/include/wctype.h: Ditto.
+
 2002-10-18  Jeff Johnston  <jjohnstn@redhat.com>
 
         * testsuite/newlib.wctype/tiswctype.c: New test case.
diff --git a/newlib/libc/include/wchar.h b/newlib/libc/include/wchar.h
index f75fe31fc..2c5fd0ef7 100644
--- a/newlib/libc/include/wchar.h
+++ b/newlib/libc/include/wchar.h
@@ -31,6 +31,10 @@
 #endif
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef _MBSTATE_T
 #define _MBSTATE_T
 typedef _mbstate_t mbstate_t;
@@ -65,4 +69,8 @@ wchar_t	*_EXFUN(wmemcpy, (wchar_t * , const wchar_t * , size_t));
 wchar_t	*_EXFUN(wmemmove, (wchar_t *, const wchar_t *, size_t));
 wchar_t	*_EXFUN(wmemset, (wchar_t *, wchar_t, size_t));
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _WCHAR_H_ */
diff --git a/newlib/libc/include/wctype.h b/newlib/libc/include/wctype.h
index 77f10e47d..15aec00e3 100644
--- a/newlib/libc/include/wctype.h
+++ b/newlib/libc/include/wctype.h
@@ -11,6 +11,10 @@
 # define WEOF ((wint_t)-1)
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef _WCTYPE_T
 #define _WCTYPE_T
 typedef int wctype_t;
@@ -40,4 +44,8 @@ wint_t	_EXFUN(towlower, (wint_t));
 wctrans_t _EXFUN(wctrans, (const char *));
 wctype_t _EXFUN(wctype, (const char *));
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _WCTYPE_H_ */