diff --git a/src/command/FileCommands.cxx b/src/command/FileCommands.cxx
index 61f1f4e0d..493b794d0 100644
--- a/src/command/FileCommands.cxx
+++ b/src/command/FileCommands.cxx
@@ -44,8 +44,7 @@
 #include "Log.hxx"
 
 #include <cassert>
-
-#include <inttypes.h> /* for PRIu64 */
+#include <cinttypes> /* for PRIu64 */
 
 gcc_pure
 static bool
diff --git a/src/command/StorageCommands.cxx b/src/command/StorageCommands.cxx
index ff54168c3..5cce791c7 100644
--- a/src/command/StorageCommands.cxx
+++ b/src/command/StorageCommands.cxx
@@ -37,10 +37,9 @@
 #include "TimePrint.hxx"
 #include "IdleFlags.hxx"
 
+#include <cinttypes> /* for PRIu64 */
 #include <memory>
 
-#include <inttypes.h> /* for PRIu64 */
-
 gcc_pure
 static bool
 skip_path(const char *name_utf8) noexcept