diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 6c8e746ab..d321a6ff7 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,10 @@
+2003-05-13  Corinna Vinschen  <corinna@vinschen.de>
+
+	* libc/ctype/ctype_.c: Remove checks for deprecated __CYGWIN32__.
+	* libc/include/stdio.h: Ditto.
+	* libc/include/sys/config.h: Ditto.
+	* libc/stdio/mktemp.c: Ditto.
+
 2003-05-13  Corinna Vinschen  <corinna@vinschen.de>
 
 	* libc/locale/ldpart.c (__part_load_locale): Substitute
diff --git a/newlib/libc/ctype/ctype_.c b/newlib/libc/ctype/ctype_.c
index 90a16944f..9991dd222 100644
--- a/newlib/libc/ctype/ctype_.c
+++ b/newlib/libc/ctype/ctype_.c
@@ -84,7 +84,7 @@ static _CONST char _ctype_b[128 + 256] = {
 	_CTYPE_DATA_128_256
 };
 
-#if defined(__CYGWIN__) || defined(__CYGWIN32__)
+#if defined(__CYGWIN__)
 extern _CONST char __declspec(dllexport) _ctype_[1 + 256] __attribute__ ((alias ("_ctype_b+127")));
 _CONST char __declspec(dllexport) *__ctype_ptr = _ctype_b + 128;
 #else
@@ -94,7 +94,7 @@ _CONST char *__ctype_ptr = _ctype_b + 128;
 
 #else	/* !defined(ALLOW_NEGATIVE_CTYPE_INDEX) */
 
-#if defined(__CYGWIN__) || defined(__CYGWIN32__)
+#if defined(__CYGWIN__)
 _CONST char __declspec(dllexport) _ctype_[1 + 256] = {
 #else
 _CONST char _ctype_[1 + 256] = {
diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
index cf9d0c49a..a82cd7639 100644
--- a/newlib/libc/include/stdio.h
+++ b/newlib/libc/include/stdio.h
@@ -79,7 +79,7 @@ typedef _fpos64_t fpos64_t;
 #define	__SNPT	0x0800		/* do not do fseek() optimisation */
 #define	__SOFF	0x1000		/* set iff _offset is in fact correct */
 #define	__SMOD	0x2000		/* true => fgetline modified _p text */
-#if defined(__CYGWIN__) || defined(__CYGWIN32__)
+#if defined(__CYGWIN__)
 #  define __SCLE  0x4000        /* convert line endings CR/LF <-> NL */
 #endif
 #define	__SL64	0x8000		/* is 64-bit offset large file */
diff --git a/newlib/libc/include/sys/config.h b/newlib/libc/include/sys/config.h
index bb04c9b2c..0859392bb 100644
--- a/newlib/libc/include/sys/config.h
+++ b/newlib/libc/include/sys/config.h
@@ -147,7 +147,7 @@
 #define __RAND_MAX 0x7fffffff
 #endif
 
-#if defined(__CYGWIN32__) || defined(__CYGWIN__)
+#if defined(__CYGWIN__)
 #include <cygwin/config.h>
 #endif
 
diff --git a/newlib/libc/stdio/mktemp.c b/newlib/libc/stdio/mktemp.c
index 66030a382..f5757f3c7 100644
--- a/newlib/libc/stdio/mktemp.c
+++ b/newlib/libc/stdio/mktemp.c
@@ -155,7 +155,7 @@ _DEFUN (_gettemp, (ptr, path, doopen),
 	  if ((*doopen = _open_r (ptr, path, O_CREAT | O_EXCL | O_RDWR, 0600))
 	      >= 0)
 	    return 1;
-#if defined(__CYGWIN32__) || defined(__CYGWIN__)
+#if defined(__CYGWIN__)
 	  if (ptr->_errno != EEXIST && ptr->_errno != EACCES)
 #else
 	  if (ptr->_errno != EEXIST)