diff --git a/src/core/control/ToolHandler.cpp b/src/core/control/ToolHandler.cpp
index e3bd4367414f..5c01fbce1abc 100644
--- a/src/core/control/ToolHandler.cpp
+++ b/src/core/control/ToolHandler.cpp
@@ -1,7 +1,7 @@
 #include "ToolHandler.h"
 
 #include <algorithm>  // for clamp
-#include <cinttypes>  // for uint32_t
+#include <cstdint>    // for uint32_t
 #include <cstdio>     // for size_t
 #include <optional>   // for nullopt, optional
 #include <string>     // for operator==, string, basic_string
diff --git a/src/core/control/jobs/Scheduler.cpp b/src/core/control/jobs/Scheduler.cpp
index 316cfe9b47eb..83f4a25ba448 100644
--- a/src/core/control/jobs/Scheduler.cpp
+++ b/src/core/control/jobs/Scheduler.cpp
@@ -1,7 +1,8 @@
 #include "Scheduler.h"
 
 #include <cassert>    // for assert
-#include <cinttypes>  // for PRId64, uint64_t
+#include <cinttypes>  // for PRId64
+#include <cstdint>    // for uint64_t
 
 #include "control/jobs/Job.h"  // for Job, JOB_TYPE_RENDER
 
diff --git a/src/core/control/settings/PageTemplateSettings.cpp b/src/core/control/settings/PageTemplateSettings.cpp
index 0a80bfa43946..d7de85478050 100644
--- a/src/core/control/settings/PageTemplateSettings.cpp
+++ b/src/core/control/settings/PageTemplateSettings.cpp
@@ -1,6 +1,7 @@
 #include "PageTemplateSettings.h"
 
-#include <cinttypes>  // for PRIx32, uint32_t
+#include <cinttypes>  // for PRIx32
+#include <cstdint>    // for uint32_t
 #include <cstdio>     // for snprintf, size_t
 #include <sstream>    // for basic_istream, strings...
 
diff --git a/src/core/control/tools/PdfElemSelection.h b/src/core/control/tools/PdfElemSelection.h
index 207d0762cdac..638e840ba847 100644
--- a/src/core/control/tools/PdfElemSelection.h
+++ b/src/core/control/tools/PdfElemSelection.h
@@ -10,7 +10,7 @@
  */
 #pragma once
 
-#include <cinttypes>  // for uint64_t
+#include <cstdint>    // for uint64_t
 #include <string>     // for string
 #include <vector>     // for vector
 
diff --git a/src/core/control/xojfile/LoadHandlerHelper.cpp b/src/core/control/xojfile/LoadHandlerHelper.cpp
index e23583541e5d..4e927ee53e3e 100644
--- a/src/core/control/xojfile/LoadHandlerHelper.cpp
+++ b/src/core/control/xojfile/LoadHandlerHelper.cpp
@@ -10,7 +10,7 @@
  */
 #include "LoadHandlerHelper.h"
 
-#include <cinttypes>  // for uint32_t
+#include <cstdint>    // for uint32_t
 #include <cstdlib>    // for strtol, strtoull
 #include <cstring>    // for strcmp, size_t, strlen
 #include <string>     // for allocator, string
diff --git a/src/core/control/xojfile/SaveHandler.cpp b/src/core/control/xojfile/SaveHandler.cpp
index 2686de7b1e1f..477439f78b50 100644
--- a/src/core/control/xojfile/SaveHandler.cpp
+++ b/src/core/control/xojfile/SaveHandler.cpp
@@ -1,6 +1,7 @@
 #include "SaveHandler.h"
 
-#include <cinttypes>   // for PRIx32, uint32_t
+#include <cinttypes>   // for PRIx32
+#include <cstdint>     // for uint32_t
 #include <cstdio>      // for sprintf, size_t
 #include <filesystem>  // for exists
 
diff --git a/src/core/gui/PageView.cpp b/src/core/gui/PageView.cpp
index e85969944d86..a4fe59174b53 100644
--- a/src/core/gui/PageView.cpp
+++ b/src/core/gui/PageView.cpp
@@ -2,8 +2,8 @@
 
 #include <algorithm>  // for max, find_if
 #include <cassert>    // for assert
