Moved around more classes in core.

core/containers/hashfuncs.h

@@ -41,11 +41,11 @@
 #include "core/math/vector3i.h"
 #include "core/math/vector4.h"
 #include "core/math/vector4i.h"
-#include "core/object_id.h"
+#include "core/object/object_id.h"
 #include "core/string/node_path.h"
 #include "core/string/string_name.h"
 #include "core/string/ustring.h"
-#include "core/rid.h"
+#include "core/containers/rid.h"
 #include "core/typedefs.h"
 
 /**

core/containers/ordered_hash_map.h

@@ -32,7 +32,7 @@
 
 #include "core/containers/hash_map.h"
 #include "core/containers/list.h"
-#include "core/pair.h"
+#include "core/containers/pair.h"
 
 /**
  * A hash map which allows to iterate elements in insertion order.

core/containers/rb_map.h

@@ -33,7 +33,7 @@
 
 #include "core/error/error_macros.h"
 #include "core/os/memory.h"
-#include "core/pair.h"
+#include "core/containers/pair.h"
 
 // based on the very nice implementation of rb-trees by:
 // https://web.archive.org/web/20120507164830/https://web.mit.edu/~emin/www/source_code/red_black_tree/index.html

core/containers/rid.h

@@ -32,7 +32,7 @@
 
 #include "core/containers/list.h"
 #include "core/os/memory.h"
-#include "core/rid_handle.h"
+#include "core/containers/rid_handle.h"
 #include "core/safe_refcount.h"
 #include "core/containers/set.h"
 #include "core/typedefs.h"

core/object/object.cpp

@@ -33,7 +33,7 @@
 #include "core/object/class_db.h"
 #include "core/core_string_names.h"
 #include "core/object/message_queue.h"
-#include "core/object_rc.h"
+#include "core/object/object_rc.h"
 #include "core/os/os.h"
 #include "core/string/print_string.h"
 #include "core/object/resource.h"

core/object/object.h

@@ -33,7 +33,7 @@
 #include "core/containers/hash_map.h"
 #include "core/containers/list.h"
 #include "core/containers/map.h"
-#include "core/object_id.h"
+#include "core/object/object_id.h"
 #include "core/os/rw_lock.h"
 #include "core/safe_refcount.h"
 #include "core/containers/set.h"

core/object/ref_ptr.h

@@ -36,7 +36,7 @@
  * It's basically an opaque container of a Reference reference, so Variant can use it.
 */
 
