Merge pull request #21978 from akien-mga/include-core-absolute

Make core/ includes absolute, remove subfolders from include path

SConstruct

@@ -224,7 +224,7 @@ Help(opts.GenerateHelpText(env_base))  # generate help
 
 # add default include paths
 
-env_base.Append(CPPPATH=['#core', '#core/math', '#editor', '#drivers', '#'])
+env_base.Append(CPPPATH=['#editor', '#drivers', '#'])
 
 # configure ENV for platform
 env_base.platform_exporters = platform_exporters

core/SCsub

@@ -18,7 +18,7 @@ for x in env.global_defaults:
     gd_inc += '#include "platform/' + x + '/globals/global_defaults.h"\n'
     gd_call += "\tregister_" + x + "_global_defaults();\n"
 
-gd_cpp = '#include "project_settings.h"\n'
+gd_cpp = '#include "core/project_settings.h"\n'
 gd_cpp += gd_inc
 gd_cpp += "void ProjectSettings::register_global_defaults() {\n" + gd_call + "\n}\n"
 
@@ -52,7 +52,7 @@ if ("SCRIPT_AES256_ENCRYPTION_KEY" in os.environ):
 
 # NOTE: It is safe to generate this file here, since this is still executed serially
 with open("script_encryption_key.gen.cpp", "w") as f:
-    f.write("#include \"project_settings.h\"\nuint8_t script_encryption_key[32]={" + txt + "};\n")
+    f.write("#include \"core/project_settings.h\"\nuint8_t script_encryption_key[32]={" + txt + "};\n")
 
 
 # Add required thirdparty code. Header paths are hardcoded, we don't need to append

core/allocators.h

@@ -31,7 +31,8 @@
 #ifndef ALLOCATORS_H
 #define ALLOCATORS_H
 
