diff --git a/Source/DiabloUI/diabloui.cpp b/Source/DiabloUI/diabloui.cpp
index 4a5c2c654..9cd0b2547 100644
--- a/Source/DiabloUI/diabloui.cpp
+++ b/Source/DiabloUI/diabloui.cpp
@@ -1,6 +1,7 @@
 #include "DiabloUI/diabloui.h"
 
 #include <algorithm>
+#include <cstdint>
 #include <string>
 
 #include "DiabloUI/button.h"
diff --git a/Source/DiabloUI/hero/selhero.cpp b/Source/DiabloUI/hero/selhero.cpp
index 844625bf7..c98f2e155 100644
--- a/Source/DiabloUI/hero/selhero.cpp
+++ b/Source/DiabloUI/hero/selhero.cpp
@@ -2,6 +2,7 @@
 
 #include <algorithm>
 #include <chrono>
+#include <cstdint>
 #include <random>
 
 #include <fmt/format.h>
diff --git a/Source/DiabloUI/mainmenu.cpp b/Source/DiabloUI/mainmenu.cpp
index 806603e7f..2bcdf0f2c 100644
--- a/Source/DiabloUI/mainmenu.cpp
+++ b/Source/DiabloUI/mainmenu.cpp
@@ -1,3 +1,4 @@
+#include <cstdint>
 
 #include "DiabloUI/diabloui.h"
 #include "DiabloUI/selok.h"
diff --git a/Source/DiabloUI/multi/selgame.cpp b/Source/DiabloUI/multi/selgame.cpp
index c8783e2ff..120ff7b49 100644
--- a/Source/DiabloUI/multi/selgame.cpp
+++ b/Source/DiabloUI/multi/selgame.cpp
@@ -1,5 +1,7 @@
 #include "DiabloUI/multi/selgame.h"
 
+#include <cstdint>
+
 #include <fmt/format.h>
 
 #include "DiabloUI/diabloui.h"
diff --git a/Source/DiabloUI/settingsmenu.cpp b/Source/DiabloUI/settingsmenu.cpp
index a0415abea..3edbb9dce 100644
--- a/Source/DiabloUI/settingsmenu.cpp
+++ b/Source/DiabloUI/settingsmenu.cpp
@@ -1,5 +1,7 @@
 #include "selstart.h"
 
+#include <cstdint>
+
 #include <function_ref.hpp>
 
 #include "DiabloUI/diabloui.h"
diff --git a/Source/control.cpp b/Source/control.cpp
index 26357d8f0..ca4b473d8 100644
--- a/Source/control.cpp
+++ b/Source/control.cpp
@@ -8,6 +8,7 @@
 #include <algorithm>
 #include <array>
 #include <cstddef>
+#include <cstdint>
 #include <string>
 
 #include <fmt/format.h>
diff --git a/Source/debug.cpp b/Source/debug.cpp
index b8242c571..c2a6618db 100644
--- a/Source/debug.cpp
+++ b/Source/debug.cpp
@@ -6,6 +6,7 @@
 
 #ifdef _DEBUG
 
+#include <cstdint>
 #include <cstdio>
 
 #include "debug.h"
diff --git a/Source/debug.h b/Source/debug.h
index d353bb74a..bbe7e7ef9 100644
--- a/Source/debug.h
+++ b/Source/debug.h
@@ -5,6 +5,7 @@
  */
 #pragma once
 
+#include <cstdint>
 #include <unordered_map>
 
 #include "engine.h"
diff --git a/Source/diablo.cpp b/Source/diablo.cpp
index bde27b597..1ca25cc87 100644
--- a/Source/diablo.cpp
+++ b/Source/diablo.cpp
@@ -4,6 +4,7 @@
  * Implementation of the main game initialization functions.
  */
 #include <array>
+#include <cstdint>
 
 #include <fmt/format.h>
 
diff --git a/Source/dvlnet/abstract_net.h b/Source/dvlnet/abstract_net.h
index d89a90c64..8ae09de88 100644
--- a/Source/dvlnet/abstract_net.h
+++ b/Source/dvlnet/abstract_net.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstdint>
 #include <exception>
 #include <memory>
 #include <string>
diff --git a/Source/dvlnet/base.cpp b/Source/dvlnet/base.cpp
index cc577d115..4e88c2dc2 100644
--- a/Source/dvlnet/base.cpp
+++ b/Source/dvlnet/base.cpp
@@ -1,6 +1,7 @@
 #include "dvlnet/base.h"
 
 #include <algorithm>