-#include "core/rid.h"
+#include "core/containers/rid.h"
 
 class RefPtr {
 	enum {

core/object/script_language.h

@@ -32,7 +32,7 @@
 
 #include "core/io/multiplayer_api.h"
 #include "core/containers/map.h"
-#include "core/pair.h"
+#include "core/containers/pair.h"
 #include "core/object/resource.h"
 
 class ScriptLanguage;

core/string/compressed_translation.cpp

@@ -30,7 +30,7 @@
 
 #include "compressed_translation.h"
 
-#include "core/pair.h"
+#include "core/containers/pair.h"
 
 extern "C" {
 #include "thirdparty/misc/smaz.h"

core/variant/variant.cpp

@@ -33,7 +33,7 @@
 #include "core/core_string_names.h"
 #include "core/io/marshalls.h"
 #include "core/math/math_funcs.h"
-#include "core/object_rc.h"
+#include "core/object/object_rc.h"
 #include "core/string/print_string.h"
 #include "core/object/resource.h"
 #include "core/variant/variant_parser.h"

core/variant/variant.h

@@ -47,10 +47,10 @@
 #include "core/math/vector4.h"
 #include "core/math/vector4i.h"
 #include "core/string/node_path.h"
-#include "core/object_id.h"
+#include "core/object/object_id.h"
 #include "core/containers/pool_vector.h"
 #include "core/object/ref_ptr.h"
-#include "core/rid.h"
+#include "core/containers/rid.h"
 #include "core/string/ustring.h"
 
 class Object;

core/variant/variant_call.cpp

@@ -35,7 +35,7 @@
 #include "core/crypto/crypto_core.h"
 #include "core/io/compression.h"
 #include "core/object/object.h"
-#include "core/object_rc.h"
+#include "core/object/object_rc.h"
 #include "core/os/os.h"
 #include "core/object/script_language.h"
 

core/variant/variant_op.cpp

@@ -32,7 +32,7 @@
 
 #include "core/core_string_names.h"
 #include "core/object/object.h"
-#include "core/object_rc.h"
+#include "core/object/object_rc.h"
 #include "core/object/script_language.h"
 
 #define CASE_TYPE_ALL(PREFIX, OP) \

drivers/gles2/shader_compiler_gles2.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/pair.h"
+#include "core/containers/pair.h"
 #include "core/string/string_builder.h"
 #include "servers/visual/shader_language.h"
 #include "servers/visual/shader_types.h"

drivers/gles2/shader_gles2.h

@@ -41,7 +41,7 @@
 #include "core/containers/hash_map.h"
 #include "core/containers/map.h"
 #include "core/math/projection.h"
-#include "core/pair.h"
+#include "core/containers/pair.h"
 #include "core/variant/variant.h"
 #include "servers/visual/shader_language.h"
 

editor/animation_bezier_editor.cpp

@@ -43,7 +43,7 @@
 #include "core/string/node_path.h"
 #include "core/os/input_event.h"
 #include "core/os/memory.h"
-#include "core/pair.h"
+#include "core/containers/pair.h"
 #include "core/string/string_name.h"
 #include "core/typedefs.h"
 #include "core/object/undo_redo.h"

editor/animation_track_editor.cpp

@@ -46,7 +46,7 @@
 #include "core/os/input_event.h"
 #include "core/os/keyboard.h"
 #include "core/os/memory.h"
-#include "core/pair.h"
+#include "core/containers/pair.h"
 #include "core/object/resource.h"
 #include "core/object/script_language.h"
 #include "core/containers/set.h"

editor/animation_track_editor_plugins.h

@@ -35,7 +35,7 @@
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"
 #include "core/object/object.h"
-#include "core/object_id.h"
+#include "core/object/object_id.h"
 #include "core/object/reference.h"
 #include "core/string/ustring.h"
 #include "core/variant/variant.h"

editor/array_property_edit.h

@@ -34,7 +34,7 @@
 
 #include "core/containers/list.h"
 #include "core/object/object.h"
-#include "core/object_id.h"
+#include "core/object/object_id.h"
 #include "core/object/reference.h"
 #include "core/string/string_name.h"
 #include "core/string/ustring.h"

editor/audio_stream_preview.h

@@ -38,7 +38,7 @@
 
 #include "core/containers/map.h"
 #include "core/object/object.h"
-#include "core/object_id.h"
+#include "core/object/object_id.h"
 #include "core/object/reference.h"
 #include "core/containers/vector.h"
 

editor/dictionary_property_edit.h

@@ -34,7 +34,7 @@
 
 #include "core/containers/list.h"
 #include "core/object/object.h"
-#include "core/object_id.h"
+#include "core/object/object_id.h"
 #include "core/object/reference.h"
 #include "core/string/string_name.h"
 #include "core/string/ustring.h"

editor/doc/doc_data.cpp

@@ -47,7 +47,7 @@
 #include "core/object/object.h"
 #include "core/os/file_access.h"
 #include "core/os/memory.h"
-#include "core/pair.h"
+#include "core/containers/pair.h"
 #include "core/string/print_string.h"
 #include "core/containers/set.h"
 #include "core/string/string_name.h"

editor/editor_data.h

@@ -36,14 +36,14 @@
 #include "scene/resources/texture.h"
 
 #include "core/containers/list.h"
-#include "core/pair.h"
+#include "core/containers/pair.h"
 #include "core/object/undo_redo.h"
 #include "core/variant/array.h"
 #include "core/variant/dictionary.h"
 #include "core/containers/hash_map.h"
 #include "core/containers/map.h"
 #include "core/string/node_path.h"
-#include "core/object_id.h"
+#include "core/object/object_id.h"
 #include "core/object/reference.h"
 #include "core/object/script_language.h"
 #include "core/containers/set.h"

editor/editor_help.cpp

@@ -49,7 +49,7 @@
 #include "core/os/input_event.h"
 #include "core/os/memory.h"
 #include "core/os/os.h"
-#include "core/pair.h"
+#include "core/containers/pair.h"
 #include "core/containers/set.h"
 #include "core/typedefs.h"
 #include "core/variant/variant.h"

editor/editor_inspector.h

@@ -41,7 +41,7 @@
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"
 #include "core/object/object.h"
-#include "core/object_id.h"
+#include "core/object/object_id.h"
 
 #include "core/object/resource.h"
 #include "core/containers/set.h"

editor/editor_network_profiler.h

@@ -35,7 +35,7 @@
 #include "core/io/multiplayer_api.h"
 #include "core/containers/map.h"
 #include "core/object/object.h"
-#include "core/object_id.h"
+#include "core/object/object_id.h"
 
 class Button;
 class LineEdit;

editor/editor_node.cpp

@@ -45,7 +45,7 @@
 #include "core/io/resource_saver.h"
 #include "core/math/math_defs.h"
 #include "core/math/vector2.h"
-#include "core/object_id.h"
+#include "core/object/object_id.h"
 #include "core/os/dir_access.h"
 #include "core/os/file_access.h"
 #include "core/os/input.h"

editor/editor_path.h

@@ -32,7 +32,7 @@
 
 #include "scene/gui/button.h"
 
-#include "core/object_id.h"
+#include "core/object/object_id.h"
 #include "core/containers/vector.h"
 
 class EditorHistory;

editor/editor_plugin.cpp

@@ -54,8 +54,8 @@
 #include "core/os/input_event.h"
 #include "core/containers/pool_vector.h"
 #include "core/object/resource.h"
-#include "core/rid.h"
-#include "core/rid_handle.h"
+#include "core/containers/rid.h"
+#include "core/containers/rid_handle.h"
 #include "core/object/script_language.h"
 #include "core/typedefs.h"
 #include "editor/editor_autoload_settings.h"

editor/editor_properties.cpp

@@ -46,11 +46,11 @@
 #include "core/math/transform_2d.h"
 #include "core/math/vector3.h"
 #include "core/object/object.h"
-#include "core/object_id.h"
+#include "core/object/object_id.h"
 #include "core/os/input_event.h"
 #include "core/os/memory.h"
 #include "core/config/project_settings.h"
-#include "core/rid.h"
+#include "core/containers/rid.h"
 #include "core/object/script_language.h"
 #include "core/typedefs.h"
 #include "editor/create_dialog.h"

editor/editor_properties_array_dict.h

@@ -36,7 +36,7 @@
 #include "core/variant/dictionary.h"
 #include "core/math/vector2.h"
 #include "core/object/object.h"
-#include "core/object_id.h"
+#include "core/object/object_id.h"
 #include "core/string/string_name.h"
 #include "core/string/ustring.h"
 #include "core/variant/variant.h"

editor/editor_resource_picker.cpp

@@ -46,7 +46,7 @@
 #include "core/math/rect2.h"
 #include "core/os/input_event.h"
 #include "core/os/memory.h"
-#include "core/pair.h"
+#include "core/containers/pair.h"
 #include "core/object/ref_ptr.h"
 #include "core/object/script_language.h"
 #include "core/string/string_name.h"

editor/editor_resource_picker.h

@@ -36,7 +36,7 @@
 #include "core/containers/list.h"
 #include "core/math/vector2.h"
 #include "core/object/object.h"
-#include "core/object_id.h"
+#include "core/object/object_id.h"
 #include "core/object/reference.h"
 #include "core/object/resource.h"
 #include "core/containers/set.h"

editor/editor_resource_preview.h

@@ -40,7 +40,7 @@
 #include "core/containers/map.h"
 #include "core/math/vector2.h"
 #include "core/object/object.h"
-#include "core/object_id.h"
+#include "core/object/object_id.h"
 #include "core/os/mutex.h"
 #include "core/object/resource.h"
 #include "core/string/string_name.h"

editor/editor_sectioned_inspector.h

@@ -34,7 +34,7 @@
 
 #include "core/containers/map.h"
 #include "core/object/object.h"
-#include "core/object_id.h"
+#include "core/object/object_id.h"
 #include "core/string/ustring.h"
 
 class SectionedInspectorFilter;

editor/import/resource_importer_scene.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/pair.h"
+#include "core/containers/pair.h"
 
 #include "core/io/resource_importer.h"
 #include "scene/main/node.h"

editor/import_dock.cpp

@@ -41,7 +41,7 @@
 #include "core/io/resource_importer.h"
 #include "core/math/vector2.h"
 #include "core/os/memory.h"
-#include "core/pair.h"
+#include "core/containers/pair.h"
 #include "core/containers/set.h"
 #include "core/typedefs.h"
 #include "core/containers/vector.h"

editor/inspector_dock.cpp

@@ -36,7 +36,7 @@
 #include "core/containers/list.h"
 #include "core/containers/map.h"
 #include "core/object/method_bind.h"
-#include "core/object_id.h"
+#include "core/object/object_id.h"
 #include "core/os/memory.h"
 #include "core/containers/set.h"
 #include "core/string/string_name.h"

editor/plugins/animation_player_editor_plugin.cpp

@@ -55,7 +55,7 @@
 #include "core/os/input_event.h"
 #include "core/os/memory.h"
 #include "core/object/resource.h"
-#include "core/rid_handle.h"
+#include "core/containers/rid_handle.h"
 #include "core/string/string_name.h"
 #include "core/typedefs.h"
 #include "core/object/undo_redo.h"

editor/plugins/animation_player_editor_plugin.h

@@ -37,7 +37,7 @@
 #include "core/math/vector2.h"
 #include "core/object/object.h"
 #include "core/object/reference.h"
-#include "core/rid.h"
+#include "core/containers/rid.h"
 #include "core/string/ustring.h"
 #include "core/containers/vector.h"
 

editor/plugins/animation_tree_editor_plugin.h

@@ -34,7 +34,7 @@
 #include "scene/gui/box_container.h"
 
 #include "core/object/object.h"
-#include "core/object_id.h"
+#include "core/object/object_id.h"
 #include "core/object/reference.h"
 #include "core/string/ustring.h"
 #include "core/containers/vector.h"

editor/plugins/audio_stream_editor_plugin.h

@@ -35,7 +35,7 @@
 
 #include "core/math/math_defs.h"
 #include "core/object/object.h"
-#include "core/object_id.h"
+#include "core/object/object_id.h"
 #include "core/object/reference.h"
 #include "core/string/ustring.h"
 

editor/plugins/canvas_item_editor_plugin.cpp

@@ -65,7 +65,7 @@
 #include "core/os/memory.h"
 #include "core/containers/pool_vector.h"
 #include "core/object/resource.h"
-#include "core/rid.h"
+#include "core/containers/rid.h"
 #include "core/string/string_name.h"
 #include "core/object/undo_redo.h"
 #include "editor/animation_track_editor.h"

editor/plugins/canvas_item_editor_plugin.h

@@ -42,7 +42,7 @@
 #include "core/math/transform_2d.h"
 #include "core/math/vector2.h"
 #include "core/object/object.h"
-#include "core/object_id.h"
+#include "core/object/object_id.h"
 #include "core/object/reference.h"
 #include "core/typedefs.h"
 #include "core/string/ustring.h"

editor/plugins/editor_preview_plugins.cpp

@@ -56,7 +56,7 @@
 #include "core/os/file_access.h"
 #include "core/os/memory.h"
 #include "core/containers/pool_vector.h"
-#include "core/rid_handle.h"
+#include "core/containers/rid_handle.h"
 #include "core/object/script_language.h"
 #include "core/containers/set.h"
 #include "core/typedefs.h"

editor/plugins/editor_preview_plugins.h

@@ -37,7 +37,7 @@
 #include "core/object/object.h"
 #include "core/object/reference.h"
 #include "core/object/resource.h"
-#include "core/rid.h"
+#include "core/containers/rid.h"
 #include "core/string/ustring.h"
 #include "core/variant/variant.h"
 

editor/plugins/script_editor_plugin.cpp

@@ -61,7 +61,7 @@
 #include "core/os/input_event.h"
 #include "core/os/main_loop.h"
 #include "core/os/memory.h"
-#include "core/pair.h"
+#include "core/containers/pair.h"
 #include "core/string/string_name.h"
 #include "core/object/undo_redo.h"
 #include "core/version_generated.gen.h"

editor/plugins/spatial_editor_plugin.cpp

@@ -49,7 +49,7 @@
 #include "core/os/os.h"
 #include "core/containers/pool_vector.h"
 #include "core/config/project_settings.h"
-#include "core/rid_handle.h"
+#include "core/containers/rid_handle.h"
 #include "core/object/script_language.h"
 #include "core/containers/set.h"
 #include "core/string/string_name.h"

editor/plugins/spatial_editor_plugin.h

@@ -50,10 +50,10 @@
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
 #include "core/object/object.h"
-#include "core/object_id.h"
+#include "core/object/object_id.h"
 #include "core/object/reference.h"
 #include "core/object/resource.h"
-#include "core/rid.h"
+#include "core/containers/rid.h"
 #include "core/typedefs.h"
 #include "core/string/ustring.h"
 #include "core/variant/variant.h"

editor/plugins/texture_region_editor_plugin.h

@@ -43,7 +43,7 @@
 #include "core/math/vector2.h"
 #include "core/object/object.h"
 #include "core/object/reference.h"
-#include "core/rid.h"
+#include "core/containers/rid.h"
 #include "core/string/ustring.h"
 
 

editor/property_editor.cpp

@@ -53,11 +53,11 @@
 #include "core/os/keyboard.h"
 #include "core/os/main_loop.h"
 #include "core/os/memory.h"
-#include "core/pair.h"
+#include "core/containers/pair.h"
 #include "core/config/project_settings.h"
 #include "core/object/ref_ptr.h"
 #include "core/object/resource.h"
-#include "core/rid.h"
+#include "core/containers/rid.h"
 #include "core/object/script_language.h"
 #include "core/containers/set.h"
 #include "core/string/string_name.h"

editor/property_selector.h

@@ -32,7 +32,7 @@
 
 #include "scene/gui/dialogs.h"
 
-#include "core/object_id.h"
+#include "core/object/object_id.h"
 #include "core/object/reference.h"
 #include "core/string/ustring.h"
 #include "core/variant/variant.h"

editor/quick_open.cpp

@@ -37,7 +37,7 @@
 #include "core/object/class_db.h"
 #include "core/os/input_event.h"
 #include "core/os/memory.h"
-#include "core/pair.h"
+#include "core/containers/pair.h"
 #include "core/typedefs.h"
 #include "editor/editor_file_system.h"
 #include "scene/gui/control.h"

editor/quick_open.h

@@ -32,7 +32,7 @@
 
 #include "scene/gui/dialogs.h"
 
-#include "core/pair.h"
+#include "core/containers/pair.h"
 #include "core/object/reference.h"
 #include "core/string/string_name.h"
 #include "core/string/ustring.h"

editor/rename_dialog.h

@@ -38,7 +38,7 @@
 #include "core/containers/list.h"
 #include "core/string/node_path.h"
 #include "core/object/object.h"
-#include "core/pair.h"
+#include "core/containers/pair.h"
 #include "core/string/ustring.h"
 
 #include "scene/gui/dialogs.h"

editor/scene_tree_dock.h

@@ -36,7 +36,7 @@
 #include "core/containers/list.h"
 #include "core/containers/map.h"
 #include "core/string/node_path.h"
-#include "core/object_id.h"
+#include "core/object/object_id.h"
 #include "core/object/reference.h"
 #include "core/object/resource.h"
 #include "core/containers/set.h"

editor/scene_tree_editor.h

@@ -36,7 +36,7 @@
 #include "core/containers/list.h"
 #include "core/math/vector2.h"
 #include "core/string/node_path.h"
-#include "core/object_id.h"
+#include "core/object/object_id.h"
 #include "core/containers/set.h"
 #include "core/string/string_name.h"
 #include "core/string/ustring.h"

editor/script_editor_debugger.h

@@ -39,7 +39,7 @@
 #include "core/math/vector2.h"
 #include "core/string/node_path.h"
 #include "core/object/object.h"
-#include "core/object_id.h"
+#include "core/object/object_id.h"
 #include "core/object/reference.h"
 #include "core/object/resource.h"
 #include "core/containers/set.h"

editor/spatial_editor_gizmos.cpp

@@ -48,7 +48,7 @@
 #include "core/string/node_path.h"
 #include "core/os/memory.h"
 #include "core/containers/pool_vector.h"
-#include "core/rid.h"
+#include "core/containers/rid.h"
 #include "core/object/script_language.h"
 #include "core/typedefs.h"
 #include "core/object/undo_redo.h"

main/tests/test_ordered_hash_map.cpp

@@ -32,7 +32,7 @@
 
 #include "core/containers/ordered_hash_map.h"
 #include "core/os/os.h"
-#include "core/pair.h"
+#include "core/containers/pair.h"
 #include "core/containers/vector.h"
 
 namespace TestOrderedHashMap {

modules/cscript/cscript_function.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/os/thread.h"
-#include "core/pair.h"
+#include "core/containers/pair.h"
 #include "core/object/reference.h"
 #include "core/object/script_language.h"
 #include "core/containers/self_list.h"

modules/cscript/cscript_tokenizer.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/pair.h"
+#include "core/containers/pair.h"
 #include "core/string/string_name.h"
 #include "core/string/ustring.h"
 #include "core/variant/variant.h"

modules/gdscript/gdscript_function.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/os/thread.h"
-#include "core/pair.h"
+#include "core/containers/pair.h"
 #include "core/object/reference.h"
 #include "core/object/script_language.h"
 #include "core/containers/self_list.h"

modules/gdscript/gdscript_tokenizer.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/pair.h"
+#include "core/containers/pair.h"
 #include "core/string/string_name.h"
 #include "core/string/ustring.h"
 #include "core/variant/variant.h"

modules/navigation/nav_rid.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/rid.h"
+#include "core/containers/rid.h"
 
 class NavRid : public RID_Data {
 	RID self;

modules/navigation/nav_utils.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/math/vector3.h"
-#include "core/rid.h"
+#include "core/containers/rid.h"
 
 #include <vector>
 

modules/navigation/pandemonium_navigation_server.h

@@ -32,7 +32,7 @@
 
 #include "servers/navigation_server.h"
 
-#include "core/rid.h"
+#include "core/containers/rid.h"
 #include "nav_map.h"
 #include "nav_region.h"
 #include "rvo_agent.h"

scene/2d/cpu_particles_2d.cpp

@@ -31,7 +31,7 @@
 #include "cpu_particles_2d.h"
 #include "core/core_string_names.h"
 #include "core/os/os.h"
-#include "core/rid.h"
+#include "core/containers/rid.h"
 #include "scene/2d/canvas_item.h"
 #include "scene/resources/particles_material.h"
 #include "scene/resources/texture.h"

scene/2d/physics_body_2d.cpp

@@ -37,7 +37,7 @@
 #include "core/object/method_bind_ext.gen.inc"
 #include "core/object/object.h"
 #include "core/config/project_settings.h"
-#include "core/rid.h"
+#include "core/containers/rid.h"
 #include "scene/resources/physics_material.h"
 #include "scene/scene_string_names.h"
 #include "servers/physics_2d_server.h"

scene/3d/cpu_particles.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/object/reference.h"
-#include "core/rid.h"
+#include "core/containers/rid.h"
 #include "core/safe_refcount.h"
 #include "scene/3d/visual_instance.h"
 

scene/3d/physics_body.cpp

@@ -36,7 +36,7 @@
 #include "core/object/method_bind_ext.gen.inc"
 #include "core/object/object.h"
 #include "core/config/project_settings.h"
-#include "core/rid.h"
+#include "core/containers/rid.h"
 #include "scene/resources/physics_material.h"
 #include "scene/scene_string_names.h"
 #include "skeleton.h"

scene/3d/portal.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/containers/local_vector.h"
-#include "core/rid.h"
+#include "core/containers/rid.h"
 #include "spatial.h"
 
 class RoomManager;

scene/3d/room.h

@@ -32,7 +32,7 @@
 
 #include "core/containers/local_vector.h"
 #include "core/math/geometry.h"
-#include "core/rid.h"
+#include "core/containers/rid.h"
 #include "spatial.h"
 
 class Portal;

scene/3d/room_group.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/rid.h"
+#include "core/containers/rid.h"
 #include "spatial.h"
 
 class Room;

scene/3d/skeleton.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/object/reference.h"
-#include "core/rid.h"
+#include "core/containers/rid.h"
 #include "scene/3d/spatial.h"
 
 #ifndef _3D_DISABLED

scene/3d/soft_body.cpp

@@ -32,7 +32,7 @@
 #include "core/containers/list.h"
 #include "core/object/object.h"
 #include "core/os/os.h"
-#include "core/rid.h"
+#include "core/containers/rid.h"
 #include "scene/3d/collision_object.h"
 #include "scene/3d/physics_body.h"
 #include "scene/3d/skeleton.h"

scene/3d/visual_instance.h

@@ -32,7 +32,7 @@
 
 #include "core/math/face3.h"
 #include "core/object/reference.h"
-#include "core/rid.h"
+#include "core/containers/rid.h"
 #include "scene/3d/cull_instance.h"
 #include "servers/visual_server.h"
 

scene/gui/control.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/math/transform_2d.h"
-#include "core/rid.h"
+#include "core/containers/rid.h"
 #include "scene/2d/canvas_item.h"
 #include "scene/resources/theme.h"
 

scene/resources/dynamic_font.h

@@ -36,7 +36,7 @@
 #include "core/io/resource_loader.h"
 #include "core/os/mutex.h"
 #include "core/os/thread_safe.h"
-#include "core/pair.h"
+#include "core/containers/pair.h"
 #include "scene/resources/font.h"
 #include "scene/resources/texture.h"
 

scene/resources/mesh.cpp

@@ -33,7 +33,7 @@
 #include "core/crypto/crypto_core.h"
 #include "core/containers/local_vector.h"
 #include "core/math/convex_hull.h"
-#include "core/pair.h"
+#include "core/containers/pair.h"
 #include "scene/resources/concave_polygon_shape.h"
 #include "scene/resources/convex_polygon_shape.h"
 #include "surface_tool.h"

scene/resources/particles_material.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/rid.h"
+#include "core/containers/rid.h"
 #include "scene/resources/material.h"
 
 class ParticlesMaterial : public Material {

servers/navigation_2d_server.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/object/object.h"
-#include "core/rid.h"
+#include "core/containers/rid.h"
 #include "scene/2d/navigation_polygon.h"
 
 // This server exposes the 3D `NavigationServer` features in the 2D world.

servers/navigation_server.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/object/object.h"
-#include "core/rid.h"
+#include "core/containers/rid.h"
 
 #include "core/object/reference.h"
 

servers/physics_2d/space_2d_sw.cpp

@@ -32,7 +32,7 @@
 
 #include "collision_solver_2d_sw.h"
 #include "core/os/os.h"
-#include "core/pair.h"
+#include "core/containers/pair.h"
 #include "physics_2d_server_sw.h"
 
 #define TEST_MOTION_MARGIN_MIN_VALUE 0.0001

servers/visual/portals/portal_types.h

@@ -36,8 +36,8 @@
 #include "core/math/quaternion.h"
 #include "core/math/transform.h"
 #include "core/math/vector3.h"
-#include "core/object_id.h"
-#include "core/rid.h"
+#include "core/object/object_id.h"
+#include "core/containers/rid.h"
 #include "portal_defines.h"
 
 // visual server scene instance.

servers/visual_server.h

@@ -35,7 +35,7 @@
 #include "core/math/geometry.h"
 #include "core/math/transform_2d.h"
 #include "core/object/object.h"
-#include "core/rid.h"
+#include "core/containers/rid.h"
 #include "core/variant/variant.h"
 
 class VisualServerCallbacks;

servers/visual_server_callbacks.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/containers/local_vector.h"
-#include "core/object_id.h"
+#include "core/object/object_id.h"
 #include "core/os/mutex.h"
 
 class VisualServerCallbacks {