diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 93f839880..e30f6afff 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,29 @@
+2004-03-10  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* include/conio.h: Remove __STRICT_ANSI__ guard from non-ANSI header.
+	* include/direct.h:  Ditto.
+	* include/dirent.h:  Ditto.
+	* include/dos.h:  Ditto.
+	* include/excpt.h:  Ditto.
+	* inlude/fcntl,h
+	* include/io.h:  Ditto.
+	* inlude/mem.h:  Ditto.
+	* include/memory.h:  Ditto.
+	* include/process.h:  Ditto.
+	* inlude/search.h:  Ditto.
+	* include/share.h:  Ditto.
+	* include/unistd.h:  Ditto.
+	* include/sys/fcntl.h:  Ditto.
+	* include/file.h:  Ditto.
+	* include/sys/locking.h:  Ditto.
+	* include/sys/param.h:  Ditto.
+	* include/sys/stat,h
+	* include/sys/time.h:  Ditto.
+	* include/sys/timeb.h:  Ditto.
+	* include/sys/types.h:  Ditto.
+	* include/sys/unistd.h:  Ditto.
+	* include/sys/utime.h:  Ditto.
+
 2004-02-21  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/_mingw.h (__UNUSED_PARAM): Define macro.
diff --git a/winsup/mingw/include/conio.h b/winsup/mingw/include/conio.h
index 780ccc10d..c8e4a8499 100644
--- a/winsup/mingw/include/conio.h
+++ b/winsup/mingw/include/conio.h
@@ -25,8 +25,6 @@
  *
  */
 
-#ifndef	__STRICT_ANSI__
-
 #ifndef	_CONIO_H_
 #define	_CONIO_H_
 
@@ -69,5 +67,3 @@ _CRTIMP int __cdecl	ungetch (int);
 #endif	/* Not RC_INVOKED */
 
 #endif	/* Not _CONIO_H_ */
-
-#endif	/* Not __STRICT_ANSI__ */
diff --git a/winsup/mingw/include/direct.h b/winsup/mingw/include/direct.h
index c8fec4cf4..6fadb5e4c 100644
--- a/winsup/mingw/include/direct.h
+++ b/winsup/mingw/include/direct.h
@@ -24,9 +24,6 @@
  * $Date$
  *
  */
-
-#ifndef __STRICT_ANSI__
-
 #ifndef	_DIRECT_H_
 #define	_DIRECT_H_
 
@@ -90,6 +87,3 @@ _CRTIMP int __cdecl _wrmdir(const wchar_t*);
 #endif	/* Not RC_INVOKED */
 
 #endif	/* Not _DIRECT_H_ */
-
-#endif	/* Not __STRICT_ANSI__ */
-
diff --git a/winsup/mingw/include/dirent.h b/winsup/mingw/include/dirent.h
index 4e787d841..b971138b6 100644
--- a/winsup/mingw/include/dirent.h
+++ b/winsup/mingw/include/dirent.h
@@ -20,9 +20,6 @@
  * $Date$
  *
  */
-
-#ifndef	__STRICT_ANSI__
-
 #ifndef _DIRENT_H_
 #define _DIRENT_H_
 
@@ -140,6 +137,3 @@ void __cdecl _wseekdir (_WDIR*, long);
 #endif	/* Not RC_INVOKED */
 
 #endif	/* Not _DIRENT_H_ */
-
-#endif	/* Not __STRICT_ANSI__ */
-
diff --git a/winsup/mingw/include/dos.h b/winsup/mingw/include/dos.h
index 4f2134e7e..219632f08 100644
--- a/winsup/mingw/include/dos.h
+++ b/winsup/mingw/include/dos.h
@@ -24,8 +24,6 @@
  *
  */
 
-#ifndef	__STRICT_ANSI__
-
 #ifndef	_DOS_H_
 #define	_DOS_H_
 
@@ -105,6 +103,3 @@ _CRTIMP unsigned __cdecl _getdiskfree (unsigned, struct _diskfree_t *);
 #endif	/* Not RC_INVOKED */
 
 #endif	/* Not _DOS_H_ */
-
-#endif	/* Not __STRICT_ANSI__ */
-
diff --git a/winsup/mingw/include/excpt.h b/winsup/mingw/include/excpt.h
index 20a2d721a..7aa442993 100644
--- a/winsup/mingw/include/excpt.h
+++ b/winsup/mingw/include/excpt.h
@@ -34,8 +34,6 @@
 /* All the headers include this file. */
 #include <_mingw.h>
 
