Moved a few more core classes.

core/bind/core_bind.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/io/compression.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
@@ -39,7 +39,7 @@
 #include "core/os/os.h"
 #include "core/os/semaphore.h"
 #include "core/os/thread.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 
 class _ResourceLoader : public Object {
 	GDCLASS(_ResourceLoader, Object);

core/containers/cowdata.h

@@ -34,7 +34,7 @@
 
 #include "core/error/error_macros.h"
 #include "core/os/memory.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 
 template <class T>
 class Vector;

core/containers/pool_vector.h

@@ -33,8 +33,8 @@
 #include "core/os/memory.h"
 #include "core/os/mutex.h"
 #include "core/os/rw_lock.h"
-#include "core/pool_allocator.h"
-#include "core/safe_refcount.h"
+#include "core/os/pool_allocator.h"
+#include "core/os/safe_refcount.h"
 #include "core/string/ustring.h"
 
 struct MemoryPool {

core/containers/rid.h

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

core/containers/rid_handle.h

@@ -33,7 +33,7 @@
 #include "core/containers/list.h"
 #include "core/os/mutex.h"
 #include "core/containers/pooled_list.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "core/typedefs.h"
 
 #include <typeinfo>

core/error/error_macros.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "core/typedefs.h"
 
 /**

core/io/image_loader.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/io/resource_loader.h"
 #include "core/containers/list.h"
 #include "core/os/file_access.h"

core/io/resource_format_binary.cpp

@@ -30,7 +30,7 @@
 
 #include "resource_format_binary.h"
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/io/file_access_compressed.h"
 #include "core/io/marshalls.h"
 #include "core/os/dir_access.h"

core/math/expression.cpp

@@ -31,7 +31,7 @@
 #include "expression.h"
 
 #include "core/object/class_db.h"
-#include "core/func_ref.h"
+#include "core/object/func_ref.h"
 #include "core/io/marshalls.h"
 #include "core/math/math_funcs.h"
 #include "core/os/os.h"

core/object/object.h

@@ -35,7 +35,7 @@
 #include "core/containers/map.h"
 #include "core/object/object_id.h"
 #include "core/os/rw_lock.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "core/containers/set.h"
 #include "core/variant/variant.h"
 #include "core/containers/vmap.h"

core/object/reference.h

@@ -33,7 +33,7 @@
 #include "core/object/class_db.h"
 #include "core/object/object.h"
 #include "core/object/ref_ptr.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 
 class Reference : public Object {
 	GDCLASS(Reference, Object);

core/object/resource.h

@@ -34,7 +34,7 @@
 #include "core/object/object.h"
 #include "core/object/ref_ptr.h"
 #include "core/object/reference.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "core/containers/self_list.h"
 
 #define RES_BASE_EXTENSION(m_ext)                                                                                   \

core/os/memory.cpp

@@ -31,7 +31,7 @@
 #include "memory.h"
 
 #include "core/error/error_macros.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 
 #include <stdio.h>
 #include <stdlib.h>

core/os/memory.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/error/error_macros.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 
 #include <stddef.h>
 

core/os/os.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/config/engine.h"
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/io/logger.h"
 #include "core/containers/list.h"
 #include "core/os/main_loop.h"

core/os/thread.cpp

@@ -36,7 +36,7 @@
 
 #if !defined(NO_THREADS)
 
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 
 Error (*Thread::set_name_func)(const String &) = nullptr;
 void (*Thread::set_priority_func)(Thread::Priority) = nullptr;

core/os/thread.h

@@ -40,7 +40,7 @@
 #include "core/typedefs.h"
 
 #if !defined(NO_THREADS)
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include <thread>
 #endif
 

core/os/threaded_array_processor.h

@@ -34,7 +34,7 @@
 #include "core/os/os.h"
 #include "core/os/thread.h"
 #include "core/os/thread_safe.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 
 template <class C, class U>
 struct ThreadArrayProcessData {

core/register_core_types.cpp

@@ -38,7 +38,7 @@
 #include "core/crypto/crypto.h"
 #include "core/crypto/hashing_context.h"
 #include "core/config/engine.h"
-#include "core/func_ref.h"
+#include "core/object/func_ref.h"
 #include "core/input/input_map.h"
 #include "core/io/config_file.h"
 #include "core/io/dtls_server.h"

core/string/string_name.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/os/mutex.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "core/string/ustring.h"
 
 struct StaticCString {

core/variant/dictionary.cpp

@@ -31,7 +31,7 @@
 #include "dictionary.h"
 
 #include "core/containers/ordered_hash_map.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "core/variant/variant.h"
 
 struct DictionaryPrivate {

drivers/png/png_driver_common.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/containers/pool_vector.h"
 
 namespace PNGDriverCommon {

drivers/png/resource_saver_png.cpp

@@ -30,7 +30,7 @@
 
 #include "resource_saver_png.h"
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/os/file_access.h"
 #include "drivers/png/png_driver_common.h"
 #include "scene/resources/texture.h"

drivers/png/resource_saver_png.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/io/resource_saver.h"
 
 class ResourceSaverPNG : public ResourceFormatSaver {

editor/audio_stream_preview.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/os/thread.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 
 #include "scene/main/node.h"
 #include "servers/audio/audio_stream.h"

editor/editor_file_system.h

@@ -36,7 +36,7 @@
 #include "core/os/dir_access.h"
 #include "core/os/thread.h"
 #include "core/os/thread_safe.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "core/containers/set.h"
 #include "core/error/error_list.h"
 #include "core/containers/hash_map.h"

editor/editor_node.cpp

@@ -37,7 +37,7 @@
 #include "core/math/color.h"
 #include "core/config/engine.h"
 #include "core/error/error_macros.h"
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/io/config_file.h"
 #include "core/io/image_loader.h"
 #include "core/io/resource_importer.h"

editor/editor_node.h

@@ -53,7 +53,7 @@
 #include "core/string/print_string.h"
 #include "core/object/reference.h"
 #include "core/object/resource.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "core/containers/set.h"
 #include "core/string/string_name.h"
 #include "core/typedefs.h"

editor/editor_plugin.cpp

@@ -44,7 +44,7 @@
 #include "servers/visual_server.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/io/resource_importer.h"
 #include "core/math/aabb.h"
 #include "core/math/basis.h"

editor/editor_profiler.cpp

@@ -35,7 +35,7 @@
 #include "scene/main/timer.h"
 #include "core/object/class_db.h"
 #include "core/error/error_macros.h"
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/math/math_funcs.h"
 #include "core/math/vector2.h"
 #include "core/input/input_event.h"

editor/editor_resource_preview.cpp

@@ -42,7 +42,7 @@
 #include "editor_settings.h"
 #include "core/error/error_list.h"
 #include "core/error/error_macros.h"
-#include "core/image.h"
+#include "core/io/image.h"
 
 #include "core/os/memory.h"
 #include "core/os/os.h"

editor/editor_resource_preview.h

@@ -35,7 +35,7 @@
 
 #include "core/os/semaphore.h"
 #include "core/os/thread.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "core/containers/list.h"
 #include "core/containers/map.h"
 #include "core/math/vector2.h"

editor/editor_run_native.cpp

@@ -32,7 +32,7 @@
 
 #include "core/object/class_db.h"
 #include "core/error/error_macros.h"
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/os/memory.h"
 #include "core/object/reference.h"
 #include "core/typedefs.h"

editor/editor_themes.cpp

@@ -41,7 +41,7 @@
 #include "modules/modules_enabled.gen.h" // For svg.
 #include "core/math/color.h"
 #include "core/variant/dictionary.h"
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
 #include "core/math/vector2.h"

editor/import/resource_importer_bitmask.cpp

@@ -29,14 +29,14 @@
 /*************************************************************************/
 
 #include "resource_importer_bitmask.h"
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/io/config_file.h"
 #include "core/io/image_loader.h"
 #include "editor/editor_file_system.h"
 #include "editor/editor_node.h"
 #include "scene/resources/bit_map.h"
 #include "scene/resources/texture.h"
-#include "core/image.h"
+#include "core/io/image.h"
 
 String ResourceImporterBitMap::get_importer_name() const {
 	return "bitmap";

editor/import/resource_importer_image.cpp

@@ -34,7 +34,7 @@
 #include "core/io/resource_saver.h"
 #include "core/os/file_access.h"
 #include "scene/resources/texture.h"
-#include "core/image.h"
+#include "core/io/image.h"
 
 String ResourceImporterImage::get_importer_name() const {
 	return "image";

editor/import/resource_importer_layered_texture.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/io/resource_importer.h"
 
 class StreamTexture;

editor/import/resource_importer_texture.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/io/resource_importer.h"
 
 class StreamTexture;

editor/import/resource_importer_texture_atlas.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/io/resource_importer.h"
 
 class ResourceImporterTextureAtlas : public ResourceImporter {

editor/plugins/animation_player_editor_plugin.cpp

@@ -48,7 +48,7 @@
 #include "core/math/color.h"
 #include "core/error/error_list.h"
 #include "core/error/error_macros.h"
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/containers/list.h"
 #include "core/math/math_funcs.h"
 #include "core/math/rect2.h"

editor/plugins/cpu_particles_2d_editor_plugin.cpp

@@ -37,7 +37,7 @@
 #include "core/math/color.h"
 #include "core/error/error_list.h"
 #include "core/error/error_macros.h"
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/containers/list.h"
 #include "core/math/vector2.h"
 #include "core/os/memory.h"

editor/plugins/curve_editor_plugin.cpp

@@ -37,7 +37,7 @@
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/error/error_macros.h"
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
 #include "core/math/rect2.h"

editor/plugins/editor_preview_plugins.cpp

@@ -44,7 +44,7 @@
 #include "core/math/color.h"
 #include "core/error/error_list.h"
 #include "core/error/error_macros.h"
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/containers/list.h"
 #include "core/math/aabb.h"
 #include "core/math/audio_frame.h"

editor/plugins/editor_preview_plugins.h

@@ -32,7 +32,7 @@
 
 #include "editor/editor_resource_preview.h"
 
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "core/math/vector2.h"
 #include "core/object/object.h"
 #include "core/object/reference.h"

editor/plugins/sprite_editor_plugin.cpp

@@ -44,7 +44,7 @@
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/error/error_macros.h"
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/math/geometry.h"
 #include "core/math/rect2.h"
 #include "core/os/memory.h"

editor/plugins/texture_editor_plugin.cpp

@@ -34,7 +34,7 @@
 #include "scene/resources/dynamic_font.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/math/vector2.h"
 #include "core/os/memory.h"
 #include "scene/gui/control.h"

editor/project_manager.cpp

@@ -35,7 +35,7 @@
 #include "core/config/engine.h"
 #include "core/error/error_list.h"
 #include "core/error/error_macros.h"
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/io/config_file.h"
 #include "core/io/resource_saver.h"
 #include "core/io/stream_peer_ssl.h"

main/main.cpp

@@ -44,7 +44,7 @@
 #include "core/os/time.h"
 #include "core/config/project_settings.h"
 #include "core/register_core_types.h"
-#include "core/script_debugger_local.h"
+#include "core/object/script_debugger_local.h"
 #include "core/object/script_language.h"
 #include "core/string/translation.h"
 #include "core/version.h"

modules/cscript/cscript_functions.cpp

@@ -31,7 +31,7 @@
 #include "cscript_functions.h"
 
 #include "core/object/class_db.h"
-#include "core/func_ref.h"
+#include "core/object/func_ref.h"
 #include "core/io/json.h"
 #include "core/io/marshalls.h"
 #include "core/math/math_funcs.h"

modules/cvtt/image_compress_cvtt.cpp

@@ -33,7 +33,7 @@
 #include "core/os/os.h"
 #include "core/os/thread.h"
 #include "core/string/print_string.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 
 #include <ConvectionKernels.h>
 

modules/cvtt/image_compress_cvtt.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/image.h"
+#include "core/io/image.h"
 
 void image_compress_cvtt(Image *p_image, float p_lossy_quality, Image::CompressSource p_source);
 void image_decompress_cvtt(Image *p_image);

modules/etc/image_compress_etc.cpp

@@ -30,7 +30,7 @@
 
 #include "image_compress_etc.h"
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/os/os.h"
 #include "core/string/print_string.h"
 

modules/gdscript/gdscript_functions.cpp

@@ -31,7 +31,7 @@
 #include "gdscript_functions.h"
 
 #include "core/object/class_db.h"
-#include "core/func_ref.h"
+#include "core/object/func_ref.h"
 #include "core/io/json.h"
 #include "core/io/marshalls.h"
 #include "core/math/math_funcs.h"

modules/gltf/gltf_spec_gloss.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/object/resource.h"
 
 class GLTFSpecGloss : public Resource {

modules/material_maker/nodes/mm_material.h

@@ -1,7 +1,7 @@
 #ifndef MAT_MAKER_MATERIAL_H
 #define MAT_MAKER_MATERIAL_H
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
 #include "core/object/reference.h"

modules/material_maker/nodes/mm_node.h

@@ -1,7 +1,7 @@
 #ifndef MAT_MAKER_NODE_H
 #define MAT_MAKER_NODE_H
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
 #include "core/variant/variant.h"

modules/material_maker/nodes/mm_node_universal_property.h

@@ -1,7 +1,7 @@
 #ifndef MM_NODE_UNIVERSAL_PROPERTY_H
 #define MM_NODE_UNIVERSAL_PROPERTY_H
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
 #include "core/object/method_bind.h"

modules/mesh_data_resource/nodes/mesh_data_instance.cpp

@@ -2,7 +2,7 @@
 
 #include "scene/resources/texture.h"
 
-#include "core/image.h"
+#include "core/io/image.h"
 
 #if TEXTURE_PACKER_PRESENT
 #include "../../texture_packer/texture_resource/packer_image_resource.h"

modules/mesh_data_resource/nodes/mesh_data_instance_2d.cpp

@@ -2,7 +2,7 @@
 
 #include "scene/resources/texture.h"
 
-#include "core/image.h"
+#include "core/io/image.h"
 
 #if TEXTURE_PACKER_PRESENT
 #include "../../texture_packer/texture_resource/packer_image_resource.h"

modules/opensimplex/noise_texture.h

@@ -32,7 +32,7 @@
 
 #include "open_simplex_noise.h"
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/object/reference.h"
 #include "editor/editor_node.h"
 #include "editor/editor_plugin.h"

modules/opensimplex/open_simplex_noise.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/object/reference.h"
 #include "scene/resources/texture.h"
 

modules/paint/dialogs/paint_save_file_dialog.cpp

@@ -27,7 +27,7 @@ SOFTWARE.
 #include "../paint_canvas.h"
 #include "../paint_canvas_layer.h"
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/os/dir_access.h"
 #include "core/os/file_access.h"
 

modules/paint/paint_canvas_layer.h

@@ -27,7 +27,7 @@ SOFTWARE.
 
 #include "core/object/reference.h"
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "scene/resources/texture.h"
 
 class TextureRect;

modules/paint/paint_layer_button.cpp

@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "paint_layer_button.h"
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "scene/resources/style_box.h"
 #include "scene/resources/texture.h"
 

modules/paint/paint_window.cpp

@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "paint_window.h"
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/input/input.h"
 #include "scene/resources/texture.h"
 

modules/props/tiled_wall/tiled_wall.cpp

@@ -2,7 +2,7 @@
 
 #include "scene/resources/texture.h"
 
-#include "core/image.h"
+#include "core/io/image.h"
 
 #if TEXTURE_PACKER_PRESENT
 #include "../../texture_packer/texture_resource/packer_image_resource.h"

modules/props_2d/tiled_wall/tiled_wall_2d.cpp

@@ -2,7 +2,7 @@
 
 #include "scene/resources/texture.h"
 
-#include "core/image.h"
+#include "core/io/image.h"
 
 #if TEXTURE_PACKER_PRESENT
 #include "../../texture_packer/texture_resource/packer_image_resource.h"

modules/pvr/image_compress_pvrtc.cpp

@@ -30,7 +30,7 @@
 
 #include "image_compress_pvrtc.h"
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/object/reference.h"
 
 #include <PvrTcEncoder.h>

modules/squish/image_compress_squish.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/image.h"
+#include "core/io/image.h"
 
 void image_compress_squish(Image *p_image, float p_lossy_quality, Image::CompressSource p_source);
 void image_decompress_squish(Image *p_image);

modules/texture_packer/layers/texture_layer_merger.h

@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/object/reference.h"
 #include "core/containers/vector.h"
 

modules/texture_packer/texture_packer.h

@@ -23,7 +23,7 @@ SOFTWARE.
 */
 
 #include "core/math/color.h"
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/object/reference.h"
 #include "core/string/ustring.h"
 #include "core/containers/vector.h"

modules/texture_packer/texture_resource/packer_image_resource.h

@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "core/image.h"
+#include "core/io/image.h"
 
 #include "scene/resources/texture.h"
 

modules/texture_packer/texture_resource/packer_image_resource_importer.h

@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/string/ustring.h"
 
 #include "core/io/resource_saver.h"

modules/theora/video_stream_theora.h

@@ -35,7 +35,7 @@
 #include "core/os/semaphore.h"
 #include "core/os/thread.h"
 #include "core/containers/ring_buffer.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "scene/resources/video_stream.h"
 #include "servers/audio_server.h"
 

modules/wfc/image_indexer.h

@@ -1,7 +1,7 @@
 #ifndef IMAGE_INDEXER_H
 #define IMAGE_INDEXER_H
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/object/reference.h"
 #include "core/variant/variant.h"
 #include "core/containers/oa_hash_map.h"

platform/android/export/export_plugin.h

@@ -36,7 +36,7 @@
 #include "core/os/file_access.h"
 #include "core/os/os.h"
 #include "core/config/project_settings.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "core/version.h"
 #include "drivers/png/png_driver_common.h"
 #include "editor/editor_export.h"

platform/iphone/export/export.cpp

@@ -36,7 +36,7 @@
 #include "core/os/file_access.h"
 #include "core/os/os.h"
 #include "core/config/project_settings.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "core/version.h"
 #include "editor/editor_export.h"
 #include "editor/editor_node.h"

scene/2d/audio_stream_player_2d.h

@@ -32,7 +32,7 @@
 
 #include "core/math/audio_frame.h"
 #include "core/object/reference.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "scene/2d/node_2d.h"
 
 class AudioStreamPlayback;

scene/3d/audio_stream_player_3d.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "scene/3d/spatial.h"
 #include "servers/audio/audio_filter_sw.h"
 #include "servers/audio_server.h"

scene/3d/cpu_particles.h

@@ -32,7 +32,7 @@
 
 #include "core/object/reference.h"
 #include "core/containers/rid.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "scene/3d/visual_instance.h"
 
 class Curve;

scene/3d/room_manager.cpp

@@ -30,7 +30,7 @@
 
 #include "room_manager.h"
 
-#include "core/bitfield_dynamic.h"
+#include "core/containers/bitfield_dynamic.h"
 #include "core/config/engine.h"
 #include "core/math/geometry.h"
 #include "core/math/quick_hull.h"

scene/audio/audio_stream_player.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "scene/main/node.h"
 #include "servers/audio/audio_stream.h"
 

scene/main/http_request.h

@@ -32,7 +32,7 @@
 
 #include "core/io/http_client.h"
 #include "core/os/thread.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "node.h"
 
 class Timer;

scene/resources/bit_map.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/object/resource.h"
 
 class BitMap : public Resource {

servers/audio/audio_rb_resampler.h

@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/os/memory.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "core/typedefs.h"
 #include "servers/audio_server.h"
 

servers/audio/audio_stream.h

@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/object/resource.h"
 #include "servers/audio/audio_filter_sw.h"
 #include "servers/audio_server.h"