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

src/threading/BasicThread.cc

@@ -1,11 +1,11 @@
+#include "zeek-config.h"
+#include "zeek/threading/BasicThread.h"
 
 #include <signal.h>
 #include <pthread.h>
 
-#include "zeek-config.h"
-#include "BasicThread.h"
-#include "Manager.h"
-#include "util.h"
+#include "zeek/threading/Manager.h"
+#include "zeek/util.h"
 
 namespace zeek::threading {
 

src/threading/Formatter.cc

@@ -1,12 +1,12 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "zeek-config.h"
-#include "Formatter.h"
+#include "zeek/threading/Formatter.h"
 
 #include <errno.h>
 
-#include "MsgThread.h"
-#include "bro_inet_ntop.h"
+#include "zeek/threading/MsgThread.h"
+#include "zeek/bro_inet_ntop.h"
 
 using zeek::threading::Value;
 using zeek::threading::Field;

src/threading/Formatter.h

@@ -4,8 +4,8 @@
 
 #include <string>
 
-#include "Type.h"
-#include "SerialTypes.h"
+#include "zeek/Type.h"
+#include "zeek/threading/SerialTypes.h"
 
 ZEEK_FORWARD_DECLARE_NAMESPACED(MsgThread, zeek, threading);
 

src/threading/Manager.cc

@@ -1,13 +1,13 @@
-#include "Manager.h"
+#include "zeek/threading/Manager.h"
 
 #include <sys/socket.h>
 #include <unistd.h>
 
-#include "NetVar.h"
-#include "iosource/Manager.h"
-#include "Event.h"
-#include "IPAddr.h"
-#include "RunState.h"
+#include "zeek/NetVar.h"
+#include "zeek/iosource/Manager.h"
+#include "zeek/Event.h"
+#include "zeek/IPAddr.h"
+#include "zeek/RunState.h"
 
 namespace zeek::threading {
 namespace detail {

src/threading/Manager.h

@@ -1,12 +1,11 @@
-
 #pragma once
 
-#include "MsgThread.h"
-#include "Timer.h"
-
 #include <list>
 #include <utility>
 
+#include "zeek/threading/MsgThread.h"
+#include "zeek/Timer.h"
+
 namespace zeek {
 namespace threading {
 namespace detail {

src/threading/MsgThread.cc

@@ -1,13 +1,13 @@
+#include "zeek/threading/MsgThread.h"
+
 #include <unistd.h>
 #include <signal.h>
 #include <fcntl.h>
 
-#include "DebugLogger.h"
-
-#include "MsgThread.h"
-#include "Manager.h"
-#include "iosource/Manager.h"
-#include "RunState.h"
+#include "zeek/DebugLogger.h"
+#include "zeek/threading/Manager.h"
+#include "zeek/iosource/Manager.h"
+#include "zeek/RunState.h"
 
 // Set by Zeek's main signal handler.
 extern int signal_val;

src/threading/MsgThread.h

@@ -1,12 +1,10 @@
-
 #pragma once
 
-#include "DebugLogger.h"
-
-#include "BasicThread.h"
-#include "Queue.h"
-#include "iosource/IOSource.h"
-#include "Flare.h"
+#include "zeek/DebugLogger.h"
+#include "zeek/threading/BasicThread.h"
+#include "zeek/threading/Queue.h"
+#include "zeek/iosource/IOSource.h"
+#include "zeek/Flare.h"
 
 namespace zeek::threading {
 	struct Value;

src/threading/Queue.h

@@ -7,8 +7,8 @@
 #include <stdint.h>
 #include <sys/time.h>
 
-#include "Reporter.h"
-#include "BasicThread.h"
+#include "zeek/Reporter.h"
+#include "zeek/threading/BasicThread.h"
 
 #undef Queue // Defined elsewhere unfortunately.
 

src/threading/SerialTypes.cc

@@ -1,18 +1,18 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
+#include "zeek/threading/SerialTypes.h"
 
-#include "SerialTypes.h"
-#include "SerializationFormat.h"
-#include "Reporter.h"
+#include "zeek/SerializationFormat.h"
+#include "zeek/Reporter.h"
 // The following are required for ValueToVal.
-#include "Val.h"
-#include "ZeekString.h"
-#include "RE.h"
-#include "module_util.h"
-#include "ID.h"
-#include "Expr.h"
-#include "Scope.h"
-#include "IPAddr.h"
+#include "zeek/Val.h"
+#include "zeek/ZeekString.h"
+#include "zeek/RE.h"
+#include "zeek/module_util.h"
+#include "zeek/ID.h"
+#include "zeek/Expr.h"
+#include "zeek/Scope.h"
+#include "zeek/IPAddr.h"
 
 namespace zeek::threading {
 

src/threading/SerialTypes.h

@@ -6,8 +6,8 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "Type.h"
-#include "net_util.h"
+#include "zeek/Type.h"
+#include "zeek/net_util.h"
 
 ZEEK_FORWARD_DECLARE_NAMESPACED(SerializationFormat, zeek::detail);
 

src/threading/formatters/Ascii.cc

@@ -1,13 +1,13 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "zeek-config.h"
+#include "threading/formatters/Ascii.h"
 
-#include "Ascii.h"
-#include "Desc.h"
-#include "threading/MsgThread.h"
-
-#include <sstream>
 #include <errno.h>
+#include <sstream>
+
+#include "zeek/Desc.h"
+#include "zeek/threading/MsgThread.h"
 
 using namespace std;
 

src/threading/formatters/Ascii.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "../Formatter.h"
+#include "zeek/threading/Formatter.h"
 
 namespace zeek::threading::formatter {
 

src/threading/formatters/JSON.cc

@@ -1,20 +1,21 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "zeek-config.h"
-
-#include "JSON.h"
-#include "rapidjson/internal/ieee754.h"
-#include "Desc.h"
-#include "threading/MsgThread.h"
+#include "zeek/threading/formatters/JSON.h"
 
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS
 #endif
 
-#include <sstream>
 #include <errno.h>
 #include <math.h>
 #include <stdint.h>
+#include <sstream>
+
+#include <rapidjson/internal/ieee754.h>
+
+#include "zeek/Desc.h"
+#include "zeek/threading/MsgThread.h"
 
 namespace zeek::threading::formatter {
 

src/threading/formatters/JSON.h

@@ -3,10 +3,10 @@
 #pragma once
 
 #define RAPIDJSON_HAS_STDSTRING 1
-#include "rapidjson/document.h"
-#include "rapidjson/writer.h"
+#include <rapidjson/document.h>
+#include <rapidjson/writer.h>
 
-#include "../Formatter.h"
+#include "zeek/threading/Formatter.h"
 
 namespace zeek::threading::formatter {