diff --git a/common/common-lua.cc b/common/common-lua.cc
index 005717bb..01cea7ce 100644
--- a/common/common-lua.cc
+++ b/common/common-lua.cc
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <stdint.h>
 #include "common-lua.hh"
 
 #ifdef HAVE_GEOIP
diff --git a/common/dns_lookup.hh b/common/dns_lookup.hh
index 8a3a234d..4c2f34f8 100644
--- a/common/dns_lookup.hh
+++ b/common/dns_lookup.hh
@@ -28,6 +28,7 @@
 #include <memory>
 #include <mutex>
 #include <atomic>
+#include <stdint.h>
 #include "iputils.hh"
 
 struct GetDNSContext {
diff --git a/common/iputils.hh b/common/iputils.hh
index e1329f22..dca2bc96 100644
--- a/common/iputils.hh
+++ b/common/iputils.hh
@@ -38,6 +38,7 @@
 #include <sstream>
 #include <boost/tuple/tuple.hpp>
 #include <boost/tuple/tuple_comparison.hpp>
+#include <stdint.h>
 
 #include "namespaces.hh"
 
diff --git a/common/minicurl.hh b/common/minicurl.hh
index 41274b7b..f022e3ea 100644
--- a/common/minicurl.hh
+++ b/common/minicurl.hh
@@ -26,6 +26,7 @@
 #include <sstream>
 #include <vector>
 #include <memory>
+#include <stdint.h>
 #include <curl/curlver.h>
 #if defined(LIBCURL_VERSION_NUM) && LIBCURL_VERSION_NUM >= 0x073200
 /* we need this so that 'CURL' is not typedef'd to void,
diff --git a/common/misc.hh b/common/misc.hh
index 37006d30..b00f48a3 100644
--- a/common/misc.hh
+++ b/common/misc.hh
@@ -27,6 +27,7 @@
 #include <cstdio>
 #include <regex.h>
 #include <limits.h>
+#include <stdint.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/ordered_index.hpp>
diff --git a/common/twmap.hh b/common/twmap.hh
index 70c9a677..ddd850e9 100644
--- a/common/twmap.hh
+++ b/common/twmap.hh
@@ -34,6 +34,7 @@
 #include <boost/optional.hpp>
 #include <iostream>
 #include <sstream>
+#include <stdint.h>
 #include "ext/hyperloglog.hpp"
 #include "ext/count_min_sketch.hpp"
 #include "iputils.hh"
diff --git a/common/webhook.hh b/common/webhook.hh
index e5f0d7a5..e0eb4532 100644
--- a/common/webhook.hh
+++ b/common/webhook.hh
@@ -24,11 +24,12 @@
 #include <mutex>
 #include <curl/curl.h>
 #include <condition_variable>
+#include <queue>
+#include <stdint.h>
 #include "json11.hpp"
 #include "dolog.hh"
 #include "minicurl.hh"
 #include "prometheus.hh"
-#include <queue>
 
 using WHConfigMap = std::map<std::string, std::string>;
 using WHEvents = std::vector<std::string>;
diff --git a/common/wforce-geoip.hh b/common/wforce-geoip.hh
index 3a7a4f49..5ac7d89c 100644
--- a/common/wforce-geoip.hh
+++ b/common/wforce-geoip.hh
@@ -27,6 +27,7 @@
 #include <GeoIP.h>
 #include <GeoIPCity.h>
 #endif
+#include <stdint.h>
 #include "lock.hh"
 #include "iputils.hh"
 
diff --git a/common/wforce-geoip2.hh b/common/wforce-geoip2.hh
index 4b1a7583..c5f20fb9 100644
--- a/common/wforce-geoip2.hh
+++ b/common/wforce-geoip2.hh
@@ -24,6 +24,7 @@
 #include <string>
 #include <mutex>
 #include <vector>
+#include <stdint.h>
 #include "lock.hh"
 #include "iputils.hh"
 #include "wforce-geoip.hh"
diff --git a/ext/ext/hyperloglog.hpp b/ext/ext/hyperloglog.hpp
index 024027d7..99e062db 100755
--- a/ext/ext/hyperloglog.hpp
+++ b/ext/ext/hyperloglog.hpp
@@ -25,6 +25,7 @@ THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #include <sstream>
 #include <stdexcept>
 #include <algorithm>
+#include <stdint.h>
 #include "murmur3.h"
 
 #define HLL_HASH_SEED 313
diff --git a/ext/json11/json11.cpp b/ext/json11/json11.cpp
index 764009b8..24019617 100644
--- a/ext/json11/json11.cpp
+++ b/ext/json11/json11.cpp
@@ -26,6 +26,7 @@
 #include <cstdio>
 #include <limits>
 #include <string>
+#include <stdint.h>
 
 namespace json11 {
 
diff --git a/trackalert/trackalert.hh b/trackalert/trackalert.hh
index 98abeb2e..ba8ffd74 100644
--- a/trackalert/trackalert.hh
+++ b/trackalert/trackalert.hh
@@ -28,6 +28,7 @@
 #include <atomic>
 #include <mutex>
 #include <thread>
+#include <stdint.h>
 #include "sholder.hh"
 #include "sstuff.hh"
 #include "webhook.hh"
diff --git a/wforce/wforce-replication.cc b/wforce/wforce-replication.cc
index db39ab9a..9f6c14fe 100644
--- a/wforce/wforce-replication.cc
+++ b/wforce/wforce-replication.cc
@@ -32,6 +32,7 @@
 #include "json11.hpp"
 #include <unistd.h>
 #include <sys/stat.h>
+#include <stdint.h>
 #include "sodcrypto.hh"
 #include "perf-stats.hh"
 #include "lock.hh"
diff --git a/wforce/wforce-sibling.cc b/wforce/wforce-sibling.cc
index 9c514772..3f9d4d3f 100644
--- a/wforce/wforce-sibling.cc
+++ b/wforce/wforce-sibling.cc
@@ -25,6 +25,7 @@
 #include "wforce_exception.hh"
 #include "wforce_ns.hh"
 #include <stddef.h>
+#include <stdint.h>
 #include <netdb.h>
 
 #define SYSLOG_NAMES
diff --git a/wforce/wforce.hh b/wforce/wforce.hh
index 93637063..695c48f5 100644
--- a/wforce/wforce.hh
+++ b/wforce/wforce.hh
@@ -29,6 +29,7 @@
 #include <boost/circular_buffer.hpp>
 #include <mutex>
 #include <thread>
+#include <stdint.h>
 #include "sholder.hh"
 #include "sstuff.hh"
 #include "replication.hh"