diff --git a/src/OpaqueVal.cc b/src/OpaqueVal.cc
index 4d7c66b431..93adc5ca06 100644
--- a/src/OpaqueVal.cc
+++ b/src/OpaqueVal.cc
@@ -6,6 +6,8 @@
 #include "probabilistic/BloomFilter.h"
 #include "probabilistic/CardinalityCounter.h"
 
+#include <broker/error.hh>
+
 // Helper to retrieve a broker value out of a broker::vector at a specified
 // index, and casted to the expected destination type.
 template<typename S, typename V, typename D>
diff --git a/src/OpaqueVal.h b/src/OpaqueVal.h
index 17ee78e2fd..3e1b91f0ab 100644
--- a/src/OpaqueVal.h
+++ b/src/OpaqueVal.h
@@ -3,6 +3,9 @@
 #ifndef OPAQUEVAL_H
 #define OPAQUEVAL_H
 
+#include <broker/data.hh>
+#include <broker/expected.hh>
+
 #include "RandTest.h"
 #include "Val.h"
 #include "digest.h"
diff --git a/src/Val.h b/src/Val.h
index 4d76ccc804..5bc5df4da9 100644
--- a/src/Val.h
+++ b/src/Val.h
@@ -8,8 +8,6 @@
 #include <array>
 #include <unordered_map>
 
-#include <broker/broker.hh>
-
 #include "net_util.h"
 #include "Type.h"
 #include "Dict.h"
diff --git a/src/broker/Data.cc b/src/broker/Data.cc
index 966fed6426..d2e53fe45b 100644
--- a/src/broker/Data.cc
+++ b/src/broker/Data.cc
@@ -1,6 +1,9 @@
 #include "Data.h"
 #include "File.h"
 #include "broker/data.bif.h"
+
+#include <broker/error.hh>
+
 #include <caf/stream_serializer.hpp>
 #include <caf/stream_deserializer.hpp>
 #include <caf/streambuf.hpp>
diff --git a/src/broker/Data.h b/src/broker/Data.h
index eda8f6550c..b134656123 100644
--- a/src/broker/Data.h
+++ b/src/broker/Data.h
@@ -1,7 +1,9 @@
 #ifndef BRO_COMM_DATA_H
 #define BRO_COMM_DATA_H
 
-#include <broker/broker.hh>
+#include <broker/data.hh>
+#include <broker/expected.hh>
+
 #include "OpaqueVal.h"
 #include "Reporter.h"
 #include "Frame.h"
diff --git a/src/broker/Manager.h b/src/broker/Manager.h
index 5dfd2eb235..569355b533 100644
--- a/src/broker/Manager.h
+++ b/src/broker/Manager.h
@@ -1,7 +1,17 @@
 #ifndef BRO_COMM_MANAGER_H
 #define BRO_COMM_MANAGER_H
 
-#include <broker/broker.hh>
+#include <broker/topic.hh>
+#include <broker/data.hh>
+#include <broker/store.hh>
+#include <broker/status.hh>
+#include <broker/error.hh>
+#include <broker/endpoint.hh>
+#include <broker/endpoint_info.hh>
+#include <broker/peer_info.hh>
+#include <broker/backend.hh>
+#include <broker/backend_options.hh>
+#include <broker/detail/hash.hh>
 #include <broker/zeek.hh>
 #include <memory>
 #include <string>
diff --git a/src/broker/Store.h b/src/broker/Store.h
index 7e5b2bde07..46d19ee923 100644
--- a/src/broker/Store.h
+++ b/src/broker/Store.h
@@ -8,7 +8,9 @@
 #include "OpaqueVal.h"
 #include "Trigger.h"
 
