diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index dea7f3d22..a2aeff766 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-24  Corinna Vinschen  <corinna@vinschen.de>
+
+	* wchar.h: Remove erroneous "C" specifier from extern declaration.
+
 2009-03-24  Corinna Vinschen  <corinna@vinschen.de>
 
 	* ctype.cc (_CTYPE_DATA_0_127): Add _B class to TAB character.
diff --git a/winsup/cygwin/wchar.h b/winsup/cygwin/wchar.h
index 2ad83e126..80e8a0ef9 100644
--- a/winsup/cygwin/wchar.h
+++ b/winsup/cygwin/wchar.h
@@ -17,22 +17,23 @@ details. */
 extern "C" {
 #endif
 
-extern "C" int __utf8_wctomb (struct _reent *, char *, wchar_t,
-			      const char *, mbstate_t *);
-
 typedef int mbtowc_f (struct _reent *, wchar_t *, const char *, size_t,
 		      const char *, mbstate_t *);
 typedef mbtowc_f *mbtowc_p;
 
-extern "C" mbtowc_p __mbtowc;
-extern "C" mbtowc_f __ascii_mbtowc;
-extern "C" mbtowc_f __utf8_mbtowc;
-extern "C" mbtowc_f __iso_mbtowc;
-extern "C" mbtowc_f __cp_mbtowc;
+extern int __utf8_wctomb (struct _reent *, char *, wchar_t,
+			      const char *, mbstate_t *);
 
-extern "C" char *__locale_charset ();
+extern int (*__mbtowc) (struct _reent *, wchar_t *, const char *, size_t,
+                 const char *, mbstate_t *);
+extern mbtowc_f __ascii_mbtowc;
+extern mbtowc_f __utf8_mbtowc;
+extern mbtowc_f __iso_mbtowc;
+extern mbtowc_f __cp_mbtowc;
 
-extern "C" mbtowc_p __set_charset_from_codepage (UINT cp, char *charset);
+extern char *__locale_charset ();
+
+extern mbtowc_p __set_charset_from_codepage (UINT cp, char *charset);
 
 #ifdef __cplusplus
 }