diff --git a/include/bits/inttypes.h b/include/bits/inttypes.h
index c1a7cf4bfd1a5115d5b9fab35ae90da05f71ea5a..e727b8a1c74decad13bf55f69eb7565e46c4d46c 100644
--- a/include/bits/inttypes.h
+++ b/include/bits/inttypes.h
@@ -3,93 +3,93 @@
 
 #define PRId8  "hhd"
 #define PRId16 "hd"
-#define PRId32 "d"
-#define PRId64 "ld"
+#define PRId32 "ld"
+#define PRId64 "Ld"
 
 #define PRIdLEAST8  "hhd"
 #define PRIdLEAST16 "hd"
-#define PRIdLEAST32 "d"
-#define PRIdLEAST64 "ld"
+#define PRIdLEAST32 "ld"
+#define PRIdLEAST64 "Ld"
 
 #define PRIdFAST8  "hhd"
 #define PRIdFAST16 "hd"
-#define PRIdFAST32 "d"
-#define PRIdFAST64 "ld"
+#define PRIdFAST32 "ld"
+#define PRIdFAST64 "Ld"
 
 #define PRIi8  "hhi"
 #define PRIi16 "hi"
-#define PRIi32 "i"
-#define PRIi64 "li"
+#define PRIi32 "li"
+#define PRIi64 "Li"
 
 #define PRIiLEAST8  "hhi"
 #define PRIiLEAST16 "hi"
-#define PRIiLEAST32 "i"
-#define PRIiLEAST64 "li"
+#define PRIiLEAST32 "li"
+#define PRIiLEAST64 "Li"
 
 #define PRIiFAST8  "hhi"
 #define PRIiFAST16 "hi"
-#define PRIiFAST32 "i"
-#define PRIiFAST64 "li"
+#define PRIiFAST32 "li"
+#define PRIiFAST64 "Li"
 
 #define PRIo8  "hho"
 #define PRIo16 "ho"
-#define PRIo32 "o"
-#define PRIo64 "lo"
+#define PRIo32 "lo"
+#define PRIo64 "Lo"
 
 #define PRIoLEAST8  "hho"
 #define PRIoLEAST16 "ho"
-#define PRIoLEAST32 "o"
-#define PRIoLEAST64 "lo"
+#define PRIoLEAST32 "lo"
+#define PRIoLEAST64 "Lo"
 
 #define PRIoFAST8  "hho"
 #define PRIoFAST16 "ho"
-#define PRIoFAST32 "o"
-#define PRIoFAST64 "lo"
+#define PRIoFAST32 "lo"
+#define PRIoFAST64 "Lo"
 
 #define PRIu8  "hhu"
 #define PRIu16 "hu"
-#define PRIu32 "u"
-#define PRIu64 "lu"
+#define PRIu32 "lu"
+#define PRIu64 "Lu"
 
 #define PRIuLEAST8  "hhu"
 #define PRIuLEAST16 "hu"
-#define PRIuLEAST32 "u"
-#define PRIuLEAST64 "lu"
+#define PRIuLEAST32 "lu"
+#define PRIuLEAST64 "Lu"
 
 #define PRIuFAST8  "hhu"
 #define PRIuFAST16 "hu"
-#define PRIuFAST32 "u"
-#define PRIuFAST64 "lu"
+#define PRIuFAST32 "lu"
+#define PRIuFAST64 "Lu"
 
 #define PRIx8  "hhx"
 #define PRIx16 "hx"
-#define PRIx32 "x"
-#define PRIx64 "lx"
+#define PRIx32 "lx"
+#define PRIx64 "Lx"
 
 #define PRIxLEAST8  "hhx"
 #define PRIxLEAST16 "hx"
-#define PRIxLEAST32 "x"
-#define PRIxLEAST64 "lx"
+#define PRIxLEAST32 "lx"
+#define PRIxLEAST64 "Lx"
 
 #define PRIxFAST8  "hhx"
 #define PRIxFAST16 "hx"
-#define PRIxFAST32 "x"
-#define PRIxFAST64 "lx"
+#define PRIxFAST32 "lx"
+#define PRIxFAST64 "Lx"
 
 #define PRIX8  "hhX"
 #define PRIX16 "hX"
-#define PRIX32 "X"
-#define PRIX64 "lX"
+#define PRIX32 "lX"
+#define PRIX64 "LX"
 
 #define PRIXLEAST8  "hhX"
 #define PRIXLEAST16 "hX"
