diff --git a/src/header/inttypes/cbindgen.toml b/src/header/inttypes/cbindgen.toml
index 928357354b..6adf69d9c7 100644
--- a/src/header/inttypes/cbindgen.toml
+++ b/src/header/inttypes/cbindgen.toml
@@ -15,92 +15,114 @@ trailer = """
 #define PRId8  "hhd"
 #define PRId16 "hd"
 #define PRId32 "d"
-#define PRId64 "ld"
 
 #define PRIdLEAST8  "hhd"
 #define PRIdLEAST16 "hd"
 #define PRIdLEAST32 "d"
-#define PRIdLEAST64 "ld"
 
 #define PRIdFAST8  "hhd"
 #define PRIdFAST16 "hd"
 #define PRIdFAST32 "d"
-#define PRIdFAST64 "ld"
 
 #define PRIi8  "hhi"
 #define PRIi16 "hi"
 #define PRIi32 "i"
-#define PRIi64 "li"
 
 #define PRIiLEAST8  "hhi"
 #define PRIiLEAST16 "hi"
 #define PRIiLEAST32 "i"
-#define PRIiLEAST64 "li"
 
 #define PRIiFAST8  "hhi"
 #define PRIiFAST16 "hi"
 #define PRIiFAST32 "i"
-#define PRIiFAST64 "li"
 
 #define PRIo8  "hho"
 #define PRIo16 "ho"
 #define PRIo32 "o"
-#define PRIo64 "lo"
 
 #define PRIoLEAST8  "hho"
 #define PRIoLEAST16 "ho"
 #define PRIoLEAST32 "o"
-#define PRIoLEAST64 "lo"
 
 #define PRIoFAST8  "hho"
 #define PRIoFAST16 "ho"
 #define PRIoFAST32 "o"
-#define PRIoFAST64 "lo"
 
 #define PRIu8  "hhu"
 #define PRIu16 "hu"
 #define PRIu32 "u"
-#define PRIu64 "lu"
 
 #define PRIuLEAST8  "hhu"
 #define PRIuLEAST16 "hu"
 #define PRIuLEAST32 "u"
-#define PRIuLEAST64 "lu"
 
 #define PRIuFAST8  "hhu"
 #define PRIuFAST16 "hu"
 #define PRIuFAST32 "u"
-#define PRIuFAST64 "lu"
 
 #define PRIx8  "hhx"
 #define PRIx16 "hx"
 #define PRIx32 "x"
-#define PRIx64 "lx"
 
 #define PRIxLEAST8  "hhx"
 #define PRIxLEAST16 "hx"
 #define PRIxLEAST32 "x"
-#define PRIxLEAST64 "lx"
 
 #define PRIxFAST8  "hhx"
 #define PRIxFAST16 "hx"
 #define PRIxFAST32 "x"
-#define PRIxFAST64 "lx"
 
 #define PRIX8  "hhX"
 #define PRIX16 "hX"
 #define PRIX32 "X"
-#define PRIX64 "lX"
 
 #define PRIXLEAST8  "hhX"
 #define PRIXLEAST16 "hX"
 #define PRIXLEAST32 "X"
-#define PRIXLEAST64 "lX"
 
 #define PRIXFAST8  "hhX"
 #define PRIXFAST16 "hX"
 #define PRIXFAST32 "X"
+
+#ifdef __LP64__
+#define PRId64 "ld"
+#define PRIdLEAST64 "ld"
+#define PRIdFAST64 "ld"
+#define PRIi64 "li"
+#define PRIiLEAST64 "li"
+#define PRIiFAST64 "li"
+#define PRIo64 "lo"
+#define PRIoLEAST64 "lo"
+#define PRIoFAST64 "lo"
+#define PRIu64 "lu"
+#define PRIuLEAST64 "lu"
+#define PRIuFAST64 "lu"
+#define PRIx64 "lx"
+#define PRIxLEAST64 "ll"
+#define PRIxFAST64 "lx"
+#define PRIX64 "lX"
+#define PRIXLEAST64 "lX"
 #define PRIXFAST64 "lX"
+#else
+#define PRId64 "lld"
+#define PRIdLEAST64 "lld"
+#define PRIdFAST64 "lld"
+#define PRIi64 "lli"
+#define PRIiLEAST64 "lli"
+#define PRIiFAST64 "lli"
+#define PRIo64 "llo"
+#define PRIoLEAST64 "llo"
+#define PRIoFAST64 "llo"
+#define PRIu64 "llu"
+#define PRIuLEAST64 "llu"
+#define PRIuFAST64 "llu"
+#define PRIx64 "llx"
+#define PRIxLEAST64 "llx"
+#define PRIxFAST64 "llx"
+#define PRIX64 "llX"
+#define PRIXLEAST64 "llX"
+#define PRIXFAST64 "llX"
+#endif
 
 #define PRIdMAX "jd"
 #define PRIiMAX "ji"