-#include <broker/broker.hh>
+#include <broker/store.hh>
+#include <broker/backend.hh>
+#include <broker/backend_options.hh>
 
 namespace bro_broker {
 
diff --git a/src/file_analysis/analyzer/x509/X509.cc b/src/file_analysis/analyzer/x509/X509.cc
index 74b903f585..33f2cb4d07 100644
--- a/src/file_analysis/analyzer/x509/X509.cc
+++ b/src/file_analysis/analyzer/x509/X509.cc
@@ -10,6 +10,8 @@
 
 #include "file_analysis/Manager.h"
 
+#include <broker/error.hh>
+
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 #include <openssl/asn1.h>
diff --git a/src/probabilistic/BitVector.h b/src/probabilistic/BitVector.h
index 12d628cacf..ecec6f5714 100644
--- a/src/probabilistic/BitVector.h
+++ b/src/probabilistic/BitVector.h
@@ -6,7 +6,8 @@
 #include <iterator>
 #include <vector>
 
-#include <broker/Data.h>
+#include <broker/data.hh>
+#include <broker/expected.hh>
 
 namespace probabilistic {
 
diff --git a/src/probabilistic/BloomFilter.cc b/src/probabilistic/BloomFilter.cc
index f449fad8b6..dd89bf9c19 100644
--- a/src/probabilistic/BloomFilter.cc
+++ b/src/probabilistic/BloomFilter.cc
@@ -4,6 +4,8 @@
 #include <cmath>
 #include <limits>
 
+#include <broker/error.hh>
+
 #include "BloomFilter.h"
 
 #include "CounterVector.h"
diff --git a/src/probabilistic/BloomFilter.h b/src/probabilistic/BloomFilter.h
index 6f2362de44..bc22c91014 100644
--- a/src/probabilistic/BloomFilter.h
+++ b/src/probabilistic/BloomFilter.h
@@ -5,7 +5,8 @@
 
 #include <vector>
 
-#include <broker/Data.h>
+#include <broker/data.hh>
+#include <broker/expected.hh>
 
 #include "BitVector.h"
 #include "Hasher.h"
diff --git a/src/probabilistic/CardinalityCounter.h b/src/probabilistic/CardinalityCounter.h
index a2d69d0809..63047172ed 100644
--- a/src/probabilistic/CardinalityCounter.h
+++ b/src/probabilistic/CardinalityCounter.h
@@ -4,7 +4,11 @@
 #define PROBABILISTIC_CARDINALITYCOUNTER_H
 
 #include <stdint.h>
-#include <OpaqueVal.h>
+#include <memory>
+#include <vector>
+
+#include <broker/data.hh>
+#include <broker/expected.hh>
 
 namespace probabilistic {
 
diff --git a/src/probabilistic/CounterVector.cc b/src/probabilistic/CounterVector.cc
index a847e06ea7..b9a173356e 100644
--- a/src/probabilistic/CounterVector.cc
+++ b/src/probabilistic/CounterVector.cc
@@ -5,6 +5,9 @@
 #include <cassert>
 #include <limits>
 #include "BitVector.h"
+#include "util.h"
+
+#include <broker/error.hh>
 
 using namespace probabilistic;
 
diff --git a/src/probabilistic/CounterVector.h b/src/probabilistic/CounterVector.h
index 41674efd11..f8209fabca 100644
--- a/src/probabilistic/CounterVector.h
+++ b/src/probabilistic/CounterVector.h
@@ -6,7 +6,8 @@
 #include <cstddef>
 #include <cstdint>
 
-#include <broker/Data.h>
+#include <broker/data.hh>
+#include <broker/expected.hh>
 
 namespace probabilistic {
 
diff --git a/src/probabilistic/Hasher.h b/src/probabilistic/Hasher.h
index 3218ec4d7a..3d60a264c0 100644
--- a/src/probabilistic/Hasher.h
+++ b/src/probabilistic/Hasher.h
@@ -3,7 +3,10 @@
 #ifndef PROBABILISTIC_HASHER_H
 #define PROBABILISTIC_HASHER_H
 
-#include <broker/Data.h>
+#include <broker/data.hh>
+#include <broker/expected.hh>
+
+#include <memory>
 
 #include "Hash.h"
 
diff --git a/src/probabilistic/Topk.cc b/src/probabilistic/Topk.cc
index 56b9030f21..8ff158e10d 100644
--- a/src/probabilistic/Topk.cc
+++ b/src/probabilistic/Topk.cc
@@ -1,5 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
+#include <broker/error.hh>
+
 #include "broker/Data.h"
 #include "probabilistic/Topk.h"
 #include "CompHash.h"