-#include <cinttypes>  // for int64_t
 #include <cmath>      // for lround
+#include <cstdint>    // for int64_t
 #include <cstdlib>    // for size_t
 #include <iomanip>    // for operator<<, quoted
 #include <memory>     // for unique_ptr, make_...
diff --git a/src/core/gui/PdfFloatingToolbox.h b/src/core/gui/PdfFloatingToolbox.h
index ead8c57aa3e3..f94546bdfd75 100644
--- a/src/core/gui/PdfFloatingToolbox.h
+++ b/src/core/gui/PdfFloatingToolbox.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <cinttypes>  // for uint8_t
+#include <cstdint>    // for uint8_t
 #include <memory>     // for unique_ptr
 
 #include <gdk/gdk.h>  // for GdkRectangle
diff --git a/src/core/gui/dialog/SelectBackgroundColorDialog.cpp b/src/core/gui/dialog/SelectBackgroundColorDialog.cpp
index 4d6f6dfc1761..80e95d1a87d9 100644
--- a/src/core/gui/dialog/SelectBackgroundColorDialog.cpp
+++ b/src/core/gui/dialog/SelectBackgroundColorDialog.cpp
@@ -1,6 +1,6 @@
 #include "SelectBackgroundColorDialog.h"
 
-#include <cinttypes>  // for uint32_t
+#include <cstdint>    // for uint32_t
 #include <string>     // for allocator
 
 #include <glib.h>  // for g_free, g_strdup_printf
diff --git a/src/core/gui/sidebar/Sidebar.cpp b/src/core/gui/sidebar/Sidebar.cpp
index 8627b8909aff..2bb5e6ff7efa 100644
--- a/src/core/gui/sidebar/Sidebar.cpp
+++ b/src/core/gui/sidebar/Sidebar.cpp
@@ -1,7 +1,7 @@
 #include "Sidebar.h"
 
 #include <cassert>    // for assert
-#include <cinttypes>  // for int64_t
+#include <cstdint>    // for int64_t
 #include <memory>     // for make_shared
 #include <string>     // for string
 
diff --git a/src/core/gui/widgets/SpinPageAdapter.cpp b/src/core/gui/widgets/SpinPageAdapter.cpp
index a7b77743a99e..7f3a32d8c0a6 100644
--- a/src/core/gui/widgets/SpinPageAdapter.cpp
+++ b/src/core/gui/widgets/SpinPageAdapter.cpp
@@ -1,6 +1,6 @@
 #include "SpinPageAdapter.h"
 
-#include <cinttypes>  // for uint64_t
+#include <cstdint>  // for uint64_t
 
 #include <glib-object.h>  // for g_signal_handler_disconnect, G_CALLBACK
 
diff --git a/src/core/model/BackgroundConfig.h b/src/core/model/BackgroundConfig.h
index a7bc49e54a30..e253f3755af8 100644
--- a/src/core/model/BackgroundConfig.h
+++ b/src/core/model/BackgroundConfig.h
@@ -11,7 +11,7 @@
 
 #pragma once
 
-#include <cinttypes>  // for uint32_t
+#include <cstdint>    // for uint32_t
 #include <map>        // for map
 #include <string>     // for string
 
diff --git a/src/core/model/Element.cpp b/src/core/model/Element.cpp
index 57511656afa4..52bd0c9881ad 100644
--- a/src/core/model/Element.cpp
+++ b/src/core/model/Element.cpp
@@ -1,8 +1,8 @@
 #include "Element.h"
 
 #include <algorithm>  // for max, min
-#include <cinttypes>  // for uint32_t
 #include <cmath>      // for ceil, floor, NAN
+#include <cstdint>    // for uint32_t
 
 #include <glib.h>  // for gint
 
diff --git a/src/core/model/Stroke.cpp b/src/core/model/Stroke.cpp
index 174c37f33b0a..584eef8fda53 100644
--- a/src/core/model/Stroke.cpp
+++ b/src/core/model/Stroke.cpp
@@ -2,8 +2,8 @@
 
 #include <algorithm>  // for min, max, copy
 #include <cassert>    // for assert
-#include <cinttypes>  // for uint64_t
 #include <cmath>      // for abs, hypot, sqrt
