Add missing zeek/ to header includes

Related to https://github.com/zeek/zeek/pull/1377

CMakeLists.txt

@@ -493,6 +493,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zeek-config.h.in
                ${CMAKE_CURRENT_BINARY_DIR}/zeek-config.h)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zeek-config.h DESTINATION include/zeek)
+execute_process(COMMAND "${CMAKE_COMMAND}" -E create_symlink
+                "."
+                "${CMAKE_CURRENT_BINARY_DIR}/zeek")
 
 if ( CAF_ROOT )
   set(ZEEK_CONFIG_CAF_ROOT_DIR ${CAF_ROOT})

auxil/bifcl

@@ -1 +1 @@
-Subproject commit a455278a0c571e99c26e1a06afa55ee07e665371
+Subproject commit 8fe72d1063c4b34689d7d8ba368ee74b69bdce6d

src/Attr.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include "zeek/Attr.h"
 #include "zeek/Expr.h"

src/Base64.cc

@@ -1,4 +1,4 @@
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include <math.h>
 

src/Base64.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include <string>
 
 namespace zeek { class String; }

src/BifReturnVal.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/IntrusivePtr.h"
 
 ZEEK_FORWARD_DECLARE_NAMESPACED(Val, zeek);

src/CCL.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/CCL.h"
 
 #include <algorithm>

src/CompHash.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/CompHash.h"
 
 #include <cstring>

src/Conn.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/Conn.h"
 
 #include <ctype.h>

src/DFA.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include "zeek/DFA.h"
 #include "zeek/EquivClass.h"

src/DNS_Mgr.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/DNS_Mgr.h"
 
 #include <sys/types.h>

src/DbgBreakpoint.cc

@@ -1,6 +1,6 @@
 // Implementation of breakpoints.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include "zeek/DbgBreakpoint.h"
 

src/DbgHelp.cc

@@ -1,5 +1,5 @@
 // Bro Debugger Help
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include "zeek/Debug.h"

src/DbgWatch.cc

@@ -1,6 +1,6 @@
 // Implementation of watches
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/DbgWatch.h"
 
 #include "zeek/Debug.h"

src/Debug.cc

@@ -1,6 +1,6 @@
 // Debugging support for Bro policy files.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include "zeek/Debug.h"
 

src/DebugCmds.cc

@@ -1,7 +1,7 @@
 // Support routines to help deal with Bro debugging commands and
 // implementation of most commands.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/DebugCmds.h"
 
 #include <sys/types.h>

src/DebugLogger.h

@@ -5,7 +5,7 @@
 
 #ifdef DEBUG
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include <stdio.h>
 #include <string>

src/Desc.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/Desc.h"
 
 #include <stdlib.h>

src/Dict.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/Dict.h"
 
 #ifdef HAVE_MEMORY_H

src/Discard.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include "zeek/Discard.h"
 

src/EquivClass.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include "zeek/EquivClass.h"
 #include "zeek/CCL.h"

src/Event.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include "zeek/Event.h"
 #include "zeek/Desc.h"

src/EventRegistry.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include <map>
 #include <memory>

src/Expr.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include "zeek/Expr.h"
 #include "zeek/Event.h"

src/File.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/File.h"
 
 #include <sys/types.h>

src/Frag.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include "zeek/Frag.h"
 #include "zeek/Hash.h"

src/Func.cc

@@ -1,7 +1,7 @@
 
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/Func.h"
 
 #include <sys/types.h>

src/Hash.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/Hash.h"
 
 #include <highwayhash/sip_hash.h>

src/ID.cc

@@ -1,7 +1,7 @@
 
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/ID.h"
 
 #include "zeek/Attr.h"

src/IP.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include <sys/types.h> // for u_char
 #include <netinet/in.h>

src/IntSet.cc

@@ -1,4 +1,4 @@
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/IntSet.h"
 
 #ifdef HAVE_MEMORY_H

src/NFA.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/NFA.h"
 
 #include <algorithm>

src/NetVar.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include "zeek/NetVar.h"
 #include "zeek/Var.h"

src/Obj.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/Obj.h"
 
 #include <stdlib.h>

src/Obj.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include <limits.h>
 

src/Options.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include "zeek/Options.h"
 #include "zeek/script_opt/ScriptOpt.h"

