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 {