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

2025-10-10 02:28:21 +00:00 · 2020-11-02 18:20:16 -07:00 · 2020-11-02 18:20:16 -07:00 · 96d9115360
commit 96d9115360
parent 78fc5615a5
640 changed files with 2708 additions and 2698 deletions
--- a/src/packet_analysis/Analyzer.h
+++ b/src/packet_analysis/Analyzer.h
@ -1,9 +1,9 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 #pragma once

-#include "Manager.h"
-#include "Tag.h"
-#include <iosource/Packet.h>
+#include "zeek/packet_analysis/Manager.h"
+#include "zeek/packet_analysis/Tag.h"
+#include "zeek/iosource/Packet.h"

 namespace zeek::packet_analysis {

--- a/src/packet_analysis/Component.cc
+++ b/src/packet_analysis/Component.cc
@ -1,8 +1,8 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "Component.h"
-#include "Desc.h"
-#include "Manager.h"
+#include "zeek/packet_analysis/Component.h"
+#include "zeek/Desc.h"
+#include "zeek/packet_analysis/Manager.h"

 using namespace zeek::packet_analysis;

--- a/src/packet_analysis/Component.h
+++ b/src/packet_analysis/Component.h
@ -6,11 +6,11 @@

 #include <functional>

-#include "util.h"
-#include "Tag.h"
+#include "zeek/util.h"
+#include "zeek/packet_analysis/Tag.h"

-#include "plugin/Component.h"
-#include "plugin/TaggedComponent.h"
+#include "zeek/plugin/Component.h"
+#include "zeek/plugin/TaggedComponent.h"

 namespace zeek::packet_analysis {

--- a/src/packet_analysis/Dispatcher.cc
+++ b/src/packet_analysis/Dispatcher.cc
@ -2,10 +2,10 @@

 #include <algorithm>

-#include "Dispatcher.h"
-#include "Analyzer.h"
-#include "Reporter.h"
-#include "DebugLogger.h"
+#include "zeek/packet_analysis/Dispatcher.h"
+#include "zeek/packet_analysis/Analyzer.h"
+#include "zeek/Reporter.h"
+#include "zeek/DebugLogger.h"

 namespace zeek::packet_analysis {

--- a/src/packet_analysis/Manager.cc
+++ b/src/packet_analysis/Manager.cc
@ -1,14 +1,14 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "Manager.h"
+#include "zeek/packet_analysis/Manager.h"

-#include "Analyzer.h"
-#include "Dispatcher.h"
-#include "zeek-bif.h"
-#include "Stats.h"
+#include "zeek/packet_analysis/Analyzer.h"
+#include "zeek/packet_analysis/Dispatcher.h"
+#include "zeek/zeek-bif.h"
+#include "zeek/Stats.h"
 #include "zeek/Sessions.h"
 #include "zeek/RunState.h"
-#include "iosource/PktDumper.h"
+#include "zeek/iosource/PktDumper.h"

 using namespace zeek::packet_analysis;

--- a/src/packet_analysis/Manager.h
+++ b/src/packet_analysis/Manager.h
@ -2,11 +2,11 @@

 #pragma once

-#include "Tag.h"
-#include "Component.h"
-#include "plugin/ComponentManager.h"
-#include "iosource/Packet.h"
-#include "Dispatcher.h"
+#include "zeek/packet_analysis/Tag.h"
+#include "zeek/packet_analysis/Component.h"
+#include "zeek/plugin/ComponentManager.h"
+#include "zeek/iosource/Packet.h"
+#include "zeek/packet_analysis/Dispatcher.h"

 ZEEK_FORWARD_DECLARE_NAMESPACED(PacketProfiler, zeek::detail);

--- a/src/packet_analysis/Tag.cc
+++ b/src/packet_analysis/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/packet_analysis/Tag.h"
+#include "zeek/packet_analysis/Manager.h"

 namespace zeek::packet_analysis {

--- a/src/packet_analysis/Tag.h
+++ b/src/packet_analysis/Tag.h
@ -3,7 +3,7 @@
 #pragma once

 #include "zeek-config.h"
-#include "../Tag.h"
+#include "zeek/Tag.h"

 namespace zeek::plugin {
 	template <class T> class TaggedComponent;
--- a/src/packet_analysis/protocol/arp/ARP.cc
+++ b/src/packet_analysis/protocol/arp/ARP.cc
@ -1,11 +1,8 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "ARP.h"
-#include "Event.h"
-
-#include "events.bif.h"
-
 #include "zeek-config.h"
+#include "zeek/packet_analysis/protocol/arp/ARP.h"
+
 #ifdef HAVE_NET_ETHERNET_H
 #include <net/ethernet.h>
 #elif defined(HAVE_SYS_ETHERNET_H)
@ -16,6 +13,10 @@
 #include <net/ethertypes.h>
 #endif

+#include "zeek/Event.h"
+
+#include "events.bif.h"
+
 using namespace zeek::packet_analysis::ARP;

 ARPAnalyzer::ARPAnalyzer()
--- a/src/packet_analysis/protocol/arp/ARP.h
+++ b/src/packet_analysis/protocol/arp/ARP.h
@ -2,12 +2,13 @@

 #pragma once

-#include <packet_analysis/Analyzer.h>
-#include <packet_analysis/Component.h>
-
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <net/if_arp.h>

+#include "zeek/packet_analysis/Analyzer.h"
+#include "zeek/packet_analysis/Component.h"
+
 #ifndef arp_pkthdr
 #define arp_pkthdr arphdr
 #endif
--- a/src/packet_analysis/protocol/arp/Plugin.cc
+++ b/src/packet_analysis/protocol/arp/Plugin.cc
@ -1,8 +1,8 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "plugin/Plugin.h"
-#include "ARP.h"
-#include "packet_analysis/Component.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/packet_analysis/Component.h"
+#include "zeek/packet_analysis/protocol/arp/ARP.h"

 namespace zeek::plugin::Zeek_ARP {

--- a/src/packet_analysis/protocol/ethernet/Ethernet.cc
+++ b/src/packet_analysis/protocol/ethernet/Ethernet.cc
@ -1,8 +1,8 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "Ethernet.h"
-#include "NetVar.h"
-#include "Manager.h"
+#include "zeek/packet_analysis/protocol/ethernet/Ethernet.h"
+#include "zeek/NetVar.h"
+#include "zeek/packet_analysis/Manager.h"

 using namespace zeek::packet_analysis::Ethernet;

--- a/src/packet_analysis/protocol/ethernet/Ethernet.h
+++ b/src/packet_analysis/protocol/ethernet/Ethernet.h
@ -2,8 +2,8 @@

 #pragma once

-#include <packet_analysis/Analyzer.h>
-#include <packet_analysis/Component.h>
+#include "zeek/packet_analysis/Analyzer.h"
+#include "zeek/packet_analysis/Component.h"

 namespace zeek::packet_analysis::Ethernet {

--- a/src/packet_analysis/protocol/ethernet/Plugin.cc
+++ b/src/packet_analysis/protocol/ethernet/Plugin.cc
@ -1,8 +1,8 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "Ethernet.h"
-#include "plugin/Plugin.h"
-#include "packet_analysis/Component.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/packet_analysis/Component.h"
+#include "zeek/packet_analysis/protocol/ethernet/Ethernet.h"

 namespace zeek::plugin::Zeek_Ethernet {

--- a/src/packet_analysis/protocol/fddi/FDDI.cc
+++ b/src/packet_analysis/protocol/fddi/FDDI.cc
@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "FDDI.h"
-#include "NetVar.h"
+#include "zeek/packet_analysis/protocol/fddi/FDDI.h"
+#include "zeek/NetVar.h"

 using namespace zeek::packet_analysis::FDDI;

--- a/src/packet_analysis/protocol/fddi/FDDI.h
+++ b/src/packet_analysis/protocol/fddi/FDDI.h
@ -2,8 +2,8 @@

 #pragma once

-#include <packet_analysis/Analyzer.h>
-#include <packet_analysis/Component.h>
+#include "zeek/packet_analysis/Analyzer.h"
+#include "zeek/packet_analysis/Component.h"

 namespace zeek::packet_analysis::FDDI {

--- a/src/packet_analysis/protocol/fddi/Plugin.cc
+++ b/src/packet_analysis/protocol/fddi/Plugin.cc
@ -1,8 +1,8 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "FDDI.h"
-#include "plugin/Plugin.h"
-#include "packet_analysis/Component.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/packet_analysis/Component.h"
+#include "zeek/packet_analysis/protocol/fddi/FDDI.h"

 namespace zeek::plugin::Zeek_FDDI {

--- a/src/packet_analysis/protocol/gre/GRE.cc
+++ b/src/packet_analysis/protocol/gre/GRE.cc
@ -1,13 +1,14 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "GRE.h"
+#include "zeek/packet_analysis/protocol/gre/GRE.h"
+
+#include <pcap.h> // For DLT_ constants
+
 #include "zeek/Sessions.h"
 #include "zeek/RunState.h"
 #include "zeek/IP.h"
 #include "zeek/Reporter.h"

-#include "pcap.h" // For DLT_ constants
-
 using namespace zeek::packet_analysis::GRE;

 static unsigned int gre_header_len(uint16_t flags=0)
--- a/src/packet_analysis/protocol/gre/GRE.h
+++ b/src/packet_analysis/protocol/gre/GRE.h
@ -2,8 +2,8 @@

 #pragma once

-#include <packet_analysis/Analyzer.h>
-#include <packet_analysis/Component.h>
+#include "zeek/packet_analysis/Analyzer.h"
+#include "zeek/packet_analysis/Component.h"

 namespace zeek::packet_analysis::GRE {

--- a/src/packet_analysis/protocol/gre/Plugin.cc
+++ b/src/packet_analysis/protocol/gre/Plugin.cc
@ -1,8 +1,8 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "GRE.h"
-#include "plugin/Plugin.h"
-#include "packet_analysis/Component.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/packet_analysis/Component.h"
+#include "zeek/packet_analysis/protocol/gre/GRE.h"

 namespace zeek::plugin::Zeek_GRE {

--- a/src/packet_analysis/protocol/ieee802_11/IEEE802_11.cc
+++ b/src/packet_analysis/protocol/ieee802_11/IEEE802_11.cc
@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "IEEE802_11.h"
-#include "NetVar.h"
+#include "zeek/packet_analysis/protocol/ieee802_11/IEEE802_11.h"
+#include "zeek/NetVar.h"

 using namespace zeek::packet_analysis::IEEE802_11;

--- a/src/packet_analysis/protocol/ieee802_11/IEEE802_11.h
+++ b/src/packet_analysis/protocol/ieee802_11/IEEE802_11.h
@ -2,8 +2,8 @@

 #pragma once

-#include <packet_analysis/Analyzer.h>
-#include <packet_analysis/Component.h>
+#include "zeek/packet_analysis/Analyzer.h"
+#include "zeek/packet_analysis/Component.h"

 namespace zeek::packet_analysis::IEEE802_11 {

--- a/src/packet_analysis/protocol/ieee802_11/Plugin.cc
+++ b/src/packet_analysis/protocol/ieee802_11/Plugin.cc
@ -1,8 +1,8 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "IEEE802_11.h"
-#include "plugin/Plugin.h"
-#include "packet_analysis/Component.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/packet_analysis/Component.h"
+#include "zeek/packet_analysis/protocol/ieee802_11/IEEE802_11.h"

 namespace zeek::plugin::Zeek_IEEE802_11 {

--- a/src/packet_analysis/protocol/ieee802_11_radio/IEEE802_11_Radio.cc
+++ b/src/packet_analysis/protocol/ieee802_11_radio/IEEE802_11_Radio.cc
@ -1,9 +1,10 @@
 // See the file "COPYING" in the main distribution directory for copyright.

+#include "zeek/packet_analysis/protocol/ieee802_11_radio/IEEE802_11_Radio.h"
+
 #include <pcap.h>

-#include "IEEE802_11_Radio.h"
-#include "NetVar.h"
+#include "zeek/NetVar.h"

 using namespace zeek::packet_analysis::IEEE802_11_Radio;

--- a/src/packet_analysis/protocol/ieee802_11_radio/IEEE802_11_Radio.h
+++ b/src/packet_analysis/protocol/ieee802_11_radio/IEEE802_11_Radio.h
@ -2,8 +2,8 @@

 #pragma once

-#include <packet_analysis/Analyzer.h>
-#include <packet_analysis/Component.h>
+#include "zeek/packet_analysis/Analyzer.h"
+#include "zeek/packet_analysis/Component.h"

 namespace zeek::packet_analysis::IEEE802_11_Radio {

--- a/src/packet_analysis/protocol/ieee802_11_radio/Plugin.cc
+++ b/src/packet_analysis/protocol/ieee802_11_radio/Plugin.cc
@ -1,8 +1,8 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "IEEE802_11_Radio.h"
-#include "plugin/Plugin.h"
-#include "packet_analysis/Component.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/packet_analysis/Component.h"
+#include "zeek/packet_analysis/protocol/ieee802_11_radio/IEEE802_11_Radio.h"

 namespace zeek::plugin::Zeek_IEEE802_11_Radio {

--- a/src/packet_analysis/protocol/ip/IP.cc
+++ b/src/packet_analysis/protocol/ip/IP.cc
@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "IP.h"
+#include "zeek/packet_analysis/protocol/ip/IP.h"
 #include "zeek/NetVar.h"
 #include "zeek/IP.h"
 #include "zeek/Discard.h"
--- a/src/packet_analysis/protocol/ip/Plugin.cc
+++ b/src/packet_analysis/protocol/ip/Plugin.cc
@ -1,8 +1,8 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "IP.h"
-#include "plugin/Plugin.h"
-#include "packet_analysis/Component.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/packet_analysis/Component.h"
+#include "zeek/packet_analysis/protocol/ip/IP.h"

 namespace zeek::plugin::Zeek_IP {

--- a/src/packet_analysis/protocol/iptunnel/IPTunnel.cc
+++ b/src/packet_analysis/protocol/iptunnel/IPTunnel.cc
@ -1,13 +1,14 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "IPTunnel.h"
+#include "zeek/packet_analysis/protocol/iptunnel/IPTunnel.h"
+
+#include <pcap.h> // For DLT_ constants
+
 #include "zeek/Sessions.h"
 #include "zeek/RunState.h"
 #include "zeek/IP.h"
 #include "zeek/TunnelEncapsulation.h"

-#include "pcap.h" // For DLT_ constants
-
 namespace zeek::packet_analysis::IPTunnel {

 IPTunnelAnalyzer* ip_tunnel_analyzer;
--- a/src/packet_analysis/protocol/iptunnel/Plugin.cc
+++ b/src/packet_analysis/protocol/iptunnel/Plugin.cc
@ -1,8 +1,8 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "IPTunnel.h"
-#include "plugin/Plugin.h"
-#include "packet_analysis/Component.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/packet_analysis/Component.h"
+#include "zeek/packet_analysis/protocol/iptunnel/IPTunnel.h"

 namespace zeek::plugin::Zeek_IPTunnel {

--- a/src/packet_analysis/protocol/linux_sll/LinuxSLL.cc
+++ b/src/packet_analysis/protocol/linux_sll/LinuxSLL.cc
@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "LinuxSLL.h"
+#include "zeek/packet_analysis/protocol/linux_sll/LinuxSLL.h"

 using namespace zeek::packet_analysis::LinuxSLL;

--- a/src/packet_analysis/protocol/linux_sll/LinuxSLL.h
+++ b/src/packet_analysis/protocol/linux_sll/LinuxSLL.h
@ -2,8 +2,8 @@

 #pragma once

-#include <packet_analysis/Analyzer.h>
-#include <packet_analysis/Component.h>
+#include "zeek/packet_analysis/Analyzer.h"
+#include "zeek/packet_analysis/Component.h"

 namespace zeek::packet_analysis::LinuxSLL {

--- a/src/packet_analysis/protocol/linux_sll/Plugin.cc
+++ b/src/packet_analysis/protocol/linux_sll/Plugin.cc
@ -1,8 +1,8 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "plugin/Plugin.h"
-#include "LinuxSLL.h"
-#include "packet_analysis/Component.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/packet_analysis/Component.h"
+#include "zeek/packet_analysis/protocol/linux_sll/LinuxSLL.h"

 namespace zeek::plugin::Zeek_LinuxSLL {

--- a/src/packet_analysis/protocol/mpls/MPLS.cc
+++ b/src/packet_analysis/protocol/mpls/MPLS.cc
@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "MPLS.h"
+#include "zeek/packet_analysis/protocol/mpls/MPLS.h"

 using namespace zeek::packet_analysis::MPLS;

--- a/src/packet_analysis/protocol/mpls/MPLS.h
+++ b/src/packet_analysis/protocol/mpls/MPLS.h
@ -2,8 +2,8 @@

 #pragma once

-#include <packet_analysis/Analyzer.h>
-#include <packet_analysis/Component.h>
+#include "zeek/packet_analysis/Analyzer.h"
+#include "zeek/packet_analysis/Component.h"

 namespace zeek::packet_analysis::MPLS {

--- a/src/packet_analysis/protocol/mpls/Plugin.cc
+++ b/src/packet_analysis/protocol/mpls/Plugin.cc
@ -1,8 +1,8 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "MPLS.h"
-#include "plugin/Plugin.h"
-#include "packet_analysis/Component.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/packet_analysis/Component.h"
+#include "zeek/packet_analysis/protocol/mpls/MPLS.h"

 namespace zeek::plugin::Zeek_MPLS {

--- a/src/packet_analysis/protocol/nflog/NFLog.cc
+++ b/src/packet_analysis/protocol/nflog/NFLog.cc
@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "NFLog.h"
-#include "NetVar.h"
+#include "zeek/packet_analysis/protocol/nflog/NFLog.h"
+#include "zeek/NetVar.h"

 using namespace zeek::packet_analysis::NFLog;

--- a/src/packet_analysis/protocol/nflog/NFLog.h
+++ b/src/packet_analysis/protocol/nflog/NFLog.h
@ -2,8 +2,8 @@

 #pragma once

-#include <packet_analysis/Analyzer.h>
-#include <packet_analysis/Component.h>
+#include "zeek/packet_analysis/Analyzer.h"
+#include "zeek/packet_analysis/Component.h"

 namespace zeek::packet_analysis::NFLog {

--- a/src/packet_analysis/protocol/nflog/Plugin.cc
+++ b/src/packet_analysis/protocol/nflog/Plugin.cc
@ -1,8 +1,8 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "NFLog.h"
-#include "plugin/Plugin.h"
-#include "packet_analysis/Component.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/packet_analysis/Component.h"
+#include "zeek/packet_analysis/protocol/nflog/NFLog.h"

 namespace zeek::plugin::Zeek_NFLog {

--- a/src/packet_analysis/protocol/null/Null.cc
+++ b/src/packet_analysis/protocol/null/Null.cc
@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "Null.h"
-#include "NetVar.h"
+#include "zeek/packet_analysis/protocol/null/Null.h"
+#include "zeek/NetVar.h"

 using namespace zeek::packet_analysis::Null;

--- a/src/packet_analysis/protocol/null/Null.h
+++ b/src/packet_analysis/protocol/null/Null.h
@ -2,8 +2,8 @@

 #pragma once

-#include <packet_analysis/Analyzer.h>
-#include <packet_analysis/Component.h>
+#include "zeek/packet_analysis/Analyzer.h"
+#include "zeek/packet_analysis/Component.h"

 namespace zeek::packet_analysis::Null {

--- a/src/packet_analysis/protocol/null/Plugin.cc
+++ b/src/packet_analysis/protocol/null/Plugin.cc
@ -1,8 +1,8 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "plugin/Plugin.h"
-#include "Null.h"
-#include "packet_analysis/Component.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/packet_analysis/Component.h"
+#include "zeek/packet_analysis/protocol/null/Null.h"

 namespace zeek::plugin::Zeek_Null {

--- a/src/packet_analysis/protocol/ppp_serial/PPPSerial.cc
+++ b/src/packet_analysis/protocol/ppp_serial/PPPSerial.cc
@ -1,7 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "PPPSerial.h"
-#include "NetVar.h"
+#include "zeek/packet_analysis/protocol/ppp_serial/PPPSerial.h"

 using namespace zeek::packet_analysis::PPPSerial;

--- a/src/packet_analysis/protocol/ppp_serial/PPPSerial.h
+++ b/src/packet_analysis/protocol/ppp_serial/PPPSerial.h
@ -2,8 +2,8 @@

 #pragma once

-#include <packet_analysis/Analyzer.h>
-#include <packet_analysis/Component.h>
+#include "zeek/packet_analysis/Analyzer.h"
+#include "zeek/packet_analysis/Component.h"

 namespace zeek::packet_analysis::PPPSerial {

--- a/src/packet_analysis/protocol/ppp_serial/Plugin.cc
+++ b/src/packet_analysis/protocol/ppp_serial/Plugin.cc
@ -1,8 +1,8 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "PPPSerial.h"
-#include "plugin/Plugin.h"
-#include "packet_analysis/Component.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/packet_analysis/Component.h"
+#include "zeek/packet_analysis/protocol/ppp_serial/PPPSerial.h"

 namespace zeek::plugin::Zeek_PPPSerial {

--- a/src/packet_analysis/protocol/pppoe/PPPoE.cc
+++ b/src/packet_analysis/protocol/pppoe/PPPoE.cc
@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "PPPoE.h"
-#include "NetVar.h"
+#include "zeek/packet_analysis/protocol/pppoe/PPPoE.h"
+#include "zeek/NetVar.h"

 using namespace zeek::packet_analysis::PPPoE;

--- a/src/packet_analysis/protocol/pppoe/PPPoE.h
+++ b/src/packet_analysis/protocol/pppoe/PPPoE.h
@ -2,8 +2,8 @@

 #pragma once

-#include <packet_analysis/Analyzer.h>
-#include <packet_analysis/Component.h>
+#include "zeek/packet_analysis/Analyzer.h"
+#include "zeek/packet_analysis/Component.h"

 namespace zeek::packet_analysis::PPPoE {

--- a/src/packet_analysis/protocol/pppoe/Plugin.cc
+++ b/src/packet_analysis/protocol/pppoe/Plugin.cc
@ -1,8 +1,8 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "PPPoE.h"
-#include "plugin/Plugin.h"
-#include "packet_analysis/Component.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/packet_analysis/Component.h"
+#include "zeek/packet_analysis/protocol/pppoe/PPPoE.h"

 namespace zeek::plugin::Zeek_PPPoE {

--- a/src/packet_analysis/protocol/root/Plugin.cc
+++ b/src/packet_analysis/protocol/root/Plugin.cc
@ -1,8 +1,8 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "Root.h"
-#include "plugin/Plugin.h"
-#include "packet_analysis/Component.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/packet_analysis/Component.h"
+#include "zeek/packet_analysis/protocol/root/Root.h"

 namespace zeek::plugin::Zeek_Root {

--- a/src/packet_analysis/protocol/root/Root.cc
+++ b/src/packet_analysis/protocol/root/Root.cc
@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "Root.h"
-#include "NetVar.h"
+#include "zeek/packet_analysis/protocol/root/Root.h"
+#include "zeek/NetVar.h"

 using namespace zeek::packet_analysis::Root;

--- a/src/packet_analysis/protocol/root/Root.h
+++ b/src/packet_analysis/protocol/root/Root.h
@ -2,8 +2,8 @@

 #pragma once

-#include <packet_analysis/Analyzer.h>
-#include <packet_analysis/Component.h>
+#include "zeek/packet_analysis/Analyzer.h"
+#include "zeek/packet_analysis/Component.h"

 namespace zeek::packet_analysis::Root {

--- a/src/packet_analysis/protocol/skip/Plugin.cc
+++ b/src/packet_analysis/protocol/skip/Plugin.cc
@ -1,8 +1,8 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "Skip.h"
-#include "plugin/Plugin.h"
-#include "packet_analysis/Component.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/packet_analysis/Component.h"
+#include "zeek/packet_analysis/protocol/skip/Skip.h"

 namespace zeek::plugin::Zeek_Skip {

--- a/src/packet_analysis/protocol/skip/Skip.cc
+++ b/src/packet_analysis/protocol/skip/Skip.cc
@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "Skip.h"
-#include "NetVar.h"
+#include "zeek/packet_analysis/protocol/skip/Skip.h"
+#include "zeek/NetVar.h"

 using namespace zeek::packet_analysis::Skip;

--- a/src/packet_analysis/protocol/skip/Skip.h
+++ b/src/packet_analysis/protocol/skip/Skip.h
@ -2,8 +2,8 @@

 #pragma once

-#include <packet_analysis/Analyzer.h>
-#include <packet_analysis/Component.h>
+#include "zeek/packet_analysis/Analyzer.h"
+#include "zeek/packet_analysis/Component.h"

 namespace zeek::packet_analysis::Skip {

--- a/src/packet_analysis/protocol/vlan/Plugin.cc
+++ b/src/packet_analysis/protocol/vlan/Plugin.cc
@ -1,8 +1,8 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "VLAN.h"
-#include "plugin/Plugin.h"
-#include "packet_analysis/Component.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/packet_analysis/Component.h"
+#include "zeek/packet_analysis/protocol/vlan/VLAN.h"

 namespace zeek::plugin::Zeek_VLAN {

--- a/src/packet_analysis/protocol/vlan/VLAN.cc
+++ b/src/packet_analysis/protocol/vlan/VLAN.cc
@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "VLAN.h"
-#include "NetVar.h"
+#include "zeek/packet_analysis/protocol/vlan/VLAN.h"
+#include "zeek/NetVar.h"

 using namespace zeek::packet_analysis::VLAN;

--- a/src/packet_analysis/protocol/vlan/VLAN.h
+++ b/src/packet_analysis/protocol/vlan/VLAN.h
@ -2,8 +2,8 @@

 #pragma once

-#include <packet_analysis/Analyzer.h>
-#include <packet_analysis/Component.h>
+#include "zeek/packet_analysis/Analyzer.h"
+#include "zeek/packet_analysis/Component.h"

 namespace zeek::packet_analysis::VLAN {

--- a/src/packet_analysis/protocol/wrapper/Plugin.cc
+++ b/src/packet_analysis/protocol/wrapper/Plugin.cc
@ -1,8 +1,8 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "Wrapper.h"
-#include "plugin/Plugin.h"
-#include "packet_analysis/Component.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/packet_analysis/Component.h"
+#include "zeek/packet_analysis/protocol/wrapper/Wrapper.h"

 namespace zeek::plugin::Zeek_Wrapper {

--- a/src/packet_analysis/protocol/wrapper/Wrapper.cc
+++ b/src/packet_analysis/protocol/wrapper/Wrapper.cc
@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "Wrapper.h"
-#include "NetVar.h"
+#include "zeek/packet_analysis/protocol/wrapper/Wrapper.h"
+#include "zeek/NetVar.h"

 using namespace zeek::packet_analysis::Wrapper;

--- a/src/packet_analysis/protocol/wrapper/Wrapper.h
+++ b/src/packet_analysis/protocol/wrapper/Wrapper.h
@ -2,8 +2,8 @@

 #pragma once

-#include <packet_analysis/Analyzer.h>
-#include <packet_analysis/Component.h>
+#include "zeek/packet_analysis/Analyzer.h"
+#include "zeek/packet_analysis/Component.h"

 namespace zeek::packet_analysis::Wrapper {