-#ifndef	__STRICT_ANSI__
-
 #include <windef.h>
 
 /*
@@ -118,6 +116,4 @@ typedef PEXCEPTION_REGISTRATION PEXCEPTION_REGISTRATION_RECORD;
 
 #endif	/* Not RC_INVOKED */
 
-#endif	/* Not strict ANSI */
-
 #endif	/* _EXCPT_H_ not defined */
diff --git a/winsup/mingw/include/fcntl.h b/winsup/mingw/include/fcntl.h
index ce193295b..b34b4caa8 100644
--- a/winsup/mingw/include/fcntl.h
+++ b/winsup/mingw/include/fcntl.h
@@ -24,9 +24,6 @@
  * $Date$
  *
  */
-
-#ifndef __STRICT_ANSI__
-
 #ifndef _FCNTL_H_
 #define _FCNTL_H_
 
@@ -86,6 +83,3 @@
 #endif	/* Not _NO_OLDNAMES */
 
 #endif	/* Not _FCNTL_H_ */
-
-#endif	/* Not __STRICT_ANSI__ */
-
diff --git a/winsup/mingw/include/io.h b/winsup/mingw/include/io.h
index 50b395ac5..433aa57ab 100644
--- a/winsup/mingw/include/io.h
+++ b/winsup/mingw/include/io.h
@@ -23,9 +23,6 @@
  * $Date$
  *
  */
-
-#ifndef	__STRICT_ANSI__
-
 #ifndef	_IO_H_
 #define	_IO_H_
 
@@ -35,7 +32,6 @@
 /* MSVC's io.h contains the stuff from dir.h, so I will too.
  * NOTE: This also defines off_t, the file offset type, through
  *       an inclusion of sys/types.h */
-#ifndef __STRICT_ANSI__
 
 #include <sys/types.h>	/* To get time_t. */
 
@@ -162,8 +158,6 @@ _CRTIMP int __cdecl chmod (const char*, int);
 
 #endif	/* Not RC_INVOKED */
 
-#endif	/* Not __STRICT_ANSI__ */
-
 /* TODO: Maximum number of open handles has not been tested, I just set
  * it the same as FOPEN_MAX. */
 #define	HANDLE_MAX	FOPEN_MAX
@@ -299,6 +293,3 @@ wchar_t * 	wmktemp(wchar_t *);
 #endif	/* Not RC_INVOKED */
 
 #endif	/* _IO_H_ not defined */
-
-#endif	/* Not strict ANSI */
-
diff --git a/winsup/mingw/include/mem.h b/winsup/mingw/include/mem.h
index 20c8fa4a5..451de0cd4 100644
--- a/winsup/mingw/include/mem.h
+++ b/winsup/mingw/include/mem.h
@@ -3,6 +3,4 @@
  *
  * mem.h maps to string.h
  */
-#ifndef	__STRICT_ANSI__
 #include <string.h>
-#endif
diff --git a/winsup/mingw/include/memory.h b/winsup/mingw/include/memory.h
index e0c91d635..9ba65cf69 100644
--- a/winsup/mingw/include/memory.h
+++ b/winsup/mingw/include/memory.h
@@ -3,7 +3,5 @@
  *
  * memory.h maps to the standard string.h header.
  */
-#ifndef	__STRICT_ANSI__
-#include	<string.h>
-#endif
 
+#include	<string.h>
diff --git a/winsup/mingw/include/process.h b/winsup/mingw/include/process.h
index 67277db8f..6d61b2a2b 100644
--- a/winsup/mingw/include/process.h
+++ b/winsup/mingw/include/process.h
@@ -24,8 +24,6 @@
  *
  */
 
-#ifndef	__STRICT_ANSI__
-
 #ifndef	_PROCESS_H_
 #define	_PROCESS_H_
 
