Improve C++ header includes to improve build time

Recent changes ended up including all the Broker headers more places
than necessary, causing compile time to increase 2x.

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>

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"

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"

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>

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"

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>

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 {
 

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>

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 {
 

src/probabilistic/BloomFilter.cc

@@ -4,6 +4,8 @@
 #include <cmath>
 #include <limits>
 
+#include <broker/error.hh>
+
 #include "BloomFilter.h"
 
 #include "CounterVector.h"

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"

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 {
 

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;
 

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 {
 

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"
 

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"