Remove unnecessary #includes in script_opt

src/script_opt/CPP/Compile.h

@@ -2,6 +2,7 @@
 
 #pragma once
 
+// Most of these headers are needed for the block of #includes later
 #include "zeek/Desc.h"
 #include "zeek/script_opt/CPP/Func.h"
 #include "zeek/script_opt/CPP/InitsInfo.h"

src/script_opt/CPP/Exprs.cc

@@ -1,8 +1,6 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "zeek/RE.h"
 #include "zeek/script_opt/CPP/Compile.h"
-#include "zeek/script_opt/ProfileFunc.h"
 
 namespace zeek::detail {
 

src/script_opt/CPP/RuntimeInitSupport.h

@@ -5,7 +5,6 @@
 #pragma once
 
 #include "zeek/Val.h"
-#include "zeek/script_opt/CPP/AttrExprType.h"
 #include "zeek/script_opt/CPP/Func.h"
 
 namespace zeek {

src/script_opt/CPP/RuntimeInits.cc

@@ -6,6 +6,8 @@
 #include "zeek/File.h"
 #include "zeek/RE.h"
 #include "zeek/ZeekString.h"
+#include "zeek/module_util.h"
+#include "zeek/script_opt/CPP/AttrExprType.h"
 #include "zeek/script_opt/CPP/RuntimeInitSupport.h"
 
 using namespace std;

src/script_opt/CPP/RuntimeInits.h

@@ -7,7 +7,6 @@
 // associated strategies for dealing with them.
 
 #include "zeek/Expr.h"
-#include "zeek/module_util.h"
 #include "zeek/script_opt/CPP/RuntimeInitSupport.h"
 
 #pragma once

src/script_opt/CPP/Vars.cc

@@ -2,7 +2,6 @@
 
 #include "zeek/script_opt/CPP/Compile.h"
 #include "zeek/script_opt/IDOptInfo.h"
-#include "zeek/script_opt/ProfileFunc.h"
 
 namespace zeek::detail {
 

src/script_opt/FuncInfo.cc

@@ -2,7 +2,7 @@
 
 #include "zeek/script_opt/FuncInfo.h"
 
-#include <unordered_set>
+#include <unordered_map>
 
 namespace zeek::detail {
 

src/script_opt/FuncInfo.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "zeek/Func.h"
+#include <string>
 
 namespace zeek::detail {
 

src/script_opt/IDOptInfo.cc

@@ -4,7 +4,6 @@
 
 #include "zeek/Desc.h"
 #include "zeek/Expr.h"
-#include "zeek/Stmt.h"
 #include "zeek/script_opt/StmtOptInfo.h"
 
 namespace zeek::detail {

src/script_opt/Inline.cc

@@ -2,7 +2,6 @@
 
 #include "zeek/script_opt/Inline.h"
 
-#include "zeek/Desc.h"
 #include "zeek/EventRegistry.h"
 #include "zeek/module_util.h"
 #include "zeek/script_opt/Expr.h"

src/script_opt/ScriptOpt.cc

@@ -5,7 +5,6 @@
 #include "zeek/Desc.h"
 #include "zeek/EventHandler.h"
 #include "zeek/EventRegistry.h"
-#include "zeek/Options.h"
 #include "zeek/Reporter.h"
 #include "zeek/module_util.h"
 #include "zeek/script_opt/CPP/Compile.h"

src/script_opt/ScriptOpt.h

@@ -4,9 +4,10 @@
 
 #pragma once
 
-#include <optional>
 #include <regex>
 #include <string>
+#include <unordered_set>
+#include <vector>
 
 #include "zeek/Expr.h"
 #include "zeek/Func.h"

src/script_opt/UsageAnalyzer.cc

@@ -3,7 +3,6 @@
 #include "zeek/script_opt/UsageAnalyzer.h"
 
 #include "zeek/EventRegistry.h"
-#include "zeek/module_util.h"
 #include "zeek/script_opt/IDOptInfo.h"
 
 namespace zeek::detail {

src/script_opt/ZAM/Branches.cc

@@ -2,7 +2,6 @@
 
 // Methods for dealing with ZAM branches.
 
-#include "zeek/Desc.h"
 #include "zeek/Reporter.h"
 #include "zeek/script_opt/ZAM/Compile.h"
 

src/script_opt/ZAM/BuiltInSupport.h

@@ -2,8 +2,12 @@
 
 #pragma once
 
+#include <optional>
+#include <string>
+
 #include "zeek/Desc.h"
-#include "zeek/Expr.h"
+#include "zeek/Val.h"
+#include "zeek/ZVal.h"
 
 namespace zeek::detail {
 

src/script_opt/ZAM/Compile.h

@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include "zeek/Event.h"
 #include "zeek/script_opt/Expr.h"
 #include "zeek/script_opt/ProfileFunc.h"
 #include "zeek/script_opt/UseDefs.h"

src/script_opt/ZAM/Driver.cc

@@ -2,12 +2,9 @@
 
 // Driver (and other high-level) methods for ZAM compilation.
 
-#include "zeek/CompHash.h"
 #include "zeek/Frame.h"
-#include "zeek/RE.h"
 #include "zeek/Reporter.h"
 #include "zeek/Scope.h"
-#include "zeek/module_util.h"
 #include "zeek/script_opt/ScriptOpt.h"
 #include "zeek/script_opt/ZAM/Compile.h"
 

src/script_opt/ZAM/Frame.h

@@ -4,6 +4,12 @@
 
 #pragma once
 
+#include <vector>
+
+#include "zeek/Attr.h"
+#include "zeek/ID.h"
+#include "zeek/util.h"
+
 namespace zeek::detail {
 
 using AttributesPtr = IntrusivePtr<Attributes>;

src/script_opt/ZAM/Low-Level.cc

@@ -4,7 +4,6 @@
 
 #include "zeek/Desc.h"
 #include "zeek/Reporter.h"
-#include "zeek/script_opt/ScriptOpt.h"
 #include "zeek/script_opt/ZAM/Compile.h"
 
 namespace zeek::detail {

src/script_opt/ZAM/Profile.cc

@@ -2,12 +2,8 @@
 
 #include "zeek/script_opt/ZAM/Profile.h"
 
-#include <unordered_map>
-#include <unordered_set>
-
 #include "zeek/Obj.h"
 #include "zeek/script_opt/ProfileFunc.h"
-#include "zeek/script_opt/ZAM/ZBody.h"
 
 namespace zeek::detail {
 

src/script_opt/ZAM/Vars.cc

@@ -4,7 +4,6 @@
 
 #include "zeek/Desc.h"
 #include "zeek/Reporter.h"
-#include "zeek/script_opt/Reduce.h"
 #include "zeek/script_opt/ZAM/Compile.h"
 
 namespace zeek::detail {

src/script_opt/ZAM/ZBody.cc

@@ -4,11 +4,9 @@
 
 #include "zeek/Conn.h"
 #include "zeek/Desc.h"
-#include "zeek/Dict.h"
-#include "zeek/EventHandler.h"
+#include "zeek/Event.h"
 #include "zeek/File.h"
 #include "zeek/Frame.h"
-#include "zeek/IPAddr.h"
 #include "zeek/OpaqueVal.h"
 #include "zeek/Overflow.h"
 #include "zeek/RE.h"

src/script_opt/ZAM/ZInst.h

@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include "zeek/script_opt/ZAM/BuiltInSupport.h"
 #include "zeek/script_opt/ZAM/Support.h"
 #include "zeek/script_opt/ZAM/ZInstAux.h"
 #include "zeek/script_opt/ZAM/ZOp.h"

src/script_opt/ZAM/ZInstAux.h

@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include "zeek/Expr.h"
 #include "zeek/Func.h"
 #include "zeek/TraverseTypes.h"
 #include "zeek/script_opt/ZAM/BuiltInSupport.h"