+#include <cstdint>
 #include <cstring>
 #include <memory>
 
diff --git a/Source/dvlnet/base.h b/Source/dvlnet/base.h
index 2ed4448d8..545e818d0 100644
--- a/Source/dvlnet/base.h
+++ b/Source/dvlnet/base.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <array>
+#include <cstdint>
 #include <deque>
 #include <map>
 #include <memory>
diff --git a/Source/dvlnet/cdwrap.h b/Source/dvlnet/cdwrap.h
index 1cd0aa69c..cf3f612e2 100644
--- a/Source/dvlnet/cdwrap.h
+++ b/Source/dvlnet/cdwrap.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstdint>
 #include <exception>
 #include <map>
 #include <memory>
diff --git a/Source/dvlnet/loopback.cpp b/Source/dvlnet/loopback.cpp
index 211474024..9b4632b6b 100644
--- a/Source/dvlnet/loopback.cpp
+++ b/Source/dvlnet/loopback.cpp
@@ -1,5 +1,7 @@
 #include "dvlnet/loopback.h"
 
+#include <cstdint>
+
 #include "multi.h"
 #include "player.h"
 #include "utils/language.h"
diff --git a/Source/dvlnet/loopback.h b/Source/dvlnet/loopback.h
index f090a0f65..72737cd14 100644
--- a/Source/dvlnet/loopback.h
+++ b/Source/dvlnet/loopback.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstdint>
 #include <queue>
 #include <string>
 
diff --git a/Source/dvlnet/protocol_zt.h b/Source/dvlnet/protocol_zt.h
index 1ab0628f4..95513bec1 100644
--- a/Source/dvlnet/protocol_zt.h
+++ b/Source/dvlnet/protocol_zt.h
@@ -3,6 +3,7 @@
 #include <algorithm>
 #include <array>
 #include <atomic>
+#include <cstdint>
 #include <deque>
 #include <exception>
 #include <map>
diff --git a/Source/encrypt.cpp b/Source/encrypt.cpp
index 3069c296f..48101ff13 100644
--- a/Source/encrypt.cpp
+++ b/Source/encrypt.cpp
@@ -5,6 +5,7 @@
  */
 #include <array>
 #include <cctype>
+#include <cstdint>
 #include <cstring>
 #include <memory>
 
diff --git a/Source/engine/demomode.cpp b/Source/engine/demomode.cpp
index c372427da..ab555cf8a 100644
--- a/Source/engine/demomode.cpp
+++ b/Source/engine/demomode.cpp
@@ -1,5 +1,6 @@
 #include "engine/demomode.h"
 
+#include <cstdint>
 #include <cstdio>
 #include <deque>
 
diff --git a/Source/engine/dx.cpp b/Source/engine/dx.cpp
index a0ae42f58..29f935a23 100644
--- a/Source/engine/dx.cpp
+++ b/Source/engine/dx.cpp
@@ -6,6 +6,7 @@
 #include "engine/dx.h"
 
 #include <SDL.h>
+#include <cstdint>
 
 #include "controls/plrctrls.h"
 #include "engine.h"
diff --git a/Source/engine/palette.cpp b/Source/engine/palette.cpp
index 3710d9821..4ff6d5dd1 100644
--- a/Source/engine/palette.cpp
+++ b/Source/engine/palette.cpp
@@ -5,6 +5,8 @@
  */
 #include "engine/palette.h"
 
+#include <cstdint>
+
 #include <fmt/core.h>
 
 #include "engine/backbuffer_state.hpp"
diff --git a/Source/engine/path.cpp b/Source/engine/path.cpp
index 1a129ebe4..47660bf53 100644
--- a/Source/engine/path.cpp
+++ b/Source/engine/path.cpp
@@ -6,6 +6,7 @@
 #include "engine/path.h"
 
 #include <array>
+#include <cstdint>
 
 #include <function_ref.hpp>
 
diff --git a/Source/engine/random.cpp b/Source/engine/random.cpp
index 212340d8a..c7ea5026d 100644
--- a/Source/engine/random.cpp
+++ b/Source/engine/random.cpp
@@ -1,5 +1,6 @@
 #include "engine/random.hpp"
 
+#include <cstdint>
 #include <limits>
 #include <random>
 
