GH-1079: Use full paths starting with zeek/ when including files

src/probabilistic/BitVector.cc

@@ -1,14 +1,13 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "BitVector.h"
+#include "zeek/probabilistic/BitVector.h"
 
-#include <broker/data.hh>
-
-#include <openssl/sha.h>
 #include <cassert>
 #include <limits>
+#include <openssl/sha.h>
+#include <broker/data.hh>
 
-#include "digest.h"
+#include "zeek/digest.h"
 
 namespace zeek::probabilistic::detail {
 

src/probabilistic/BitVector.h

@@ -2,12 +2,12 @@
 
 #pragma once
 
-#include <broker/expected.hh>
-
 #include <iterator>
 #include <memory>
 #include <vector>
 
+#include <broker/expected.hh>
+
 namespace broker { class data; }
 
 namespace zeek::probabilistic::detail {

src/probabilistic/BloomFilter.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "BloomFilter.h"
+#include "zeek/probabilistic/BloomFilter.h"
 
 #include <cmath>
 #include <limits>
@@ -8,10 +8,9 @@
 #include <broker/data.hh>
 #include <broker/error.hh>
 
-#include "CounterVector.h"
-
-#include "../util.h"
-#include "../Reporter.h"
+#include "zeek/probabilistic/CounterVector.h"
+#include "zeek/util.h"
+#include "zeek/Reporter.h"
 
 namespace zeek::probabilistic {
 

src/probabilistic/BloomFilter.h

@@ -10,8 +10,8 @@
 
 #include <broker/expected.hh>
 
-#include "BitVector.h"
-#include "Hasher.h"
+#include "zeek/probabilistic/BitVector.h"
+#include "zeek/probabilistic/Hasher.h"
 
 namespace broker { class data; }
 

src/probabilistic/CardinalityCounter.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "CardinalityCounter.h"
+#include "zeek/probabilistic/CardinalityCounter.h"
 
 #include <math.h>
 #include <stdint.h>
@@ -8,7 +8,7 @@
 
 #include <broker/data.hh>
 
-#include "Reporter.h"
+#include "zeek/Reporter.h"
 
 namespace zeek::probabilistic::detail {
 

src/probabilistic/CardinalityCounter.h

@@ -2,12 +2,12 @@
 
 #pragma once
 
-#include <broker/expected.hh>
+#include <stdint.h>
 
 #include <memory>
 #include <vector>
 
-#include <stdint.h>
+#include <broker/expected.hh>
 
 namespace broker { class data; }
 

src/probabilistic/CounterVector.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "CounterVector.h"
+#include "zeek/probabilistic/CounterVector.h"
 
 #include <cassert>
 #include <limits>
@@ -8,8 +8,8 @@
 #include <broker/data.hh>
 #include <broker/error.hh>
 
-#include "BitVector.h"
-#include "util.h"
+#include "zeek/probabilistic/BitVector.h"
+#include "zeek/util.h"
 
 namespace zeek::probabilistic::detail {
 

src/probabilistic/Hasher.cc

@@ -1,17 +1,15 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "Hasher.h"
+#include "zeek/probabilistic/Hasher.h"
 
 #include <typeinfo>
-
 #include <openssl/evp.h>
-
-#include "NetVar.h"
-#include "Var.h"
-#include "digest.h"
-#include "highwayhash/sip_hash.h"
-
 #include <broker/data.hh>
+#include <highwayhash/sip_hash.h>
+
+#include "zeek/NetVar.h"
+#include "zeek/Var.h"
+#include "zeek/digest.h"
 
 namespace zeek::probabilistic::detail {
 

src/probabilistic/Hasher.h

@@ -2,11 +2,10 @@
 
 #pragma once
 
-#include "Hash.h"
-
+#include <memory>
 #include <broker/expected.hh>
 
-#include <memory>
+#include "zeek/Hash.h"
 
 namespace broker { class data; }
 

src/probabilistic/Topk.cc

@@ -1,13 +1,13 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "probabilistic/Topk.h"
+#include "zeek/probabilistic/Topk.h"
 
 #include <broker/error.hh>
 
-#include "broker/Data.h"
-#include "CompHash.h"
-#include "Reporter.h"
-#include "Dict.h"
+#include "zeek/broker/Data.h"
+#include "zeek/CompHash.h"
+#include "zeek/Reporter.h"
+#include "zeek/Dict.h"
 
 namespace zeek::probabilistic::detail {
 

src/probabilistic/Topk.h

@@ -3,8 +3,8 @@
 #pragma once
 
 #include <list>
-#include "Val.h"
-#include "OpaqueVal.h"
+#include "zeek/Val.h"
+#include "zeek/OpaqueVal.h"
 
 // This class implements the top-k algorithm. Or - to be more precise - an
 // interpretation of it.

src/probabilistic/bloom-filter.bif

@@ -5,8 +5,8 @@
 // TODO: This is currently included from the top-level src directory, hence
 // paths are relative to there. We need a better mechanisms to pull in
 // BiFs defined in sub directories.
-#include "probabilistic/BloomFilter.h"
-#include "OpaqueVal.h"
+#include "zeek/probabilistic/BloomFilter.h"
+#include "zeek/OpaqueVal.h"
 
 using namespace probabilistic;
 

src/probabilistic/cardinality-counter.bif

@@ -1,8 +1,8 @@
 ##! Functions to create and manipulate probabilistic cardinality counters.
 
 %%{
-#include "probabilistic/CardinalityCounter.h"
-#include "OpaqueVal.h"
+#include "zeek/probabilistic/CardinalityCounter.h"
+#include "zeek/OpaqueVal.h"
 
 using namespace probabilistic;
 %%}

src/probabilistic/top-k.bif

@@ -1,7 +1,7 @@
 ##! Functions to probabilistically determine top-k elements.
 
 %%{
-#include "probabilistic/Topk.h"
+#include "zeek/probabilistic/Topk.h"
 %%}
 
 ## Creates a top-k data structure which tracks *size* elements.