+#include <cstdint>    // for uint64_t
 #include <iterator>   // for back_insert_iterator
 #include <limits>     // for numeric_limits
 #include <numeric>    // for accumulate
diff --git a/src/core/pdf/base/XojPdfPage.h b/src/core/pdf/base/XojPdfPage.h
index be770c40059d..77c17f5fdc22 100644
--- a/src/core/pdf/base/XojPdfPage.h
+++ b/src/core/pdf/base/XojPdfPage.h
@@ -11,15 +11,16 @@
 
 #pragma once
 
-#include <cinttypes>  // for uint8_t
-#include <memory>     // for shared_ptr
-#include <string>     // for string
-#include <vector>     // for vector
+#include <cstdint>  // for uint8_t
+#include <memory>   // for shared_ptr
+#include <string>   // for string
+#include <vector>   // for vector
 
-#include <glib.h> // for GURI
 #include <cairo.h>  // for cairo_region_t, cairo_t
+#include <glib.h>   // for GURI
 
 #include "util/raii/CairoWrappers.h"
+
 #include "XojPdfAction.h"
 
 class XojPdfLink;
diff --git a/src/core/undo/UndoRedoHandler.cpp b/src/core/undo/UndoRedoHandler.cpp
index 3707858720cd..92d910898974 100644
--- a/src/core/undo/UndoRedoHandler.cpp
+++ b/src/core/undo/UndoRedoHandler.cpp
@@ -1,7 +1,8 @@
 #include "UndoRedoHandler.h"
 
 #include <algorithm>  // for find_if
-#include <cinttypes>  // for PRIu64, uint64_t
+#include <cinttypes>  // for PRIu64
+#include <cstdint>    // for uint64_t
 #include <iterator>   // for end, begin
 #include <memory>     // for unique_ptr, allocator_traits<>::value_type
 #include <utility>    // for move
diff --git a/src/core/view/background/OneColorBackgroundView.cpp b/src/core/view/background/OneColorBackgroundView.cpp
index ffce1833110f..c8d5fd27637c 100644
--- a/src/core/view/background/OneColorBackgroundView.cpp
+++ b/src/core/view/background/OneColorBackgroundView.cpp
@@ -1,6 +1,6 @@
 #include "OneColorBackgroundView.h"
 
-#include <cinttypes>  // for uint32_t
+#include <cstdint>  // for uint32_t
 
 #include "model/BackgroundConfig.h"               // for BackgroundConfig
 #include "view/background/BackgroundView.h"       // for view
diff --git a/src/util/include/util/PlaceholderString.h b/src/util/include/util/PlaceholderString.h
index 634ffe194ea1..dcd3241a4755 100644
--- a/src/util/include/util/PlaceholderString.h
+++ b/src/util/include/util/PlaceholderString.h
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <cinttypes>  // for int64_t
+#include <cstdint>    // for int64_t
 #include <memory>     // for unique_ptr
 #include <ostream>    // for ostream
 #include <string>     // for string
diff --git a/src/util/serializing/HexObjectEncoding.cpp b/src/util/serializing/HexObjectEncoding.cpp
index c4a3bd74a8ae..946a69f5c336 100644
--- a/src/util/serializing/HexObjectEncoding.cpp
+++ b/src/util/serializing/HexObjectEncoding.cpp
@@ -1,6 +1,7 @@
 #include "util/serializing/HexObjectEncoding.h"
 
-#include <cinttypes>  // for uint8_t, PRIx8
+#include <cinttypes>  // for PRIx8
+#include <cstdint>    // for uint8_t
 #include <cstdio>     // for sprintf
 
 #include <glib.h>  // for g_free, g_malloc, g_string_append_len
diff --git a/src/util/serializing/ObjectInputStream.cpp b/src/util/serializing/ObjectInputStream.cpp
index 8101451d3fa1..7e578046069e 100644
--- a/src/util/serializing/ObjectInputStream.cpp
+++ b/src/util/serializing/ObjectInputStream.cpp
@@ -1,6 +1,6 @@
 #include "util/serializing/ObjectInputStream.h"
 
-#include <cinttypes>  // for uint32_t
+#include <cstdint>  // for uint32_t
 
 #include <glib.h>  // for g_free, g_strdup_...