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

src/logging/Component.cc

@@ -1,9 +1,9 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "Component.h"
-#include "Manager.h"
-#include "../Desc.h"
-#include "../util.h"
+#include "zeek/logging/Component.h"
+#include "zeek/logging/Manager.h"
+#include "zeek/Desc.h"
+#include "zeek/util.h"
 
 namespace zeek::logging {
 

src/logging/Component.h

@@ -2,9 +2,9 @@
 
 #pragma once
 
-#include "Tag.h"
-#include "plugin/Component.h"
-#include "plugin/TaggedComponent.h"
+#include "zeek/logging/Tag.h"
+#include "zeek/plugin/Component.h"
+#include "zeek/plugin/TaggedComponent.h"
 
 ZEEK_FORWARD_DECLARE_NAMESPACED(WriterFrontend, zeek, logging);
 ZEEK_FORWARD_DECLARE_NAMESPACED(WriterBackend, zeek, logging);

src/logging/Manager.cc

@@ -1,32 +1,33 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "Manager.h"
+#include "zeek/logging/Manager.h"
 
 #include <utility>
 
-#include "Event.h"
-#include "EventHandler.h"
-#include "NetVar.h"
-#include "RunState.h"
-#include "Type.h"
-#include "File.h"
-#include "input.h"
-#include "IntrusivePtr.h"
-#include "Func.h"
-
-#include "broker/Manager.h"
-#include "threading/Manager.h"
-#include "threading/SerialTypes.h"
-
-#include "Desc.h"
-#include "WriterFrontend.h"
-#include "WriterBackend.h"
-#include "logging.bif.h"
-#include "plugin/Plugin.h"
-#include "plugin/Manager.h"
-
 #include <broker/endpoint_info.hh>
 
+#include "zeek/Event.h"
+#include "zeek/EventHandler.h"
+#include "zeek/NetVar.h"
+#include "zeek/RunState.h"
+#include "zeek/Type.h"
+#include "zeek/File.h"
+#include "zeek/input.h"
+#include "zeek/IntrusivePtr.h"
+#include "zeek/Func.h"
+#include "zeek/Desc.h"
+
+#include "zeek/broker/Manager.h"
+#include "zeek/threading/Manager.h"
+#include "zeek/threading/SerialTypes.h"
+
+#include "zeek/logging/WriterFrontend.h"
+#include "zeek/logging/WriterBackend.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/plugin/Manager.h"
+
+#include "logging.bif.h"
+
 using namespace std;
 
 namespace zeek::logging {

src/logging/Manager.h

@@ -6,13 +6,13 @@
 
 #include <string_view>
 
-#include "../Val.h"
-#include "../Tag.h"
-#include "../EventHandler.h"
-#include "../plugin/ComponentManager.h"
+#include "zeek/Val.h"
+#include "zeek/Tag.h"
+#include "zeek/EventHandler.h"
+#include "zeek/plugin/ComponentManager.h"
 
-#include "Component.h"
-#include "WriterBackend.h"
+#include "zeek/logging/Component.h"
+#include "zeek/logging/WriterBackend.h"
 
 namespace broker { struct endpoint_info; }
 ZEEK_FORWARD_DECLARE_NAMESPACED(SerializationFormat, zeek::detail);

src/logging/Tag.cc

@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "Tag.h"
-#include "Manager.h"
+#include "zeek/logging/Tag.h"
+#include "zeek/logging/Manager.h"
 
 namespace zeek::logging {
 

src/logging/Tag.h

@@ -3,7 +3,7 @@
 #pragma once
 
 #include "zeek-config.h"
-#include "../Tag.h"
+#include "zeek/Tag.h"
 
 ZEEK_FORWARD_DECLARE_NAMESPACED(EnumVal, zeek);
 

src/logging/WriterBackend.cc

@@ -1,13 +1,13 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
+#include "zeek/logging/WriterBackend.h"
+
 #include <broker/data.hh>
 
-#include "util.h"
-#include "threading/SerialTypes.h"
-
-#include "Manager.h"
-#include "WriterBackend.h"
-#include "WriterFrontend.h"
+#include "zeek/util.h"
+#include "zeek/threading/SerialTypes.h"
+#include "zeek/logging/Manager.h"
+#include "zeek/logging/WriterFrontend.h"
 
 // Messages sent from backend to frontend (i.e., "OutputMessages").
 

src/logging/WriterBackend.h

@@ -4,9 +4,8 @@
 
 #pragma once
 
-#include "threading/MsgThread.h"
-
-#include "Component.h"
+#include "zeek/threading/MsgThread.h"
+#include "zeek/logging/Component.h"
 
 namespace broker { class data; }
 

src/logging/WriterFrontend.cc

@@ -1,11 +1,10 @@
+#include "zeek/logging/WriterFrontend.h"
 
-#include "RunState.h"
-#include "threading/SerialTypes.h"
-#include "broker/Manager.h"
-
-#include "Manager.h"
-#include "WriterFrontend.h"
-#include "WriterBackend.h"
+#include "zeek/RunState.h"
+#include "zeek/threading/SerialTypes.h"
+#include "zeek/broker/Manager.h"
+#include "zeek/logging/Manager.h"
+#include "zeek/logging/WriterBackend.h"
 
 using zeek::threading::Value;
 using zeek::threading::Field;

src/logging/WriterFrontend.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "WriterBackend.h"
+#include "zeek/logging/WriterBackend.h"
 
 ZEEK_FORWARD_DECLARE_NAMESPACED(Manager, zeek, logging);
 

src/logging/logging.bif

@@ -3,7 +3,7 @@
 module Log;
 
 %%{
-#include "logging/Manager.h"
+#include "zeek/logging/Manager.h"
 %%}
 
 type Filter: record;

src/logging/writers/ascii/Ascii.cc

@@ -1,11 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include <ctime>
-#include <cstdio>
-#include <string>
-#include <vector>
-#include <memory>
-#include <optional>
+#include "zeek/logging/writers/ascii/Ascii.h"
 
 #include <errno.h>
 #include <fcntl.h>
@@ -14,12 +9,18 @@
 #include <unistd.h>
 #include <dirent.h>
 
-#include "Func.h"
-#include "RunState.h"
-#include "logging/Manager.h"
-#include "threading/SerialTypes.h"
+#include <ctime>
+#include <cstdio>
+#include <string>
+#include <vector>
+#include <memory>
+#include <optional>
+
+#include "zeek/Func.h"
+#include "zeek/RunState.h"
+#include "zeek/logging/Manager.h"
+#include "zeek/threading/SerialTypes.h"
 
-#include "Ascii.h"
 #include "ascii.bif.h"
 
 using namespace std;

src/logging/writers/ascii/Ascii.h

@@ -4,11 +4,12 @@
 
 #pragma once
 
-#include "logging/WriterBackend.h"
-#include "threading/formatters/Ascii.h"
-#include "threading/formatters/JSON.h"
-#include "Desc.h"
-#include "zlib.h"
+#include <zlib.h>
+
+#include "zeek/logging/WriterBackend.h"
+#include "zeek/threading/formatters/Ascii.h"
+#include "zeek/threading/formatters/JSON.h"
+#include "zeek/Desc.h"
 
 namespace zeek::plugin::detail::Zeek_AsciiWriter { class Plugin; }
 

src/logging/writers/ascii/Plugin.cc

@@ -1,9 +1,7 @@
 // See the file  in the main distribution directory for copyright.
 
-
-#include "plugin/Plugin.h"
-
-#include "Ascii.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/logging/writers/ascii/Ascii.h"
 
 namespace zeek::plugin::detail::Zeek_AsciiWriter {
 

src/logging/writers/none/None.cc

@@ -1,8 +1,8 @@
+#include "zeek/logging/writers/none/None.h"
 
 #include <algorithm>
 #include <iostream>
 
-#include "None.h"
 #include "none.bif.h"
 
 namespace zeek::logging::writer::detail {

src/logging/writers/none/None.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "logging/WriterBackend.h"
+#include "zeek/logging/WriterBackend.h"
 
 namespace zeek::logging::writer::detail {
 

src/logging/writers/none/Plugin.cc

@@ -1,9 +1,7 @@
 // See the file  in the main distribution directory for copyright.
 
-
-#include "plugin/Plugin.h"
-
-#include "None.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/logging/writers/none/None.h"
 
 namespace zeek::plugin::detail::Zeek_NoneWriter {
 

src/logging/writers/sqlite/Plugin.cc

@@ -1,9 +1,7 @@
 // See the file  in the main distribution directory for copyright.
 
-
-#include "plugin/Plugin.h"
-
-#include "SQLite.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/logging/writers/sqlite/SQLite.h"
 
 namespace zeek::plugin::detail::Zeek_SQLiteWriter {
 

src/logging/writers/sqlite/SQLite.cc

@@ -1,14 +1,14 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "zeek-config.h"
+#include "zeek/logging/writers/sqlite/SQLite.h"
 
-#include <string>
 #include <errno.h>
+#include <string>
 #include <vector>
 
-#include "threading/SerialTypes.h"
+#include "zeek/threading/SerialTypes.h"
 
-#include "SQLite.h"
 #include "sqlite.bif.h"
 
 using namespace std;

src/logging/writers/sqlite/SQLite.h

@@ -6,10 +6,10 @@
 
 #include "zeek-config.h"
 
-#include "logging/WriterBackend.h"
-#include "threading/formatters/Ascii.h"
-#include "3rdparty/sqlite3.h"
-#include "Desc.h"
+#include "zeek/logging/WriterBackend.h"
+#include "zeek/threading/formatters/Ascii.h"
+#include "zeek/3rdparty/sqlite3.h"
+#include "zeek/Desc.h"
 
 namespace zeek::logging::writer::detail {