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

src/plugin/Component.cc

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

src/plugin/Component.h

@@ -8,7 +8,6 @@
 ZEEK_FORWARD_DECLARE_NAMESPACED(ODesc, zeek);
 
 namespace zeek::plugin {
-
 namespace component {
 
 /**

src/plugin/ComponentManager.h

@@ -4,13 +4,13 @@
 #include <list>
 #include <string>
 
-#include "Type.h"
-#include "Var.h" // for add_type()
-#include "Val.h"
-#include "Reporter.h"
-#include "Scope.h"
-#include "zeekygen/Manager.h"
-#include "DebugLogger.h"
+#include "zeek/Type.h"
+#include "zeek/Var.h" // for add_type()
+#include "zeek/Val.h"
+#include "zeek/Reporter.h"
+#include "zeek/Scope.h"
+#include "zeek/zeekygen/Manager.h"
+#include "zeek/DebugLogger.h"
 
 namespace zeek::plugin {
 

src/plugin/Manager.cc

@@ -1,22 +1,22 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include <optional>
-#include <sstream>
-#include <fstream>
+#include "zeek/plugin/Manager.h"
+
 #include <dirent.h>
 #include <glob.h>
 #include <dlfcn.h>
 #include <errno.h>
 #include <sys/stat.h>
+#include <optional>
+#include <sstream>
+#include <fstream>
 
-#include "Manager.h"
-
-#include "../Reporter.h"
-#include "../Func.h"
-#include "../Event.h"
-#include "../Val.h"
-#include "../util.h"
-#include "../input.h"
+#include "zeek/Reporter.h"
+#include "zeek/Func.h"
+#include "zeek/Event.h"
+#include "zeek/Val.h"
+#include "zeek/util.h"
+#include "zeek/input.h"
 
 using namespace std;
 

src/plugin/Manager.h

@@ -6,11 +6,10 @@
 #include <map>
 #include <string_view>
 
-#include "Plugin.h"
-#include "Component.h"
-
-#include "../Reporter.h"
-#include "../ZeekArgs.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/plugin/Component.h"
+#include "zeek/Reporter.h"
+#include "zeek/ZeekArgs.h"
 
 namespace zeek {
 namespace plugin {

src/plugin/Plugin.cc

@@ -1,21 +1,18 @@
-// See the file  in the main distribution directory for copyright.
-
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "Plugin.h"
+#include "zeek/plugin/Plugin.h"
 
 #include <cassert>
 
-#include "Manager.h"
-#include "Component.h"
-#include "Val.h"
-
-#include "../Desc.h"
-#include "../Event.h"
-#include "../Func.h"
-#include "../Conn.h"
-#include "../input.h"
-#include "threading/SerialTypes.h"
+#include "zeek/plugin/Manager.h"
+#include "zeek/plugin/Component.h"
+#include "zeek/Val.h"
+#include "zeek/Desc.h"
+#include "zeek/Event.h"
+#include "zeek/Func.h"
+#include "zeek/Conn.h"
+#include "zeek/input.h"
+#include "zeek/threading/SerialTypes.h"
 
 namespace zeek::plugin {
 

src/plugin/Plugin.h

@@ -2,13 +2,14 @@
 
 #pragma once
 
+#include "zeek-config.h"
+
 #include <list>
 #include <string>
 #include <utility>
 
-#include "zeek-config.h"
-#include "logging/WriterBackend.h"
-#include "ZeekArgs.h"
+#include "zeek/logging/WriterBackend.h"
+#include "zeek/ZeekArgs.h"
 
 // Increase this when making incompatible changes to the plugin API. Note
 // that the constant is never used in C code. It's picked up on by CMake.