src/PolicyFile.cc

@@ -1,4 +1,4 @@
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/PolicyFile.h"
 
 #include <sys/types.h>

src/PriorityQueue.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/PriorityQueue.h"
 
 #include <stdio.h>

src/PriorityQueue.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include <math.h>
 #include <stdint.h>

src/RE.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/RE.h"
 
 #include <stdlib.h>

src/RandTest.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include <stdint.h>
 
 #define RT_MONTEN 6  /* Bytes used as Monte Carlo

src/Reassem.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/Reassem.h"
 
 #include <algorithm>

src/Reporter.cc

@@ -2,7 +2,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 //
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/Reporter.h"
 
 #include <unistd.h>

src/Rule.cc

@@ -1,4 +1,4 @@
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include "zeek/Rule.h"
 #include "zeek/RuleAction.h"

src/RuleAction.cc

@@ -1,4 +1,4 @@
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/RuleAction.h"
 
 #include <string>

src/RuleCondition.cc

@@ -1,4 +1,4 @@
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include "zeek/RuleCondition.h"
 #include "zeek/RuleMatcher.h"

src/RuleMatcher.cc

@@ -1,5 +1,5 @@
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/RuleMatcher.h"
 
 #include <algorithm>

src/RunState.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/RunState.h"
 
 #include <sys/types.h>

src/RunState.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include <string>
 #include <optional>

src/Scope.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include "zeek/Scope.h"
 #include "zeek/Desc.h"

src/SerializationFormat.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include <stdint.h>
 #include <string>

src/Sessions.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/Sessions.h"
 
 #include <netinet/in.h>

src/SmithWaterman.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include <ctype.h>
 #include <algorithm>

src/Stats.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include <sys/types.h>
 #include <sys/time.h>

src/Stmt.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include "zeek/Stmt.h"
 

src/Tag.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include <stdint.h>
 #include <string>

src/Timer.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/Timer.h"
 
 #include "zeek/util.h"

src/TraverseTypes.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 ZEEK_FORWARD_DECLARE_NAMESPACED(TraversalCallback, zeek::detail);
 

src/TunnelEncapsulation.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include <vector>
 

src/Type.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/Type.h"
 
 #include <string>

src/Val.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/Val.h"
 
 #include <sys/types.h>

src/Var.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/Var.h"
 
 #include <memory>

src/ZeekString.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/ZeekString.h"
 
 #include <ctype.h>

src/ZeekString.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include <sys/types.h>
 

src/analyzer/Component.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include "zeek/analyzer/Tag.h"
 #include "zeek/plugin/Component.h"

src/analyzer/Tag.h

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

src/analyzer/protocol/dce-rpc/DCE_RPC.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/analyzer/protocol/dce-rpc/DCE_RPC.h"
 
 #include <stdlib.h>

src/analyzer/protocol/dns/DNS.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/analyzer/protocol/dns/DNS.h"
 
 #include <ctype.h>

src/analyzer/protocol/finger/Finger.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/analyzer/protocol/finger/Finger.h"
 
 #include <ctype.h>

src/analyzer/protocol/ftp/FTP.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/analyzer/protocol/ftp/FTP.h"
 
 #include <stdlib.h>

src/analyzer/protocol/gnutella/Gnutella.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/analyzer/protocol/gnutella/Gnutella.h"
 
 #include <ctype.h>

src/analyzer/protocol/http/HTTP.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/analyzer/protocol/http/HTTP.h"
 
 #include <ctype.h>

src/analyzer/protocol/icmp/ICMP.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/analyzer/protocol/icmp/ICMP.h"
 
 #include <netinet/icmp6.h>

src/analyzer/protocol/ident/Ident.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/analyzer/protocol/ident/Ident.h"
 
 #include <ctype.h>

src/analyzer/protocol/imap/imap.pac

@@ -12,7 +12,7 @@ namespace zeek::analyzer::imap { class IMAP_Analyzer; }
 namespace binpac { namespace IMAP { class IMAP_Conn; } }
 using IMAPAnalyzer = zeek::analyzer::imap::IMAP_Analyzer*;
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/Reporter.h"
 #include "zeek/analyzer/protocol/imap/IMAP.h"
 

