diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index edb6f185e..716a8e7ca 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-01  Earnie Boyd  <earnie@users.sf.net>
+
+	* include/_mingw.h (__int32, __int16, __int8, small, hyper): Define.
+	Note: Also added to w32api/include/basetyps.h.
+
 2003-06-18  Earnie Boyd  <earnie@users.sf.net>
 
 	* include/dirent.h (dirent): Make d_name and array instead of a pointer.
diff --git a/winsup/mingw/include/_mingw.h b/winsup/mingw/include/_mingw.h
index 1196f28e1..cb535b010 100644
--- a/winsup/mingw/include/_mingw.h
+++ b/winsup/mingw/include/_mingw.h
@@ -80,8 +80,24 @@
 # ifndef __stdcall
 #  define __stdcall __attribute__((stdcall))
 # endif
-# undef __int64
-# define __int64 long long
+# ifndef __int64
+#  define __int64 long long
+# endif
+# ifndef __int32
+#  define __int32 long
+# endif
+# ifndef __int16
+#  define __int16 int
+# endif
+# ifndef __int8
+#  define __int8 char
+# endif
+# ifndef small
+#  define small char
+# endif
+# ifndef hyper
+#  define hyper long long
+# endif
 #endif /* __GNUC__ */
 
 #define __MINGW32_VERSION 3.1