diff --git a/Source/engine/render/scrollrt.cpp b/Source/engine/render/scrollrt.cpp
index 5350cdc82..f4c3a5342 100644
--- a/Source/engine/render/scrollrt.cpp
+++ b/Source/engine/render/scrollrt.cpp
@@ -5,6 +5,8 @@
  */
 #include "engine/render/scrollrt.h"
 
+#include <cstdint>
+
 #include "DiabloUI/ui_flags.hpp"
 #include "automap.h"
 #include "controls/plrctrls.h"
diff --git a/Source/engine/render/text_render.cpp b/Source/engine/render/text_render.cpp
index b42773e30..9be66d642 100644
--- a/Source/engine/render/text_render.cpp
+++ b/Source/engine/render/text_render.cpp
@@ -7,6 +7,7 @@
 
 #include <array>
 #include <cstddef>
+#include <cstdint>
 #include <unordered_map>
 #include <utility>
 
diff --git a/Source/error.cpp b/Source/error.cpp
index 902736a1c..451fb953e 100644
--- a/Source/error.cpp
+++ b/Source/error.cpp
@@ -4,6 +4,7 @@
  * Implementation of in-game message functions.
  */
 
+#include <cstdint>
 #include <deque>
 
 #include "error.h"
diff --git a/Source/gmenu.cpp b/Source/gmenu.cpp
index c005b441d..d410435e2 100644
--- a/Source/gmenu.cpp
+++ b/Source/gmenu.cpp
@@ -5,6 +5,8 @@
  */
 #include "gmenu.h"
 
+#include <cstdint>
+
 #include "DiabloUI/ui_flags.hpp"
 #include "control.h"
 #include "controls/axis_direction.h"
diff --git a/Source/inv.cpp b/Source/inv.cpp
index 6403c5057..246891c3a 100644
--- a/Source/inv.cpp
+++ b/Source/inv.cpp
@@ -3,9 +3,10 @@
  *
  * Implementation of player inventory.
  */
+#include <algorithm>
+#include <cstdint>
 #include <utility>
 
-#include <algorithm>
 #include <fmt/format.h>
 
 #include "DiabloUI/ui_flags.hpp"
diff --git a/Source/levels/drlg_l1.cpp b/Source/levels/drlg_l1.cpp
index de8f327bb..a6fa9fea3 100644
--- a/Source/levels/drlg_l1.cpp
+++ b/Source/levels/drlg_l1.cpp
@@ -1,5 +1,7 @@
 #include "levels/drlg_l1.h"
 
+#include <cstdint>
+
 #include "engine/load_file.hpp"
 #include "engine/point.hpp"
 #include "engine/random.hpp"
diff --git a/Source/levels/drlg_l1.h b/Source/levels/drlg_l1.h
index c2480e3fe..50b6a3f6a 100644
--- a/Source/levels/drlg_l1.h
+++ b/Source/levels/drlg_l1.h
@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include <cstdint>
+
 #include "engine/world_tile.hpp"
 #include "levels/gendung.h"
 
diff --git a/Source/levels/drlg_l2.cpp b/Source/levels/drlg_l2.cpp
index c156c21d1..13b549003 100644
--- a/Source/levels/drlg_l2.cpp
+++ b/Source/levels/drlg_l2.cpp
@@ -5,6 +5,7 @@
  */
 #include "levels/drlg_l2.h"
 
+#include <cstdint>
 #include <list>
 
 #include "diablo.h"
