diff --git a/arch/i386/bits/alltypes.h.sh b/arch/i386/bits/alltypes.h.sh
index 4daaf98f94a09f5c2e61164198c83aaa6f04fb73..9d94c9117a2244f303fd3bccbf6453cb830793cf 100755
--- a/arch/i386/bits/alltypes.h.sh
+++ b/arch/i386/bits/alltypes.h.sh
@@ -53,9 +53,6 @@ TYPEDEF uint64_t           uint_fast64_t;
 TYPEDEF long          intptr_t;
 TYPEDEF unsigned long uintptr_t;
 
-TYPEDEF long long          intmax_t;
-TYPEDEF unsigned long long uintmax_t;
-
 TYPEDEF long time_t;
 TYPEDEF int suseconds_t;
 STRUCT timeval { time_t tv_sec; int tv_usec; };
diff --git a/arch/x86_64/bits/alltypes.h.sh b/arch/x86_64/bits/alltypes.h.sh
index bcbb5ee1189eab79bb1e6e70031d76f1d2c9fef9..af2a4d9accfcb9e8f433b34fe3291ebfe4fb643e 100755
--- a/arch/x86_64/bits/alltypes.h.sh
+++ b/arch/x86_64/bits/alltypes.h.sh
@@ -53,9 +53,6 @@ TYPEDEF uint64_t           uint_fast64_t;
 TYPEDEF long          intptr_t;
 TYPEDEF unsigned long uintptr_t;
 
-TYPEDEF long long          intmax_t;
-TYPEDEF unsigned long long uintmax_t;
-
 TYPEDEF long time_t;
 TYPEDEF long suseconds_t;
 STRUCT timeval { time_t tv_sec; int tv_usec; };
diff --git a/include/stdint.h b/include/stdint.h
index 8e187a5fd475625f88082f51f77a259390e1be52..a4c73b5e5ffbf148e78be4a3cffcbdc9396e545d 100644
--- a/include/stdint.h
+++ b/include/stdint.h
@@ -11,16 +11,6 @@
 #define __NEED_uint32_t
 #define __NEED_uint64_t
 
-#define __NEED_int_least8_t
-#define __NEED_int_least16_t
-#define __NEED_int_least32_t
-#define __NEED_int_least64_t
-
-#define __NEED_uint_least8_t
-#define __NEED_uint_least16_t
-#define __NEED_uint_least32_t
-#define __NEED_uint_least64_t
-
 #define __NEED_int_fast8_t
 #define __NEED_int_fast16_t
 #define __NEED_int_fast32_t
@@ -33,8 +23,6 @@
 
 #define __NEED_intptr_t
 #define __NEED_uintptr_t
-#define __NEED_intmax_t
-#define __NEED_uintmax_t
 
 #include <bits/alltypes.h>
 
@@ -48,6 +36,9 @@ typedef uint16_t uint_least16_t;
 typedef uint32_t uint_least32_t;
 typedef uint64_t uint_least64_t;
 
+typedef long long          intmax_t;
+typedef unsigned long long uintmax_t;
+
 #if !defined __cplusplus || defined __STDC_LIMIT_MACROS
 
 #define INT8_MIN   (-1-0x7f)