diff --git a/apps/esmtool/labels.hpp b/apps/esmtool/labels.hpp
index 8450ccfa03..66699e277b 100644
--- a/apps/esmtool/labels.hpp
+++ b/apps/esmtool/labels.hpp
@@ -2,6 +2,7 @@
 #define OPENMW_ESMTOOL_LABELS_H
 
 #include <string>
+#include <cstdint>
 
 std::string bodyPartLabel(int idx);
 std::string meshPartLabel(int idx);
diff --git a/apps/openmw/mwinput/controlswitch.hpp b/apps/openmw/mwinput/controlswitch.hpp
index b4353c31f5..36ff1235a7 100644
--- a/apps/openmw/mwinput/controlswitch.hpp
+++ b/apps/openmw/mwinput/controlswitch.hpp
@@ -4,6 +4,7 @@
 #include <map>
 #include <string>
 #include <string_view>
+#include <cstdint>
 
 namespace ESM
 {
diff --git a/components/detournavigator/recastmesh.hpp b/components/detournavigator/recastmesh.hpp
index df9d6414d5..aa6d55b582 100644
--- a/components/detournavigator/recastmesh.hpp
+++ b/components/detournavigator/recastmesh.hpp
@@ -17,6 +17,7 @@
 #include <vector>
 #include <tuple>
 #include <numeric>
+#include <cstdint>
 
 namespace DetourNavigator
 {
diff --git a/components/esm/common.cpp b/components/esm/common.cpp
index d04033edef..5f04d01f84 100644
--- a/components/esm/common.cpp
+++ b/components/esm/common.cpp
@@ -1,4 +1,6 @@
-#include "sstream"
+#include "common.hpp"
+
+#include <sstream>
 
 namespace ESM
 {
diff --git a/components/platform/file.hpp b/components/platform/file.hpp
index 8faf9c67cb..e8219c1ed8 100644
--- a/components/platform/file.hpp
+++ b/components/platform/file.hpp
@@ -3,6 +3,7 @@
 
 #include <cstdlib>
 #include <string_view>
+#include <cstdint>
 
 namespace Platform::File {
 
diff --git a/components/settings/settings.hpp b/components/settings/settings.hpp
index 178b8d3ebc..3481f4c24a 100644
--- a/components/settings/settings.hpp
+++ b/components/settings/settings.hpp
@@ -8,6 +8,7 @@
 #include <string>
 #include <string_view>
 #include <vector>
+#include <cstdint>
 
 #include <osg/Vec2f>
 #include <osg/Vec3f>