diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index c3f459626..63182d7e7 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-23  Corinna Vinschen  <corinna@vinschen.de>
+
+	* libc/locale/locale.c: Drop Cygwin-specific windows.h include.
+	(loadlocale): Call __set_charset_from_codepage with 0 codepage.
+
 2009-09-22  Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* libc/include/stdlib.h: Add posix_memalign.
diff --git a/newlib/libc/locale/locale.c b/newlib/libc/locale/locale.c
index a01b312f8..ef7a7e428 100644
--- a/newlib/libc/locale/locale.c
+++ b/newlib/libc/locale/locale.c
@@ -166,9 +166,6 @@ No supporting OS subroutines are required.
 #include <stdlib.h>
 #include <wchar.h>
 #include "../stdlib/local.h"
-#ifdef __CYGWIN__
-#include <windows.h>
-#endif
 
 #define _LC_LAST      7
 #define ENCODING_LEN 31
@@ -468,7 +465,7 @@ loadlocale(struct _reent *p, int category)
       else if (c[0] == '\0' || c[0] == '@')
 	/* End of string or just a modifier */
 #ifdef __CYGWIN__
-	__set_charset_from_codepage (GetACP (), charset);
+	__set_charset_from_codepage (0, charset);
 #else
 	strcpy (charset, "ISO-8859-1");
 #endif