diff --git a/src/goto-programs/name_mangler.cpp b/src/goto-programs/name_mangler.cpp
index cfa49d9b4aa..b88659a1a4a 100644
--- a/src/goto-programs/name_mangler.cpp
+++ b/src/goto-programs/name_mangler.cpp
@@ -10,6 +10,7 @@ Author: Kareem Khazem <karkhaz@karkhaz.com>, 2019
 
 #include <util/get_base_name.h>
 
+#include <cstdint>
 #include <iomanip>
 #include <sstream>
 
diff --git a/src/goto-programs/osx_fat_reader.h b/src/goto-programs/osx_fat_reader.h
index 68da304b127..d6134b094dd 100644
--- a/src/goto-programs/osx_fat_reader.h
+++ b/src/goto-programs/osx_fat_reader.h
@@ -14,6 +14,7 @@ Module: Read OS X Fat Binaries
 
 #include <util/message.h>
 
+#include <cstdint>
 #include <fstream>
 #include <map>
 #include <string>
diff --git a/src/solvers/prop/prop.h b/src/solvers/prop/prop.h
index d9df185d460..a2450e84470 100644
--- a/src/solvers/prop/prop.h
+++ b/src/solvers/prop/prop.h
@@ -17,6 +17,8 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include "literal.h"
 
+#include <cstdint>
+
 /*! \brief TO_BE_DOCUMENTED
 */
 class propt
diff --git a/src/solvers/smt2/smt2_conv.cpp b/src/solvers/smt2/smt2_conv.cpp
index 839b164ee0a..b4d7db59284 100644
--- a/src/solvers/smt2/smt2_conv.cpp
+++ b/src/solvers/smt2/smt2_conv.cpp
@@ -42,6 +42,8 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include "smt2_tokenizer.h"
 
+#include <cstdint>
+
 // Mark different kinds of error conditions
 
 // Unexpected types and other combinations not implemented and not
diff --git a/src/util/ieee_float.cpp b/src/util/ieee_float.cpp
index 29cac3ecb0b..1fee65294a2 100644
--- a/src/util/ieee_float.cpp
+++ b/src/util/ieee_float.cpp
@@ -8,14 +8,15 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include "ieee_float.h"
 
-#include <limits>
-
 #include "arith_tools.h"
 #include "bitvector_types.h"
 #include "floatbv_expr.h"
 #include "invariant.h"
 #include "std_expr.h"
 
+#include <cstdint>
+#include <limits>
+
 mp_integer ieee_float_spect::bias() const
 {
   return power(2, e-1)-1;
diff --git a/src/util/unicode.cpp b/src/util/unicode.cpp
index 80603f5f42e..5679890f9fd 100644
--- a/src/util/unicode.cpp
+++ b/src/util/unicode.cpp
@@ -8,13 +8,14 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include "unicode.h"
 
+#include "invariant.h"
+
 #include <codecvt>
+#include <cstdint>
 #include <iomanip>
 #include <locale>
 #include <sstream>
 
-#include "invariant.h"
-
 #ifdef _WIN32
 #  include <util/pragma_push.def>
 #  ifdef _MSC_VER