diff --git a/include/godot_cpp/core/class_db.hpp b/include/godot_cpp/core/class_db.hpp
index 57a2f9013..749e47504 100644
--- a/include/godot_cpp/core/class_db.hpp
+++ b/include/godot_cpp/core/class_db.hpp
@@ -45,9 +45,9 @@
 #include <godot_cpp/variant/callable_method_pointer.hpp>
 
 #include <godot_cpp/templates/a_hash_map.hpp>
-#include <list>
+#include <godot_cpp/templates/hash_set.hpp>
+#include <godot_cpp/templates/list.hpp>
 #include <mutex>
-#include <set>
 
 namespace godot {
 
@@ -55,7 +55,7 @@ namespace godot {
 
 struct MethodDefinition {
 	StringName name;
-	std::list<StringName> args;
+	List<StringName> args;
 	MethodDefinition() {}
 	MethodDefinition(StringName p_name) :
 			name(p_name) {}
@@ -86,10 +86,10 @@ class ClassDB {
 		StringName parent_name;
 		GDExtensionInitializationLevel level = GDEXTENSION_INITIALIZATION_SCENE;
 		AHashMap<StringName, MethodBind *> method_map;
-		std::set<StringName> signal_names;
+		HashSet<StringName> signal_names;
 		AHashMap<StringName, VirtualMethod> virtual_methods;
-		std::set<StringName> property_names;
-		std::set<StringName> constant_names;
+		HashSet<StringName> property_names;
+		HashSet<StringName> constant_names;
 		// Pointer to the parent custom class, if any. Will be null if the parent class is a Godot class.
 		ClassInfo *parent_ptr = nullptr;
 	};
diff --git a/src/core/class_db.cpp b/src/core/class_db.cpp
index 16c7fbb0f..2f5b3177d 100644
--- a/src/core/class_db.cpp
+++ b/src/core/class_db.cpp
@@ -419,7 +419,7 @@ void ClassDB::initialize(GDExtensionInitializationLevel p_level) {
 }
 
 void ClassDB::deinitialize(GDExtensionInitializationLevel p_level) {
-	std::set<StringName> to_erase;
+	HashSet<StringName> to_erase;
 	for (int i = class_register_order.size() - 1; i >= 0; --i) {
 		const StringName &name = class_register_order[i];
 		const ClassInfo &cl = classes[name];