diff --git a/Source/levels/drlg_l2.h b/Source/levels/drlg_l2.h
index 2fa37d132..3a7afe8a3 100644
--- a/Source/levels/drlg_l2.h
+++ b/Source/levels/drlg_l2.h
@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include <cstdint>
+
 #include "levels/gendung.h"
 
 namespace devilution {
diff --git a/Source/levels/drlg_l3.cpp b/Source/levels/drlg_l3.cpp
index b2ea22e6a..72e13edcf 100644
--- a/Source/levels/drlg_l3.cpp
+++ b/Source/levels/drlg_l3.cpp
@@ -1,4 +1,7 @@
+#include "levels/drlg_l3.h"
+
 #include <algorithm>
+#include <cstdint>
 
 #include "engine/load_file.hpp"
 #include "engine/points_in_rectangle_range.hpp"
diff --git a/Source/levels/drlg_l3.h b/Source/levels/drlg_l3.h
index 9bd924e7d..6f662a456 100644
--- a/Source/levels/drlg_l3.h
+++ b/Source/levels/drlg_l3.h
@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include <cstdint>
+
 #include "levels/gendung.h"
 
 namespace devilution {
diff --git a/Source/levels/drlg_l4.cpp b/Source/levels/drlg_l4.cpp
index cea20655a..76a040c35 100644
--- a/Source/levels/drlg_l4.cpp
+++ b/Source/levels/drlg_l4.cpp
@@ -5,6 +5,8 @@
  */
 #include "levels/drlg_l4.h"
 
+#include <cstdint>
+
 #include "engine/load_file.hpp"
 #include "engine/random.hpp"
 #include "levels/gendung.h"
diff --git a/Source/levels/drlg_l4.h b/Source/levels/drlg_l4.h
index 5167163d1..81a6b7e34 100644
--- a/Source/levels/drlg_l4.h
+++ b/Source/levels/drlg_l4.h
@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include <cstdint>
+
 #include "engine/world_tile.hpp"
 #include "levels/gendung.h"
 
diff --git a/Source/levels/gendung.cpp b/Source/levels/gendung.cpp
index 9eb65f790..7b7cf835f 100644
--- a/Source/levels/gendung.cpp
+++ b/Source/levels/gendung.cpp
@@ -1,7 +1,8 @@
-#include <stack>
-
 #include "levels/gendung.h"
 
+#include <cstdint>
+#include <stack>
+
 #include "engine/load_file.hpp"
 #include "engine/random.hpp"
 #include "init.h"
diff --git a/Source/loadsave.cpp b/Source/loadsave.cpp
index 12f220daa..128b48bc4 100644
--- a/Source/loadsave.cpp
+++ b/Source/loadsave.cpp
@@ -6,6 +6,7 @@
 #include "loadsave.h"
 
 #include <climits>
+#include <cstdint>
 #include <cstring>
 #include <numeric>
 #include <unordered_map>
diff --git a/Source/loadsave.h b/Source/loadsave.h
index ad8a42e7e..023c4090e 100644
--- a/Source/loadsave.h
+++ b/Source/loadsave.h
@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include <cstdint>
+
 #include "pfile.h"
 #include "player.h"
 #include "utils/attributes.h"
diff --git a/Source/menu.cpp b/Source/menu.cpp
index 54c741202..ae3a02405 100644
--- a/Source/menu.cpp
+++ b/Source/menu.cpp
@@ -4,6 +4,8 @@
  * Implementation of functions for interacting with the main menu.
  */
 
+#include <cstdint>
+
 #include "DiabloUI/diabloui.h"
 #include "DiabloUI/settingsmenu.h"
 #include "engine/demomode.h"
diff --git a/Source/menu.h b/Source/menu.h
index 617ae3f9b..7c314c8fe 100644
--- a/Source/menu.h
+++ b/Source/menu.h
@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include <cstdint>
+
 #include "multi.h"
 
 namespace devilution {
diff --git a/Source/minitext.cpp b/Source/minitext.cpp
index 68a5ac880..fda565d20 100644
--- a/Source/minitext.cpp
+++ b/Source/minitext.cpp
@@ -3,6 +3,7 @@
  *
  * Implementation of scrolling dialog text.
  */
+#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/Source/monster.cpp b/Source/monster.cpp
index 64abeed2c..1086704bf 100644
--- a/Source/monster.cpp
+++ b/Source/monster.cpp
@@ -6,6 +6,7 @@
 #include "monster.h"
 
 #include <climits>
+#include <cstdint>
 
 #include <algorithm>
 #include <array>
diff --git a/Source/mpq/mpq_reader.cpp b/Source/mpq/mpq_reader.cpp
index a3ca475c4..85f0e1629 100644
--- a/Source/mpq/mpq_reader.cpp
+++ b/Source/mpq/mpq_reader.cpp
@@ -1,5 +1,7 @@
 #include "mpq/mpq_reader.hpp"
 
+#include <cstdint>
+
 #include <libmpq/mpq.h>
 
 #include "utils/stdcompat/optional.hpp"
diff --git a/Source/mpq/mpq_sdl_rwops.cpp b/Source/mpq/mpq_sdl_rwops.cpp
index cade2cb16..529cb39c2 100644
--- a/Source/mpq/mpq_sdl_rwops.cpp
+++ b/Source/mpq/mpq_sdl_rwops.cpp
@@ -1,5 +1,6 @@
 #include "mpq/mpq_sdl_rwops.hpp"
 
+#include <cstdint>
 #include <cstring>
 #include <memory>
 #include <vector>
diff --git a/Source/msg.cpp b/Source/msg.cpp
index 02215c291..2757c72ae 100644
--- a/Source/msg.cpp
+++ b/Source/msg.cpp
@@ -4,6 +4,7 @@
  * Implementation of function for sending and reciving network messages.
  */
 #include <climits>
+#include <cstdint>
 #include <list>
 #include <memory>
 #include <unordered_map>
diff --git a/Source/multi.cpp b/Source/multi.cpp
index 861f7a7d6..1f2f5513a 100644
--- a/Source/multi.cpp
+++ b/Source/multi.cpp
@@ -4,10 +4,11 @@
  * Implementation of functions for keeping multiplaye games in sync.
  */
 
+#include <cstdint>
+#include <ctime>
+
 #include <SDL.h>
 #include <config.h>
-
-#include <ctime>
 #include <fmt/format.h>
 
 #include "DiabloUI/diabloui.h"
diff --git a/Source/nthread.cpp b/Source/nthread.cpp
index 907e6cd88..edc7fa3a6 100644
--- a/Source/nthread.cpp
+++ b/Source/nthread.cpp
@@ -5,6 +5,8 @@
  */
 #include "nthread.h"
 
+#include <cstdint>
+
 #include <fmt/core.h>
 
 #include "diablo.h"
diff --git a/Source/nthread.h b/Source/nthread.h
index e6c4b6c07..d07fdd03d 100644
--- a/Source/nthread.h
+++ b/Source/nthread.h
@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include <cstdint>
+
 #include "player.h"
 #include "utils/attributes.h"
 
diff --git a/Source/pack.cpp b/Source/pack.cpp
index 5245fa101..70ff9a2e3 100644
--- a/Source/pack.cpp
+++ b/Source/pack.cpp
@@ -5,6 +5,8 @@
  */
 #include "pack.h"
 
+#include <cstdint>
+
 #include "engine/random.hpp"
 #include "init.h"
 #include "loadsave.h"
diff --git a/Source/pfile.cpp b/Source/pfile.cpp
index 1feb07c6d..afe4909f6 100644
--- a/Source/pfile.cpp
+++ b/Source/pfile.cpp
@@ -5,6 +5,7 @@
  */
 #include "pfile.h"
 
+#include <cstdint>
 #include <string>
 #include <unordered_map>
 
diff --git a/Source/pfile.h b/Source/pfile.h
index 82c28ec2b..4f17612ee 100644
--- a/Source/pfile.h
+++ b/Source/pfile.h
@@ -5,6 +5,8 @@
  */
 #pragma once
 
+#include <cstdint>
+
 #include "DiabloUI/diabloui.h"
 #include "player.h"
 
diff --git a/Source/platform/ctr/asio/include/netinet/in.h b/Source/platform/ctr/asio/include/netinet/in.h
index 096c101f4..4920c392d 100644
--- a/Source/platform/ctr/asio/include/netinet/in.h
+++ b/Source/platform/ctr/asio/include/netinet/in.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstdint>
 #include_next <netinet/in.h>
 
 struct in6_addr {
diff --git a/Source/platform/ctr/display.cpp b/Source/platform/ctr/display.cpp
index 1dffc7628..c6ba9c3c9 100644
--- a/Source/platform/ctr/display.cpp
+++ b/Source/platform/ctr/display.cpp
@@ -1,6 +1,7 @@
 #include "platform/ctr/display.hpp"
 #include <SDL.h>
 
+#include <cstdint>
 uint32_t Get3DSScalingFlag(bool fitToScreen, int width, int height)
 {
 	if (fitToScreen)
diff --git a/Source/platform/ctr/random.cpp b/Source/platform/ctr/random.cpp
index 6126a5051..a00969ae8 100644
--- a/Source/platform/ctr/random.cpp
+++ b/Source/platform/ctr/random.cpp
@@ -1,4 +1,5 @@
 #include <3ds.h>
+#include <cstdint>
 #include <sodium.h>
 #include <sys/types.h>
 
diff --git a/Source/platform/ctr/sockets.cpp b/Source/platform/ctr/sockets.cpp
index 7140d1391..ce57a5a02 100644
--- a/Source/platform/ctr/sockets.cpp
+++ b/Source/platform/ctr/sockets.cpp
@@ -1,5 +1,6 @@
 #include "platform/ctr/sockets.hpp"
 
+#include <cstdint>
 #include <malloc.h>
 
 #include <3ds.h>
diff --git a/Source/platform/switch/keyboard.cpp b/Source/platform/switch/keyboard.cpp
index 120a75962..12ca59f28 100644
--- a/Source/platform/switch/keyboard.cpp
+++ b/Source/platform/switch/keyboard.cpp
@@ -1,5 +1,6 @@
 #include "platform/switch/keyboard.h"
 
+#include <cstdint>
 #include <cstring>
 
 #include <SDL.h>
diff --git a/Source/platform/switch/random.cpp b/Source/platform/switch/random.cpp
index 59c6d88ce..f5a8321e9 100644
--- a/Source/platform/switch/random.cpp
+++ b/Source/platform/switch/random.cpp
@@ -1,5 +1,6 @@
 #include "platform/switch/random.hpp"
 
+#include <cstdint>
 #include <sys/types.h>
 
 #include <sodium.h>
diff --git a/Source/platform/vita/random.cpp b/Source/platform/vita/random.cpp
index 14dd879b1..191795717 100644
--- a/Source/platform/vita/random.cpp
+++ b/Source/platform/vita/random.cpp
@@ -1,3 +1,4 @@
+#include <cstdint>
 #include <psp2/kernel/rng.h>
 #include <sodium.h>
 #include <sys/types.h>
diff --git a/Source/platform/vita/touch.cpp b/Source/platform/vita/touch.cpp
index c382d94f2..38d5ca33c 100644
--- a/Source/platform/vita/touch.cpp
+++ b/Source/platform/vita/touch.cpp
@@ -1,6 +1,7 @@
 #include "platform/vita/touch.h"
 
 #include <cmath>
+#include <cstdint>
 
 #include "options.h"
 #include "utils/display.h"
diff --git a/Source/playerdat.cpp b/Source/playerdat.cpp
index feef58293..a0a4c674e 100644
--- a/Source/playerdat.cpp
+++ b/Source/playerdat.cpp
@@ -6,6 +6,8 @@
 
 #include "playerdat.hpp"
 
+#include <cstdint>
+
 #include "items.h"
 #include "player.h"
 #include "textdat.h"
diff --git a/Source/plrmsg.cpp b/Source/plrmsg.cpp
index 56a329487..84fdd190d 100644
--- a/Source/plrmsg.cpp
+++ b/Source/plrmsg.cpp
@@ -6,6 +6,7 @@
 #include "plrmsg.h"
 
 #include <algorithm>
+#include <cstdint>
 
 #include <fmt/format.h>
 
diff --git a/Source/qol/floatingnumbers.cpp b/Source/qol/floatingnumbers.cpp
index 2c1c4cbaf..1aee55f45 100644
--- a/Source/qol/floatingnumbers.cpp
+++ b/Source/qol/floatingnumbers.cpp
@@ -1,5 +1,6 @@
 #include "floatingnumbers.h"
 
+#include <cstdint>
 #include <ctime>
 #include <deque>
 #include <fmt/format.h>
diff --git a/Source/quests.cpp b/Source/quests.cpp
index 78ae3a731..b066fadde 100644
--- a/Source/quests.cpp
+++ b/Source/quests.cpp
@@ -5,6 +5,8 @@
  */
 #include "quests.h"
 
+#include <cstdint>
+
 #include <fmt/format.h>
 
 #include "DiabloUI/ui_flags.hpp"
diff --git a/Source/stores.cpp b/Source/stores.cpp
index ddf7bdce0..fcead5648 100644
--- a/Source/stores.cpp
+++ b/Source/stores.cpp
@@ -6,6 +6,7 @@
 #include "stores.h"
 
 #include <algorithm>
+#include <cstdint>
 
 #include <fmt/format.h>
 
diff --git a/Source/storm/storm_net.cpp b/Source/storm/storm_net.cpp
index ba347c6f4..fff17ebae 100644
--- a/Source/storm/storm_net.cpp
+++ b/Source/storm/storm_net.cpp
@@ -1,11 +1,14 @@
 #include "storm/storm_net.hpp"
 
+#include <cstdint>
 #include <memory>
+
 #ifndef NONET
-#include "utils/sdl_mutex.h"
 #include <mutex>
 #include <thread>
 #include <utility>
+
+#include "utils/sdl_mutex.h"
 #endif
 
 #include "dvlnet/abstract_net.h"
diff --git a/Source/sync.cpp b/Source/sync.cpp
index 55f232652..bf246788f 100644
--- a/Source/sync.cpp
+++ b/Source/sync.cpp
@@ -4,6 +4,7 @@
  * Implementation of functionality for syncing game state with other players.
  */
 #include <climits>
+#include <cstdint>
 
 #include "levels/gendung.h"
 #include "monster.h"
diff --git a/Source/tmsg.cpp b/Source/tmsg.cpp
index 0940e2ec3..d83b4f248 100644
--- a/Source/tmsg.cpp
+++ b/Source/tmsg.cpp
@@ -5,6 +5,8 @@
  */
 #include <list>
 
+#include <cstdint>
+
 #include "diablo.h"
 #include "tmsg.h"
 
diff --git a/Source/utils/cel_to_clx.cpp b/Source/utils/cel_to_clx.cpp
index a6c3bde9e..7f402ee1f 100644
--- a/Source/utils/cel_to_clx.cpp
+++ b/Source/utils/cel_to_clx.cpp
@@ -1,5 +1,6 @@
 #include "utils/cel_to_clx.hpp"
 
+#include <cstdint>
 #include <cstring>
 
 #include <vector>
diff --git a/Source/utils/cl2_to_clx.cpp b/Source/utils/cl2_to_clx.cpp
index 76177631e..c369caf8d 100644
--- a/Source/utils/cl2_to_clx.cpp
+++ b/Source/utils/cl2_to_clx.cpp
@@ -1,5 +1,6 @@
 #include "utils/cl2_to_clx.hpp"
 
+#include <cstdint>
 #include <cstring>
 
 #include "utils/endian.hpp"
diff --git a/Source/utils/display.cpp b/Source/utils/display.cpp
index 6a2b8622d..18c180e27 100644
--- a/Source/utils/display.cpp
+++ b/Source/utils/display.cpp
@@ -1,6 +1,7 @@
 #include "utils/display.h"
 
 #include <algorithm>
+#include <cstdint>
 
 #ifdef __vita__
 #include <psp2/power.h>
diff --git a/Source/utils/endian_stream.hpp b/Source/utils/endian_stream.hpp
index 6dc33c2bc..232b1ead5 100644
--- a/Source/utils/endian_stream.hpp
+++ b/Source/utils/endian_stream.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstdint>
 #include <cstdio>
 #include <cstring>
 
diff --git a/Source/utils/file_util.cpp b/Source/utils/file_util.cpp
index 1eeccaccd..b6859a2ac 100644
--- a/Source/utils/file_util.cpp
+++ b/Source/utils/file_util.cpp
@@ -1,6 +1,7 @@
 #include "utils/file_util.h"
 
 #include <cerrno>
+#include <cstdint>
 #include <cstring>
 
 #include <algorithm>
diff --git a/Source/utils/language.cpp b/Source/utils/language.cpp
index 06917fdf1..18157d510 100644
--- a/Source/utils/language.cpp
+++ b/Source/utils/language.cpp
@@ -1,5 +1,6 @@
 #include "utils/language.h"
 
+#include <cstdint>
 #include <memory>
 #include <unordered_map>
 #include <vector>
diff --git a/Source/utils/surface_to_clx.cpp b/Source/utils/surface_to_clx.cpp
index ffbc79c9d..d52b6645e 100644
--- a/Source/utils/surface_to_clx.cpp
+++ b/Source/utils/surface_to_clx.cpp
@@ -1,5 +1,6 @@
 #include "utils/surface_to_clx.hpp"
 
+#include <cstdint>
 #include <cstring>
 #include <vector>
 
diff --git a/Source/utils/utf8.cpp b/Source/utils/utf8.cpp
index 8bf2286ef..73f994cff 100644
--- a/Source/utils/utf8.cpp
+++ b/Source/utils/utf8.cpp
@@ -1,6 +1,7 @@
 #include "utils/utf8.hpp"
 
 #include <cstddef>
+#include <cstdint>
 #include <cstring>
 
 #include <hoehrmann_utf8.h>