diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 53b7e71e7..ecac33b08 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,4 +1,9 @@
 
+Thu Jan 18 10:33:01  2001  Earnie Boyd  <earnie@users.sourceforge.net>
+
+	* include/wchar.h: Protect prototypes only declared in the C++ STL
+	from being declared unless __cplusplus is defined.
+
 Tue Jan 16 11:37:31  2001  Earnie Boyd  <earnie@users.sourceforge.net>
 
 	* include/stdlib.h: Apply Danny Smith patch 102730
diff --git a/winsup/mingw/include/wchar.h b/winsup/mingw/include/wchar.h
index 9d598e80e..8aa8ae40b 100644
--- a/winsup/mingw/include/wchar.h
+++ b/winsup/mingw/include/wchar.h
@@ -256,6 +256,8 @@ wchar_t * 	wmktemp(wchar_t *);
 
 #endif /* not __STRICT_ANSI__ */
 
+#ifdef __cplusplus
+/* These are only defined in C++ STL runtime dll.  */
 typedef int mbstate_t;
 typedef wchar_t _Wint_t;
 
@@ -266,7 +268,8 @@ size_t  mbsrtowcs(wchar_t *, const char **, size_t, mbstate_t *);
 
 size_t  wcrtomb(char *, wchar_t, mbstate_t *);
 size_t  wcsrtombs(char *, const wchar_t **, size_t, mbstate_t *);
-int  wctob(wint_t);
+int  	wctob(wint_t);
+#endif def __cplusplus
 
 #ifdef __cplusplus
 }	/* end of extern "C" */