Index: b/tools/external/driver-tool/tool-args.hpp
===================================================================
--- a/tools/external/driver-tool/tool-args.hpp
+++ b/tools/external/driver-tool/tool-args.hpp
@@ -36,6 +36,7 @@
 #include <string>
 #include <iosfwd>
 #include <cstring>
+#include <cstdint>
 
 #include "util.hpp"
 #define USE_TOOL_HELP 0
Index: b/tools/external/driver-tool/json-parse.hpp
===================================================================
--- a/tools/external/driver-tool/json-parse.hpp
+++ b/tools/external/driver-tool/json-parse.hpp
@@ -36,6 +36,8 @@
 #include "debug.hpp"
 #include "opt_string.hpp"
 
+#include <cstdint>
+
 #if MS_Visual_C
 #pragma warning(disable: 4061)
 #endif
Index: b/tools/test-tools/sam-analyze/alig.hpp
===================================================================
--- a/tools/test-tools/sam-analyze/alig.hpp
+++ b/tools/test-tools/sam-analyze/alig.hpp
@@ -3,6 +3,7 @@
 
 #include <string>
 #include <algorithm>
+#include <cstdint>
 #include "database.hpp"
 
 struct sam_alig_t {
Index: b/tools/test-tools/sam-factory/sam-factory.cpp
===================================================================
--- a/tools/test-tools/sam-factory/sam-factory.cpp
+++ b/tools/test-tools/sam-factory/sam-factory.cpp
@@ -7,6 +7,7 @@
 #include <sstream>
 #include <memory>
 #include <cstring>
+#include <cstdint>
 
 const std::string empty_string( "" );
 const std::string star_string( "*" );
Index: b/tools/test-tools/qa-stats/input.hpp
===================================================================
--- a/tools/test-tools/qa-stats/input.hpp
+++ b/tools/test-tools/qa-stats/input.hpp
@@ -34,6 +34,7 @@
 #include <vector>
 #include <memory>
 #include <variant>
+#include <cstdint>
 
 struct CIGAR {
     struct OP {