src/analyzer/protocol/krb/KRB.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include <mutex>
 
 #ifdef USE_KRB5

src/analyzer/protocol/krb/krb.pac

@@ -6,7 +6,7 @@ namespace zeek::analyzer::krb { class KRB_Analyzer; }
 namespace binpac { namespace KRB { class KRB_Conn; } }
 using KRBAnalyzer = zeek::analyzer::krb::KRB_Analyzer*;
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/analyzer/protocol/krb/KRB.h"
 
 #include "analyzer/protocol/krb/types.bif.h"

src/analyzer/protocol/krb/krb_TCP.pac

@@ -6,7 +6,7 @@ namespace zeek::analyzer::krb_tcp { class KRB_Analyzer; }
 namespace binpac { namespace KRB_TCP { class KRB_Conn; } }
 using KRBTCPAnalyzer = zeek::analyzer::krb_tcp::KRB_Analyzer*;
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/analyzer/protocol/krb/KRB_TCP.h"
 
 #include "analyzer/protocol/krb/types.bif.h"

src/analyzer/protocol/login/Login.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/analyzer/protocol/login/Login.h"
 
 #include <ctype.h>

src/analyzer/protocol/login/NVT.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/analyzer/protocol/login/NVT.h"
 
 #include <stdlib.h>

src/analyzer/protocol/login/RSH.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/analyzer/protocol/login/RSH.h"
 
 #include "zeek/NetVar.h"

src/analyzer/protocol/login/Rlogin.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/analyzer/protocol/login/Rlogin.h"
 
 #include "zeek/NetVar.h"

src/analyzer/protocol/login/Telnet.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include "zeek/analyzer/protocol/login/Telnet.h"
 #include "zeek/analyzer/protocol/login/NVT.h"

src/analyzer/protocol/mime/MIME.cc

@@ -1,4 +1,4 @@
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/analyzer/protocol/mime/MIME.h"
 
 #include "zeek/NetVar.h"

src/analyzer/protocol/ncp/NCP.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/analyzer/protocol/ncp/NCP.h"
 
 #include <stdlib.h>

src/analyzer/protocol/netbios/NetbiosSSN.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/analyzer/protocol/netbios/NetbiosSSN.h"
 
 #include <ctype.h>

src/analyzer/protocol/pop3/POP3.cc

@@ -1,7 +1,7 @@
 // This code contributed to Bro by Florian Schimandl, Hugh Dollman and
 // Robin Sommer.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/analyzer/protocol/pop3/POP3.h"
 
 #include <vector>

src/analyzer/protocol/rpc/MOUNT.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/analyzer/protocol/rpc/MOUNT.h"
 
 #include <algorithm>

src/analyzer/protocol/rpc/NFS.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/analyzer/protocol/rpc/NFS.h"
 
 #include <utility>

src/analyzer/protocol/rpc/Portmap.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/analyzer/protocol/rpc/Portmap.h"
 
 #include "zeek/NetVar.h"

src/analyzer/protocol/rpc/RPC.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/analyzer/protocol/rpc/RPC.h"
 
 #include <stdlib.h>

src/analyzer/protocol/rpc/XDR.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/analyzer/protocol/rpc/XDR.h"
 
 #include <string.h>

src/analyzer/protocol/smtp/SMTP.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/analyzer/protocol/smtp/SMTP.h"
 
 #include <stdlib.h>

src/analyzer/protocol/stepping-stone/SteppingStone.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/analyzer/protocol/stepping-stone/SteppingStone.h"
 
 #include <stdlib.h>

src/analyzer/protocol/udp/UDP.cc

@@ -1,6 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 #include "zeek/analyzer/protocol/udp/UDP.h"
 
 #include <algorithm>

src/analyzer/protocol/zip/ZIP.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include <zlib.h>
 

src/bsd-getopt-long.c

@@ -54,7 +54,7 @@
 
 #define IN_GETOPT_LONG_C 1
 
-#include <zeek-config.h>
+#include <zeek/zeek-config.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>

src/file_analysis/Component.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "zeek-config.h"
+#include "zeek/zeek-config.h"
 
 #include "zeek/file_analysis/Tag.h"
 #include "zeek/plugin/Component.h"

src/file_analysis/Tag.h

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

src/input/Tag.h

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