diff --git a/src/Attr.h b/src/Attr.h
index 0e18f0ace2..742df69db6 100644
--- a/src/Attr.h
+++ b/src/Attr.h
@@ -6,7 +6,7 @@
 #include <string>
 
 #include "Obj.h"
-#include "BroList.h"
+#include "ZeekList.h"
 #include "IntrusivePtr.h"
 
 ZEEK_FORWARD_DECLARE_NAMESPACED(Expr, zeek::detail);
diff --git a/src/BroList.h b/src/BroList.h
index 73b28a5426..1956e71971 100644
--- a/src/BroList.h
+++ b/src/BroList.h
@@ -1,27 +1,2 @@
-// See the file "COPYING" in the main distribution directory for copyright.
-
-#pragma once
-
-#include "List.h"
-
-ZEEK_FORWARD_DECLARE_NAMESPACED(Val, zeek);
-using val_list = zeek::PList<zeek::Val>;
-
-ZEEK_FORWARD_DECLARE_NAMESPACED(Expr, zeek::detail);
-using expr_list = zeek::PList<zeek::detail::Expr>;
-
-ZEEK_FORWARD_DECLARE_NAMESPACED(ID, zeek::detail);
-using id_list = zeek::PList<zeek::detail::ID>;
-
-ZEEK_FORWARD_DECLARE_NAMESPACED(Stmt, zeek::detail);
-using stmt_list = zeek::PList<zeek::detail::Stmt>;
-
-namespace zeek { class Type; }
-using BroType [[deprecated("Remove in v4.1. Use zeek::Type instead.")]] = zeek::Type;
-using type_list = zeek::PList<zeek::Type>;
-
-ZEEK_FORWARD_DECLARE_NAMESPACED(Attr, zeek::detail);
-using attr_list = zeek::PList<zeek::detail::Attr>;
-
-ZEEK_FORWARD_DECLARE_NAMESPACED(Timer, zeek::detail);
-using timer_list = zeek::PList<zeek::detail::Timer, zeek::ListOrder::UNORDERED>;
+#warning "BroList.h is deprecated and will be removed in v4.1. Use ZeekList.h instead."
+#include "ZeekList.h"
diff --git a/src/Event.h b/src/Event.h
index ce28cc63ce..655dd0c40e 100644
--- a/src/Event.h
+++ b/src/Event.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "BroList.h"
+#include "ZeekList.h"
 #include "analyzer/Analyzer.h"
 #include "iosource/IOSource.h"
 #include "Flare.h"
diff --git a/src/EventHandler.h b/src/EventHandler.h
index deb78fea92..c211a1fbdb 100644
--- a/src/EventHandler.h
+++ b/src/EventHandler.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "BroList.h"
+#include "ZeekList.h"
 #include "ZeekArgs.h"
 #include "Type.h"
 
diff --git a/src/Expr.h b/src/Expr.h
index 615dc93a13..2415a9ea91 100644
--- a/src/Expr.h
+++ b/src/Expr.h
@@ -8,7 +8,7 @@
 #include <utility>
 #include <optional>
 
-#include "BroList.h"
+#include "ZeekList.h"
 #include "IntrusivePtr.h"
 #include "Timer.h"
 #include "Type.h"
diff --git a/src/Frame.h b/src/Frame.h
index 416e921b1f..fe39da38b8 100644
--- a/src/Frame.h
+++ b/src/Frame.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "BroList.h" // for typedef val_list
+#include "ZeekList.h" // for typedef val_list
 #include "Obj.h"
 #include "IntrusivePtr.h"
 #include "ZeekArgs.h"
diff --git a/src/Func.h b/src/Func.h
index 8c5d37c3f6..4c97226d7c 100644
--- a/src/Func.h
+++ b/src/Func.h
@@ -9,7 +9,7 @@
 #include <tuple>
 #include <type_traits>
 
-#include "BroList.h"
+#include "ZeekList.h"
 #include "Obj.h"
 #include "IntrusivePtr.h"
 #include "Type.h" /* for function_flavor */
diff --git a/src/Reporter.h b/src/Reporter.h
index decc2696c7..1b3a0d228c 100644
--- a/src/Reporter.h
+++ b/src/Reporter.h
@@ -12,7 +12,7 @@
 #include <unordered_set>
 #include <unordered_map>
 
-#include "BroList.h"
+#include "ZeekList.h"
 #include "net_util.h"
 
 ZEEK_FORWARD_DECLARE_NAMESPACED(Analyzer, zeek, analyzer);
diff --git a/src/Scope.h b/src/Scope.h
index fd6a4d030d..445d3ddc1a 100644
--- a/src/Scope.h
+++ b/src/Scope.h
@@ -8,7 +8,7 @@
 #include <map>
 
 #include "Obj.h"