-#define PRIXLEAST32 "X"
-#define PRIXLEAST64 "lX"
+#define PRIXLEAST32 "lX"
+#define PRIXLEAST64 "LX"
 
 #define PRIXFAST8  "hhX"
 #define PRIXFAST16 "hX"
-#define PRIXFAST32 "X"
-#define PRIXFAST64 "lX"
+#define PRIXFAST32 "lX"
+#define PRIXFAST64 "LX"
 
 #define PRIdMAX "jd"
 #define PRIiMAX "ji"
@@ -107,78 +107,78 @@
 
 #define SCNd8  "hhd"
 #define SCNd16 "hd"
-#define SCNd32 "d"
-#define SCNd64 "ld"
+#define SCNd32 "ld"
+#define SCNd64 "Ld"
 
 #define SCNdLEAST8  "hhd"
 #define SCNdLEAST16 "hd"
-#define SCNdLEAST32 "d"
-#define SCNdLEAST64 "ld"
+#define SCNdLEAST32 "ld"
+#define SCNdLEAST64 "Ld"
 
 #define SCNdFAST8  "hhd"
 #define SCNdFAST16 "hd"
-#define SCNdFAST32 "d"
-#define SCNdFAST64 "ld"
+#define SCNdFAST32 "ld"
+#define SCNdFAST64 "Ld"
 
 #define SCNi8  "hhi"
 #define SCNi16 "hi"
-#define SCNi32 "i"
-#define SCNi64 "li"
+#define SCNi32 "li"
+#define SCNi64 "Li"
 
 #define SCNiLEAST8  "hhi"
 #define SCNiLEAST16 "hi"
-#define SCNiLEAST32 "i"
-#define SCNiLEAST64 "li"
+#define SCNiLEAST32 "li"
+#define SCNiLEAST64 "Li"
 
 #define SCNiFAST8  "hhi"
 #define SCNiFAST16 "hi"
-#define SCNiFAST32 "i"
-#define SCNiFAST64 "li"
+#define SCNiFAST32 "li"
+#define SCNiFAST64 "Li"
 
 #define SCNo8  "hho"
 #define SCNo16 "ho"
-#define SCNo32 "o"
-#define SCNo64 "lo"
+#define SCNo32 "lo"
+#define SCNo64 "Lo"
 
 #define SCNoLEAST8  "hho"
 #define SCNoLEAST16 "ho"
-#define SCNoLEAST32 "o"
-#define SCNoLEAST64 "lo"
+#define SCNoLEAST32 "lo"
+#define SCNoLEAST64 "Lo"
 
 #define SCNoFAST8  "hho"
 #define SCNoFAST16 "ho"
-#define SCNoFAST32 "o"
-#define SCNoFAST64 "lo"
+#define SCNoFAST32 "lo"
+#define SCNoFAST64 "Lo"
 
 #define SCNu8  "hhu"
 #define SCNu16 "hu"
-#define SCNu32 "u"
-#define SCNu64 "lu"
+#define SCNu32 "lu"
+#define SCNu64 "Lu"
 
 #define SCNuLEAST8  "hhu"
 #define SCNuLEAST16 "hu"
-#define SCNuLEAST32 "u"
-#define SCNuLEAST64 "lu"
+#define SCNuLEAST32 "lu"
+#define SCNuLEAST64 "Lu"
 
 #define SCNuFAST8  "hhu"
 #define SCNuFAST16 "hu"
-#define SCNuFAST32 "u"
-#define SCNuFAST64 "lu"
+#define SCNuFAST32 "lu"
+#define SCNuFAST64 "Lu"
 
 #define SCNx8  "hhx"
 #define SCNx16 "hx"
-#define SCNx32 "x"
-#define SCNx64 "lx"
+#define SCNx32 "lx"
+#define SCNx64 "Lx"
 
 #define SCNxLEAST8  "hhx"
 #define SCNxLEAST16 "hx"
-#define SCNxLEAST32 "x"
-#define SCNxLEAST64 "lx"
+#define SCNxLEAST32 "lx"
+#define SCNxLEAST64 "Lx"
 
 #define SCNxFAST8  "hhx"
 #define SCNxFAST16 "hx"
-#define SCNxFAST32 "x"
-#define SCNxFAST64 "lx"
+#define SCNxFAST32 "lx"
+#define SCNxFAST64 "Lx"
 
 #define SCNdMAX "jd"
 #define SCNiMAX "ji"