diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index f79530cff..38707e878 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,12 @@
+2005-03-06  Ralf Corsepious  <ralf.corsepius@rtems.org>
+
+	* libc/include/machine/_types.h: New file.
+	* libc/include/sys/types.h: Do not check for __rtems__
+	when including <machine/_types.h>.  Remove some redundant
+	declarations now that <machine/_types.h> is included.
+	* libc/sys/rtems/machine/_types.h: Removed.  Replaced with
+	shared header file.
+
 2005-02-25  Ralf Corsepious  <ralf.corsepius@rtems.org>
 
 	* libm/common/fdlibm.h (FLT_UWORD_MAX, FLT_UWORD_HALF_MAX): Add
diff --git a/newlib/libc/sys/rtems/machine/_types.h b/newlib/libc/include/machine/_types.h
similarity index 100%
rename from newlib/libc/sys/rtems/machine/_types.h
rename to newlib/libc/include/machine/_types.h
diff --git a/newlib/libc/include/sys/types.h b/newlib/libc/include/sys/types.h
index 944149589..5c288bfc0 100644
--- a/newlib/libc/include/sys/types.h
+++ b/newlib/libc/include/sys/types.h
@@ -22,35 +22,15 @@
 #ifndef __INTTYPES_DEFINED__
 #define __INTTYPES_DEFINED__
 
-#if !defined (__rtems__)
-typedef short int __int16_t;
-typedef unsigned short int __uint16_t;
-
-#if __INT_MAX__ == 32767
-typedef long int __int32_t;
-typedef unsigned long int __uint32_t;
-#else
-typedef int __int32_t;
-typedef unsigned int __uint32_t;
-#endif
-
-#if __LONG_MAX__ > 2147483647 || !defined(__GNUC__)
-typedef long int __int64_t;
-typedef unsigned long int __uint64_t;
-#else
-__extension__ typedef long long __int64_t;
-__extension__ typedef unsigned long long __uint64_t;
-#endif
-#else /* __rtems__ */
+#include <machine/_types.h>
 
+#if defined(__rtems__)
 /*
  *  The following section is RTEMS specific and is needed to more
  *  closely match the types defined in the BSD sys/types.h.
  *  This is needed to let the RTEMS/BSD TCP/IP stack compile.
  */
 
-#include <machine/_types.h>
-
 /* deprecated */
 #if ___int8_t_defined
 typedef __uint8_t	u_int8_t;