Merge pull request #111254 from Ivorforce/object-no-rb-rw

Remove `rw_lock.h` and `rb_map.h` includes from `object.h`.

core/config/project_settings.h

@@ -31,6 +31,7 @@
 #pragma once
 
 #include "core/object/class_db.h"
+#include "core/templates/rb_map.h"
 
 template <typename T>
 class TypedArray;

core/input/input.h

@@ -34,6 +34,7 @@
 #include "core/object/object.h"
 #include "core/os/keyboard.h"
 #include "core/os/thread_safe.h"
+#include "core/templates/rb_map.h"
 #include "core/templates/rb_set.h"
 #include "core/variant/typed_array.h"
 

core/io/resource_format_binary.h

@@ -33,6 +33,7 @@
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
+#include "core/templates/rb_map.h"
 
 class ResourceLoaderBinary {
 	bool translation_remapped = false;

core/object/class_db.h

@@ -32,6 +32,7 @@
 
 #include "core/object/method_bind.h"
 #include "core/object/object.h"
+#include "core/os/rw_lock.h"
 #include "core/string/print_string.h"
 
 // Makes callable_mp readily available in all classes connecting signals.

core/object/object.h

@@ -33,12 +33,10 @@
 #include "core/extension/gdextension_interface.h"
 #include "core/object/message_queue.h"
 #include "core/object/object_id.h"
-#include "core/os/rw_lock.h"
 #include "core/os/spin_lock.h"
 #include "core/templates/hash_map.h"
 #include "core/templates/hash_set.h"
 #include "core/templates/list.h"
-#include "core/templates/rb_map.h"
 #include "core/templates/safe_refcount.h"
 #include "core/variant/callable_bind.h"
 #include "core/variant/variant.h"