diff --git a/include/stddef.h b/include/stddef.h
index 099ca1574be6a2712aae479a48b55f4140fff6db..fa0bc7daf528f082aab9958c1054fa0f716e9a03 100644
--- a/include/stddef.h
+++ b/include/stddef.h
@@ -3,10 +3,10 @@
 
 #define NULL 0
 
-typedef signed long ptrdiff_t;
+typedef signed long long ptrdiff_t;
 
 typedef unsigned char wchar_t;
 
-typedef unsigned long size_t;
+typedef unsigned long long size_t;
 
 #endif /* _STDDEF_H */
diff --git a/include/stdint.h b/include/stdint.h
index cf25e00fbeba1675052d52d49dfcc0e696097ed6..cbe5e37fe71a6271f17dc5e55f78e85a93930f2b 100644
--- a/include/stdint.h
+++ b/include/stdint.h
@@ -56,54 +56,54 @@ typedef unsigned short uint_fast16_t;
 #define INT32_C(value) value ## L
 #define INT32_MIN -0x80000000
 #define INT32_MAX 0x7FFFFFFF
-typedef signed int int32_t;
+typedef signed long int32_t;
 
 #define INT_LEAST32_MIN -0x80000000
 #define INT_LEAST32_MAX 0x7FFFFFFF
-typedef signed int int_least32_t;
+typedef signed long int_least32_t;
 
 #define INT_FAST32_MIN -0x80000000
 #define INT_FAST32_MAX 0x7FFFFFFF
-typedef signed int int_fast32_t;
+typedef signed long int_fast32_t;
 
 #define UINT32_C(value) value ## UL
 #define UINT32_MIN 0x00000000
 #define UINT32_MAX 0xFFFFFFFF
-typedef unsigned int uint32_t;
+typedef unsigned long uint32_t;
 
 #define UINT_LEAST32_MIN 0x00000000
 #define UINT_LEAST32_MAX 0xFFFFFFFF
-typedef unsigned int uint_least32_t;
+typedef unsigned long uint_least32_t;
 
 #define UINT_FAST32_MIN 0x00000000
 #define UINT_FAST32_MAX 0xFFFFFFFF
-typedef unsigned int uint_fast32_t;
+typedef unsigned long uint_fast32_t;
 
 #define INT64_C(value) value ## LL
 #define INT64_MIN -0x8000000000000000
 #define INT64_MAX 0x7FFFFFFFFFFFFFFF
-typedef signed long int64_t;
+typedef signed long long int64_t;
 
 #define INT_LEAST64_MIN -0x8000000000000000
 #define INT_LEAST64_MAX 0x7FFFFFFFFFFFFFFF
-typedef signed long int_least64_t;
+typedef signed long long int_least64_t;
 
 #define INT_FAST64_MIN -0x8000000000000000
 #define INT_FAST64_MAX 0x7FFFFFFFFFFFFFFF
-typedef signed long int_fast64_t;
+typedef signed long long int_fast64_t;
 
 #define UINT64_C(value) value ## ULL
 #define UINT64_MIN 0x0000000000000000
 #define UINT64_MAX 0xFFFFFFFFFFFFFFFF
-typedef unsigned long uint64_t;
+typedef unsigned long long uint64_t;
 
 #define UINT_LEAST64_MIN 0x0000000000000000
 #define UINT_LEAST64_MAX 0xFFFFFFFFFFFFFFFF
-typedef unsigned long uint_least64_t;
+typedef unsigned long long uint_least64_t;
 
 #define UINT_FAST64_MIN 0x0000000000000000
 #define UINT_FAST64_MAX 0xFFFFFFFFFFFFFFFF
-typedef unsigned long uint_fast64_t;
+typedef unsigned long long uint_fast64_t;
 
 #define INTMAX_C(value) value ## LL
 #define INTMAX_MIN INT64_MIN
@@ -125,6 +125,6 @@ typedef uint64_t uintptr_t;
 
 #define SIZE_MAX UINT64_MAX
 
-typedef int sig_atomic_t;
+typedef long sig_atomic_t;
 
 #endif /* _STDINT_H */