diff --git a/NEWS b/NEWS
index 4c9b4c6803..89dbfdd61a 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,10 @@ We would like to thank ... for their contributions to this release.
 Breaking Changes
 ----------------
 
+- The code base underwent a big cleanup of #include usage, across almost all of the
+  files. We tested builds of all of the existing third-party packages and only noticed one
+  or two failures, but there is a possibility for breakage related to this cleanup.
+
 New Functionality
 -----------------
 
diff --git a/src/DNS_Mapping.cc b/src/DNS_Mapping.cc
index 3fa14b4e93..2500551606 100644
--- a/src/DNS_Mapping.cc
+++ b/src/DNS_Mapping.cc
@@ -3,6 +3,7 @@
 #include "zeek/DNS_Mapping.h"
 
 #include <ares_nameser.h>
+#include <cinttypes>
 
 #include "zeek/DNS_Mgr.h"
 #include "zeek/Reporter.h"
diff --git a/src/Dict.h b/src/Dict.h
index c3443a3ddf..b53c7e6c99 100644
--- a/src/Dict.h
+++ b/src/Dict.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #include <algorithm>
+#include <cinttypes>
 #include <cmath>
 #include <cstdint>
 #include <fstream>
diff --git a/src/Hash.cc b/src/Hash.cc
index a1f37bae0d..a6ef2b7934 100644
--- a/src/Hash.cc
+++ b/src/Hash.cc
@@ -2,11 +2,10 @@
 
 #include "zeek/Hash.h"
 
-#include "zeek/zeek-config.h"
-
 #include <highwayhash/highwayhash_target.h>
 #include <highwayhash/instruction_sets.h>
 #include <highwayhash/sip_hash.h>
+#include <cinttypes>
 
 #include "zeek/DebugLogger.h"
 #include "zeek/Desc.h"
diff --git a/src/Reassem.cc b/src/Reassem.cc
index 39a7cd8f5b..cbf0c0dc88 100644
--- a/src/Reassem.cc
+++ b/src/Reassem.cc
@@ -5,6 +5,7 @@
 #include "zeek/zeek-config.h"
 
 #include <algorithm>
+#include <cinttypes>
 #include <limits>
 
 #include "zeek/Desc.h"
diff --git a/src/ScriptCoverageManager.cc b/src/ScriptCoverageManager.cc
index 8603fb2755..a57394b8bf 100644
--- a/src/ScriptCoverageManager.cc
+++ b/src/ScriptCoverageManager.cc
@@ -4,6 +4,7 @@
 
 #include <sys/stat.h>
 #include <algorithm>
+#include <cinttypes>
 #include <cstdio>
 #include <cstring>
 #include <fstream>
diff --git a/src/SerializationFormat.cc b/src/SerializationFormat.cc
index 8f0bb88198..ab96b5d4ca 100644
--- a/src/SerializationFormat.cc
+++ b/src/SerializationFormat.cc
@@ -3,6 +3,7 @@
 #include "zeek/SerializationFormat.h"
 
 #include <cctype>
+#include <cinttypes>
 
 #include "zeek/DebugLogger.h"
 #include "zeek/IPAddr.h"
diff --git a/src/Tag.cc b/src/Tag.cc
index 6233799585..a65b9d300e 100644
--- a/src/Tag.cc
+++ b/src/Tag.cc
@@ -2,6 +2,8 @@
 
 #include "zeek/Tag.h"
 
+#include <cinttypes>
+
 #include "zeek/Val.h"
 
 namespace zeek {
diff --git a/src/Type.cc b/src/Type.cc
index f12ed51895..2fa1209613 100644
--- a/src/Type.cc
+++ b/src/Type.cc
@@ -4,6 +4,7 @@
 
 #include "zeek/zeek-config.h"
 
+#include <cinttypes>
 #include <list>
 #include <map>
 #include <string>
diff --git a/src/main.cc b/src/main.cc
index c9a3f50eab..905f80eacb 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -3,6 +3,7 @@
 #include "zeek/zeek-config.h"
 
 #include <unistd.h>
+#include <cinttypes>
 
 #include "zeek/RunState.h"
 #include "zeek/Stats.h"
diff --git a/src/parse.y b/src/parse.y
index c6fe97501e..c652a471d6 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -83,6 +83,7 @@
 
 %{
 #include <cassert>
+#include <cinttypes>
 #include <cstdlib>
 #include <cstring>
 #include <set>
diff --git a/src/probabilistic/BloomFilter.cc b/src/probabilistic/BloomFilter.cc
index 9d95cf5a8d..726d302af6 100644
--- a/src/probabilistic/BloomFilter.cc
+++ b/src/probabilistic/BloomFilter.cc
@@ -2,6 +2,7 @@
 
 #include "zeek/probabilistic/BloomFilter.h"
 
+#include <cinttypes>
 #include <cmath>
 #include <limits>
 
diff --git a/src/probabilistic/CardinalityCounter.cc b/src/probabilistic/CardinalityCounter.cc
index 4014b3de57..fc60fafd26 100644
--- a/src/probabilistic/CardinalityCounter.cc
+++ b/src/probabilistic/CardinalityCounter.cc
@@ -2,6 +2,7 @@
 
 #include "zeek/probabilistic/CardinalityCounter.h"
 
+#include <cinttypes>
 #include <cmath>
 #include <cstdint>
 #include <utility>
diff --git a/src/storage/backend/redis/Redis.cc b/src/storage/backend/redis/Redis.cc
index effacc38b1..4f75e4f940 100644
--- a/src/storage/backend/redis/Redis.cc
+++ b/src/storage/backend/redis/Redis.cc
@@ -3,6 +3,7 @@
 #include "zeek/storage/backend/redis/Redis.h"
 
 #include <algorithm>
+#include <cinttypes>
 
 #include "zeek/DebugLogger.h"
 #include "zeek/Func.h"
diff --git a/src/threading/BasicThread.cc b/src/threading/BasicThread.cc
index f5c6a588ad..4c606b5cb2 100644
--- a/src/threading/BasicThread.cc
+++ b/src/threading/BasicThread.cc
@@ -5,6 +5,7 @@
 #include "zeek/zeek-config.h"
 
 #include <pthread.h>
+#include <cinttypes>
 #include <csignal>
 
 #include "zeek/threading/Manager.h"
diff --git a/src/util.h b/src/util.h
index 677b171b66..3e8d2943af 100644
--- a/src/util.h
+++ b/src/util.h
@@ -16,7 +16,6 @@
 
 #include <libgen.h>
 #include <unistd.h>
-#include <cinttypes>
 #include <cstdarg>
 #include <cstdint>
 #include <cstdio>
diff --git a/testing/btest/plugins/api-plugin/src/Plugin.cc b/testing/btest/plugins/api-plugin/src/Plugin.cc
index 9aeb0ce034..92f8b0e45e 100644
--- a/testing/btest/plugins/api-plugin/src/Plugin.cc
+++ b/testing/btest/plugins/api-plugin/src/Plugin.cc
@@ -1,6 +1,7 @@
 
 #include "Plugin.h"
 
+#include <cinttypes>
 #include <iostream>
 
 #include "zeek/ID.h"