diff --git a/src/script_opt/ZAM/Validate.cc b/src/script_opt/ZAM/Validate.cc
index 9540964335..4bd5a4494b 100644
--- a/src/script_opt/ZAM/Validate.cc
+++ b/src/script_opt/ZAM/Validate.cc
@@ -1,8 +1,11 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
+#include <map>
+#include <regex>
 #include <string>
 
-#include "zeek/script_opt/ZAM/ZBody.h"
+#include "zeek/Reporter.h"
+#include "zeek/script_opt/ZAM/ZInst.h"
 #include "zeek/script_opt/ZAM/ZOp.h"
 
 using std::string;