4 files changed, 19 insertions, 29 deletions
diff --git a/arch/i386/bits/alltypes.h.sh b/arch/i386/bits/alltypes.h.sh
index cbdbea0a..4daaf98f 100755
--- a/arch/i386/bits/alltypes.h.sh
+++ b/arch/i386/bits/alltypes.h.sh
@@ -36,21 +36,10 @@ TYPEDEF unsigned short     uint16_t;
 TYPEDEF unsigned int       uint32_t;
 TYPEDEF unsigned long long uint64_t;
 
-TYPEDEF unsigned char      __uint8_t;
 TYPEDEF unsigned short     __uint16_t;
 TYPEDEF unsigned int       __uint32_t;
 TYPEDEF unsigned long long __uint64_t;
 
-TYPEDEF int8_t  int_least8_t;
-TYPEDEF int16_t int_least16_t;
-TYPEDEF int32_t int_least32_t;
-TYPEDEF int64_t int_least64_t;
-
-TYPEDEF uint8_t  uint_least8_t;
-TYPEDEF uint16_t uint_least16_t;
-TYPEDEF uint32_t uint_least32_t;
-TYPEDEF uint64_t uint_least64_t;
-
 TYPEDEF int8_t    int_fast8_t;
 TYPEDEF int       int_fast16_t;
 TYPEDEF int       int_fast32_t;
diff --git a/arch/x86_64/bits/alltypes.h.sh b/arch/x86_64/bits/alltypes.h.sh
index 1d0abf9c..bcbb5ee1 100755
--- a/arch/x86_64/bits/alltypes.h.sh
+++ b/arch/x86_64/bits/alltypes.h.sh
@@ -36,21 +36,10 @@ TYPEDEF unsigned short     uint16_t;
 TYPEDEF unsigned int       uint32_t;
 TYPEDEF unsigned long      uint64_t;
 
-TYPEDEF unsigned char      __uint8_t;
 TYPEDEF unsigned short     __uint16_t;
 TYPEDEF unsigned int       __uint32_t;
 TYPEDEF unsigned long      __uint64_t;
 
-TYPEDEF int8_t  int_least8_t;
-TYPEDEF int16_t int_least16_t;
-TYPEDEF int32_t int_least32_t;
-TYPEDEF int64_t int_least64_t;
-
-TYPEDEF uint8_t  uint_least8_t;
-TYPEDEF uint16_t uint_least16_t;
-TYPEDEF uint32_t uint_least32_t;
-TYPEDEF uint64_t uint_least64_t;
-
 TYPEDEF int8_t    int_fast8_t;
 TYPEDEF int       int_fast16_t;
 TYPEDEF int       int_fast32_t;
diff --git a/include/stdint.h b/include/stdint.h
index 4d24fd2e..8e187a5f 100644
--- a/include/stdint.h
+++ b/include/stdint.h
@@ -38,6 +38,16 @@
 
 #include <bits/alltypes.h>
 
+typedef int8_t  int_least8_t;
+typedef int16_t int_least16_t;
+typedef int32_t int_least32_t;
+typedef int64_t int_least64_t;
+
+typedef uint8_t  uint_least8_t;
+typedef uint16_t uint_least16_t;
+typedef uint32_t uint_least32_t;
+typedef uint64_t uint_least64_t;
+
 #if !defined __cplusplus || defined __STDC_LIMIT_MACROS
 
 #define INT8_MIN   (-1-0x7f)
diff --git a/include/sys/types.h b/include/sys/types.h
index 5c6b2090..72b4c5c1 100644
--- a/include/sys/types.h
+++ b/include/sys/types.h
@@ -23,12 +23,9 @@ extern "C" {
 #define __NEED_int32_t
 #define __NEED_int64_t
 
-#define __NEED_u_int8_t
-#define __NEED_u_int16_t
-#define __NEED_u_int32_t
-#define __NEED_u_int64_t
-
-#define __NEED_register_t
+#define __NEED___uint16_t
+#define __NEED___uint32_t
+#define __NEED___uint64_t
 
 #define __NEED_blkcnt_t
 #define __NEED_fsblkcnt_t
@@ -37,7 +34,6 @@ extern "C" {
 #define __NEED_id_t
 #define __NEED_key_t
 #define __NEED_clock_t
-#define __NEED_useconds_t
 #define __NEED_suseconds_t
 #define __NEED_blksize_t
 
@@ -57,6 +53,11 @@ extern "C" {
 
 #include <bits/alltypes.h>
 
+typedef unsigned char u_int8_t;
+typedef __uint16_t u_int16_t;
+typedef __uint32_t u_int32_t;
+typedef __uint64_t u_int64_t;
+
 #ifdef _GNU_SOURCE
 typedef unsigned long caddr_t;
 typedef unsigned char u_char;
@@ -65,6 +66,7 @@ typedef unsigned u_int, uint;
 typedef unsigned long u_long, ulong;
 typedef long long quad_t;
 typedef unsigned long long u_quad_t;
+typedef long register_t;
 #include <endian.h>
 #include <sys/select.h>
 #include <sys/sysmacros.h>