-#include "BroList.h"
+#include "ZeekList.h"
 #include "IntrusivePtr.h"
 #include "TraverseTypes.h"
 
diff --git a/src/Stmt.h b/src/Stmt.h
index e0a9b76b78..572359ad68 100644
--- a/src/Stmt.h
+++ b/src/Stmt.h
@@ -4,7 +4,7 @@
 
 // BRO statements.
 
-#include "BroList.h"
+#include "ZeekList.h"
 #include "Dict.h"
 #include "ID.h"
 #include "Obj.h"
diff --git a/src/Type.h b/src/Type.h
index 8f94e19d4c..fe0d86f591 100644
--- a/src/Type.h
+++ b/src/Type.h
@@ -4,7 +4,7 @@
 
 #include "Obj.h"
 #include "Attr.h"
-#include "BroList.h"
+#include "ZeekList.h"
 #include "IntrusivePtr.h"
 
 #include <string>
diff --git a/src/ZeekArgs.h b/src/ZeekArgs.h
index d44406fd57..fbd7b8d478 100644
--- a/src/ZeekArgs.h
+++ b/src/ZeekArgs.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include <vector>
-#include "BroList.h"
+#include "ZeekList.h"
 
 namespace zeek {
 
diff --git a/src/ZeekList.h b/src/ZeekList.h
new file mode 100644
index 0000000000..73b28a5426
--- /dev/null
+++ b/src/ZeekList.h
@@ -0,0 +1,27 @@
+// See the file "COPYING" in the main distribution directory for copyright.
+
+#pragma once
+
+#include "List.h"
+
+ZEEK_FORWARD_DECLARE_NAMESPACED(Val, zeek);
+using val_list = zeek::PList<zeek::Val>;
+
+ZEEK_FORWARD_DECLARE_NAMESPACED(Expr, zeek::detail);
+using expr_list = zeek::PList<zeek::detail::Expr>;
+
+ZEEK_FORWARD_DECLARE_NAMESPACED(ID, zeek::detail);
+using id_list = zeek::PList<zeek::detail::ID>;
+
+ZEEK_FORWARD_DECLARE_NAMESPACED(Stmt, zeek::detail);
+using stmt_list = zeek::PList<zeek::detail::Stmt>;
+
+namespace zeek { class Type; }
+using BroType [[deprecated("Remove in v4.1. Use zeek::Type instead.")]] = zeek::Type;
+using type_list = zeek::PList<zeek::Type>;
+
+ZEEK_FORWARD_DECLARE_NAMESPACED(Attr, zeek::detail);
+using attr_list = zeek::PList<zeek::detail::Attr>;
+
+ZEEK_FORWARD_DECLARE_NAMESPACED(Timer, zeek::detail);
+using timer_list = zeek::PList<zeek::detail::Timer, zeek::ListOrder::UNORDERED>;
diff --git a/src/file_analysis/File.h b/src/file_analysis/File.h
index 2ee8418e36..d75f2ba7a1 100644
--- a/src/file_analysis/File.h
+++ b/src/file_analysis/File.h
@@ -9,7 +9,7 @@
 #include "analyzer/Tag.h"
 #include "AnalyzerSet.h"
 #include "ZeekString.h"
-#include "BroList.h" // for val_list
+#include "ZeekList.h" // for val_list
 #include "ZeekArgs.h"
 #include "WeirdState.h"
 
diff --git a/src/input.h b/src/input.h
index 8c36f45655..a50ae842ae 100644
--- a/src/input.h
+++ b/src/input.h
@@ -5,7 +5,7 @@
 #include <vector>
 #include <string>
 
-#include "BroList.h"
+#include "ZeekList.h"
 
 // These are required by the lexer in scan.l and are intentionally not namespaced.
 extern int yyparse();
diff --git a/src/parse.y b/src/parse.y
index b573af3337..6ad81f1884 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -78,15 +78,17 @@
 #include <string.h>
 #include <assert.h>
 
+#include <set>
+#include <string>
+
 #include "input.h"
-#include "BroList.h"
+#include "ZeekList.h"
 #include "Desc.h"
 #include "Expr.h"
 #include "Func.h"
 #include "Stmt.h"
 #include "Val.h"
 #include "Var.h"
-/* #include "analyzer/protocol/dns/DNS.h" */
 #include "RE.h"
 #include "Scope.h"
 #include "Reporter.h"
@@ -95,9 +97,6 @@
 #include "module_util.h"
 #include "IntrusivePtr.h"
 
-#include <set>
-#include <string>
-
 extern const char* filename;  // Absolute path of file currently being parsed.
 extern const char* last_filename; // Absolute path of last file parsed.
 extern const char* last_tok_filename;