@@ -156,4 +154,3 @@ _CRTIMP int __cdecl spawnvpe (int, const char*, const char* const*, const char*
 #endif	/* _PROCESS_H_ not defined */
 
 #endif	/* Not __STRICT_ANSI__ */
-
diff --git a/winsup/mingw/include/search.h b/winsup/mingw/include/search.h
index b42b05a71..2d7768b53 100644
--- a/winsup/mingw/include/search.h
+++ b/winsup/mingw/include/search.h
@@ -43,7 +43,6 @@ _CRTIMP void* __cdecl bsearch (const void*, const void*, size_t, size_t,
 _CRTIMP void __cdecl qsort (void*, size_t, size_t,
 			    int (*)(const void*, const void*));
 
-#ifndef __STRICT_ANSI__
 _CRTIMP void* __cdecl _lfind (const void*, const void*, unsigned int*,
 			      unsigned int, int (*)(const void*, const void*));
 _CRTIMP void* __cdecl _lsearch (const void*, void*, unsigned int*, unsigned int,
@@ -55,7 +54,6 @@ _CRTIMP void* __cdecl lfind (const void*, const void*, unsigned int*,
 _CRTIMP void* __cdecl lsearch (const void*, void*, unsigned int*, unsigned int,
 			       int (*)(const void*, const void*));
 #endif
-#endif /* __STRICT_ANSI__ */
 
 #ifdef __cplusplus
 }
diff --git a/winsup/mingw/include/share.h b/winsup/mingw/include/share.h
index 605d7e796..4643752f2 100644
--- a/winsup/mingw/include/share.h
+++ b/winsup/mingw/include/share.h
@@ -24,8 +24,6 @@
  *
  */
 
-#ifndef	__STRICT_ANSI__
-
 #ifndef	_SHARE_H_
 #define	_SHARE_H_
 
@@ -38,8 +36,6 @@
 #define	_SH_DENYRD	0x30	/* Deny read */
 #define	_SH_DENYNO	0x40	/* Deny nothing */
 
-#ifndef __STRICT_ANSI__
-
 #ifndef _NO_OLDNAMES
 
 /* Non ANSI names */
@@ -50,9 +46,4 @@
 
 #endif	/* Not _NO_OLDNAMES */
 
-#endif	/* Not __STRICT_ANSI__ */
-
 #endif	/* Not _SHARE_H_ */
-
-#endif	/* Not __STRICT_ANSI__ */
-
diff --git a/winsup/mingw/include/sys/fcntl.h b/winsup/mingw/include/sys/fcntl.h
index b343f272f..a2090bc82 100644
--- a/winsup/mingw/include/sys/fcntl.h
+++ b/winsup/mingw/include/sys/fcntl.h
@@ -3,6 +3,5 @@
  *
  * This fcntl.h maps to the root fcntl.h
  */
-#ifndef __STRICT_ANSI__
+
 #include <fcntl.h>
-#endif
diff --git a/winsup/mingw/include/sys/file.h b/winsup/mingw/include/sys/file.h
index 96c49e117..e95654c09 100644
--- a/winsup/mingw/include/sys/file.h
+++ b/winsup/mingw/include/sys/file.h
@@ -4,6 +4,4 @@
  * This file.h maps to the root fcntl.h
  * TODO?
  */
-#ifndef __STRICT_ANSI__
 #include <fcntl.h>
-#endif
diff --git a/winsup/mingw/include/sys/locking.h b/winsup/mingw/include/sys/locking.h
index 48e08e2c1..ccdb9ec39 100644
--- a/winsup/mingw/include/sys/locking.h
+++ b/winsup/mingw/include/sys/locking.h
@@ -24,8 +24,6 @@
  *
  */
 
-#ifndef	__STRICT_ANSI__
-
 #ifndef	_LOCKING_H_
 #define	_LOCKING_H_
 
@@ -47,6 +45,3 @@
 #endif	/* Not NO_OLDNAMES */
 
 #endif	/* Not _LOCKING_H_ */
-
-#endif	/* Not __STRICT_ANSI__ */
-
diff --git a/winsup/mingw/include/sys/param.h b/winsup/mingw/include/sys/param.h
index 5ff4c8779..40e5af848 100644
--- a/winsup/mingw/include/sys/param.h
+++ b/winsup/mingw/include/sys/param.h
@@ -28,7 +28,6 @@
 #include <sys/types.h>
 #include <limits.h>
 
-#ifndef __STRICT_ANSI__
 /* These are useful for cross-compiling */ 
 #define BIG_ENDIAN	4321
 #define LITTLE_ENDIAN	1234
@@ -37,5 +36,3 @@
 #define MAXPATHLEN PATH_MAX
 
 #endif
-
-#endif
diff --git a/winsup/mingw/include/sys/stat.h b/winsup/mingw/include/sys/stat.h
index f851c25f4..f782d2fa1 100644
--- a/winsup/mingw/include/sys/stat.h
+++ b/winsup/mingw/include/sys/stat.h
@@ -25,8 +25,6 @@
  *
  */
 
-#ifndef __STRICT_ANSI__
-
 #ifndef _STAT_H_
 #define _STAT_H_
 
@@ -185,6 +183,3 @@ _CRTIMP int __cdecl	stat (const char*, struct stat*);
 #endif	/* Not RC_INVOKED */
 
 #endif	/* Not _STAT_H_ */
-
-#endif	/* Not __STRICT_ANSI__ */
-
diff --git a/winsup/mingw/include/sys/time.h b/winsup/mingw/include/sys/time.h
index dfa35d18b..bcd550945 100644
--- a/winsup/mingw/include/sys/time.h
+++ b/winsup/mingw/include/sys/time.h
@@ -1,7 +1,6 @@
 
 #include <time.h>
 
-#ifndef __STRICT_ANSI__
 #ifndef _TIMEVAL_DEFINED /* also in winsock[2].h */
 #define _TIMEVAL_DEFINED
 struct timeval {
@@ -15,5 +14,3 @@ struct timeval {
 	((tvp)->tv_usec cmp (uvp)->tv_usec))
 #define timerclear(tvp)	 (tvp)->tv_sec = (tvp)->tv_usec = 0
 #endif /* _TIMEVAL_DEFINED */
-
-#endif /* __STRICT_ANSI__ */
diff --git a/winsup/mingw/include/sys/timeb.h b/winsup/mingw/include/sys/timeb.h
index 16b4dc0a4..4e5b1bfae 100644
--- a/winsup/mingw/include/sys/timeb.h
+++ b/winsup/mingw/include/sys/timeb.h
@@ -24,8 +24,6 @@
  *
  */
 
-#ifndef	__STRICT_ANSI__
-
 #ifndef	_TIMEB_H_
 #define	_TIMEB_H_
 
@@ -77,6 +75,3 @@ _CRTIMP void __cdecl	ftime (struct timeb*);
 #endif	/* Not RC_INVOKED */
 
 #endif	/* Not _TIMEB_H_ */
-
-#endif	/* Not __STRICT_ANSI__ */
-
diff --git a/winsup/mingw/include/sys/types.h b/winsup/mingw/include/sys/types.h
index 6c39fd8e3..a1f66abdb 100644
--- a/winsup/mingw/include/sys/types.h
+++ b/winsup/mingw/include/sys/types.h
@@ -46,8 +46,6 @@ typedef	long	time_t;
 #endif
 
 
-#ifndef	__STRICT_ANSI__
-
 #ifndef	_OFF_T_
 #define	_OFF_T_
 typedef long _off_t;
@@ -120,8 +118,6 @@ typedef _ssize_t ssize_t;
 #endif
 #endif /* Not _SSIZE_T_ */ 
 
-#endif	/* Not __STRICT_ANSI__ */
-
 #endif	/* Not RC_INVOKED */
 
 #endif	/* Not _TYPES_H_ */
diff --git a/winsup/mingw/include/sys/unistd.h b/winsup/mingw/include/sys/unistd.h
index ed122d9dd..39eac4a90 100644
--- a/winsup/mingw/include/sys/unistd.h
+++ b/winsup/mingw/include/sys/unistd.h
@@ -3,7 +3,4 @@
  *
  * unistd.h maps (roughly) to io.h
  */
-#ifndef __STRICT_ANSI__
 #include <io.h>
-#endif
-
diff --git a/winsup/mingw/include/sys/utime.h b/winsup/mingw/include/sys/utime.h
index 1ddeabafa..f95ec8485 100644
--- a/winsup/mingw/include/sys/utime.h
+++ b/winsup/mingw/include/sys/utime.h
@@ -23,9 +23,6 @@
  * $Date$
  *
  */
-
-#ifndef	__STRICT_ANSI__
-
 #ifndef	_UTIME_H_
 #define	_UTIME_H_
 
@@ -84,6 +81,3 @@ _CRTIMP int __cdecl	utime (const char*, struct utimbuf*);
 #endif	/* Not RC_INVOKED */
 
 #endif	/* Not _UTIME_H_ */
-
-#endif	/* Not __STRICT_ANSI__ */
-
diff --git a/winsup/mingw/include/unistd.h b/winsup/mingw/include/unistd.h
index faa205655..37682e579 100644
--- a/winsup/mingw/include/unistd.h
+++ b/winsup/mingw/include/unistd.h
@@ -4,7 +4,8 @@
  * unistd.h maps (roughly) to io.h
  */
 
-#ifndef __STRICT_ANSI__
+#ifndef _UNISTD_H
+#define _UNISTD_H
 
 #include <io.h>
 #include <process.h>
@@ -13,5 +14,4 @@
 #include <getopt.h>
 #undef __UNISTD_GETOPT__
 
-#endif 
-
+#endif /* _UNISTD_H */