diff --git a/core/SCsub b/core/SCsub
index 04c033100..42cccf734 100644
--- a/core/SCsub
+++ b/core/SCsub
@@ -184,6 +184,7 @@ SConscript("math/SCsub")
 SConscript("string/SCsub")
 SConscript("containers/SCsub")
 SConscript("variant/SCsub")
+SConscript("error/SCsub")
 SConscript("crypto/SCsub")
 SConscript("io/SCsub")
 SConscript("log/SCsub")
diff --git a/core/bitfield_dynamic.h b/core/bitfield_dynamic.h
index 0da930cb0..5eb0b2466 100644
--- a/core/bitfield_dynamic.h
+++ b/core/bitfield_dynamic.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 
 class BitFieldDynamic {
 public:
diff --git a/core/containers/cowdata.h b/core/containers/cowdata.h
index 5408fab4f..c3a535f0c 100644
--- a/core/containers/cowdata.h
+++ b/core/containers/cowdata.h
@@ -32,7 +32,7 @@
 
 #include <string.h>
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/os/memory.h"
 #include "core/safe_refcount.h"
 
diff --git a/core/containers/hash_map.h b/core/containers/hash_map.h
index 0ecb7cfdf..2e694c71d 100644
--- a/core/containers/hash_map.h
+++ b/core/containers/hash_map.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/hashfuncs.h"
 #include "core/containers/list.h"
 #include "core/math/math_funcs.h"
diff --git a/core/containers/list.h b/core/containers/list.h
index dd6407d91..bee327f04 100644
--- a/core/containers/list.h
+++ b/core/containers/list.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/os/memory.h"
 #include "core/containers/sort_array.h"
 
diff --git a/core/containers/local_vector.h b/core/containers/local_vector.h
index 2923d9c5b..06d837629 100644
--- a/core/containers/local_vector.h
+++ b/core/containers/local_vector.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/os/memory.h"
 #include "core/containers/pool_vector.h"
 #include "core/containers/sort_array.h"
diff --git a/core/containers/map.h b/core/containers/map.h
index d9efdc7ad..9c9031328 100644
--- a/core/containers/map.h
+++ b/core/containers/map.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/os/memory.h"
 
 // based on the very nice implementation of rb-trees by:
diff --git a/core/containers/rb_map.h b/core/containers/rb_map.h
index d2507a053..cc84b0da3 100644
--- a/core/containers/rb_map.h
+++ b/core/containers/rb_map.h
@@ -31,7 +31,7 @@
 #ifndef RB_MAP_H
 #define RB_MAP_H
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/os/memory.h"
 #include "core/pair.h"
 
diff --git a/core/containers/self_list.h b/core/containers/self_list.h
index a54597caf..338c67f72 100644
--- a/core/containers/self_list.h
+++ b/core/containers/self_list.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/typedefs.h"
 
 template <class T>
diff --git a/core/containers/sort_array.h b/core/containers/sort_array.h
index 128bf9e78..8dea0453c 100644
--- a/core/containers/sort_array.h
+++ b/core/containers/sort_array.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/typedefs.h"
 
 #define ERR_BAD_COMPARE(cond)                                         \
diff --git a/core/containers/vector.h b/core/containers/vector.h
index e82ed5768..01b325d80 100644
--- a/core/containers/vector.h
+++ b/core/containers/vector.h
@@ -37,7 +37,7 @@
  */
 
 #include "core/containers/cowdata.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/os/memory.h"
 #include "core/containers/sort_array.h"
 
diff --git a/core/error/SCsub b/core/error/SCsub
new file mode 100644
index 000000000..dfd6248a9
--- /dev/null
+++ b/core/error/SCsub
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+Import("env")
+
+env_error = env.Clone()
+
+env_error.add_source_files(env.core_sources, "*.cpp")
diff --git a/core/error_list.h b/core/error/error_list.h
similarity index 100%
rename from core/error_list.h
rename to core/error/error_list.h
diff --git a/core/error_macros.cpp b/core/error/error_macros.cpp
similarity index 99%
rename from core/error_macros.cpp
rename to core/error/error_macros.cpp
index a26edea9a..6b087900d 100644
--- a/core/error_macros.cpp
+++ b/core/error/error_macros.cpp
@@ -32,7 +32,7 @@
 
 #include "core/io/logger.h"
 #include "core/string/ustring.h"
-#include "os/os.h"
+#include "core/os/os.h"
 
 static ErrorHandlerList *error_handler_list = nullptr;
 
diff --git a/core/error_macros.h b/core/error/error_macros.h
similarity index 100%
rename from core/error_macros.h
rename to core/error/error_macros.h
diff --git a/core/image.cpp b/core/image.cpp
index cfa5757c5..486c7e142 100644
--- a/core/image.cpp
+++ b/core/image.cpp
@@ -30,7 +30,7 @@
 
 #include "image.h"
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/hash_map.h"
 #include "core/io/image_loader.h"
 #include "core/io/resource_loader.h"
diff --git a/core/math/bsp_tree.cpp b/core/math/bsp_tree.cpp
index 768711dda..d4ba3e8a5 100644
--- a/core/math/bsp_tree.cpp
+++ b/core/math/bsp_tree.cpp
@@ -30,7 +30,7 @@
 
 #include "bsp_tree.h"
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/string/print_string.h"
 
 void BSP_Tree::from_aabb(const AABB &p_aabb) {
diff --git a/core/math/convex_hull.cpp b/core/math/convex_hull.cpp
index ff220f831..d3bcef231 100644
--- a/core/math/convex_hull.cpp
+++ b/core/math/convex_hull.cpp
@@ -58,7 +58,7 @@ subject to the following restrictions:
 
 #include "convex_hull.h"
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/math/aabb.h"
 #include "core/math/math_defs.h"
 #include "core/os/memory.h"
diff --git a/core/math/math_funcs.cpp b/core/math/math_funcs.cpp
index a1cb8ec98..3f058b82c 100644
--- a/core/math/math_funcs.cpp
+++ b/core/math/math_funcs.cpp
@@ -30,7 +30,7 @@
 
 #include "math_funcs.h"
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 
 RandomPCG Math::default_rand(RandomPCG::DEFAULT_SEED, RandomPCG::DEFAULT_INC);
 
diff --git a/core/math/vector2.h b/core/math/vector2.h
index cc65fe213..4cfbd60c1 100644
--- a/core/math/vector2.h
+++ b/core/math/vector2.h
@@ -33,7 +33,7 @@
 
 #include "core/math/math_funcs.h"
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 
 class String;
 
diff --git a/core/math/vector2i.h b/core/math/vector2i.h
index 0dc3bc98d..490ba325a 100644
--- a/core/math/vector2i.h
+++ b/core/math/vector2i.h
@@ -32,7 +32,7 @@
 /*************************************************************************/
 
 #include "core/math/math_funcs.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 
 #include "vector2.h"
 
diff --git a/core/math/vector3i.h b/core/math/vector3i.h
index 831c56c79..f38c5aaba 100644
--- a/core/math/vector3i.h
+++ b/core/math/vector3i.h
@@ -31,7 +31,7 @@
 #ifndef VECTOR3I_H
 #define VECTOR3I_H
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/math/math_funcs.h"
 
 class String;
diff --git a/core/math/vector4i.h b/core/math/vector4i.h
index b0b459f15..71c7d1213 100644
--- a/core/math/vector4i.h
+++ b/core/math/vector4i.h
@@ -31,7 +31,7 @@
 #ifndef VECTOR4I_H
 #define VECTOR4I_H
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/math/math_funcs.h"
 
 class String;
diff --git a/core/os/memory.cpp b/core/os/memory.cpp
index 264ada81f..a539fcbf1 100644
--- a/core/os/memory.cpp
+++ b/core/os/memory.cpp
@@ -30,7 +30,7 @@
 
 #include "memory.h"
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/safe_refcount.h"
 
 #include <stdio.h>
diff --git a/core/os/memory.h b/core/os/memory.h
index 758b871ed..e4ee03396 100644
--- a/core/os/memory.h
+++ b/core/os/memory.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/safe_refcount.h"
 
 #include <stddef.h>
diff --git a/core/os/mutex.h b/core/os/mutex.h
index 97a7929d0..1cb06643f 100644
--- a/core/os/mutex.h
+++ b/core/os/mutex.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/typedefs.h"
 
 #if !defined(NO_THREADS)
diff --git a/core/os/rw_lock.h b/core/os/rw_lock.h
index d2d485b14..0a1a8db56 100644
--- a/core/os/rw_lock.h
+++ b/core/os/rw_lock.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 
 #if !defined(NO_THREADS)
 
diff --git a/core/os/semaphore.h b/core/os/semaphore.h
index 56ba7c451..71cd5c31f 100644
--- a/core/os/semaphore.h
+++ b/core/os/semaphore.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/typedefs.h"
 
 #if !defined(NO_THREADS)
diff --git a/core/pool_allocator.cpp b/core/pool_allocator.cpp
index e6501ae6a..6c961d018 100644
--- a/core/pool_allocator.cpp
+++ b/core/pool_allocator.cpp
@@ -30,7 +30,7 @@
 
 #include "pool_allocator.h"
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/os/memory.h"
 #include "core/os/os.h"
 #include "core/string/print_string.h"
diff --git a/core/safe_refcount.cpp b/core/safe_refcount.cpp
index f6273dfb5..1367aed9b 100644
--- a/core/safe_refcount.cpp
+++ b/core/safe_refcount.cpp
@@ -32,7 +32,7 @@
 
 #include "safe_refcount.h"
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 
 // On C++14 we don't have std::atomic::is_always_lockfree, so this is the best we can do
 void check_lockless_atomics() {
diff --git a/core/typedefs.h b/core/typedefs.h
index a7219d104..8ea51c998 100644
--- a/core/typedefs.h
+++ b/core/typedefs.h
@@ -146,7 +146,7 @@ T *_nullptr() {
 
 #include "core/int_types.h"
 
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 
 /** Generic ABS function, for math uses please use Math::abs */
 
diff --git a/editor/animation_bezier_editor.cpp b/editor/animation_bezier_editor.cpp
index 99bd00a2a..f62e4c6e3 100644
--- a/editor/animation_bezier_editor.cpp
+++ b/editor/animation_bezier_editor.cpp
@@ -35,7 +35,7 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp
index 342943441..33307ee13 100644
--- a/editor/animation_track_editor.cpp
+++ b/editor/animation_track_editor.cpp
@@ -35,7 +35,7 @@
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/engine.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/math/basis.h"
 #include "core/math/math_funcs.h"
 #include "core/math/quaternion.h"
diff --git a/editor/audio_stream_preview.cpp b/editor/audio_stream_preview.cpp
index 4fa3cacd5..05f9eadcc 100644
--- a/editor/audio_stream_preview.cpp
+++ b/editor/audio_stream_preview.cpp
@@ -31,7 +31,7 @@
 #include "audio_stream_preview.h"
 
 #include "core/object/class_db.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/math/audio_frame.h"
 #include "core/os/memory.h"
diff --git a/editor/connections_dialog.cpp b/editor/connections_dialog.cpp
index 527f62b43..b9f812fae 100644
--- a/editor/connections_dialog.cpp
+++ b/editor/connections_dialog.cpp
@@ -33,7 +33,7 @@
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/variant/dictionary.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/math/aabb.h"
 #include "core/math/basis.h"
diff --git a/editor/dependency_editor.cpp b/editor/dependency_editor.cpp
index b2dfb66d9..ca3f13bec 100644
--- a/editor/dependency_editor.cpp
+++ b/editor/dependency_editor.cpp
@@ -38,8 +38,8 @@
 #include "core/project_settings.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/math/vector2.h"
 #include "core/os/dir_access.h"
 #include "core/os/memory.h"
diff --git a/editor/doc/doc_data.cpp b/editor/doc/doc_data.cpp
index e134e47db..c5dcb8479 100644
--- a/editor/doc/doc_data.cpp
+++ b/editor/doc/doc_data.cpp
@@ -41,7 +41,7 @@
 #include "scene/resources/theme.h"
 #include "core/io/xml_parser.h"
 #include "core/object/class_db.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/object/method_bind.h"
 #include "core/object/object.h"
diff --git a/editor/doc/doc_data.h b/editor/doc/doc_data.h
index a7600c666..ace04eab6 100644
--- a/editor/doc/doc_data.h
+++ b/editor/doc/doc_data.h
@@ -33,7 +33,7 @@
 #include "core/containers/map.h"
 #include "core/variant/variant.h"
 #include "core/object/reference.h"
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/string/ustring.h"
 #include "core/containers/vector.h"
 
diff --git a/editor/editor_audio_buses.cpp b/editor/editor_audio_buses.cpp
index cb8310238..83db91a49 100644
--- a/editor/editor_audio_buses.cpp
+++ b/editor/editor_audio_buses.cpp
@@ -41,8 +41,8 @@
 #include "core/project_settings.h"
 #include "core/object/class_db.h"
 #include "core/variant/dictionary.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/io/resource_loader.h"
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
diff --git a/editor/editor_autoload_settings.cpp b/editor/editor_autoload_settings.cpp
index d1fac2514..209df2b25 100644
--- a/editor/editor_autoload_settings.cpp
+++ b/editor/editor_autoload_settings.cpp
@@ -40,7 +40,7 @@
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/variant/dictionary.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/io/resource_loader.h"
 #include "core/containers/map.h"
 #include "core/math/math_funcs.h"
diff --git a/editor/editor_data.cpp b/editor/editor_data.cpp
index 66d694277..d27c6866c 100644
--- a/editor/editor_data.cpp
+++ b/editor/editor_data.cpp
@@ -31,8 +31,8 @@
 #include "editor_data.h"
 
 #include "core/object/class_db.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/io/config_file.h"
 #include "core/io/resource_loader.h"
 #include "core/os/file_access.h"
diff --git a/editor/editor_dir_dialog.cpp b/editor/editor_dir_dialog.cpp
index a3a7179d7..4bf05234f 100644
--- a/editor/editor_dir_dialog.cpp
+++ b/editor/editor_dir_dialog.cpp
@@ -38,8 +38,8 @@
 #include "scene/gui/button.h"
 #include "scene/gui/line_edit.h"
 #include "core/object/class_db.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/math/vector2.h"
 #include "core/os/dir_access.h"
 #include "core/os/memory.h"
diff --git a/editor/editor_export.cpp b/editor/editor_export.cpp
index ef5742d5e..e87cb1d0e 100644
--- a/editor/editor_export.cpp
+++ b/editor/editor_export.cpp
@@ -32,7 +32,7 @@
 
 #include "core/object/class_db.h"
 #include "core/crypto/crypto_core.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/io/config_file.h"
 #include "core/io/file_access_pack.h" // PACK_HEADER_MAGIC, PACK_FORMAT_VERSION
 #include "core/io/resource_loader.h"
diff --git a/editor/editor_export.h b/editor/editor_export.h
index 8f0d41c84..f4c375b8b 100644
--- a/editor/editor_export.h
+++ b/editor/editor_export.h
@@ -37,7 +37,7 @@
 #include "scene/main/timer.h"
 #include "scene/resources/texture.h"
 
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/containers/list.h"
 #include "core/containers/map.h"
 #include "core/object/object.h"
diff --git a/editor/editor_file_dialog.cpp b/editor/editor_file_dialog.cpp
index 9515210c9..c52d5366b 100644
--- a/editor/editor_file_dialog.cpp
+++ b/editor/editor_file_dialog.cpp
@@ -33,8 +33,8 @@
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/variant/dictionary.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/math/vector2.h"
 #include "core/os/dir_access.h"
diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp
index e8a8da9cf..cb6158e3b 100644
--- a/editor/editor_file_system.cpp
+++ b/editor/editor_file_system.cpp
@@ -43,7 +43,7 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/variant/dictionary.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/io/config_file.h"
 #include "core/os/dir_access.h"
 #include "core/os/memory.h"
diff --git a/editor/editor_file_system.h b/editor/editor_file_system.h
index bfdf963b0..8f12aeb5d 100644
--- a/editor/editor_file_system.h
+++ b/editor/editor_file_system.h
@@ -38,7 +38,7 @@
 #include "core/os/thread_safe.h"
 #include "core/safe_refcount.h"
 #include "core/containers/set.h"
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/containers/hash_map.h"
 #include "core/containers/list.h"
 #include "core/containers/map.h"
diff --git a/editor/editor_folding.cpp b/editor/editor_folding.cpp
index 4839a51c2..83808b7f6 100644
--- a/editor/editor_folding.cpp
+++ b/editor/editor_folding.cpp
@@ -34,8 +34,8 @@
 #include "editor_inspector.h"
 #include "editor_settings.h"
 #include "core/variant/array.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/io/config_file.h"
 #include "core/containers/list.h"
 #include "core/string/node_path.h"
diff --git a/editor/editor_help.h b/editor/editor_help.h
index 4da42ce65..e54f28a50 100644
--- a/editor/editor_help.h
+++ b/editor/editor_help.h
@@ -37,7 +37,7 @@
 #include "scene/gui/rich_text_label.h"
 
 #include "core/math/color.h"
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/containers/map.h"
 #include "core/object/object.h"
 #include "core/object/reference.h"
diff --git a/editor/editor_help_search.cpp b/editor/editor_help_search.cpp
index ee577d996..6126aad40 100644
--- a/editor/editor_help_search.cpp
+++ b/editor/editor_help_search.cpp
@@ -34,7 +34,7 @@
 #include "editor_node.h"
 #include "editor_scale.h"
 #include "core/object/class_db.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"
 #include "core/os/input_event.h"
diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp
index efd1ba4e5..bcaeaabdb 100644
--- a/editor/editor_inspector.cpp
+++ b/editor/editor_inspector.cpp
@@ -33,7 +33,7 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/variant/dictionary.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/hash_map.h"
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
diff --git a/editor/editor_layouts_dialog.cpp b/editor/editor_layouts_dialog.cpp
index 6c7600a8c..a5ca7010a 100644
--- a/editor/editor_layouts_dialog.cpp
+++ b/editor/editor_layouts_dialog.cpp
@@ -37,7 +37,7 @@
 #include "scene/gui/box_container.h"
 #include "scene/gui/item_list.h"
 #include "scene/gui/line_edit.h"
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/containers/list.h"
 #include "core/math/math_defs.h"
 #include "core/os/input_event.h"
diff --git a/editor/editor_log.h b/editor/editor_log.h
index 43cc5e59e..c0b6e0b8d 100644
--- a/editor/editor_log.h
+++ b/editor/editor_log.h
@@ -33,7 +33,7 @@
 #include "scene/gui/box_container.h"
 
 #include "core/os/thread.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/object/object.h"
 #include "core/string/ustring.h"
 
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 892d14ad1..2797256e6 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -36,7 +36,7 @@
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/engine.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/image.h"
 #include "core/io/config_file.h"
 #include "core/io/image_loader.h"
diff --git a/editor/editor_node.h b/editor/editor_node.h
index 26be191b1..d05efa590 100644
--- a/editor/editor_node.h
+++ b/editor/editor_node.h
@@ -42,7 +42,7 @@
 #include "scene/gui/split_container.h"
 
 #include "core/variant/dictionary.h"
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/containers/list.h"
 #include "core/containers/map.h"
 #include "core/math/rect2.h"
diff --git a/editor/editor_path.cpp b/editor/editor_path.cpp
index f1f46b6b9..55952256e 100644
--- a/editor/editor_path.cpp
+++ b/editor/editor_path.cpp
@@ -33,7 +33,7 @@
 #include "editor_node.h"
 #include "editor_scale.h"
 #include "core/object/class_db.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"
diff --git a/editor/editor_plugin.h b/editor/editor_plugin.h
index 03461f6b4..c3f7d1bcd 100644
--- a/editor/editor_plugin.h
+++ b/editor/editor_plugin.h
@@ -38,8 +38,8 @@
 
 #include "core/variant/array.h"
 #include "core/variant/dictionary.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/io/config_file.h"
 #include "core/containers/list.h"
 #include "core/object/method_bind.h"
diff --git a/editor/editor_plugin_settings.cpp b/editor/editor_plugin_settings.cpp
index b9274a6f5..01c17ecf2 100644
--- a/editor/editor_plugin_settings.cpp
+++ b/editor/editor_plugin_settings.cpp
@@ -31,8 +31,8 @@
 #include "editor_plugin_settings.h"
 
 #include "core/object/class_db.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/io/config_file.h"
 #include "core/os/dir_access.h"
 #include "core/os/file_access.h"
diff --git a/editor/editor_profiler.cpp b/editor/editor_profiler.cpp
index e9c29d2f3..c9c76a030 100644
--- a/editor/editor_profiler.cpp
+++ b/editor/editor_profiler.cpp
@@ -34,7 +34,7 @@
 #include "editor_settings.h"
 #include "scene/main/timer.h"
 #include "core/object/class_db.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/image.h"
 #include "core/math/math_funcs.h"
 #include "core/math/vector2.h"
diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp
index e09cfe5f6..628688fe4 100644
--- a/editor/editor_properties.cpp
+++ b/editor/editor_properties.cpp
@@ -33,7 +33,7 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/variant/dictionary.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/math/aabb.h"
 #include "core/math/basis.h"
 #include "core/math/math_defs.h"
diff --git a/editor/editor_properties_array_dict.cpp b/editor/editor_properties_array_dict.cpp
index e1c70e774..9a9346791 100644
--- a/editor/editor_properties_array_dict.cpp
+++ b/editor/editor_properties_array_dict.cpp
@@ -32,7 +32,7 @@
 
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/io/marshalls.h"
 #include "core/io/resource_loader.h"
 #include "core/math/math_defs.h"
diff --git a/editor/editor_property_name_processor.cpp b/editor/editor_property_name_processor.cpp
index 93e19efa8..ad93c840c 100644
--- a/editor/editor_property_name_processor.cpp
+++ b/editor/editor_property_name_processor.cpp
@@ -31,7 +31,7 @@
 #include "editor_property_name_processor.h"
 
 #include "editor_settings.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/typedefs.h"
 
 EditorPropertyNameProcessor *EditorPropertyNameProcessor::singleton = nullptr;
diff --git a/editor/editor_resource_picker.cpp b/editor/editor_resource_picker.cpp
index 26936a481..49f18c7f4 100644
--- a/editor/editor_resource_picker.cpp
+++ b/editor/editor_resource_picker.cpp
@@ -39,7 +39,7 @@
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/variant/dictionary.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/io/resource_loader.h"
 #include "core/containers/map.h"
 #include "core/math/math_defs.h"
diff --git a/editor/editor_resource_preview.cpp b/editor/editor_resource_preview.cpp
index 6b26146d7..dc829c650 100644
--- a/editor/editor_resource_preview.cpp
+++ b/editor/editor_resource_preview.cpp
@@ -40,8 +40,8 @@
 #include "editor_node.h"
 #include "editor_scale.h"
 #include "editor_settings.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/image.h"
 
 #include "core/os/memory.h"
diff --git a/editor/editor_run.cpp b/editor/editor_run.cpp
index a58f27d25..83b4ef0fa 100644
--- a/editor/editor_run.cpp
+++ b/editor/editor_run.cpp
@@ -36,7 +36,7 @@
 #include "script_editor_debugger.h"
 #include "core/project_settings.h"
 #include "editor_settings.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/math/math_funcs.h"
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"
diff --git a/editor/editor_run.h b/editor/editor_run.h
index c8f310380..b44841d10 100644
--- a/editor/editor_run.h
+++ b/editor/editor_run.h
@@ -32,7 +32,7 @@
 
 #include "core/os/os.h"
 
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/containers/list.h"
 #include "core/string/ustring.h"
 
diff --git a/editor/editor_run_native.cpp b/editor/editor_run_native.cpp
index 4a386b319..1d2347869 100644
--- a/editor/editor_run_native.cpp
+++ b/editor/editor_run_native.cpp
@@ -31,7 +31,7 @@
 #include "editor_run_native.h"
 
 #include "core/object/class_db.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/image.h"
 #include "core/os/memory.h"
 #include "core/object/reference.h"
diff --git a/editor/editor_run_script.cpp b/editor/editor_run_script.cpp
index 9c5278526..f78471f7d 100644
--- a/editor/editor_run_script.cpp
+++ b/editor/editor_run_script.cpp
@@ -32,7 +32,7 @@
 
 #include "editor_node.h"
 #include "core/object/class_db.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/object/script_language.h"
 #include "core/string/ustring.h"
 #include "core/variant/variant.h"
diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp
index 97d2ef1b7..bcd44a114 100644
--- a/editor/editor_settings.cpp
+++ b/editor/editor_settings.cpp
@@ -34,8 +34,8 @@
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/variant/dictionary.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/io/certs_compressed.gen.h"
 #include "core/io/config_file.h"
 #include "core/io/ip.h"
diff --git a/editor/editor_spin_slider.cpp b/editor/editor_spin_slider.cpp
index 9ab4dd3de..62b886531 100644
--- a/editor/editor_spin_slider.cpp
+++ b/editor/editor_spin_slider.cpp
@@ -36,8 +36,8 @@
 #include "editor_scale.h"
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
 #include "core/math/rect2.h"
diff --git a/editor/editor_sub_scene.cpp b/editor/editor_sub_scene.cpp
index 32d6d9bd3..c6dbb2df3 100644
--- a/editor/editor_sub_scene.cpp
+++ b/editor/editor_sub_scene.cpp
@@ -33,7 +33,7 @@
 #include "editor/editor_node.h"
 #include "scene/resources/packed_scene.h"
 #include "core/object/class_db.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/io/resource_loader.h"
 #include "core/os/memory.h"
 #include "core/object/reference.h"
diff --git a/editor/editor_translation.cpp b/editor/editor_translation.cpp
index 9f9255789..381cd4b53 100644
--- a/editor/editor_translation.cpp
+++ b/editor/editor_translation.cpp
@@ -35,7 +35,7 @@
 #include "core/io/translation_loader_po.h"
 #include "editor/doc_translations.gen.h"
 #include "editor/editor_translations.gen.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/os/memory.h"
 #include "core/object/reference.h"
 #include "core/string/translation.h"
diff --git a/editor/export_template_manager.cpp b/editor/export_template_manager.cpp
index 06006b341..aa25a6467 100644
--- a/editor/export_template_manager.cpp
+++ b/editor/export_template_manager.cpp
@@ -33,7 +33,7 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/variant/dictionary.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/io/http_client.h"
 #include "core/io/json.h"
 #include "core/io/zip_io.h"
diff --git a/editor/export_template_manager.h b/editor/export_template_manager.h
index 298a5ed7c..568656374 100644
--- a/editor/export_template_manager.h
+++ b/editor/export_template_manager.h
@@ -32,7 +32,7 @@
 
 #include "scene/gui/dialogs.h"
 
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/object/object.h"
 #include "core/string/ustring.h"
 #include "core/variant/variant.h"
diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp
index 0b787bbf2..1344ddb18 100644
--- a/editor/filesystem_dock.cpp
+++ b/editor/filesystem_dock.cpp
@@ -48,8 +48,8 @@
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/variant/dictionary.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/io/config_file.h"
 #include "core/io/resource_saver.h"
 #include "core/os/input_event.h"
diff --git a/editor/find_in_files.cpp b/editor/find_in_files.cpp
index f0fe972be..509f2e054 100644
--- a/editor/find_in_files.cpp
+++ b/editor/find_in_files.cpp
@@ -47,8 +47,8 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/math/math_defs.h"
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"
diff --git a/editor/import_dock.cpp b/editor/import_dock.cpp
index 6cc91fa1a..32d021af5 100644
--- a/editor/import_dock.cpp
+++ b/editor/import_dock.cpp
@@ -36,8 +36,8 @@
 #include "editor_scale.h"
 #include "core/object/class_db.h"
 #include "core/variant/dictionary.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/io/resource_importer.h"
 #include "core/math/vector2.h"
 #include "core/os/memory.h"
diff --git a/editor/inspector_dock.cpp b/editor/inspector_dock.cpp
index a59acb6bc..bdf0387c5 100644
--- a/editor/inspector_dock.cpp
+++ b/editor/inspector_dock.cpp
@@ -31,7 +31,7 @@
 #include "inspector_dock.h"
 
 #include "core/object/class_db.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/io/resource_loader.h"
 #include "core/containers/list.h"
 #include "core/containers/map.h"
diff --git a/editor/multi_node_edit.cpp b/editor/multi_node_edit.cpp
index e2422c158..0a48fdba3 100644
--- a/editor/multi_node_edit.cpp
+++ b/editor/multi_node_edit.cpp
@@ -32,7 +32,7 @@
 
 #include "core/math/math_fieldwise.h"
 #include "editor_node.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/hash_map.h"
 #include "core/object/undo_redo.h"
 #include "editor/editor_inspector.h"
diff --git a/editor/plugin_config_dialog.cpp b/editor/plugin_config_dialog.cpp
index fbb89674b..a822c3a4f 100644
--- a/editor/plugin_config_dialog.cpp
+++ b/editor/plugin_config_dialog.cpp
@@ -38,8 +38,8 @@
 #include "scene/gui/grid_container.h"
 #include "modules/modules_enabled.gen.h" // For gdscript.
 #include "core/object/class_db.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/io/resource_saver.h"
 #include "core/math/vector2.h"
 #include "core/os/memory.h"
diff --git a/editor/plugins/abstract_polygon_2d_editor.cpp b/editor/plugins/abstract_polygon_2d_editor.cpp
index c02351455..3dc2ee81b 100644
--- a/editor/plugins/abstract_polygon_2d_editor.cpp
+++ b/editor/plugins/abstract_polygon_2d_editor.cpp
@@ -35,7 +35,7 @@
 #include "editor/editor_scale.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/math/geometry.h"
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
diff --git a/editor/plugins/animation_blend_space_1d_editor.cpp b/editor/plugins/animation_blend_space_1d_editor.cpp
index 94bc905ef..e02a0e75a 100644
--- a/editor/plugins/animation_blend_space_1d_editor.cpp
+++ b/editor/plugins/animation_blend_space_1d_editor.cpp
@@ -35,7 +35,7 @@
 #include "scene/animation/animation_blend_tree.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/io/resource_loader.h"
 #include "core/containers/list.h"
 #include "core/math/math_funcs.h"
diff --git a/editor/plugins/animation_blend_space_2d_editor.cpp b/editor/plugins/animation_blend_space_2d_editor.cpp
index 2189a8416..deccd6754 100644
--- a/editor/plugins/animation_blend_space_2d_editor.cpp
+++ b/editor/plugins/animation_blend_space_2d_editor.cpp
@@ -39,7 +39,7 @@
 #include "scene/animation/animation_player.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/math/geometry.h"
 #include "core/math/math_funcs.h"
diff --git a/editor/plugins/animation_blend_tree_editor_plugin.cpp b/editor/plugins/animation_blend_tree_editor_plugin.cpp
index 41b4fd223..879570a8b 100644
--- a/editor/plugins/animation_blend_tree_editor_plugin.cpp
+++ b/editor/plugins/animation_blend_tree_editor_plugin.cpp
@@ -33,7 +33,7 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/hash_map.h"
 #include "core/io/resource_loader.h"
 #include "core/containers/list.h"
diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp
index 5535f2833..243e0e03d 100644
--- a/editor/plugins/animation_player_editor_plugin.cpp
+++ b/editor/plugins/animation_player_editor_plugin.cpp
@@ -46,8 +46,8 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/image.h"
 #include "core/containers/list.h"
 #include "core/math/math_funcs.h"
diff --git a/editor/plugins/animation_state_machine_editor.cpp b/editor/plugins/animation_state_machine_editor.cpp
index 1f7e6022d..c09492340 100644
--- a/editor/plugins/animation_state_machine_editor.cpp
+++ b/editor/plugins/animation_state_machine_editor.cpp
@@ -37,7 +37,7 @@
 #include "scene/animation/animation_player.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/math/geometry.h"
 #include "core/math/math_defs.h"
diff --git a/editor/plugins/animation_tree_editor_plugin.cpp b/editor/plugins/animation_tree_editor_plugin.cpp
index 56f4cbb80..0e5771e7c 100644
--- a/editor/plugins/animation_tree_editor_plugin.cpp
+++ b/editor/plugins/animation_tree_editor_plugin.cpp
@@ -39,7 +39,7 @@
 #include "scene/animation/animation_player.h"
 #include "scene/scene_string_names.h"
 #include "core/object/class_db.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/math/vector2.h"
 #include "core/os/memory.h"
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp
index 9d31f5083..054d91fde 100644
--- a/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/editor/plugins/canvas_item_editor_plugin.cpp
@@ -55,8 +55,8 @@
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/engine.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/io/resource_loader.h"
 #include "core/math/geometry.h"
 #include "core/math/math_funcs.h"
diff --git a/editor/plugins/collision_polygon_editor_plugin.cpp b/editor/plugins/collision_polygon_editor_plugin.cpp
index db471c43b..f9abf6dee 100644
--- a/editor/plugins/collision_polygon_editor_plugin.cpp
+++ b/editor/plugins/collision_polygon_editor_plugin.cpp
@@ -38,7 +38,7 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/math/aabb.h"
 #include "core/math/basis.h"
 #include "core/math/geometry.h"
diff --git a/editor/plugins/cpu_particles_2d_editor_plugin.cpp b/editor/plugins/cpu_particles_2d_editor_plugin.cpp
index cb4d4d9cf..140fdf376 100644
--- a/editor/plugins/cpu_particles_2d_editor_plugin.cpp
+++ b/editor/plugins/cpu_particles_2d_editor_plugin.cpp
@@ -35,8 +35,8 @@
 #include "scene/gui/separator.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/image.h"
 #include "core/containers/list.h"
 #include "core/math/vector2.h"
diff --git a/editor/plugins/curve_editor_plugin.cpp b/editor/plugins/curve_editor_plugin.cpp
index 81b5bcd10..4efa90cba 100644
--- a/editor/plugins/curve_editor_plugin.cpp
+++ b/editor/plugins/curve_editor_plugin.cpp
@@ -36,7 +36,7 @@
 #include "editor/editor_scale.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/image.h"
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
diff --git a/editor/plugins/editor_preview_plugins.cpp b/editor/plugins/editor_preview_plugins.cpp
index ce7fba760..f1703eddc 100644
--- a/editor/plugins/editor_preview_plugins.cpp
+++ b/editor/plugins/editor_preview_plugins.cpp
@@ -42,8 +42,8 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/image.h"
 #include "core/containers/list.h"
 #include "core/math/aabb.h"
diff --git a/editor/plugins/material_editor_plugin.cpp b/editor/plugins/material_editor_plugin.cpp
index 29f44e1dd..0b599daff 100644
--- a/editor/plugins/material_editor_plugin.cpp
+++ b/editor/plugins/material_editor_plugin.cpp
@@ -40,7 +40,7 @@
 #include "scene/resources/world.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/math/basis.h"
 #include "core/math/math_funcs.h"
diff --git a/editor/plugins/mesh_instance_editor_plugin.cpp b/editor/plugins/mesh_instance_editor_plugin.cpp
index 8a445554b..c14b8048a 100644
--- a/editor/plugins/mesh_instance_editor_plugin.cpp
+++ b/editor/plugins/mesh_instance_editor_plugin.cpp
@@ -40,7 +40,7 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/math/math_funcs.h"
 #include "core/math/rect2.h"
diff --git a/editor/plugins/multimesh_editor_plugin.cpp b/editor/plugins/multimesh_editor_plugin.cpp
index 4d4afc342..0fb8545ab 100644
--- a/editor/plugins/multimesh_editor_plugin.cpp
+++ b/editor/plugins/multimesh_editor_plugin.cpp
@@ -35,7 +35,7 @@
 #include "scene/resources/multimesh.h"
 #include "spatial_editor_plugin.h"
 #include "core/object/class_db.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/map.h"
 #include "core/math/basis.h"
 #include "core/math/face3.h"
diff --git a/editor/plugins/particles_editor_plugin.cpp b/editor/plugins/particles_editor_plugin.cpp
index 7ed73eab6..17bd8b584 100644
--- a/editor/plugins/particles_editor_plugin.cpp
+++ b/editor/plugins/particles_editor_plugin.cpp
@@ -32,7 +32,7 @@
 
 #include "core/io/resource_loader.h"
 #include "core/object/class_db.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/containers/map.h"
 #include "core/math/aabb.h"
diff --git a/editor/plugins/physical_bone_plugin.cpp b/editor/plugins/physical_bone_plugin.cpp
index 804956048..ca3853e14 100644
--- a/editor/plugins/physical_bone_plugin.cpp
+++ b/editor/plugins/physical_bone_plugin.cpp
@@ -33,7 +33,7 @@
 #include "editor/plugins/spatial_editor_plugin.h"
 #include "scene/3d/physics_body.h"
 #include "core/object/class_db.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/os/memory.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/control.h"
diff --git a/editor/plugins/resource_preloader_editor_plugin.cpp b/editor/plugins/resource_preloader_editor_plugin.cpp
index 89332fb4f..c4a4fe58c 100644
--- a/editor/plugins/resource_preloader_editor_plugin.cpp
+++ b/editor/plugins/resource_preloader_editor_plugin.cpp
@@ -35,7 +35,7 @@
 #include "editor/editor_settings.h"
 #include "core/object/class_db.h"
 #include "core/variant/dictionary.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/os/memory.h"
 #include "core/object/resource.h"
diff --git a/editor/plugins/root_motion_editor_plugin.cpp b/editor/plugins/root_motion_editor_plugin.cpp
index df18dcc8a..d29bf3cbf 100644
--- a/editor/plugins/root_motion_editor_plugin.cpp
+++ b/editor/plugins/root_motion_editor_plugin.cpp
@@ -34,7 +34,7 @@
 #include "scene/3d/skeleton.h"
 #include "scene/main/viewport.h"
 #include "core/object/class_db.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/containers/map.h"
 #include "core/os/memory.h"
diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp
index a87606648..8274e25be 100644
--- a/editor/plugins/script_editor_plugin.cpp
+++ b/editor/plugins/script_editor_plugin.cpp
@@ -52,7 +52,7 @@
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/variant/dictionary.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/io/config_file.h"
 #include "core/io/resource_saver.h"
 #include "core/containers/map.h"
diff --git a/editor/plugins/script_editor_plugin.h b/editor/plugins/script_editor_plugin.h
index a0cf0daf7..92875f1fa 100644
--- a/editor/plugins/script_editor_plugin.h
+++ b/editor/plugins/script_editor_plugin.h
@@ -39,7 +39,7 @@
 
 #include "core/object/script_language.h"
 #include "core/variant/array.h"
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/containers/list.h"
 #include "core/math/vector2.h"
 #include "core/object/object.h"
diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp
index 107a34ff1..91f1e9444 100644
--- a/editor/plugins/script_text_editor.cpp
+++ b/editor/plugins/script_text_editor.cpp
@@ -33,8 +33,8 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/variant/dictionary.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/io/resource_loader.h"
 #include "core/math/expression.h"
 #include "core/math/math_defs.h"
diff --git a/editor/plugins/shader_editor_plugin.cpp b/editor/plugins/shader_editor_plugin.cpp
index 530e47308..f8f8575cd 100644
--- a/editor/plugins/shader_editor_plugin.cpp
+++ b/editor/plugins/shader_editor_plugin.cpp
@@ -33,8 +33,8 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
 #include "core/containers/map.h"
diff --git a/editor/plugins/spatial_editor_plugin.h b/editor/plugins/spatial_editor_plugin.h
index e26010761..956c9a02a 100644
--- a/editor/plugins/spatial_editor_plugin.h
+++ b/editor/plugins/spatial_editor_plugin.h
@@ -41,7 +41,7 @@
 
 #include "core/math/color.h"
 #include "core/variant/dictionary.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/hash_map.h"
 #include "core/containers/list.h"
 #include "core/math/aabb.h"
diff --git a/editor/plugins/sprite_editor_plugin.cpp b/editor/plugins/sprite_editor_plugin.cpp
index eacf57451..105d8e48f 100644
--- a/editor/plugins/sprite_editor_plugin.cpp
+++ b/editor/plugins/sprite_editor_plugin.cpp
@@ -43,7 +43,7 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/image.h"
 #include "core/math/geometry.h"
 #include "core/math/rect2.h"
diff --git a/editor/plugins/sprite_frames_editor_plugin.cpp b/editor/plugins/sprite_frames_editor_plugin.cpp
index 5cffbb975..104bf96fa 100644
--- a/editor/plugins/sprite_frames_editor_plugin.cpp
+++ b/editor/plugins/sprite_frames_editor_plugin.cpp
@@ -33,7 +33,7 @@
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/variant/dictionary.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/io/resource_loader.h"
 #include "core/containers/list.h"
 #include "core/math/math_defs.h"
diff --git a/editor/plugins/text_editor.cpp b/editor/plugins/text_editor.cpp
index 4bb757a7a..88002b17f 100644
--- a/editor/plugins/text_editor.cpp
+++ b/editor/plugins/text_editor.cpp
@@ -35,7 +35,7 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/variant/dictionary.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/math/transform_2d.h"
 #include "core/math/vector2.h"
 #include "core/os/input_event.h"
diff --git a/editor/plugins/texture_region_editor_plugin.cpp b/editor/plugins/texture_region_editor_plugin.cpp
index bcdae8258..3d79fb288 100644
--- a/editor/plugins/texture_region_editor_plugin.cpp
+++ b/editor/plugins/texture_region_editor_plugin.cpp
@@ -37,7 +37,7 @@
 #include "scene/gui/panel.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
 #include "core/math/transform_2d.h"
diff --git a/editor/plugins/theme_editor_plugin.cpp b/editor/plugins/theme_editor_plugin.cpp
index 4a364c960..f3d7cb8d7 100644
--- a/editor/plugins/theme_editor_plugin.cpp
+++ b/editor/plugins/theme_editor_plugin.cpp
@@ -33,7 +33,7 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/io/resource_loader.h"
 #include "core/math/vector2.h"
 #include "core/os/input_event.h"
diff --git a/editor/progress_dialog.cpp b/editor/progress_dialog.cpp
index a0bc1dae9..89b62ee56 100644
--- a/editor/progress_dialog.cpp
+++ b/editor/progress_dialog.cpp
@@ -35,7 +35,7 @@
 #include "editor_scale.h"
 #include "main/main.h"
 #include "core/object/class_db.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/math/math_defs.h"
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"
diff --git a/editor/project_export.cpp b/editor/project_export.cpp
index 499f04c60..49b0c76e6 100644
--- a/editor/project_export.cpp
+++ b/editor/project_export.cpp
@@ -32,8 +32,8 @@
 
 #include "core/object/class_db.h"
 #include "core/variant/dictionary.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/math/rect2.h"
 #include "core/os/memory.h"
diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp
index bc7c6da36..b49e16cc6 100644
--- a/editor/project_manager.cpp
+++ b/editor/project_manager.cpp
@@ -33,8 +33,8 @@
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/engine.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/image.h"
 #include "core/io/config_file.h"
 #include "core/io/resource_saver.h"
diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp
index 394f432d3..36cdaa9bb 100644
--- a/editor/project_settings_editor.cpp
+++ b/editor/project_settings_editor.cpp
@@ -42,8 +42,8 @@
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/variant/dictionary.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/io/resource_loader.h"
 #include "core/containers/list.h"
 #include "core/containers/map.h"
diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp
index 9860c03d9..fd20e4750 100644
--- a/editor/property_editor.cpp
+++ b/editor/property_editor.cpp
@@ -33,8 +33,8 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/io/resource_loader.h"
 #include "core/containers/map.h"
 #include "core/math/aabb.h"
diff --git a/editor/property_selector.cpp b/editor/property_selector.cpp
index 06d8072b8..7ef580319 100644
--- a/editor/property_selector.cpp
+++ b/editor/property_selector.cpp
@@ -32,7 +32,7 @@
 
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/containers/map.h"
 #include "core/object/method_bind.h"
diff --git a/editor/rename_dialog.h b/editor/rename_dialog.h
index 9dcbe236b..1a80c1364 100644
--- a/editor/rename_dialog.h
+++ b/editor/rename_dialog.h
@@ -34,7 +34,7 @@
 
 #ifdef MODULE_REGEX_ENABLED
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/string/node_path.h"
 #include "core/object/object.h"
diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp
index d61f79c62..42d8a54c5 100644
--- a/editor/scene_tree_dock.cpp
+++ b/editor/scene_tree_dock.cpp
@@ -33,8 +33,8 @@
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
 #include "core/variant/dictionary.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
 #include "core/math/vector2.h"
diff --git a/editor/scene_tree_editor.cpp b/editor/scene_tree_editor.cpp
index 710c25711..f897642d9 100644
--- a/editor/scene_tree_editor.cpp
+++ b/editor/scene_tree_editor.cpp
@@ -34,7 +34,7 @@
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/variant/dictionary.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/hashfuncs.h"
 #include "core/math/math_defs.h"
 #include "core/math/transform_2d.h"
diff --git a/editor/script_create_dialog.cpp b/editor/script_create_dialog.cpp
index df79e0eec..5efae2612 100644
--- a/editor/script_create_dialog.cpp
+++ b/editor/script_create_dialog.cpp
@@ -32,7 +32,7 @@
 
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
 #include "core/containers/list.h"
diff --git a/editor/script_editor_debugger.cpp b/editor/script_editor_debugger.cpp
index ec7044e47..e8770f8a9 100644
--- a/editor/script_editor_debugger.cpp
+++ b/editor/script_editor_debugger.cpp
@@ -33,8 +33,8 @@
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/variant/dictionary.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/io/marshalls.h"
 #include "core/io/multiplayer_api.h"
 #include "core/io/packet_peer.h"
diff --git a/editor/settings_config_dialog.cpp b/editor/settings_config_dialog.cpp
index c58b84adc..469e94c73 100644
--- a/editor/settings_config_dialog.cpp
+++ b/editor/settings_config_dialog.cpp
@@ -39,7 +39,7 @@
 #include "script_editor_debugger.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/containers/map.h"
 #include "core/math/math_defs.h"
diff --git a/editor/spatial_editor_gizmos.cpp b/editor/spatial_editor_gizmos.cpp
index f2ce93891..d43c7cc24 100644
--- a/editor/spatial_editor_gizmos.cpp
+++ b/editor/spatial_editor_gizmos.cpp
@@ -32,8 +32,8 @@
 
 #include "core/variant/array.h"
 #include "core/object/class_db.h"
-#include "core/error_list.h"
-#include "core/error_macros.h"
+#include "core/error/error_list.h"
+#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/containers/map.h"
 #include "core/math/aabb.h"
diff --git a/main/main.h b/main/main.h
index 65c86d521..af2a2f927 100644
--- a/main/main.h
+++ b/main/main.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/os/thread.h"
 #include "core/typedefs.h"
 
diff --git a/main/tests/test_tools.h b/main/tests/test_tools.h
index b94b71f7d..2ae7184a4 100644
--- a/main/tests/test_tools.h
+++ b/main/tests/test_tools.h
@@ -31,7 +31,7 @@
 #ifndef TEST_TOOLS_H
 #define TEST_TOOLS_H
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 
 struct ErrorDetector {
 	ErrorDetector() {
diff --git a/modules/enet/register_types.cpp b/modules/enet/register_types.cpp
index 5232fbea5..840e79e27 100644
--- a/modules/enet/register_types.cpp
+++ b/modules/enet/register_types.cpp
@@ -29,7 +29,7 @@
 /*************************************************************************/
 
 #include "register_types.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "networked_multiplayer_enet.h"
 
 static bool enet_ok = false;
diff --git a/modules/tga/image_loader_tga.cpp b/modules/tga/image_loader_tga.cpp
index 5a18d1224..41672e898 100644
--- a/modules/tga/image_loader_tga.cpp
+++ b/modules/tga/image_loader_tga.cpp
@@ -30,7 +30,7 @@
 
 #include "image_loader_tga.h"
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/io/file_access_memory.h"
 #include "core/os/os.h"
 #include "core/string/print_string.h"
diff --git a/modules/upnp/register_types.cpp b/modules/upnp/register_types.cpp
index cf836eefe..f47a9f3d6 100644
--- a/modules/upnp/register_types.cpp
+++ b/modules/upnp/register_types.cpp
@@ -30,7 +30,7 @@
 
 #include "register_types.h"
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 
 #include "upnp.h"
 #include "upnp_device.h"
diff --git a/modules/web/html/bbcode_parser.cpp b/modules/web/html/bbcode_parser.cpp
index 4c5321390..210e41a29 100644
--- a/modules/web/html/bbcode_parser.cpp
+++ b/modules/web/html/bbcode_parser.cpp
@@ -1,6 +1,6 @@
 #include "bbcode_parser.h"
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/log/logger.h"
 
 String BBCodeParserAttribute::get_attribute() {
diff --git a/modules/web/html/html_parser.cpp b/modules/web/html/html_parser.cpp
index d10394519..1e907ad10 100644
--- a/modules/web/html/html_parser.cpp
+++ b/modules/web/html/html_parser.cpp
@@ -1,7 +1,7 @@
 #include "html_parser.h"
 
 #include "core/object/class_db.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/log/logger.h"
 
 String HTMLParserAttribute::get_attribute() {
diff --git a/modules/web/html/markdown_renderer.cpp b/modules/web/html/markdown_renderer.cpp
index 12a164cd4..74a497687 100644
--- a/modules/web/html/markdown_renderer.cpp
+++ b/modules/web/html/markdown_renderer.cpp
@@ -1,7 +1,7 @@
 #include "markdown_renderer.h"
 
 #include "core/object/class_db.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/log/logger.h"
 
 #include "./libs/hoedown/html.h"
diff --git a/modules/web/http/web_node.cpp b/modules/web/http/web_node.cpp
index a31c83bae..4ed3229ba 100644
--- a/modules/web/http/web_node.cpp
+++ b/modules/web/http/web_node.cpp
@@ -1,7 +1,7 @@
 
 #include "web_node.h"
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 
 #include "core/object/object.h"
 #include "core/string/print_string.h"
diff --git a/modules/web/nodes/list_page/list_web_page.cpp b/modules/web/nodes/list_page/list_web_page.cpp
index fa343e5ff..60f3c5bb3 100644
--- a/modules/web/nodes/list_page/list_web_page.cpp
+++ b/modules/web/nodes/list_page/list_web_page.cpp
@@ -1,6 +1,6 @@
 #include "list_web_page.h"
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/os/dir_access.h"
 #include "core/os/file_access.h"
 
diff --git a/modules/websocket/emws_client.h b/modules/websocket/emws_client.h
index 0adf5c567..d6364901e 100644
--- a/modules/websocket/emws_client.h
+++ b/modules/websocket/emws_client.h
@@ -32,7 +32,7 @@
 
 #ifdef JAVASCRIPT_ENABLED
 
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "emws_peer.h"
 #include "websocket_client.h"
 
diff --git a/modules/websocket/emws_peer.h b/modules/websocket/emws_peer.h
index 663076bd8..2ac07f544 100644
--- a/modules/websocket/emws_peer.h
+++ b/modules/websocket/emws_peer.h
@@ -32,7 +32,7 @@
 
 #ifdef JAVASCRIPT_ENABLED
 
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/io/packet_peer.h"
 #include "core/containers/ring_buffer.h"
 #include "emscripten.h"
diff --git a/modules/websocket/register_types.cpp b/modules/websocket/register_types.cpp
index 0dfe0f551..5c7579146 100644
--- a/modules/websocket/register_types.cpp
+++ b/modules/websocket/register_types.cpp
@@ -29,7 +29,7 @@
 /*************************************************************************/
 
 #include "register_types.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/project_settings.h"
 #ifdef JAVASCRIPT_ENABLED
 #include "emscripten.h"
diff --git a/modules/websocket/websocket_client.h b/modules/websocket/websocket_client.h
index 699db7282..1a92ee981 100644
--- a/modules/websocket/websocket_client.h
+++ b/modules/websocket/websocket_client.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/crypto/crypto.h"
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "websocket_multiplayer_peer.h"
 #include "websocket_peer.h"
 
diff --git a/modules/websocket/websocket_multiplayer_peer.h b/modules/websocket/websocket_multiplayer_peer.h
index 34476ad66..eaa64ca30 100644
--- a/modules/websocket/websocket_multiplayer_peer.h
+++ b/modules/websocket/websocket_multiplayer_peer.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/io/networked_multiplayer_peer.h"
 #include "core/containers/list.h"
 #include "websocket_peer.h"
diff --git a/modules/websocket/websocket_peer.h b/modules/websocket/websocket_peer.h
index 4bf373855..6552b6817 100644
--- a/modules/websocket/websocket_peer.h
+++ b/modules/websocket/websocket_peer.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/io/packet_peer.h"
 #include "websocket_macros.h"
 
diff --git a/modules/websocket/wsl_client.h b/modules/websocket/wsl_client.h
index e9cf3d56f..7244912e6 100644
--- a/modules/websocket/wsl_client.h
+++ b/modules/websocket/wsl_client.h
@@ -32,7 +32,7 @@
 
 #ifndef JAVASCRIPT_ENABLED
 
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/io/stream_peer_ssl.h"
 #include "core/io/stream_peer_tcp.h"
 #include "websocket_client.h"
diff --git a/modules/websocket/wsl_peer.h b/modules/websocket/wsl_peer.h
index 04b883084..b14617ce9 100644
--- a/modules/websocket/wsl_peer.h
+++ b/modules/websocket/wsl_peer.h
@@ -32,7 +32,7 @@
 
 #ifndef JAVASCRIPT_ENABLED
 
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/io/packet_peer.h"
 #include "core/io/stream_peer_tcp.h"
 #include "core/containers/ring_buffer.h"
diff --git a/platform/android/export/pandemonium_plugin_config.h b/platform/android/export/pandemonium_plugin_config.h
index 8d72ac1ca..080df2f98 100644
--- a/platform/android/export/pandemonium_plugin_config.h
+++ b/platform/android/export/pandemonium_plugin_config.h
@@ -31,7 +31,7 @@
 #ifndef ANDROID_PANDEMONIUM_PLUGIN_CONFIG_H
 #define ANDROID_PANDEMONIUM_PLUGIN_CONFIG_H
 
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/io/config_file.h"
 #include "core/project_settings.h"
 #include "core/string/ustring.h"
diff --git a/platform/android/java_pandemonium_io_wrapper.cpp b/platform/android/java_pandemonium_io_wrapper.cpp
index 56113b2ea..f642392fa 100644
--- a/platform/android/java_pandemonium_io_wrapper.cpp
+++ b/platform/android/java_pandemonium_io_wrapper.cpp
@@ -30,7 +30,7 @@
 
 #include "java_pandemonium_io_wrapper.h"
 #include "core/variant/array.h"
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/math/rect2.h"
 #include "core/variant/variant.h"
 
diff --git a/platform/android/power_android.cpp b/platform/android/power_android.cpp
index c30c3b44e..356795709 100644
--- a/platform/android/power_android.cpp
+++ b/platform/android/power_android.cpp
@@ -55,7 +55,7 @@ Adapted from corresponding SDL 2.0 code.
 
 #include "power_android.h"
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 
 static void LocalReferenceHolder_Cleanup(struct LocalReferenceHolder *refholder) {
 	if (refholder->m_env) {
diff --git a/platform/iphone/plugin/pandemonium_plugin_config.h b/platform/iphone/plugin/pandemonium_plugin_config.h
index 9a152bf72..0b082a081 100644
--- a/platform/iphone/plugin/pandemonium_plugin_config.h
+++ b/platform/iphone/plugin/pandemonium_plugin_config.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/io/config_file.h"
 #include "core/string/ustring.h"
 
diff --git a/platform/windows/context_gl_windows.h b/platform/windows/context_gl_windows.h
index 392de0b94..38b06eb93 100644
--- a/platform/windows/context_gl_windows.h
+++ b/platform/windows/context_gl_windows.h
@@ -34,7 +34,7 @@
 
 // Author: Juan Linietsky <reduzio@gmail.com>, (C) 2008
 
-#include "core/error_list.h"
+#include "core/error/error_list.h"
 #include "core/os/os.h"
 
 #define WIN32_LEAN_AND_MEAN
diff --git a/platform/x11/power_x11.cpp b/platform/x11/power_x11.cpp
index c1e889791..40079cb70 100644
--- a/platform/x11/power_x11.cpp
+++ b/platform/x11/power_x11.cpp
@@ -58,7 +58,7 @@ Adapted from corresponding SDL 2.0 code.
 #include <stdio.h>
 #include <unistd.h>
 
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include <dirent.h>
 #include <fcntl.h>
 #include <sys/stat.h>
diff --git a/servers/audio/effects/eq.cpp b/servers/audio/effects/eq.cpp
index eb58d1236..f5de4eca6 100644
--- a/servers/audio/effects/eq.cpp
+++ b/servers/audio/effects/eq.cpp
@@ -31,7 +31,7 @@
 // Author: reduzio@gmail.com (C) 2006
 
 #include "eq.h"
-#include "core/error_macros.h"
+#include "core/error/error_macros.h"
 #include "core/math/math_funcs.h"
 #include <math.h>