diff --git a/src/Conn.h b/src/Conn.h
index a65b34b9ab..64af809a5b 100644
--- a/src/Conn.h
+++ b/src/Conn.h
@@ -31,7 +31,6 @@ class RuleEndpointState;
 class EncapsulationStack;
 
 ZEEK_FORWARD_DECLARE_NAMESPACED(Val, zeek);
-ZEEK_FORWARD_DECLARE_NAMESPACED(RecorVal, zeek);
 
 namespace zeek {
 using ValPtr = zeek::IntrusivePtr<Val>;
diff --git a/src/ID.h b/src/ID.h
index b93a28d581..4f3642e5b1 100644
--- a/src/ID.h
+++ b/src/ID.h
@@ -276,6 +276,8 @@ void init();
 
 } // namespace zeek::id
 
+using ID [[deprecated("Remove in v4.1 Use zeek::detail::ID instead.")]] = zeek::detail::ID;
+
 using init_class [[deprecated("Remove in v4.1. Use zeek::detail::InitClass instead.")]] = zeek::detail::InitClass;
 [[deprecated("Remove in v4.1. Use zeek::detail::INIT_NONE instead.")]]
 constexpr auto INIT_NONE = zeek::detail::INIT_NONE;
diff --git a/src/List.h b/src/List.h
index 757321439f..95733f01b4 100644
--- a/src/List.h
+++ b/src/List.h
@@ -26,8 +26,6 @@
 #include <cassert>
 #include "util.h"
 
-//enum class [[deprecated("Remove in v4.1. Use zeek::ListOrder instead.")]] ListOrder : int { ORDERED, UNORDERED };
-
 namespace zeek {
 
 enum class ListOrder : int { ORDERED, UNORDERED };
diff --git a/src/Scope.cc b/src/Scope.cc
index 3743440551..78d1aa8a44 100644
--- a/src/Scope.cc
+++ b/src/Scope.cc
@@ -223,11 +223,11 @@ Scope* global_scope()
 
 }
 
-const zeek::detail::IDPtr lookup_ID(
+const zeek::detail::ID* lookup_ID(
 	const char* name, const char* module,
 	bool no_global,
 	bool same_module_only,
 	bool check_export)
-{
-	return zeek::detail::lookup_ID(name, module, no_global, same_module_only, check_export);
-}
+	{
+	return zeek::detail::lookup_ID(name, module, no_global, same_module_only, check_export).get();
+	}
diff --git a/src/Scope.h b/src/Scope.h
index cef3c5022f..9b91e6fe00 100644
--- a/src/Scope.h
+++ b/src/Scope.h
@@ -128,7 +128,7 @@ constexpr auto global_scope [[deprecated("Remove in v4.1 Use zeek::detail::globa
 
 // Because of the use of default arguments, this function can't be aliased like the rest.
 [[deprecated("Remove in v4.1 Use zeek::detail::lookup_ID instead.")]]
-extern const zeek::detail::IDPtr lookup_ID(
+extern const zeek::detail::ID* lookup_ID(
 	const char* name, const char* module,
 	bool no_global = false,
 	bool same_module_only = false,
diff --git a/src/Val.cc b/src/Val.cc
index 32f688234e..615d6c366a 100644
--- a/src/Val.cc
+++ b/src/Val.cc
@@ -393,7 +393,7 @@ void Val::SetID(detail::ID* id)
 	}
 #endif
 
-bool Val::WouldOverflow(const ::zeek::Type* from_type, const ::zeek::Type* to_type, const Val* val)
+bool Val::WouldOverflow(const zeek::Type* from_type, const zeek::Type* to_type, const Val* val)
 	{
 	if ( !to_type || !from_type )
 		return true;