diff --git a/arch/arm/bits/alltypes.h.sh b/arch/arm/bits/alltypes.h.sh
index abe782d9..c1db1a0c 100755
--- a/arch/arm/bits/alltypes.h.sh
+++ b/arch/arm/bits/alltypes.h.sh
@@ -56,6 +56,9 @@ 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 float float_t;
 TYPEDEF double double_t;
 
diff --git a/arch/i386/bits/alltypes.h.sh b/arch/i386/bits/alltypes.h.sh
index 579aa1af..aec73731 100755
--- a/arch/i386/bits/alltypes.h.sh
+++ b/arch/i386/bits/alltypes.h.sh
@@ -64,6 +64,9 @@ 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;
+
 #if defined(__FLT_EVAL_METHOD__) && __FLT_EVAL_METHOD__ == 0
 TYPEDEF float float_t;
 TYPEDEF double double_t;
diff --git a/arch/microblaze/bits/alltypes.h.sh b/arch/microblaze/bits/alltypes.h.sh
index 6ddd0823..23f12d8e 100755
--- a/arch/microblaze/bits/alltypes.h.sh
+++ b/arch/microblaze/bits/alltypes.h.sh
@@ -56,6 +56,9 @@ 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 float float_t;
 TYPEDEF double double_t;
 
diff --git a/arch/mips/bits/alltypes.h.sh b/arch/mips/bits/alltypes.h.sh
index 6ddd0823..23f12d8e 100755
--- a/arch/mips/bits/alltypes.h.sh
+++ b/arch/mips/bits/alltypes.h.sh
@@ -56,6 +56,9 @@ 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 float float_t;
 TYPEDEF double double_t;
 
diff --git a/arch/powerpc/bits/alltypes.h.sh b/arch/powerpc/bits/alltypes.h.sh
index 417e2919..7d3cdc36 100755
--- a/arch/powerpc/bits/alltypes.h.sh
+++ b/arch/powerpc/bits/alltypes.h.sh
@@ -56,6 +56,9 @@ TYPEDEF uint64_t           uint_fast64_t;
 TYPEDEF int intptr_t;
 TYPEDEF unsigned uintptr_t;
 
+TYPEDEF long long          intmax_t;
+TYPEDEF unsigned long long uintmax_t;
+
 TYPEDEF float float_t;
 TYPEDEF double double_t;
 
diff --git a/arch/x86_64/bits/alltypes.h.sh b/arch/x86_64/bits/alltypes.h.sh
index 62e77ac9..c5e54aab 100755
--- a/arch/x86_64/bits/alltypes.h.sh
+++ b/arch/x86_64/bits/alltypes.h.sh
@@ -55,6 +55,9 @@ TYPEDEF uint64_t           uint_fast64_t;
 TYPEDEF long          intptr_t;
 TYPEDEF unsigned long uintptr_t;
 
+TYPEDEF long          intmax_t;
+TYPEDEF unsigned long uintmax_t;
+
 TYPEDEF float float_t;
 TYPEDEF double double_t;
 
diff --git a/include/stdint.h b/include/stdint.h
index 486d1ac2..138fb211 100644
--- a/include/stdint.h
+++ b/include/stdint.h
@@ -24,6 +24,9 @@
 #define __NEED_intptr_t
 #define __NEED_uintptr_t
 
+#define __NEED_intmax_t
+#define __NEED_uintmax_t
+
 #include <bits/alltypes.h>
 
 typedef int8_t  int_least8_t;
@@ -36,25 +39,22 @@ 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)
 #define INT16_MIN  (-1-0x7fff)
 #define INT32_MIN  (-1-0x7fffffff)
-#define INT64_MIN  (-1-0x7fffffffffffffffLL)
+#define INT64_MIN  (-1-0x7fffffffffffffff)
 
 #define INT8_MAX   (0x7f)
 #define INT16_MAX  (0x7fff)
 #define INT32_MAX  (0x7fffffff)
-#define INT64_MAX  (0x7fffffffffffffffLL)
+#define INT64_MAX  (0x7fffffffffffffff)
 
 #define UINT8_MAX  (0xff)
 #define UINT16_MAX (0xffff)
 #define UINT32_MAX (0xffffffff)
-#define UINT64_MAX (0xffffffffffffffffULL)
+#define UINT64_MAX (0xffffffffffffffff)
 
 #define INT_LEAST8_MIN   INT8_MIN
 #define INT_LEAST16_MIN  INT16_MIN
@@ -95,15 +95,22 @@ typedef unsigned long long uintmax_t;
 #define INT8_C(c)  c
 #define INT16_C(c) c
 #define INT32_C(c) c
-#define INT64_C(c) c ## LL
 
 #define UINT8_C(c)  c
 #define UINT16_C(c) c
 #define UINT32_C(c) c ## U
-#define UINT64_C(c) c ## ULL
 
+#if UINTPTR_MAX == UINT64_MAX
+#define INT64_C(c) c ## L
+#define UINT64_C(c) c ## UL
+#define INTMAX_C(c)  c ## L
+#define UINTMAX_C(c) c ## UL
+#else
+#define INT64_C(c) c ## LL
+#define UINT64_C(c) c ## ULL
 #define INTMAX_C(c)  c ## LL
 #define UINTMAX_C(c) c ## ULL
+#endif
 
 #endif