-#include "os/memory.h"
+#include "core/os/memory.h"
+
 template <int PREALLOC_COUNT = 64, int MAX_HANDS = 8>
 class BalloonAllocator {
 

core/array.cpp

@@ -30,10 +30,10 @@
 
 #include "array.h"
 
-#include "hashfuncs.h"
-#include "object.h"
-#include "variant.h"
-#include "vector.h"
+#include "core/hashfuncs.h"
+#include "core/object.h"
+#include "core/variant.h"
+#include "core/vector.h"
 
 class ArrayPrivate {
 public:

core/array.h

@@ -31,7 +31,8 @@
 #ifndef ARRAY_H
 #define ARRAY_H
 
-#include "typedefs.h"
+#include "core/typedefs.h"
+
 class Variant;
 class ArrayPrivate;
 class Object;

core/bind/core_bind.cpp

@@ -30,14 +30,14 @@
 
 #include "core_bind.h"
 
+#include "core/io/file_access_compressed.h"
+#include "core/io/file_access_encrypted.h"
+#include "core/io/json.h"
+#include "core/io/marshalls.h"
+#include "core/math/geometry.h"
+#include "core/os/keyboard.h"
+#include "core/os/os.h"
 #include "core/project_settings.h"
-#include "geometry.h"
-#include "io/file_access_compressed.h"
-#include "io/file_access_encrypted.h"
-#include "io/json.h"
-#include "io/marshalls.h"
-#include "os/keyboard.h"
-#include "os/os.h"
 
 #include "thirdparty/misc/base64.h"
 

core/bind/core_bind.h

@@ -31,15 +31,15 @@
 #ifndef CORE_BIND_H
 #define CORE_BIND_H
 
-#include "image.h"
-#include "io/compression.h"
-#include "io/resource_loader.h"
-#include "io/resource_saver.h"
-#include "os/dir_access.h"
-#include "os/file_access.h"
-#include "os/os.h"
-#include "os/semaphore.h"
-#include "os/thread.h"
+#include "core/image.h"
+#include "core/io/compression.h"
+#include "core/io/resource_loader.h"
+#include "core/io/resource_saver.h"
+#include "core/os/dir_access.h"
+#include "core/os/file_access.h"
+#include "core/os/os.h"
+#include "core/os/semaphore.h"
+#include "core/os/thread.h"
 
 class _ResourceLoader : public Object {
 	GDCLASS(_ResourceLoader, Object);

core/class_db.cpp

@@ -30,9 +30,9 @@
 
 #include "class_db.h"
 
-#include "engine.h"
-#include "os/mutex.h"
-#include "version.h"
+#include "core/engine.h"
+#include "core/os/mutex.h"
+#include "core/version.h"
 
 #define OBJTYPE_RLOCK RWLockRead _rw_lockr_(lock);
 #define OBJTYPE_WLOCK RWLockWrite _rw_lockw_(lock);

core/class_db.h

@@ -31,16 +31,16 @@
 #ifndef CLASS_DB_H
 #define CLASS_DB_H
 
-#include "method_bind.h"
-#include "object.h"
-#include "print_string.h"
+#include "core/method_bind.h"
+#include "core/object.h"
+#include "core/print_string.h"
 
 /**
 	@author Juan Linietsky <reduzio@gmail.com>
 */
 
 /**	To bind more then 6 parameters include this:
- *  #include "method_bind_ext.gen.inc"
+ *  #include "core/method_bind_ext.gen.inc"
  */
 
 #define DEFVAL(m_defval) (m_defval)

core/color.cpp

@@ -30,10 +30,10 @@
 
 #include "color.h"
 
-#include "color_names.inc"
-#include "map.h"
-#include "math_funcs.h"
-#include "print_string.h"
+#include "core/color_names.inc"
+#include "core/map.h"
+#include "core/math/math_funcs.h"
+#include "core/print_string.h"
 
 uint32_t Color::to_argb32() const {
 

core/color.h

@@ -31,8 +31,8 @@
 #ifndef COLOR_H
 #define COLOR_H
 
-#include "math_funcs.h"
-#include "ustring.h"
+#include "core/math/math_funcs.h"
+#include "core/ustring.h"
 /**
 	@author Juan Linietsky <reduzio@gmail.com>
 */

core/color_names.inc

@@ -1,5 +1,5 @@
 // Names from https://en.wikipedia.org/wiki/List_of_colors (through https://raw.githubusercontent.com/SuperUserNameMan/color_to_name/616a7cddafefda91478b7bc26167de97fb5badb1/godot_version.gd), slightly edited and normalized
-#include "map.h"
+#include "core/map.h"
 
 static Map<String, Color> _named_colors;
 static void _populate_named_colors() {

core/command_queue_mt.cpp

@@ -30,7 +30,7 @@
 
 #include "command_queue_mt.h"
 
-#include "os/os.h"
+#include "core/os/os.h"
 
 void CommandQueueMT::lock() {
 

core/command_queue_mt.h

@@ -31,11 +31,11 @@
 #ifndef COMMAND_QUEUE_MT_H
 #define COMMAND_QUEUE_MT_H
 
-#include "os/memory.h"
-#include "os/mutex.h"
-#include "os/semaphore.h"
-#include "simple_type.h"
-#include "typedefs.h"
+#include "core/os/memory.h"
+#include "core/os/mutex.h"
+#include "core/os/semaphore.h"
+#include "core/simple_type.h"
+#include "core/typedefs.h"
 /**
 	@author Juan Linietsky <reduzio@gmail.com>
 */

core/compressed_translation.cpp

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

core/compressed_translation.h

@@ -31,7 +31,7 @@
 #ifndef COMPRESSED_TRANSLATION_H
 #define COMPRESSED_TRANSLATION_H
 
-#include "translation.h"
+#include "core/translation.h"
 
 class PHashTranslation : public Translation {
 

core/core_string_names.h

@@ -31,7 +31,7 @@
 #ifndef CORE_STRING_NAMES_H
 #define CORE_STRING_NAMES_H
 
-#include "string_db.h"
+#include "core/string_db.h"
 
 class CoreStringNames {
 

core/cowdata.h

@@ -31,8 +31,8 @@
 #ifndef COWDATA_H_
 #define COWDATA_H_
 
-#include "os/memory.h"
-#include "safe_refcount.h"
+#include "core/os/memory.h"
+#include "core/safe_refcount.h"
 
 template <class T>
 class Vector;

core/dictionary.cpp

@@ -30,9 +30,9 @@
 
 #include "dictionary.h"
 
-#include "ordered_hash_map.h"
-#include "safe_refcount.h"
-#include "variant.h"
+#include "core/ordered_hash_map.h"
+#include "core/safe_refcount.h"
+#include "core/variant.h"
 
 struct DictionaryPrivate {
 

core/dictionary.h

@@ -31,9 +31,10 @@
 #ifndef DICTIONARY_H
 #define DICTIONARY_H
 
-#include "array.h"
-#include "list.h"
-#include "ustring.h"
+#include "core/array.h"
+#include "core/list.h"
+#include "core/ustring.h"
+
 class Variant;
 
 struct DictionaryPrivate;

core/dvector.h

@@ -31,12 +31,12 @@
 #ifndef DVECTOR_H
 #define DVECTOR_H
 
-#include "os/copymem.h"
-#include "os/memory.h"
-#include "os/rw_lock.h"
-#include "pool_allocator.h"
-#include "safe_refcount.h"
-#include "ustring.h"
+#include "core/os/copymem.h"
+#include "core/os/memory.h"
+#include "core/os/rw_lock.h"
+#include "core/pool_allocator.h"
+#include "core/safe_refcount.h"
+#include "core/ustring.h"
 
 struct MemoryPool {
 

core/engine.cpp

@@ -30,11 +30,11 @@
 
 #include "engine.h"
 
-#include "authors.gen.h"
-#include "donors.gen.h"
-#include "license.gen.h"
-#include "version.h"
-#include "version_hash.gen.h"
+#include "core/authors.gen.h"
+#include "core/donors.gen.h"
+#include "core/license.gen.h"
+#include "core/version.h"
+#include "core/version_hash.gen.h"
 
 void Engine::set_iterations_per_second(int p_ips) {
 

core/engine.h

@@ -31,10 +31,10 @@
 #ifndef ENGINE_H
 #define ENGINE_H
 
-#include "list.h"
-#include "os/main_loop.h"
-#include "ustring.h"
-#include "vector.h"
+#include "core/list.h"
+#include "core/os/main_loop.h"
+#include "core/ustring.h"
+#include "core/vector.h"
 
 class Engine {
 

core/error_macros.cpp

@@ -30,7 +30,7 @@
 
 #include "error_macros.h"
 
-#include "io/logger.h"
+#include "core/io/logger.h"
 #include "os/os.h"
 
 bool _err_error_exists = false;

core/error_macros.h

@@ -31,7 +31,7 @@
 #ifndef ERROR_MACROS_H
 #define ERROR_MACROS_H
 
-#include "typedefs.h"
+#include "core/typedefs.h"
 /**
  * Error macros. Unlike exceptions and asserts, these macros try to maintain consistency and stability
  * inside the code. It is recommended to always return processable data, so in case of an error, the

core/func_ref.h

@@ -31,7 +31,7 @@
 #ifndef FUNC_REF_H
 #define FUNC_REF_H
 
-#include "reference.h"
+#include "core/reference.h"
 
 class FuncRef : public Reference {
 

core/global_constants.cpp

@@ -30,10 +30,10 @@
 
 #include "global_constants.h"
 
-#include "object.h"
-#include "os/input_event.h"
-#include "os/keyboard.h"
-#include "variant.h"
+#include "core/object.h"
+#include "core/os/input_event.h"
+#include "core/os/keyboard.h"
+#include "core/variant.h"
 
 struct _GlobalConstant {
 

core/global_constants.h

@@ -31,7 +31,7 @@
 #ifndef GLOBAL_CONSTANTS_H
 #define GLOBAL_CONSTANTS_H
 
-#include "string_db.h"
+#include "core/string_db.h"
 
 class GlobalConstants {
 public:

core/hash_map.h

@@ -31,12 +31,12 @@
 #ifndef HASH_MAP_H
 #define HASH_MAP_H
 
-#include "error_macros.h"
-#include "hashfuncs.h"
-#include "list.h"
-#include "math_funcs.h"
-#include "os/memory.h"
-#include "ustring.h"
+#include "core/error_macros.h"
+#include "core/hashfuncs.h"
+#include "core/list.h"
+#include "core/math/math_funcs.h"
+#include "core/os/memory.h"
+#include "core/ustring.h"
 
 /**
  * @class HashMap

core/hashfuncs.h

@@ -31,12 +31,12 @@
 #ifndef HASHFUNCS_H
 #define HASHFUNCS_H
 
-#include "math_defs.h"
-#include "math_funcs.h"
-#include "node_path.h"
-#include "string_db.h"
-#include "typedefs.h"
-#include "ustring.h"
+#include "core/math/math_defs.h"
+#include "core/math/math_funcs.h"
+#include "core/node_path.h"
+#include "core/string_db.h"
+#include "core/typedefs.h"
+#include "core/ustring.h"
 
 /**
  * Hashing functions

core/helper/math_fieldwise.cpp

@@ -30,7 +30,7 @@
 
 #ifdef TOOLS_ENABLED
 
-#include "core/helper/math_fieldwise.h"
+#include "math_fieldwise.h"
 
 #define SETUP_TYPE(m_type)    \
 	m_type source = p_source; \

core/image.cpp

@@ -30,15 +30,15 @@
 
 #include "image.h"
 
+#include "core/hash_map.h"
 #include "core/io/image_loader.h"
+#include "core/io/resource_loader.h"
+#include "core/math/math_funcs.h"
 #include "core/os/copymem.h"
-#include "hash_map.h"
-#include "math_funcs.h"
-#include "print_string.h"
+#include "core/print_string.h"
 
-#include "io/resource_loader.h"
-#include "math_funcs.h"
 #include "thirdparty/misc/hq2x.h"
+
 #include <stdio.h>
 
 const char *Image::format_names[Image::FORMAT_MAX] = {

core/image.h

@@ -31,10 +31,10 @@
 #ifndef IMAGE_H
 #define IMAGE_H
 
-#include "color.h"
-#include "dvector.h"
-#include "rect2.h"
-#include "resource.h"
+#include "core/color.h"
+#include "core/dvector.h"
+#include "core/math/rect2.h"
+#include "core/resource.h"
 
 /**
  *	@author Juan Linietsky <reduzio@gmail.com>

core/input_map.cpp

@@ -30,8 +30,8 @@
 
 #include "input_map.h"
 
-#include "os/keyboard.h"
-#include "project_settings.h"
+#include "core/os/keyboard.h"
+#include "core/project_settings.h"
 
 InputMap *InputMap::singleton = NULL;
 

core/input_map.h

@@ -31,8 +31,8 @@
 #ifndef INPUT_MAP_H
 #define INPUT_MAP_H
 
-#include "object.h"
-#include "os/input_event.h"
+#include "core/object.h"
+#include "core/os/input_event.h"
 
 class InputMap : public Object {
 

core/io/compression.cpp

@@ -29,9 +29,10 @@
 /*************************************************************************/
 
 #include "compression.h"
-#include "os/copymem.h"
-#include "project_settings.h"
-#include "zip_io.h"
+
+#include "core/io/zip_io.h"
+#include "core/os/copymem.h"
+#include "core/project_settings.h"
 
 #include "thirdparty/misc/fastlz.h"
 

core/io/compression.h

@@ -31,7 +31,7 @@
 #ifndef COMPRESSION_H
 #define COMPRESSION_H
 
-#include "typedefs.h"
+#include "core/typedefs.h"
 
 class Compression {
 

core/io/config_file.cpp

@@ -29,9 +29,10 @@
 /*************************************************************************/
 
 #include "config_file.h"
-#include "os/file_access.h"
-#include "os/keyboard.h"
-#include "variant_parser.h"
+
+#include "core/os/file_access.h"
+#include "core/os/keyboard.h"
+#include "core/variant_parser.h"
 
 PoolStringArray ConfigFile::_get_sections() const {
 

core/io/config_file.h

@@ -32,7 +32,7 @@
 #define CONFIG_FILE_H
 
 #include "core/ordered_hash_map.h"
-#include "reference.h"
+#include "core/reference.h"
 
 class ConfigFile : public Reference {
 

core/io/file_access_buffered.cpp

@@ -30,9 +30,7 @@
 
 #include "file_access_buffered.h"
 
-#include <string.h>
-
-#include "error_macros.h"
+#include "core/error_macros.h"
 
 Error FileAccessBuffered::set_error(Error p_error) const {
 

core/io/file_access_buffered.h

@@ -31,10 +31,9 @@
 #ifndef FILE_ACCESS_BUFFERED_H
 #define FILE_ACCESS_BUFFERED_H
 
-#include "os/file_access.h"
-
-#include "dvector.h"
-#include "ustring.h"
+#include "core/dvector.h"
+#include "core/os/file_access.h"
+#include "core/ustring.h"
 
 class FileAccessBuffered : public FileAccess {
 

core/io/file_access_compressed.cpp

@@ -29,7 +29,9 @@
 /*************************************************************************/
 
 #include "file_access_compressed.h"
-#include "print_string.h"
+
+#include "core/print_string.h"
+
 void FileAccessCompressed::configure(const String &p_magic, Compression::Mode p_mode, int p_block_size) {
 
 	magic = p_magic.ascii().get_data();

core/io/file_access_compressed.h

@@ -31,8 +31,8 @@
 #ifndef FILE_ACCESS_COMPRESSED_H
 #define FILE_ACCESS_COMPRESSED_H
 
-#include "io/compression.h"
-#include "os/file_access.h"
+#include "core/io/compression.h"
+#include "core/os/file_access.h"
 
 class FileAccessCompressed : public FileAccess {
 

core/io/file_access_encrypted.cpp

@@ -30,9 +30,9 @@
 
 #include "file_access_encrypted.h"
 
+#include "core/os/copymem.h"
+#include "core/print_string.h"
 #include "core/variant.h"
-#include "os/copymem.h"
-#include "print_string.h"
 
 #include "thirdparty/misc/aes256.h"
 #include "thirdparty/misc/md5.h"

core/io/file_access_encrypted.h

@@ -31,7 +31,7 @@
 #ifndef FILE_ACCESS_ENCRYPTED_H
 #define FILE_ACCESS_ENCRYPTED_H
 
-#include "os/file_access.h"
+#include "core/os/file_access.h"
 
 class FileAccessEncrypted : public FileAccess {
 public:

core/io/file_access_memory.cpp

@@ -30,10 +30,10 @@
 
 #include "file_access_memory.h"
 
-#include "map.h"
-#include "os/copymem.h"
-#include "os/dir_access.h"
-#include "project_settings.h"
+#include "core/map.h"
+#include "core/os/copymem.h"
+#include "core/os/dir_access.h"
+#include "core/project_settings.h"
 
 static Map<String, Vector<uint8_t> > *files = NULL;
 

core/io/file_access_memory.h

@@ -31,7 +31,7 @@
 #ifndef FILE_ACCESS_MEMORY_H
 #define FILE_ACCESS_MEMORY_H
 
-#include "os/file_access.h"
+#include "core/os/file_access.h"
 
 class FileAccessMemory : public FileAccess {
 

core/io/file_access_network.cpp

@@ -29,10 +29,11 @@
 /*************************************************************************/
 
 #include "file_access_network.h"
-#include "io/ip.h"
-#include "marshalls.h"
-#include "os/os.h"
-#include "project_settings.h"
+
+#include "core/io/ip.h"
+#include "core/io/marshalls.h"
+#include "core/os/os.h"
+#include "core/project_settings.h"
 
 //#define DEBUG_PRINT(m_p) print_line(m_p)
 //#define DEBUG_TIME(m_what) printf("MS: %s - %lli\n",m_what,OS::get_singleton()->get_ticks_usec());

core/io/file_access_network.h

@@ -31,10 +31,10 @@
 #ifndef FILE_ACCESS_NETWORK_H
 #define FILE_ACCESS_NETWORK_H
 
-#include "io/stream_peer_tcp.h"
-#include "os/file_access.h"
-#include "os/semaphore.h"
-#include "os/thread.h"
+#include "core/io/stream_peer_tcp.h"
+#include "core/os/file_access.h"
+#include "core/os/semaphore.h"
+#include "core/os/thread.h"
 
 class FileAccessNetwork;
 

core/io/file_access_pack.cpp

@@ -29,7 +29,8 @@
 /*************************************************************************/
 
 #include "file_access_pack.h"
-#include "version.h"
+
+#include "core/version.h"
 
 #include <stdio.h>
 

core/io/file_access_pack.h

@@ -31,11 +31,11 @@
 #ifndef FILE_ACCESS_PACK_H
 #define FILE_ACCESS_PACK_H
 
-#include "list.h"
-#include "map.h"
-#include "os/dir_access.h"
-#include "os/file_access.h"
-#include "print_string.h"
+#include "core/list.h"
+#include "core/map.h"
+#include "core/os/dir_access.h"
+#include "core/os/file_access.h"
+#include "core/print_string.h"
 
 class PackSource;
 

core/io/file_access_zip.h

@@ -34,7 +34,7 @@
 #define FILE_ACCESS_ZIP_H
 
 #include "core/io/file_access_pack.h"
-#include "map.h"
+#include "core/map.h"
 
 #include "thirdparty/minizip/unzip.h"
 

core/io/http_client.cpp

@@ -29,8 +29,9 @@
 /*************************************************************************/
 
 #include "http_client.h"
-#include "io/stream_peer_ssl.h"
-#include "version.h"
+
+#include "core/io/stream_peer_ssl.h"
+#include "core/version.h"
 
 const char *HTTPClient::_methods[METHOD_MAX] = {
 	"GET",

core/io/http_client.h

@@ -31,10 +31,10 @@
 #ifndef HTTP_CLIENT_H
 #define HTTP_CLIENT_H
 
-#include "io/ip.h"
-#include "io/stream_peer.h"
-#include "io/stream_peer_tcp.h"
-#include "reference.h"
+#include "core/io/ip.h"
+#include "core/io/stream_peer.h"
+#include "core/io/stream_peer_tcp.h"
+#include "core/reference.h"
 
 class HTTPClient : public Reference {
 

core/io/image_loader.cpp

@@ -30,7 +30,8 @@
 
 #include "image_loader.h"
 
-#include "print_string.h"
+#include "core/print_string.h"
+
 bool ImageFormatLoader::recognize(const String &p_extension) const {
 
 	List<String> extensions;

core/io/image_loader.h

@@ -31,11 +31,11 @@
 #ifndef IMAGE_LOADER_H
 #define IMAGE_LOADER_H
 
-#include "image.h"
-#include "io/resource_loader.h"
-#include "list.h"
-#include "os/file_access.h"
-#include "ustring.h"
+#include "core/image.h"
+#include "core/io/resource_loader.h"
+#include "core/list.h"
+#include "core/os/file_access.h"
+#include "core/ustring.h"
 
 /**
 	@author Juan Linietsky <reduzio@gmail.com>

core/io/ip.cpp

@@ -29,9 +29,10 @@
 /*************************************************************************/
 
 #include "ip.h"
-#include "hash_map.h"
-#include "os/semaphore.h"
-#include "os/thread.h"
+
+#include "core/hash_map.h"
+#include "core/os/semaphore.h"
+#include "core/os/thread.h"
 
 VARIANT_ENUM_CAST(IP::ResolverStatus);
 

core/io/ip.h

@@ -31,8 +31,8 @@
 #ifndef IP_H
 #define IP_H
 
-#include "io/ip_address.h"
-#include "os/os.h"
+#include "core/io/ip_address.h"
+#include "core/os/os.h"
 
 struct _IP_ResolverPrivate;
 

core/io/ip_address.h

@@ -31,7 +31,7 @@
 #ifndef IP_ADDRESS_H
 #define IP_ADDRESS_H
 
-#include "ustring.h"
+#include "core/ustring.h"
 
 struct IP_Address {
 

core/io/json.cpp

@@ -29,7 +29,8 @@
 /*************************************************************************/
 
 #include "json.h"
-#include "print_string.h"
+
+#include "core/print_string.h"
 
 const char *JSON::tk_name[TK_MAX] = {
 	"'{'",

core/io/json.h

@@ -31,7 +31,7 @@
 #ifndef JSON_H
 #define JSON_H
 
-#include "variant.h"
+#include "core/variant.h"
 
 class JSON {
 

core/io/logger.cpp

@@ -30,9 +30,9 @@
 
 #include "logger.h"
 
-#include "os/dir_access.h"
-#include "os/os.h"
-#include "print_string.h"
+#include "core/os/dir_access.h"
+#include "core/os/os.h"
+#include "core/print_string.h"
 
 // va_copy was defined in the C99, but not in C++ standards before C++11.
 // When you compile C++ without --std=c++<XX> option, compilers still define

core/io/logger.h

@@ -31,9 +31,10 @@
 #ifndef LOGGER_H
 #define LOGGER_H
 
-#include "os/file_access.h"
-#include "ustring.h"
-#include "vector.h"
+#include "core/os/file_access.h"
+#include "core/ustring.h"
+#include "core/vector.h"
+
 #include <stdarg.h>
 
 class Logger {
@@ -106,4 +107,4 @@ public:
 	virtual ~CompositeLogger();
 };
 
-#endif
+#endif

core/io/marshalls.cpp

@@ -29,9 +29,11 @@
 /*************************************************************************/
 
 #include "marshalls.h"
-#include "os/keyboard.h"
-#include "print_string.h"
-#include "reference.h"
+
+#include "core/os/keyboard.h"
+#include "core/print_string.h"
+#include "core/reference.h"
+
 #include <limits.h>
 #include <stdio.h>
 

core/io/marshalls.h

@@ -31,10 +31,10 @@
 #ifndef MARSHALLS_H
 #define MARSHALLS_H
 
-#include "typedefs.h"
+#include "core/reference.h"
+#include "core/typedefs.h"
+#include "core/variant.h"
 
-#include "reference.h"
-#include "variant.h"
 /**
   * Miscellaneous helpers for marshalling data types, and encoding
   * in an endian independent way

core/io/multiplayer_api.cpp

@@ -28,7 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/io/multiplayer_api.h"
+#include "multiplayer_api.h"
+
 #include "core/io/marshalls.h"
 #include "scene/main/node.h"
 

core/io/networked_multiplayer_peer.h

@@ -31,7 +31,7 @@
 #ifndef NETWORKED_MULTIPLAYER_PEER_H
 #define NETWORKED_MULTIPLAYER_PEER_H
 
-#include "io/packet_peer.h"
+#include "core/io/packet_peer.h"
 
 class NetworkedMultiplayerPeer : public PacketPeer {
 

core/io/packet_peer.cpp

@@ -30,8 +30,9 @@
 
 #include "packet_peer.h"
 
-#include "io/marshalls.h"
-#include "project_settings.h"
+#include "core/io/marshalls.h"
+#include "core/project_settings.h"
+
 /* helpers / binders */
 
 PacketPeer::PacketPeer() {

core/io/packet_peer.h

@@ -31,9 +31,10 @@
 #ifndef PACKET_PEER_H
 #define PACKET_PEER_H
 
-#include "io/stream_peer.h"
-#include "object.h"
-#include "ring_buffer.h"
+#include "core/io/stream_peer.h"
+#include "core/object.h"
+#include "core/ring_buffer.h"
+
 class PacketPeer : public Reference {
 
 	GDCLASS(PacketPeer, Reference);

core/io/packet_peer_udp.cpp

@@ -29,7 +29,8 @@
 /*************************************************************************/
 
 #include "packet_peer_udp.h"
-#include "io/ip.h"
+
+#include "core/io/ip.h"
 
 PacketPeerUDP *(*PacketPeerUDP::_create)() = NULL;
 

core/io/packet_peer_udp.h

@@ -31,8 +31,8 @@
 #ifndef PACKET_PEER_UDP_H
 #define PACKET_PEER_UDP_H
 
-#include "io/ip.h"
-#include "io/packet_peer.h"
+#include "core/io/ip.h"
+#include "core/io/packet_peer.h"
 
 class PacketPeerUDP : public PacketPeer {
 	GDCLASS(PacketPeerUDP, PacketPeer);

core/io/pck_packer.cpp

@@ -29,8 +29,9 @@
 /*************************************************************************/
 
 #include "pck_packer.h"
+
 #include "core/os/file_access.h"
-#include "version.h"
+#include "core/version.h"
 
 static uint64_t _align(uint64_t p_n, int p_alignment) {
 

core/io/resource_format_binary.h

@@ -31,9 +31,9 @@
 #ifndef RESOURCE_FORMAT_BINARY_H
 #define RESOURCE_FORMAT_BINARY_H
 
-#include "io/resource_loader.h"
-#include "io/resource_saver.h"
-#include "os/file_access.h"
+#include "core/io/resource_loader.h"
+#include "core/io/resource_saver.h"
+#include "core/os/file_access.h"
 
 class ResourceInteractiveLoaderBinary : public ResourceInteractiveLoader {
 

core/io/resource_import.cpp

@@ -30,8 +30,8 @@
 
 #include "resource_import.h"
 
-#include "os/os.h"
-#include "variant_parser.h"
+#include "core/os/os.h"
+#include "core/variant_parser.h"
 
 Error ResourceFormatImporter::_get_path_and_type(const String &p_path, PathAndType &r_path_and_type, bool *r_valid) const {
 

core/io/resource_import.h

@@ -31,7 +31,8 @@
 #ifndef RESOURCE_IMPORT_H
 #define RESOURCE_IMPORT_H
 
-#include "io/resource_loader.h"
+#include "core/io/resource_loader.h"
+
 class ResourceImporter;
 
 class ResourceFormatImporter : public ResourceFormatLoader {

core/io/resource_loader.cpp

@@ -29,14 +29,16 @@
 /*************************************************************************/
 
 #include "resource_loader.h"
-#include "io/resource_import.h"
-#include "os/file_access.h"
-#include "os/os.h"
-#include "path_remap.h"
-#include "print_string.h"
-#include "project_settings.h"
-#include "translation.h"
-#include "variant_parser.h"
+
+#include "core/io/resource_import.h"
+#include "core/os/file_access.h"
+#include "core/os/os.h"
+#include "core/path_remap.h"
+#include "core/print_string.h"
+#include "core/project_settings.h"
+#include "core/translation.h"
+#include "core/variant_parser.h"
+
 ResourceFormatLoader *ResourceLoader::loader[MAX_LOADERS];
 
 int ResourceLoader::loader_count = 0;

core/io/resource_loader.h

@@ -31,7 +31,7 @@
 #ifndef RESOURCE_LOADER_H
 #define RESOURCE_LOADER_H
 
-#include "resource.h"
+#include "core/resource.h"
 
 /**
 	@author Juan Linietsky <reduzio@gmail.com>

core/io/resource_saver.cpp

@@ -29,10 +29,11 @@
 /*************************************************************************/
 
 #include "resource_saver.h"
-#include "os/file_access.h"
-#include "project_settings.h"
-#include "resource_loader.h"
-#include "script_language.h"
+
+#include "core/io/resource_loader.h"
+#include "core/os/file_access.h"
+#include "core/project_settings.h"
+#include "core/script_language.h"
 
 ResourceFormatSaver *ResourceSaver::saver[MAX_SAVERS];
 

core/io/resource_saver.h

@@ -31,7 +31,7 @@
 #ifndef RESOURCE_SAVER_H
 #define RESOURCE_SAVER_H
 
-#include "resource.h"
+#include "core/resource.h"
 
 /**
 	@author Juan Linietsky <reduzio@gmail.com>

core/io/stream_peer.cpp

@@ -29,7 +29,8 @@
 /*************************************************************************/
 
 #include "stream_peer.h"
-#include "io/marshalls.h"
+
+#include "core/io/marshalls.h"
 
 Error StreamPeer::_put_data(const PoolVector<uint8_t> &p_data) {
 

core/io/stream_peer.h

@@ -31,7 +31,7 @@
 #ifndef STREAM_PEER_H
 #define STREAM_PEER_H
 
-#include "reference.h"
+#include "core/reference.h"
 
 class StreamPeer : public Reference {
 	GDCLASS(StreamPeer, Reference);

core/io/stream_peer_ssl.cpp

@@ -29,8 +29,9 @@
 /*************************************************************************/
 
 #include "stream_peer_ssl.h"
-#include "os/file_access.h"
-#include "project_settings.h"
+
+#include "core/os/file_access.h"
+#include "core/project_settings.h"
 
 StreamPeerSSL *(*StreamPeerSSL::_create)() = NULL;
 

core/io/stream_peer_ssl.h

@@ -31,7 +31,7 @@
 #ifndef STREAM_PEER_SSL_H
 #define STREAM_PEER_SSL_H
 
-#include "io/stream_peer.h"
+#include "core/io/stream_peer.h"
 
 class StreamPeerSSL : public StreamPeer {
 	GDCLASS(StreamPeerSSL, StreamPeer);

core/io/stream_peer_tcp.h

@@ -31,10 +31,9 @@
 #ifndef STREAM_PEER_TCP_H
 #define STREAM_PEER_TCP_H
 
-#include "stream_peer.h"
-
-#include "io/ip.h"
-#include "ip_address.h"
+#include "core/io/ip.h"
+#include "core/io/ip_address.h"
+#include "core/io/stream_peer.h"
 
 class StreamPeerTCP : public StreamPeer {
 

core/io/tcp_server.h

@@ -31,9 +31,9 @@
 #ifndef TCP_SERVER_H
 #define TCP_SERVER_H
 
-#include "io/ip.h"
-#include "io/stream_peer.h"
-#include "stream_peer_tcp.h"
+#include "core/io/ip.h"
+#include "core/io/stream_peer.h"
+#include "core/io/stream_peer_tcp.h"
 
 class TCP_Server : public Reference {
 

core/io/translation_loader_po.cpp

@@ -29,8 +29,9 @@
 /*************************************************************************/
 
 #include "translation_loader_po.h"
-#include "os/file_access.h"
-#include "translation.h"
+
+#include "core/os/file_access.h"
+#include "core/translation.h"
 
 RES TranslationLoaderPO::load_translation(FileAccess *f, Error *r_error, const String &p_path) {
 

core/io/translation_loader_po.h

@@ -31,9 +31,10 @@
 #ifndef TRANSLATION_LOADER_PO_H
 #define TRANSLATION_LOADER_PO_H
 
-#include "io/resource_loader.h"
-#include "os/file_access.h"
-#include "translation.h"
+#include "core/io/resource_loader.h"
+#include "core/os/file_access.h"
+#include "core/translation.h"
+
 class TranslationLoaderPO : public ResourceFormatLoader {
 public:
 	static RES load_translation(FileAccess *f, Error *r_error, const String &p_path = String());

core/io/xml_parser.cpp

@@ -29,7 +29,9 @@
 /*************************************************************************/
 
 #include "xml_parser.h"
-#include "print_string.h"
+
+#include "core/print_string.h"
+
 //#define DEBUG_XML
 
 VARIANT_ENUM_CAST(XMLParser::NodeType);

core/io/xml_parser.h

@@ -31,10 +31,10 @@
 #ifndef XML_PARSER_H
 #define XML_PARSER_H
 
-#include "os/file_access.h"
-#include "reference.h"
-#include "ustring.h"
-#include "vector.h"
+#include "core/os/file_access.h"
+#include "core/reference.h"
+#include "core/ustring.h"
+#include "core/vector.h"
 
 /*
   Based on irrXML (see their zlib license). Added mainly for compatibility with their Collada loader.

core/io/zip_io.h

@@ -31,8 +31,8 @@
 #ifndef ZIP_IO_H
 #define ZIP_IO_H
 
-#include "os/copymem.h"
-#include "os/file_access.h"
+#include "core/os/copymem.h"
+#include "core/os/file_access.h"
 
 #include "thirdparty/minizip/unzip.h"
 #include "thirdparty/minizip/zip.h"

core/list.h

@@ -31,8 +31,8 @@
 #ifndef GLOBALS_LIST_H
 #define GLOBALS_LIST_H
 
-#include "os/memory.h"
-#include "sort.h"
+#include "core/os/memory.h"
+#include "core/sort.h"
 
 /**
  * Generic Templatized Linked List Implementation.

core/map.h

@@ -31,7 +31,7 @@
 #ifndef MAP_H
 #define MAP_H
 
-#include "set.h"
+#include "core/set.h"
 
 /**
 	@author Juan Linietsky <reduzio@gmail.com>

core/math/a_star.cpp

@@ -29,9 +29,10 @@
 /*************************************************************************/
 
 #include "a_star.h"
-#include "geometry.h"
+
+#include "core/math/geometry.h"
+#include "core/script_language.h"
 #include "scene/scene_string_names.h"
-#include "script_language.h"
 
 int AStar::get_available_point_id() const {
 

core/math/a_star.h

@@ -31,8 +31,9 @@
 #ifndef ASTAR_H
 #define ASTAR_H
 
-#include "reference.h"
-#include "self_list.h"
+#include "core/reference.h"
+#include "core/self_list.h"
+
 /**
 	A* pathfinding algorithm
 

core/math/aabb.cpp

@@ -30,7 +30,7 @@
 
 #include "aabb.h"
 
-#include "print_string.h"
+#include "core/print_string.h"
 
 real_t AABB::get_area() const {
 

core/math/aabb.h

@@ -31,9 +31,9 @@
 #ifndef AABB_H
 #define AABB_H
 
-#include "math_defs.h"
-#include "plane.h"
-#include "vector3.h"
+#include "core/math/math_defs.h"
+#include "core/math/plane.h"
+#include "core/math/vector3.h"
 
 /**
  * AABB / AABB (Axis Aligned Bounding Box)

core/math/audio_frame.h

@@ -31,7 +31,7 @@
 #ifndef AUDIOFRAME_H
 #define AUDIOFRAME_H
 
-#include "typedefs.h"
+#include "core/typedefs.h"
 
 static inline float undenormalise(volatile float f) {
 	union {

core/math/bsp_tree.cpp

@@ -29,8 +29,9 @@
 /*************************************************************************/
 
 #include "bsp_tree.h"
-#include "error_macros.h"
-#include "print_string.h"
+
+#include "core/error_macros.h"
+#include "core/print_string.h"
 
 void BSP_Tree::from_aabb(const AABB &p_aabb) {
 

core/math/bsp_tree.h

@@ -31,13 +31,13 @@
 #ifndef BSP_TREE_H
 #define BSP_TREE_H
 
-#include "aabb.h"
-#include "dvector.h"
-#include "face3.h"
-#include "method_ptrcall.h"
-#include "plane.h"
-#include "variant.h"
-#include "vector.h"
+#include "core/dvector.h"
+#include "core/math/aabb.h"
+#include "core/math/face3.h"
+#include "core/math/plane.h"
+#include "core/method_ptrcall.h"
+#include "core/variant.h"
+#include "core/vector.h"
 /**
 	@author Juan Linietsky <reduzio@gmail.com>
 */

core/math/camera_matrix.cpp

@@ -29,8 +29,9 @@
 /*************************************************************************/
 
 #include "camera_matrix.h"
-#include "math_funcs.h"
-#include "print_string.h"
+
+#include "core/math/math_funcs.h"
+#include "core/print_string.h"
 
 void CameraMatrix::set_identity() {