diff --git a/apps/essimporter/converter.cpp b/apps/essimporter/converter.cpp
index 00c24514ea..b44d376842 100644
--- a/apps/essimporter/converter.cpp
+++ b/apps/essimporter/converter.cpp
@@ -1,6 +1,7 @@
 #include "converter.hpp"
 
 #include <algorithm>
+#include <cstdint>
 #include <stdexcept>
 
 #include <osgDB/WriteFile>
diff --git a/apps/essimporter/importacdt.hpp b/apps/essimporter/importacdt.hpp
index 54910ac82c..65519c6a6c 100644
--- a/apps/essimporter/importacdt.hpp
+++ b/apps/essimporter/importacdt.hpp
@@ -1,6 +1,7 @@
 #ifndef OPENMW_ESSIMPORT_ACDT_H
 #define OPENMW_ESSIMPORT_ACDT_H
 
+#include <cstdint>
 #include <string>
 
 #include "importscri.hpp"
diff --git a/apps/essimporter/importcellref.cpp b/apps/essimporter/importcellref.cpp
index d9639eb0dd..756770d0b5 100644
--- a/apps/essimporter/importcellref.cpp
+++ b/apps/essimporter/importcellref.cpp
@@ -1,6 +1,7 @@
 #include "importcellref.hpp"
 
 #include <components/esm3/esmreader.hpp>
+#include <cstdint>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importcntc.cpp b/apps/essimporter/importcntc.cpp
index 41f4e50101..34c99babef 100644
--- a/apps/essimporter/importcntc.cpp
+++ b/apps/essimporter/importcntc.cpp
@@ -1,6 +1,7 @@
 #include "importcntc.hpp"
 
 #include <components/esm3/esmreader.hpp>
+#include <cstdint>
 
 namespace ESSImport
 {
diff --git a/apps/essimporter/importcrec.hpp b/apps/essimporter/importcrec.hpp
index 87a2d311c8..5217f4edc4 100644
--- a/apps/essimporter/importcrec.hpp
+++ b/apps/essimporter/importcrec.hpp
@@ -3,6 +3,7 @@
 
 #include "importinventory.hpp"
 #include <components/esm3/aipackage.hpp>
+#include <cstdint>
 
 namespace ESM
 {
diff --git a/apps/essimporter/importdial.hpp b/apps/essimporter/importdial.hpp
index 2a09af9f2a..b8b6fd536a 100644
--- a/apps/essimporter/importdial.hpp
+++ b/apps/essimporter/importdial.hpp
@@ -1,5 +1,8 @@
 #ifndef OPENMW_ESSIMPORT_IMPORTDIAL_H
 #define OPENMW_ESSIMPORT_IMPORTDIAL_H
+
+#include <cstdint>
+
 namespace ESM
 {
     class ESMReader;
diff --git a/apps/essimporter/importgame.hpp b/apps/essimporter/importgame.hpp
index e880166b45..276060ae4c 100644
--- a/apps/essimporter/importgame.hpp
+++ b/apps/essimporter/importgame.hpp
@@ -1,6 +1,8 @@
 #ifndef OPENMW_ESSIMPORT_GAME_H
 #define OPENMW_ESSIMPORT_GAME_H
 
+#include <cstdint>
+
 namespace ESM
 {
     class ESMReader;
diff --git a/apps/essimporter/importinventory.hpp b/apps/essimporter/importinventory.hpp
index 9e0dcbb30a..7261e64f68 100644
--- a/apps/essimporter/importinventory.hpp
+++ b/apps/essimporter/importinventory.hpp
@@ -1,6 +1,7 @@
 #ifndef OPENMW_ESSIMPORT_IMPORTINVENTORY_H
 #define OPENMW_ESSIMPORT_IMPORTINVENTORY_H
 
+#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/apps/essimporter/importklst.hpp b/apps/essimporter/importklst.hpp
index 8a098ac501..9cdb2d701b 100644
--- a/apps/essimporter/importklst.hpp
+++ b/apps/essimporter/importklst.hpp
@@ -1,6 +1,7 @@
 #ifndef OPENMW_ESSIMPORT_KLST_H
 #define OPENMW_ESSIMPORT_KLST_H
 
+#include <cstdint>
 #include <map>
 #include <string>
 
diff --git a/apps/essimporter/importnpcc.hpp b/apps/essimporter/importnpcc.hpp
index f3532f2103..47925226e4 100644
--- a/apps/essimporter/importnpcc.hpp
+++ b/apps/essimporter/importnpcc.hpp
@@ -2,6 +2,7 @@
 #define OPENMW_ESSIMPORT_NPCC_H
 
 #include <components/esm3/aipackage.hpp>
+#include <cstdint>
 
 #include "importinventory.hpp"
 
diff --git a/apps/essimporter/importplayer.hpp b/apps/essimporter/importplayer.hpp
index 3602abd9c3..89957bf4b4 100644
--- a/apps/essimporter/importplayer.hpp
+++ b/apps/essimporter/importplayer.hpp
@@ -1,6 +1,7 @@
 #ifndef OPENMW_ESSIMPORT_PLAYER_H
 #define OPENMW_ESSIMPORT_PLAYER_H
 
+#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/apps/essimporter/importproj.h b/apps/essimporter/importproj.h
index 01592af3e3..a2e03b5ba3 100644
--- a/apps/essimporter/importproj.h
+++ b/apps/essimporter/importproj.h
@@ -3,6 +3,7 @@
 
 #include <components/esm/esmcommon.hpp>
 #include <components/esm/util.hpp>
+#include <cstdint>
 #include <vector>
 
 namespace ESM
diff --git a/apps/essimporter/importscpt.hpp b/apps/essimporter/importscpt.hpp
index a75a3e38da..af383b674c 100644
--- a/apps/essimporter/importscpt.hpp
+++ b/apps/essimporter/importscpt.hpp
@@ -3,6 +3,8 @@
 
 #include "importscri.hpp"
 
+#include <cstdint>
+
 #include <components/esm/esmcommon.hpp>
 #include <components/esm3/loadscpt.hpp>
 
diff --git a/apps/essimporter/importscri.hpp b/apps/essimporter/importscri.hpp
index 73d8942f81..0c83a4d3be 100644
--- a/apps/essimporter/importscri.hpp
+++ b/apps/essimporter/importscri.hpp
@@ -3,6 +3,7 @@
 
 #include <components/esm3/variant.hpp>
 
+#include <cstdint>
 #include <vector>
 
 namespace ESM
diff --git a/apps/essimporter/importsplm.h b/apps/essimporter/importsplm.h
index 39405db6d3..762e32d9da 100644
--- a/apps/essimporter/importsplm.h
+++ b/apps/essimporter/importsplm.h
@@ -2,6 +2,7 @@
 #define OPENMW_ESSIMPORT_IMPORTSPLM_H
 
 #include <components/esm/esmcommon.hpp>
+#include <cstdint>
 #include <vector>
 
 namespace ESM