diff --git a/src/Event.cc b/src/Event.cc
index e07b5d4e4b..6f2a1f9a89 100644
--- a/src/Event.cc
+++ b/src/Event.cc
@@ -2,17 +2,14 @@
 
 #include "zeek/Event.h"
 
-#include "zeek/zeek-config.h"
-
 #include "zeek/Desc.h"
-#include "zeek/Func.h"
-#include "zeek/NetVar.h"
 #include "zeek/Trigger.h"
 #include "zeek/Val.h"
 #include "zeek/iosource/Manager.h"
-#include "zeek/iosource/PktSrc.h"
 #include "zeek/plugin/Manager.h"
 
+#include "event.bif.netvar_h"
+
 zeek::EventMgr zeek::event_mgr;
 
 namespace zeek {
diff --git a/src/Event.h b/src/Event.h
index a1789aed87..7283ce4645 100644
--- a/src/Event.h
+++ b/src/Event.h
@@ -5,12 +5,10 @@
 #include <tuple>
 #include <type_traits>
 
-#include "zeek/Flare.h"
-#include "zeek/IntrusivePtr.h"
 #include "zeek/ZeekArgs.h"
-#include "zeek/ZeekList.h"
 #include "zeek/analyzer/Analyzer.h"
 #include "zeek/iosource/IOSource.h"
+#include "zeek/util.h"
 
 namespace zeek {