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

2025-10-03 07:08:19 +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/file_analysis/Analyzer.cc
+++ b/src/file_analysis/Analyzer.cc
@ -1,8 +1,8 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "Analyzer.h"
-#include "Manager.h"
-#include "Val.h"
+#include "zeek/file_analysis/Analyzer.h"
+#include "zeek/file_analysis/Manager.h"
+#include "zeek/Val.h"

 namespace zeek::file_analysis {

--- a/src/file_analysis/Analyzer.h
+++ b/src/file_analysis/Analyzer.h
@ -2,10 +2,10 @@

 #pragma once

-#include "Tag.h"
-
 #include <sys/types.h> // for u_char

+#include "zeek/file_analysis/Tag.h"
+
 ZEEK_FORWARD_DECLARE_NAMESPACED(RecordVal, zeek);
 namespace zeek {
 using RecordValPtr = IntrusivePtr<RecordVal>;
--- a/src/file_analysis/AnalyzerSet.cc
+++ b/src/file_analysis/AnalyzerSet.cc
@ -1,11 +1,12 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "AnalyzerSet.h"
-#include "File.h"
-#include "Analyzer.h"
-#include "Manager.h"
-#include "CompHash.h"
-#include "Val.h"
+#include "zeek/file_analysis/AnalyzerSet.h"
+#include "zeek/file_analysis/File.h"
+#include "zeek/file_analysis/Analyzer.h"
+#include "zeek/file_analysis/Manager.h"
+#include "zeek/CompHash.h"
+#include "zeek/Val.h"
+
 #include "file_analysis/file_analysis.bif.h"

 namespace zeek::file_analysis::detail {
--- a/src/file_analysis/AnalyzerSet.h
+++ b/src/file_analysis/AnalyzerSet.h
@ -5,8 +5,8 @@
 #include <queue>
 #include <memory>

-#include "Dict.h"
-#include "Tag.h"
+#include "zeek/Dict.h"
+#include "zeek/file_analysis/Tag.h"

 ZEEK_FORWARD_DECLARE_NAMESPACED(CompositeHash, zeek::detail);
 ZEEK_FORWARD_DECLARE_NAMESPACED(RecordVal, zeek);
--- a/src/file_analysis/Component.cc
+++ b/src/file_analysis/Component.cc
@ -1,10 +1,10 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "Component.h"
-#include "Manager.h"
+#include "zeek/file_analysis/Component.h"

-#include "../Desc.h"
-#include "../util.h"
+#include "zeek/Desc.h"
+#include "zeek/util.h"
+#include "zeek/file_analysis/Manager.h"

 namespace zeek::file_analysis {

--- a/src/file_analysis/Component.h
+++ b/src/file_analysis/Component.h
@ -2,11 +2,11 @@

 #pragma once

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

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

 ZEEK_FORWARD_DECLARE_NAMESPACED(RecordVal, zeek);
 namespace zeek {
--- a/src/file_analysis/File.cc
+++ b/src/file_analysis/File.cc
@ -1,23 +1,23 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "File.h"
+#include "zeek/file_analysis/File.h"

 #include <utility>

-#include "FileReassembler.h"
-#include "FileTimer.h"
-#include "Analyzer.h"
-#include "Manager.h"
-#include "Reporter.h"
-#include "Val.h"
-#include "Type.h"
-#include "Event.h"
-#include "RuleMatcher.h"
+#include "zeek/file_analysis/FileReassembler.h"
+#include "zeek/file_analysis/FileTimer.h"
+#include "zeek/file_analysis/Analyzer.h"
+#include "zeek/file_analysis/Manager.h"
+#include "zeek/Reporter.h"
+#include "zeek/Val.h"
+#include "zeek/Type.h"
+#include "zeek/Event.h"
+#include "zeek/RuleMatcher.h"

-#include "analyzer/Analyzer.h"
-#include "analyzer/Manager.h"
+#include "zeek/analyzer/Analyzer.h"
+#include "zeek/analyzer/Manager.h"

-#include "analyzer/extract/Extract.h"
+#include "zeek/file_analysis/analyzer/extract/Extract.h"

 namespace zeek::file_analysis {

--- a/src/file_analysis/File.h
+++ b/src/file_analysis/File.h
@ -6,12 +6,12 @@
 #include <string>
 #include <utility>

-#include "analyzer/Tag.h"
-#include "AnalyzerSet.h"
-#include "ZeekString.h"
-#include "ZeekList.h" // for ValPList
-#include "ZeekArgs.h"
-#include "WeirdState.h"
+#include "zeek/analyzer/Tag.h"
+#include "zeek/file_analysis/AnalyzerSet.h"
+#include "zeek/ZeekString.h"
+#include "zeek/ZeekList.h" // for ValPList
+#include "zeek/ZeekArgs.h"
+#include "zeek/WeirdState.h"

 ZEEK_FORWARD_DECLARE_NAMESPACED(Connection, zeek);
 ZEEK_FORWARD_DECLARE_NAMESPACED(EventHandlerPtr, zeek);
--- a/src/file_analysis/FileReassembler.cc
+++ b/src/file_analysis/FileReassembler.cc
@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "FileReassembler.h"
-#include "File.h"
+#include "zeek/file_analysis/FileReassembler.h"
+#include "zeek/file_analysis/File.h"

 ZEEK_FORWARD_DECLARE_NAMESPACED(File, zeek, file_analysis);

--- a/src/file_analysis/FileReassembler.h
+++ b/src/file_analysis/FileReassembler.h
@ -2,7 +2,7 @@

 #pragma once

-#include "Reassem.h"
+#include "zeek/Reassem.h"

 namespace zeek { class File; }
 using BroFile [[deprecated("Remove in v4.1. Use zeek::File.")]] = zeek::File;
--- a/src/file_analysis/FileTimer.cc
+++ b/src/file_analysis/FileTimer.cc
@ -1,8 +1,8 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "FileTimer.h"
-#include "File.h"
-#include "Manager.h"
+#include "zeek/file_analysis/FileTimer.h"
+#include "zeek/file_analysis/File.h"
+#include "zeek/file_analysis/Manager.h"

 namespace zeek::file_analysis::detail {

--- a/src/file_analysis/FileTimer.h
+++ b/src/file_analysis/FileTimer.h
@ -3,7 +3,7 @@
 #pragma once

 #include <string>
-#include "Timer.h"
+#include "zeek/Timer.h"

 namespace zeek::file_analysis::detail {

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

-#include "Manager.h"
-#include "File.h"
-#include "Analyzer.h"
-#include "Event.h"
-#include "UID.h"
-#include "digest.h"
-
-#include "plugin/Manager.h"
-#include "analyzer/Manager.h"
-#include "file_analysis/file_analysis.bif.h"
+#include "zeek/file_analysis/Manager.h"

 #include <openssl/md5.h>

+#include "zeek/file_analysis/File.h"
+#include "zeek/file_analysis/Analyzer.h"
+#include "zeek/Event.h"
+#include "zeek/UID.h"
+#include "zeek/digest.h"
+#include "zeek/plugin/Manager.h"
+#include "zeek/analyzer/Manager.h"
+
+#include "file_analysis/file_analysis.bif.h"
+
 using namespace std;

 namespace zeek::file_analysis {
--- a/src/file_analysis/Manager.h
+++ b/src/file_analysis/Manager.h
@ -6,13 +6,13 @@
 #include <set>
 #include <map>

-#include "Component.h"
-#include "RunState.h"
-#include "RuleMatcher.h"
+#include "zeek/file_analysis/Component.h"
+#include "zeek/RunState.h"
+#include "zeek/RuleMatcher.h"

-#include "plugin/ComponentManager.h"
-#include "analyzer/Tag.h"
-#include "FileTimer.h"
+#include "zeek/plugin/ComponentManager.h"
+#include "zeek/analyzer/Tag.h"
+#include "zeek/file_analysis/FileTimer.h"

 ZEEK_FORWARD_DECLARE_NAMESPACED(TableVal, zeek);
 ZEEK_FORWARD_DECLARE_NAMESPACED(VectorVal, zeek);
--- a/src/file_analysis/Tag.cc
+++ b/src/file_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/file_analysis/Tag.h"
+#include "zeek/file_analysis/Manager.h"

 namespace zeek::file_analysis {

--- a/src/file_analysis/Tag.h
+++ b/src/file_analysis/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);

--- a/src/file_analysis/analyzer/data_event/DataEvent.cc
+++ b/src/file_analysis/analyzer/data_event/DataEvent.cc
@ -2,12 +2,12 @@

 #include <string>

-#include "DataEvent.h"
-#include "EventRegistry.h"
-#include "Event.h"
-#include "Func.h"
-#include "util.h"
-#include "file_analysis/Manager.h"
+#include "zeek/file_analysis/analyzer/data_event/DataEvent.h"
+#include "zeek/EventRegistry.h"
+#include "zeek/Event.h"
+#include "zeek/Func.h"
+#include "zeek/util.h"
+#include "zeek/file_analysis/Manager.h"

 namespace zeek::file_analysis::detail {

--- a/src/file_analysis/analyzer/data_event/DataEvent.h
+++ b/src/file_analysis/analyzer/data_event/DataEvent.h
@ -4,10 +4,10 @@

 #include <string>

-#include "Val.h"
-#include "File.h"
-#include "Analyzer.h"
-#include "EventHandler.h"
+#include "zeek/Val.h"
+#include "zeek/file_analysis/File.h"
+#include "zeek/file_analysis/Analyzer.h"
+#include "zeek/EventHandler.h"

 namespace zeek::file_analysis::detail {

--- a/src/file_analysis/analyzer/data_event/Plugin.cc
+++ b/src/file_analysis/analyzer/data_event/Plugin.cc
@ -1,8 +1,8 @@
 // See the file in the main distribution directory for copyright.

-#include "DataEvent.h"
-#include "plugin/Plugin.h"
-#include "file_analysis/Component.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/file_analysis/Component.h"
+#include "zeek/file_analysis/analyzer/data_event/DataEvent.h"

 namespace zeek::plugin::detail::Zeek_FileDataEvent {

--- a/src/file_analysis/analyzer/entropy/Entropy.cc
+++ b/src/file_analysis/analyzer/entropy/Entropy.cc
@ -1,11 +1,12 @@
 // See the file "COPYING" in the main distribution directory for copyright.

+#include "zeek/file_analysis/analyzer/entropy/Entropy.h"
+
 #include <string>

-#include "Entropy.h"
-#include "util.h"
-#include "Event.h"
-#include "file_analysis/Manager.h"
+#include "zeek/util.h"
+#include "zeek/Event.h"
+#include "zeek/file_analysis/Manager.h"

 namespace zeek::file_analysis::detail {

--- a/src/file_analysis/analyzer/entropy/Entropy.h
+++ b/src/file_analysis/analyzer/entropy/Entropy.h
@ -4,10 +4,10 @@

 #include <string>

-#include "Val.h"
-#include "OpaqueVal.h"
-#include "File.h"
-#include "Analyzer.h"
+#include "zeek/Val.h"
+#include "zeek/OpaqueVal.h"
+#include "zeek/file_analysis/File.h"
+#include "zeek/file_analysis/Analyzer.h"

 #include "events.bif.h"

--- a/src/file_analysis/analyzer/entropy/Plugin.cc
+++ b/src/file_analysis/analyzer/entropy/Plugin.cc
@ -1,8 +1,8 @@
 // See the file  in the main distribution directory for copyright.

-#include "Entropy.h"
-#include "plugin/Plugin.h"
-#include "file_analysis/Component.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/file_analysis/Component.h"
+#include "zeek/file_analysis/analyzer/entropy/Entropy.h"

 namespace zeek::plugin::detail::Zeek_FileEntropy {

--- a/src/file_analysis/analyzer/extract/Extract.cc
+++ b/src/file_analysis/analyzer/extract/Extract.cc
@ -1,12 +1,13 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include <string>
-#include <fcntl.h>
+#include "zeek/file_analysis/analyzer/extract/Extract.h"

-#include "Extract.h"
-#include "util.h"
-#include "Event.h"
-#include "file_analysis/Manager.h"
+#include <fcntl.h>
+#include <string>
+
+#include "zeek/util.h"
+#include "zeek/Event.h"
+#include "zeek/file_analysis/Manager.h"

 namespace zeek::file_analysis::detail {

--- a/src/file_analysis/analyzer/extract/Extract.h
+++ b/src/file_analysis/analyzer/extract/Extract.h
@ -4,11 +4,11 @@

 #include <string>

-#include "Val.h"
-#include "File.h"
-#include "Analyzer.h"
+#include "zeek/Val.h"
+#include "zeek/file_analysis/File.h"
+#include "zeek/file_analysis/Analyzer.h"

-#include "analyzer/extract/events.bif.h"
+#include "file_analysis/analyzer/extract/events.bif.h"

 namespace zeek::file_analysis::detail {

--- a/src/file_analysis/analyzer/extract/Plugin.cc
+++ b/src/file_analysis/analyzer/extract/Plugin.cc
@ -1,8 +1,8 @@
 // See the file  in the main distribution directory for copyright.

-#include "Extract.h"
-#include "plugin/Plugin.h"
-#include "file_analysis/Component.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/file_analysis/Component.h"
+#include "zeek/file_analysis/analyzer/extract/Extract.h"

 namespace zeek::plugin::detail::Zeek_FileExtract {

--- a/src/file_analysis/analyzer/extract/functions.bif
+++ b/src/file_analysis/analyzer/extract/functions.bif
@ -3,7 +3,8 @@
 module FileExtract;

 %%{
-#include "file_analysis/Manager.h"
+#include "zeek/zeek/file_analysis/Manager.h"
+
 #include "file_analysis/file_analysis.bif.h"
 %%}

--- a/src/file_analysis/analyzer/hash/Hash.cc
+++ b/src/file_analysis/analyzer/hash/Hash.cc
@ -1,11 +1,12 @@
 // See the file "COPYING" in the main distribution directory for copyright.

+#include "zeek/file_analysis/analyzer/hash/Hash.h"
+
 #include <string>

-#include "Hash.h"
-#include "util.h"
-#include "Event.h"
-#include "file_analysis/Manager.h"
+#include "zeek/util.h"
+#include "zeek/Event.h"
+#include "zeek/file_analysis/Manager.h"

 namespace zeek::file_analysis::detail {

--- a/src/file_analysis/analyzer/hash/Hash.h
+++ b/src/file_analysis/analyzer/hash/Hash.h
@ -4,10 +4,10 @@

 #include <string>

-#include "Val.h"
-#include "OpaqueVal.h"
-#include "File.h"
-#include "Analyzer.h"
+#include "zeek/Val.h"
+#include "zeek/OpaqueVal.h"
+#include "zeek/file_analysis/File.h"
+#include "zeek/file_analysis/Analyzer.h"

 #include "events.bif.h"

--- a/src/file_analysis/analyzer/hash/Plugin.cc
+++ b/src/file_analysis/analyzer/hash/Plugin.cc
@ -1,8 +1,8 @@
 // See the file  in the main distribution directory for copyright.

-#include "Hash.h"
-#include "plugin/Plugin.h"
-#include "file_analysis/Component.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/file_analysis/Component.h"
+#include "zeek/file_analysis/analyzer/hash/Hash.h"

 namespace zeek::plugin::detail::Zeek_FileHash {

--- a/src/file_analysis/analyzer/pe/PE.cc
+++ b/src/file_analysis/analyzer/pe/PE.cc
@ -1,5 +1,5 @@
-#include "PE.h"
-#include "file_analysis/Manager.h"
+#include "zeek/file_analysis/analyzer/pe/PE.h"
+#include "zeek/file_analysis/Manager.h"

 namespace zeek::file_analysis::detail {

--- a/src/file_analysis/analyzer/pe/PE.h
+++ b/src/file_analysis/analyzer/pe/PE.h
@ -2,8 +2,8 @@

 #include <string>

-#include "Val.h"
-#include "../File.h"
+#include "zeek/Val.h"
+#include "zeek/File.h"
 #include "pe_pac.h"

 namespace zeek::file_analysis::detail {
--- a/src/file_analysis/analyzer/pe/Plugin.cc
+++ b/src/file_analysis/analyzer/pe/Plugin.cc
@ -1,8 +1,8 @@
 // See the file  in the main distribution directory for copyright.

-#include "PE.h"
-#include "plugin/Plugin.h"
-#include "file_analysis/Component.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/file_analysis/Component.h"
+#include "zeek/file_analysis/analyzer/pe/PE.h"

 namespace zeek::plugin::detail::Zeek_PE {

--- a/src/file_analysis/analyzer/pe/pe-analyzer.pac
+++ b/src/file_analysis/analyzer/pe/pe-analyzer.pac
@ -1,6 +1,7 @@
 %extern{
-#include "Event.h"
-#include "file_analysis/File.h"
+#include "zeek/Event.h"
+#include "zeek/file_analysis/File.h"
+
 #include "events.bif.h"
 %}

--- a/src/file_analysis/analyzer/unified2/Plugin.cc
+++ b/src/file_analysis/analyzer/unified2/Plugin.cc
@ -2,9 +2,9 @@

 // See the file "COPYING" in the main distribution directory for copyright.

-#include "Unified2.h"
-#include "plugin/Plugin.h"
-#include "file_analysis/Component.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/file_analysis/Component.h"
+#include "zeek/file_analysis/analyzer/unified2/Unified2.h"

 namespace zeek::plugin::detail::Zeek_Unified2 {

--- a/src/file_analysis/analyzer/unified2/Unified2.cc
+++ b/src/file_analysis/analyzer/unified2/Unified2.cc
@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "Unified2.h"
-#include "file_analysis/Manager.h"
+#include "zeek/file_analysis/analyzer/unified2/Unified2.h"
+#include "zeek/file_analysis/Manager.h"

 namespace zeek::file_analysis::detail {

--- a/src/file_analysis/analyzer/unified2/Unified2.h
+++ b/src/file_analysis/analyzer/unified2/Unified2.h
@ -4,9 +4,9 @@

 #include <string>

-#include "Val.h"
-#include "File.h"
-#include "Analyzer.h"
+#include "zeek/Val.h"
+#include "zeek/file_analysis/File.h"
+#include "zeek/file_analysis/Analyzer.h"
 #include "unified2_pac.h"

 namespace zeek::file_analysis::detail {
--- a/src/file_analysis/analyzer/unified2/unified2-analyzer.pac
+++ b/src/file_analysis/analyzer/unified2/unified2-analyzer.pac
@ -1,10 +1,11 @@

 %extern{
-#include "Event.h"
-#include "file_analysis/File.h"
+#include "zeek/Event.h"
+#include "zeek/file_analysis/File.h"
+#include "zeek/IPAddr.h"
+
 #include "events.bif.h"
 #include "types.bif.h"
-#include "IPAddr.h"
 %}

 %code{
--- a/src/file_analysis/analyzer/x509/OCSP.cc
+++ b/src/file_analysis/analyzer/x509/OCSP.cc
@ -1,25 +1,23 @@

 // See the file "COPYING" in the main distribution directory for copyright.

+#include "zeek/file_analysis/analyzer/x509/OCSP.h"
+
 #include <string>

-#include "OCSP.h"
-#include "X509.h"
-#include "Event.h"
-#include "Reporter.h"
-
-#include "types.bif.h"
-#include "ocsp_events.bif.h"
-
-#include "file_analysis/File.h"
-#include "file_analysis/Manager.h"
-
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 #include <openssl/asn1.h>
 #include <openssl/opensslconf.h>

-#include "file_analysis/analyzer/x509/X509.h"
+#include "zeek/file_analysis/analyzer/x509/X509.h"
+#include "zeek/Event.h"
+#include "zeek/Reporter.h"
+#include "zeek/file_analysis/File.h"
+#include "zeek/file_analysis/Manager.h"
+
+#include "types.bif.h"
+#include "ocsp_events.bif.h"

 // helper function of sk_X509_value to avoid namespace problem
 // sk_X509_value(X,Y) = > SKM_sk_value(X509,X,Y)
--- a/src/file_analysis/analyzer/x509/OCSP.h
+++ b/src/file_analysis/analyzer/x509/OCSP.h
@ -5,7 +5,7 @@
 #include <string>
 #include <openssl/ocsp.h>

-#include "X509Common.h"
+#include "zeek/file_analysis/analyzer/x509/X509Common.h"

 ZEEK_FORWARD_DECLARE_NAMESPACED(File, zeek, file_analysis);

--- a/src/file_analysis/analyzer/x509/Plugin.cc
+++ b/src/file_analysis/analyzer/x509/Plugin.cc
@ -1,9 +1,9 @@
 // See the file  in the main distribution directory for copyright.

-#include "X509.h"
-#include "OCSP.h"
-#include "plugin/Plugin.h"
-#include "file_analysis/Component.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/file_analysis/Component.h"
+#include "zeek/file_analysis/analyzer/x509/X509.h"
+#include "zeek/file_analysis/analyzer/x509/OCSP.h"

 namespace zeek::plugin::detail::Zeek_X509 {

--- a/src/file_analysis/analyzer/x509/X509.cc
+++ b/src/file_analysis/analyzer/x509/X509.cc
@ -1,16 +1,9 @@
 // See the file "COPYING" in the main distribution directory for copyright.

+#include "zeek/file_analysis/analyzer/x509/X509.h"
+
 #include <string>

-#include "X509.h"
-#include "Event.h"
-
-#include "events.bif.h"
-#include "types.bif.h"
-
-#include "file_analysis/File.h"
-#include "file_analysis/Manager.h"
-
 #include <broker/error.hh>
 #include <broker/expected.hh>
 #include <broker/data.hh>
@ -21,6 +14,13 @@
 #include <openssl/opensslconf.h>
 #include <openssl/err.h>

+#include "zeek/Event.h"
+#include "zeek/file_analysis/File.h"
+#include "zeek/file_analysis/Manager.h"
+
+#include "events.bif.h"
+#include "types.bif.h"
+
 namespace zeek::file_analysis::detail {

 X509::X509(RecordValPtr args, file_analysis::File* file)
--- a/src/file_analysis/analyzer/x509/X509.h
+++ b/src/file_analysis/analyzer/x509/X509.h
@ -5,9 +5,9 @@
 #include <string>
 #include <map>

-#include "OpaqueVal.h"
-#include "X509Common.h"
-#include "Func.h"
+#include "zeek/OpaqueVal.h"
+#include "zeek/file_analysis/analyzer/x509/X509Common.h"
+#include "zeek/Func.h"

 #if ( OPENSSL_VERSION_NUMBER < 0x10002000L ) || defined(LIBRESSL_VERSION_NUMBER)

--- a/src/file_analysis/analyzer/x509/X509Common.cc
+++ b/src/file_analysis/analyzer/x509/X509Common.cc
@ -1,12 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.

-#include "X509Common.h"
-#include "x509-extension_pac.h"
-#include "Reporter.h"
-
-#include "events.bif.h"
-#include "ocsp_events.bif.h"
-#include "types.bif.h"
+#include "zeek/file_analysis/analyzer/x509/X509Common.h"

 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
@ -14,6 +8,13 @@
 #include <openssl/opensslconf.h>
 #include <openssl/err.h>

+#include "zeek/Reporter.h"
+
+#include "x509-extension_pac.h"
+#include "events.bif.h"
+#include "ocsp_events.bif.h"
+#include "types.bif.h"
+
 namespace zeek::file_analysis::detail {

 X509Common::X509Common(const file_analysis::Tag& arg_tag,
--- a/src/file_analysis/analyzer/x509/X509Common.h
+++ b/src/file_analysis/analyzer/x509/X509Common.h
@ -5,11 +5,11 @@

 #pragma once

-#include "file_analysis/Analyzer.h"
-
 #include <openssl/x509.h>
 #include <openssl/asn1.h>

+#include "zeek/file_analysis/Analyzer.h"
+
 ZEEK_FORWARD_DECLARE_NAMESPACED(EventHandlerPtr, zeek);
 ZEEK_FORWARD_DECLARE_NAMESPACED(Reporter, zeek);
 ZEEK_FORWARD_DECLARE_NAMESPACED(StringVal, zeek);
--- a/src/file_analysis/analyzer/x509/functions.bif
+++ b/src/file_analysis/analyzer/x509/functions.bif
@ -1,8 +1,4 @@
 %%{
-#include "file_analysis/analyzer/x509/X509.h"
-#include "types.bif.h"
-#include "net_util.h"
-
 #include <openssl/x509.h>
 #include <openssl/asn1.h>
 #include <openssl/x509_vfy.h>
@ -10,6 +6,11 @@
 #include <openssl/pem.h>
 #include <openssl/err.h>

+#include "zeek/file_analysis/analyzer/x509/X509.h"
+#include "zeek/net_util.h"
+
+#include "types.bif.h"
+
 // construct an error record
 static zeek::RecordValPtr x509_result_record(uint64_t num, const char* reason, zeek::ValPtr chainVector = nullptr)
 	{
--- a/src/file_analysis/analyzer/x509/x509-extension.pac
+++ b/src/file_analysis/analyzer/x509/x509-extension.pac
@ -5,8 +5,9 @@
 %include zeek.pac

 %extern{
+#include "zeek/file_analysis/File.h"
+
 #include "types.bif.h"
-#include "file_analysis/File.h"
 #include "events.bif.h"
 %}

--- a/src/file_analysis/file_analysis.bif
+++ b/src/file_analysis/file_analysis.bif
@ -3,9 +3,9 @@
 module Files;

 %%{
-#include "file_analysis/Manager.h"
-#include "file_analysis/File.h"
-#include "Reporter.h"
+#include "zeek/file_analysis/Manager.h"
+#include "zeek/file_analysis/File.h"
+#include "zeek/Reporter.h"
 %%}

 type AnalyzerArgs: record;