diff --git a/src/CompHash.cc b/src/CompHash.cc
index e4ab1c536f..376ce39c97 100644
--- a/src/CompHash.cc
+++ b/src/CompHash.cc
@@ -8,7 +8,6 @@
 #include <map>
 #include <vector>
 
-#include "zeek/Dict.h"
 #include "zeek/Func.h"
 #include "zeek/IPAddr.h"
 #include "zeek/RE.h"
diff --git a/src/Conn.h b/src/Conn.h
index b13c7ab850..85700648b9 100644
--- a/src/Conn.h
+++ b/src/Conn.h
@@ -7,7 +7,6 @@
 #include <tuple>
 #include <type_traits>
 
-#include "zeek/Dict.h"
 #include "zeek/IPAddr.h"
 #include "zeek/IntrusivePtr.h"
 #include "zeek/Rule.h"
diff --git a/src/EventTrace.h b/src/EventTrace.h
index ff28496f6a..ef9ba60d30 100644
--- a/src/EventTrace.h
+++ b/src/EventTrace.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #include "zeek/Val.h"
+#include "zeek/ZeekArgs.h"
 
 namespace zeek::detail
 	{
diff --git a/src/ID.cc b/src/ID.cc
index 03ca67d82e..acd4597e80 100644
--- a/src/ID.cc
+++ b/src/ID.cc
@@ -6,7 +6,6 @@
 
 #include "zeek/Attr.h"
 #include "zeek/Desc.h"
-#include "zeek/Dict.h"
 #include "zeek/EventRegistry.h"
 #include "zeek/Expr.h"
 #include "zeek/File.h"
diff --git a/src/Val.h b/src/Val.h
index 6daa352a1f..8a01be9924 100644
--- a/src/Val.h
+++ b/src/Val.h
@@ -8,7 +8,6 @@
 #include <unordered_map>
 #include <vector>
 
-#include "zeek/Dict.h"
 #include "zeek/IntrusivePtr.h"
 #include "zeek/Notifier.h"
 #include "zeek/Reporter.h"
@@ -38,6 +37,10 @@ class RE_Matcher;
 class File;
 using FilePtr = zeek::IntrusivePtr<File>;
 
+template <typename T> class RobustDictIterator;
+template <typename T> class Dictionary;
+template <typename T> using PDict = Dictionary<T>;
+
 namespace detail
 	{
 
diff --git a/src/analyzer/Manager.h b/src/analyzer/Manager.h
index c510e2d921..22167e2f03 100644
--- a/src/analyzer/Manager.h
+++ b/src/analyzer/Manager.h
@@ -23,7 +23,6 @@
 #include <queue>
 #include <vector>
 
-#include "zeek/Dict.h"
 #include "zeek/IP.h"
 #include "zeek/Tag.h"
 #include "zeek/analyzer/Analyzer.h"
diff --git a/src/packet_analysis/Analyzer.cc b/src/packet_analysis/Analyzer.cc
index aa5c500b3d..ba79e13c40 100644
--- a/src/packet_analysis/Analyzer.cc
+++ b/src/packet_analysis/Analyzer.cc
@@ -3,7 +3,6 @@
 #include "zeek/packet_analysis/Analyzer.h"
 
 #include "zeek/DebugLogger.h"
-#include "zeek/Dict.h"
 #include "zeek/Event.h"
 #include "zeek/RunState.h"
 #include "zeek/session/Manager.h"
diff --git a/src/supervisor/Supervisor.cc b/src/supervisor/Supervisor.cc
index b74f88db41..032d19b44b 100644
--- a/src/supervisor/Supervisor.cc
+++ b/src/supervisor/Supervisor.cc
@@ -25,7 +25,6 @@ extern "C"
 	}
 
 #include "zeek/DebugLogger.h"
-#include "zeek/Dict.h"
 #include "zeek/Event.h"
 #include "zeek/EventHandler.h"
 #include "zeek/ID.h"
diff --git a/src/util.cc b/src/util.cc
index 125be958bb..1cd79f62f0 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -46,7 +46,6 @@
 #include "zeek/3rdparty/ConvertUTF.h"
 #include "zeek/3rdparty/doctest.h"
 #include "zeek/Desc.h"
-#include "zeek/Dict.h"
 #include "zeek/Hash.h"
 #include "zeek/NetVar.h"
 #include "zeek/Obj.h"