From f6d1765340ab90515b167ebd25ce5a6a37088b39 Mon Sep 17 00:00:00 2001 From: Thaddeus Crews Date: Tue, 17 Mar 2026 14:37:48 -0500 Subject: [PATCH 1/3] CI: Add `#include` validation hook --- .pre-commit-config.yaml | 8 ++- misc/scripts/validate_includes.py | 111 ++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+), 1 deletion(-) create mode 100755 misc/scripts/validate_includes.py diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5a4ee612fe..580464f910 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -110,11 +110,17 @@ repos: additional_dependencies: [xmlschema] - id: validate-codeowners - name: validate codeowners + name: validate-codeowners language: python entry: python misc/scripts/validate_codeowners.py args: [--unowned] + - id: validate-includes + name: validate-includes + language: python + entry: python misc/scripts/validate_includes.py + files: \.(c|h|cpp|hpp|cc|hh|cxx|hxx|m|mm|inc)$ + - id: eslint name: eslint language: node diff --git a/misc/scripts/validate_includes.py b/misc/scripts/validate_includes.py new file mode 100755 index 0000000000..dcedd3303d --- /dev/null +++ b/misc/scripts/validate_includes.py @@ -0,0 +1,111 @@ +#!/usr/bin/env python3 + +if __name__ != "__main__": + raise ImportError(f'Utility script "{__file__}" should not be used as a module!') + +import os +from pathlib import Path + +if Path(os.getcwd()).as_posix() != (ROOT := Path(__file__).parent.parent.parent).as_posix(): + raise RuntimeError(f'Utility script "{__file__}" must be run from the repository root!') + +import argparse +import re +from dataclasses import dataclass + +BASE_FOLDER = Path(__file__).resolve().parent.parent.parent +RE_INCLUDES = re.compile( + r"^#(?Pinclude|import) " # Both `include` and `import` keywords valid. + r'(?P[<"])' # Handle both styles of char wrappers. Does NOT handle macro expansion. + r'(?P.+?)[>"]', # Resolve path of include itself. Can safely assume the sequence matches. + re.RegexFlag.MULTILINE, +) + + +@dataclass +class IncludeData: + path: str + is_angle: bool + is_import: bool + + @staticmethod + def from_match(match: re.Match[str]): + items = match.groupdict() + return IncludeData( + items["path"], + items["sequence"] == "<", + items["keyword"] == "import", + ) + + def copy(self): + return IncludeData(self.path, self.is_angle, self.is_import) + + def __str__(self): + return "#{keyword} {rbracket}{path}{lbracket}".format( + keyword="import" if self.is_import else "include", + rbracket="<" if self.is_angle else '"', + path=self.path, + lbracket=">" if self.is_angle else '"', + ) + + +def validate_includes(path: Path) -> int: + ret = 0 + content = path.read_text(encoding="utf-8") + + for data in map(IncludeData.from_match, RE_INCLUDES.finditer(content)): + original_data = data.copy() + + if "\\" in data.path: + data.path = data.path.replace("\\", "/") + + if data.path.startswith("thirdparty/"): + data.is_angle = True + + if (relative_path := path.parent / data.path).exists(): + # Relative includes are only permitted under certain circumstances. + + if relative_path.name.split(".")[0] == path.name.split(".")[0]: + # Identical leading names permitted + pass + + elif ("modules" in relative_path.parts and "modules" in path.parts) or ( + "platform" in relative_path.parts and "platform" in path.parts + ): + # Modules and platforms can use relative includes if constrained to the module/platform itself. + pass + + else: + data.path = relative_path.resolve().relative_to(BASE_FOLDER).as_posix() + + if original_data != data: + content = content.replace(f"{original_data}", f"{data}") + ret += 1 + + if ret: + with open(path, "w", encoding="utf-8", newline="\n") as file: + file.write(content) + + return ret + + +def main() -> int: + parser = argparse.ArgumentParser(description="Validate C/C++ includes, correcting if necessary") + parser.add_argument("files", nargs="+", help="A list of files to validate") + args = parser.parse_args() + + ret = 0 + + for file in map(Path, args.files): + ret += validate_includes(file) + + return ret + + +try: + raise SystemExit(main()) +except KeyboardInterrupt: + import signal + + signal.signal(signal.SIGINT, signal.SIG_DFL) + os.kill(os.getpid(), signal.SIGINT) From 98868393cca32cc9cbff5b474291e66064bd9e7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 18 Mar 2026 08:27:06 +0100 Subject: [PATCH 2/3] Style: Enforce `#include` validation hook --- .../extension/gdextension_function_loader.cpp | 2 +- core/extension/libgodot.h | 2 +- core/input/input.cpp | 2 +- core/io/compression.cpp | 3 +-- core/io/file_access_patched.cpp | 3 +-- core/io/file_access_patched.h | 4 ++-- core/io/file_access_zip.h | 2 +- core/io/http_client_tcp.h | 3 +-- core/io/zip_io.h | 4 ++-- core/math/bvh.h | 3 +-- core/math/bvh_tree.h | 20 +++++++++---------- core/math/color.cpp | 2 +- core/math/delaunay_3d.h | 2 +- core/math/geometry_2d.cpp | 6 +++--- core/math/random_pcg.h | 2 +- core/os/condition_variable.h | 2 +- core/os/mutex.h | 2 +- core/os/os.cpp | 2 +- core/os/rw_lock.h | 2 +- core/os/semaphore.h | 4 ++-- core/os/thread.h | 2 +- core/string/optimized_translation.cpp | 2 +- core/string/ustring.cpp | 2 +- core/templates/lru.h | 4 ++-- core/variant/variant_call.cpp | 3 +-- core/variant/variant_construct.h | 3 +-- core/variant/variant_op.h | 3 +-- core/variant/variant_setget.h | 3 +-- core/variant/variant_utility.h | 2 +- drivers/alsa/audio_driver_alsa.cpp | 2 +- .../apple_embedded/app_delegate_service.mm | 7 +++---- drivers/apple_embedded/apple_embedded.mm | 5 ++--- .../bridging_header_apple_embedded.h | 8 ++++---- .../display_server_apple_embedded.h | 2 +- .../display_server_apple_embedded.mm | 17 ++++++++-------- drivers/apple_embedded/godot_app_delegate.mm | 3 +-- .../godot_keyboard_input_view.mm | 5 ++--- .../godot_view_apple_embedded.mm | 7 +++---- .../apple_embedded/godot_view_controller.mm | 13 ++++++------ drivers/apple_embedded/godot_view_renderer.mm | 5 ++--- drivers/apple_embedded/os_apple_embedded.h | 5 ++--- drivers/apple_embedded/os_apple_embedded.mm | 9 ++++----- drivers/metal/metal3_objects.cpp | 8 ++++---- drivers/metal/metal3_objects.h | 3 +-- drivers/metal/metal_device_profile.cpp | 2 +- drivers/metal/metal_device_properties.cpp | 3 +-- drivers/metal/metal_objects_shared.cpp | 2 +- drivers/metal/metal_objects_shared.h | 8 ++++---- drivers/metal/pixel_formats.cpp | 2 +- drivers/metal/pixel_formats.h | 5 ++--- .../metal/rendering_context_driver_metal.cpp | 7 +++---- .../metal/rendering_device_driver_metal.cpp | 7 +++---- drivers/metal/rendering_device_driver_metal.h | 5 ++--- .../metal/rendering_device_driver_metal3.cpp | 5 ++--- .../metal/rendering_device_driver_metal3.h | 4 ++-- .../rendering_shader_container_metal.cpp | 6 ++---- .../metal/rendering_shader_container_metal.h | 5 ++--- drivers/pulseaudio/audio_driver_pulseaudio.h | 2 +- drivers/unix/ip_unix.cpp | 2 +- .../vulkan/rendering_device_driver_vulkan.cpp | 4 ++-- .../vulkan/rendering_device_driver_vulkan.h | 5 ++--- .../rendering_shader_container_vulkan.cpp | 2 +- drivers/windows/dir_access_windows.cpp | 3 +-- editor/export/editor_export.h | 4 ++-- .../editor_export_platform_apple_embedded.h | 3 +-- editor/export/editor_export_platform_pc.h | 2 +- editor/export/lipo.cpp | 2 +- .../3d/post_import_plugin_skeleton_renamer.h | 2 +- .../post_import_plugin_skeleton_rest_fixer.h | 2 +- ...t_import_plugin_skeleton_track_organizer.h | 2 +- editor/import/3d/resource_importer_obj.h | 2 +- .../import/dynamic_font_import_settings.cpp | 3 +-- editor/scene/2d/sprite_2d_editor_plugin.cpp | 2 +- editor/scene/2d/tiles/tile_data_editors.cpp | 3 +-- editor/scene/2d/tiles/tile_data_editors.h | 3 +-- .../scene/2d/tiles/tile_map_layer_editor.cpp | 3 +-- .../2d/tiles/tile_set_atlas_source_editor.h | 5 ++--- editor/scene/2d/tiles/tile_set_editor.cpp | 5 ++--- editor/scene/2d/tiles/tiles_editor_plugin.cpp | 3 +-- editor/shader/editor_shader_language_plugin.h | 2 +- editor/shader/text_shader_language_plugin.cpp | 3 +-- .../shader/visual_shader_language_plugin.cpp | 2 +- modules/bcdec/image_decompress_bcdec.cpp | 2 +- modules/csg/csg_shape.h | 2 +- modules/gdscript/tests/test_lsp.h | 2 +- modules/meshoptimizer/register_types.cpp | 2 +- modules/mp3/audio_stream_mp3.cpp | 2 +- modules/mp3/audio_stream_mp3.h | 2 +- .../2d/nav_mesh_generator_2d.cpp | 4 ++-- modules/noise/fastnoise_lite.h | 2 +- modules/openxr/openxr_platform_inc.h | 6 +++--- modules/theora/video_stream_theora.cpp | 2 +- modules/vhacd/register_types.cpp | 2 +- modules/zip/zip_packer.h | 2 +- modules/zip/zip_reader.h | 2 +- platform/linuxbsd/platform_gl.h | 4 ++-- platform/linuxbsd/wayland/detect_prime_egl.h | 4 ++-- platform/linuxbsd/x11/detect_prime_x11.cpp | 4 ++-- platform/linuxbsd/x11/gl_manager_x11.cpp | 2 +- platform/macos/platform_gl.h | 8 ++++---- .../windows/crash_handler_windows_signal.cpp | 3 +-- .../windows/gl_manager_windows_native.cpp | 3 +-- platform/windows/platform_gl.h | 8 ++++---- scene/2d/line_builder.h | 2 +- scene/2d/mesh_instance_2d.cpp | 2 +- scene/2d/multimesh_instance_2d.cpp | 2 +- scene/2d/parallax_background.cpp | 3 +-- scene/animation/animation_blend_space_1d.cpp | 3 +-- scene/animation/animation_blend_space_2d.cpp | 3 +-- scene/gui/color_picker_shape.cpp | 2 +- scene/gui/range.cpp | 2 +- scene/main/scene_tree_fti.cpp | 2 +- scene/resources/2d/navigation_polygon.cpp | 2 +- scene/resources/3d/mesh_library.cpp | 2 +- scene/resources/3d/mesh_library.h | 2 +- scene/resources/3d/primitive_meshes.cpp | 2 +- scene/resources/audio_stream_wav.h | 2 +- scene/resources/bone_map.h | 2 +- scene/resources/gradient.h | 2 +- scene/resources/skeleton_profile.h | 2 +- scene/resources/surface_tool.h | 2 +- servers/physics_2d/physics_server_2d_dummy.h | 2 +- servers/rendering/instance_uniforms.cpp | 2 +- .../renderer_rd/effects/copy_effects.cpp | 2 +- servers/rendering/renderer_rd/effects/fsr2.h | 2 +- servers/rendering/rendering_device_binds.cpp | 2 +- .../rendering/rendering_shader_container.cpp | 2 +- servers/xr/xr_positional_tracker.cpp | 3 +-- tests/test_macros.h | 2 +- 129 files changed, 203 insertions(+), 248 deletions(-) diff --git a/core/extension/gdextension_function_loader.cpp b/core/extension/gdextension_function_loader.cpp index afe55eb922..978fd50120 100644 --- a/core/extension/gdextension_function_loader.cpp +++ b/core/extension/gdextension_function_loader.cpp @@ -30,7 +30,7 @@ #include "gdextension_function_loader.h" -#include "gdextension.h" +#include "core/extension/gdextension.h" Error GDExtensionFunctionLoader::open_library(const String &p_path) { ERR_FAIL_COND_V_MSG(!p_path.begins_with("libgodot://"), ERR_FILE_NOT_FOUND, "Function based GDExtensions should have a path starting with libgodot://"); diff --git a/core/extension/libgodot.h b/core/extension/libgodot.h index 5b6f39dc67..17d0753f77 100644 --- a/core/extension/libgodot.h +++ b/core/extension/libgodot.h @@ -30,7 +30,7 @@ #pragma once -#include "gdextension_interface.gen.h" +#include "core/extension/gdextension_interface.gen.h" #ifdef __cplusplus extern "C" { diff --git a/core/input/input.cpp b/core/input/input.cpp index 512f402158..38da1c6e85 100644 --- a/core/input/input.cpp +++ b/core/input/input.cpp @@ -42,7 +42,7 @@ #include "core/os/thread.h" #endif -#include "thirdparty/gamepadmotionhelpers/GamepadMotion.hpp" +#include #define STANDARD_GRAVITY 9.80665f diff --git a/core/io/compression.cpp b/core/io/compression.cpp index 72d2e1b222..3c37f68b7b 100644 --- a/core/io/compression.cpp +++ b/core/io/compression.cpp @@ -32,8 +32,7 @@ #include "core/io/zip_io.h" -#include "thirdparty/misc/fastlz.h" - +#include #include #ifdef BROTLI_ENABLED diff --git a/core/io/file_access_patched.cpp b/core/io/file_access_patched.cpp index 8c520b6876..4657491a9d 100644 --- a/core/io/file_access_patched.cpp +++ b/core/io/file_access_patched.cpp @@ -30,9 +30,8 @@ #include "file_access_patched.h" -#include "file_access_pack.h" - #include "core/io/delta_encoding.h" +#include "core/io/file_access_pack.h" #include "core/os/os.h" Error FileAccessPatched::_apply_patch() const { diff --git a/core/io/file_access_patched.h b/core/io/file_access_patched.h index 62cfb7b870..6e6fd99fae 100644 --- a/core/io/file_access_patched.h +++ b/core/io/file_access_patched.h @@ -30,8 +30,8 @@ #pragma once -#include "file_access.h" -#include "file_access_memory.h" +#include "core/io/file_access.h" +#include "core/io/file_access_memory.h" class FileAccessPatched : public FileAccess { GDSOFTCLASS(FileAccessPatched, FileAccess); diff --git a/core/io/file_access_zip.h b/core/io/file_access_zip.h index 3cdd1643b5..53f10444a6 100644 --- a/core/io/file_access_zip.h +++ b/core/io/file_access_zip.h @@ -34,7 +34,7 @@ #include "core/io/file_access_pack.h" -#include "thirdparty/minizip/unzip.h" +#include class ZipArchive : public PackSource { public: diff --git a/core/io/http_client_tcp.h b/core/io/http_client_tcp.h index ae6f3b453a..80dd7043b9 100644 --- a/core/io/http_client_tcp.h +++ b/core/io/http_client_tcp.h @@ -30,9 +30,8 @@ #pragma once -#include "http_client.h" - #include "core/crypto/crypto.h" +#include "core/io/http_client.h" #include "core/io/ip.h" class StreamPeerTCP; diff --git a/core/io/zip_io.h b/core/io/zip_io.h index f4c00f2c03..f925a1f5e9 100644 --- a/core/io/zip_io.h +++ b/core/io/zip_io.h @@ -33,8 +33,8 @@ #include "core/io/file_access.h" // This file serves as the Godot interface to minizip. -#include "thirdparty/minizip/unzip.h" // IWYU pragma: export -#include "thirdparty/minizip/zip.h" // IWYU pragma: export +#include // IWYU pragma: export +#include // IWYU pragma: export // Get the current file info and safely convert the full filepath to a String. int godot_unzip_get_current_file_info(unzFile p_zip_file, unz_file_info64 &r_file_info, String &r_filepath); diff --git a/core/math/bvh.h b/core/math/bvh.h index 03a358f118..3208c55273 100644 --- a/core/math/bvh.h +++ b/core/math/bvh.h @@ -50,8 +50,7 @@ // TYPE_BODY // and pairable_mask is either 0 if static, or set to all if non static -#include "bvh_tree.h" - +#include "core/math/bvh_tree.h" #include "core/math/geometry_3d.h" #include "core/os/mutex.h" diff --git a/core/math/bvh_tree.h b/core/math/bvh_tree.h index 86daaab5ce..7c76a3292b 100644 --- a/core/math/bvh_tree.h +++ b/core/math/bvh_tree.h @@ -169,8 +169,8 @@ template uint32_t Color::to_argb32() const { uint32_t c = (uint8_t)Math::round(a * 255.0f); diff --git a/core/math/delaunay_3d.h b/core/math/delaunay_3d.h index 7acf8cbcce..2d2ad84dbb 100644 --- a/core/math/delaunay_3d.h +++ b/core/math/delaunay_3d.h @@ -39,7 +39,7 @@ #include "core/templates/local_vector.h" #include "core/templates/vector.h" -#include "thirdparty/misc/r128.h" +#include class Delaunay3D { struct Simplex; diff --git a/core/math/geometry_2d.cpp b/core/math/geometry_2d.cpp index 7b6a3a1828..5ac8b51627 100644 --- a/core/math/geometry_2d.cpp +++ b/core/math/geometry_2d.cpp @@ -33,11 +33,11 @@ #include "core/math/math_funcs_binary.h" GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Walloc-zero") -#include "thirdparty/clipper2/include/clipper2/clipper.h" +#include GODOT_GCC_WARNING_POP -#include "thirdparty/misc/polypartition.h" +#include #define STB_RECT_PACK_IMPLEMENTATION -#include "thirdparty/misc/stb_rect_pack.h" +#include const int clipper_precision = 5; // Based on CMP_EPSILON. diff --git a/core/math/random_pcg.h b/core/math/random_pcg.h index 618f3ebe76..a9eb3db67f 100644 --- a/core/math/random_pcg.h +++ b/core/math/random_pcg.h @@ -32,7 +32,7 @@ #include "core/math/math_funcs.h" -#include "thirdparty/misc/pcg.h" +#include #include // ldexp diff --git a/core/os/condition_variable.h b/core/os/condition_variable.h index 4fbd55e8f0..9cd63811d6 100644 --- a/core/os/condition_variable.h +++ b/core/os/condition_variable.h @@ -37,7 +37,7 @@ #ifdef MINGW_ENABLED #define MINGW_STDTHREAD_REDUNDANCY_WARNING -#include "thirdparty/mingw-std-threads/mingw.condition_variable.h" +#include #define THREADING_NAMESPACE mingw_stdthread #else #include diff --git a/core/os/mutex.h b/core/os/mutex.h index 0727a79623..5c33cdfc7d 100644 --- a/core/os/mutex.h +++ b/core/os/mutex.h @@ -34,7 +34,7 @@ #ifdef MINGW_ENABLED #define MINGW_STDTHREAD_REDUNDANCY_WARNING -#include "thirdparty/mingw-std-threads/mingw.mutex.h" +#include #define THREADING_NAMESPACE mingw_stdthread #else #include diff --git a/core/os/os.cpp b/core/os/os.cpp index 7c01497365..c489fa3986 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -43,7 +43,7 @@ #ifdef MINGW_ENABLED #define MINGW_STDTHREAD_REDUNDANCY_WARNING -#include "thirdparty/mingw-std-threads/mingw.thread.h" +#include #define THREADING_NAMESPACE mingw_stdthread #else #include diff --git a/core/os/rw_lock.h b/core/os/rw_lock.h index 521c1deabf..7beed84340 100644 --- a/core/os/rw_lock.h +++ b/core/os/rw_lock.h @@ -34,7 +34,7 @@ #ifdef MINGW_ENABLED #define MINGW_STDTHREAD_REDUNDANCY_WARNING -#include "thirdparty/mingw-std-threads/mingw.shared_mutex.h" +#include #define THREADING_NAMESPACE mingw_stdthread #else #include diff --git a/core/os/semaphore.h b/core/os/semaphore.h index aae5d4274e..44499d88ee 100644 --- a/core/os/semaphore.h +++ b/core/os/semaphore.h @@ -40,8 +40,8 @@ #ifdef MINGW_ENABLED #define MINGW_STDTHREAD_REDUNDANCY_WARNING -#include "thirdparty/mingw-std-threads/mingw.condition_variable.h" -#include "thirdparty/mingw-std-threads/mingw.mutex.h" +#include +#include #define THREADING_NAMESPACE mingw_stdthread #else #include diff --git a/core/os/thread.h b/core/os/thread.h index 216433997a..b4faf89ccf 100644 --- a/core/os/thread.h +++ b/core/os/thread.h @@ -52,7 +52,7 @@ #ifdef MINGW_ENABLED #define MINGW_STDTHREAD_REDUNDANCY_WARNING -#include "thirdparty/mingw-std-threads/mingw.thread.h" +#include #define THREADING_NAMESPACE mingw_stdthread #else #include diff --git a/core/string/optimized_translation.cpp b/core/string/optimized_translation.cpp index 06e349bdb9..3fc934b5dc 100644 --- a/core/string/optimized_translation.cpp +++ b/core/string/optimized_translation.cpp @@ -34,7 +34,7 @@ #include "core/templates/pair.h" extern "C" { -#include "thirdparty/misc/smaz.h" +#include } struct CompressedString { diff --git a/core/string/ustring.cpp b/core/string/ustring.cpp index ac9092c6bf..37f4d8c741 100644 --- a/core/string/ustring.cpp +++ b/core/string/ustring.cpp @@ -47,7 +47,7 @@ STATIC_ASSERT_INCOMPLETE_TYPE(class, Object); #include "core/variant/variant.h" #include "core/version_generated.gen.h" -#include "thirdparty/grisu2/grisu2.h" +#include #include diff --git a/core/templates/lru.h b/core/templates/lru.h index df15d4b63f..e605affc20 100644 --- a/core/templates/lru.h +++ b/core/templates/lru.h @@ -30,8 +30,8 @@ #pragma once -#include "hash_map.h" -#include "list.h" +#include "core/templates/hash_map.h" +#include "core/templates/list.h" template , void (*BeforeEvict)(TKey &, TData &) = nullptr> class LRUCache { diff --git a/core/variant/variant_call.cpp b/core/variant/variant_call.cpp index 057c24e6de..7320a3616e 100644 --- a/core/variant/variant_call.cpp +++ b/core/variant/variant_call.cpp @@ -28,8 +28,6 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -#include "variant.h" - #include "core/debugger/engine_debugger.h" #include "core/io/compression.h" #include "core/io/marshalls.h" @@ -38,6 +36,7 @@ #include "core/templates/local_vector.h" #include "core/variant/binder_common.h" #include "core/variant/method_ptrcall.h" +#include "core/variant/variant.h" #include "core/variant/variant_internal.h" typedef void (*VariantFunc)(Variant &r_ret, Variant &p_self, const Variant **p_args); diff --git a/core/variant/variant_construct.h b/core/variant/variant_construct.h index 2eefc8627d..a906e1a394 100644 --- a/core/variant/variant_construct.h +++ b/core/variant/variant_construct.h @@ -30,10 +30,9 @@ #pragma once -#include "variant.h" - #include "core/templates/a_hash_map.h" #include "core/variant/binder_common.h" +#include "core/variant/variant.h" #include "core/variant/variant_internal.h" template diff --git a/core/variant/variant_op.h b/core/variant/variant_op.h index de1190f574..db63e2c51b 100644 --- a/core/variant/variant_op.h +++ b/core/variant/variant_op.h @@ -30,10 +30,9 @@ #pragma once -#include "variant.h" - #include "core/variant/method_ptrcall.h" #include "core/variant/type_info.h" +#include "core/variant/variant.h" #include "core/variant/variant_internal.h" template diff --git a/core/variant/variant_setget.h b/core/variant/variant_setget.h index 1f56d8d591..7c9017b221 100644 --- a/core/variant/variant_setget.h +++ b/core/variant/variant_setget.h @@ -30,9 +30,8 @@ #pragma once -#include "variant.h" - #include "core/variant/method_ptrcall.h" +#include "core/variant/variant.h" #include "core/variant/variant_internal.h" /**** NAMED SETTERS AND GETTERS ****/ diff --git a/core/variant/variant_utility.h b/core/variant/variant_utility.h index b5e0c7e18d..d8a6fafdb8 100644 --- a/core/variant/variant_utility.h +++ b/core/variant/variant_utility.h @@ -30,7 +30,7 @@ #pragma once -#include "variant.h" +#include "core/variant/variant.h" struct VariantUtilityFunctions { // Math diff --git a/drivers/alsa/audio_driver_alsa.cpp b/drivers/alsa/audio_driver_alsa.cpp index 6e4074eb9e..744e6a72d7 100644 --- a/drivers/alsa/audio_driver_alsa.cpp +++ b/drivers/alsa/audio_driver_alsa.cpp @@ -37,7 +37,7 @@ #include "core/os/os.h" #ifdef SOWRAP_ENABLED -#include "asound-so_wrap.h" +#include "drivers/alsa/asound-so_wrap.h" #else #include #endif diff --git a/drivers/apple_embedded/app_delegate_service.mm b/drivers/apple_embedded/app_delegate_service.mm index f649a8e9ed..4e3ce1b443 100644 --- a/drivers/apple_embedded/app_delegate_service.mm +++ b/drivers/apple_embedded/app_delegate_service.mm @@ -30,13 +30,12 @@ #import "app_delegate_service.h" -#import "godot_view_apple_embedded.h" -#import "godot_view_controller.h" -#import "os_apple_embedded.h" - #include "core/config/project_settings.h" #include "core/os/main_loop.h" #include "core/os/os.h" +#import "drivers/apple_embedded/godot_view_apple_embedded.h" +#import "drivers/apple_embedded/godot_view_controller.h" +#import "drivers/apple_embedded/os_apple_embedded.h" #import "drivers/coreaudio/audio_driver_coreaudio.h" #include "main/main.h" diff --git a/drivers/apple_embedded/apple_embedded.mm b/drivers/apple_embedded/apple_embedded.mm index 368e879ac8..b6b5410e6f 100644 --- a/drivers/apple_embedded/apple_embedded.mm +++ b/drivers/apple_embedded/apple_embedded.mm @@ -30,10 +30,9 @@ #import "apple_embedded.h" -#import "app_delegate_service.h" -#import "godot_view_controller.h" - #include "core/object/class_db.h" +#import "drivers/apple_embedded/app_delegate_service.h" +#import "drivers/apple_embedded/godot_view_controller.h" #import #import diff --git a/drivers/apple_embedded/bridging_header_apple_embedded.h b/drivers/apple_embedded/bridging_header_apple_embedded.h index fa29f5bbb1..5e0bb8b262 100644 --- a/drivers/apple_embedded/bridging_header_apple_embedded.h +++ b/drivers/apple_embedded/bridging_header_apple_embedded.h @@ -31,8 +31,8 @@ #pragma once // IWYU pragma: begin_exports. -#import "app_delegate_service.h" -#import "godot_app_delegate.h" -#import "godot_view_apple_embedded.h" -#import "godot_view_controller.h" +#import "drivers/apple_embedded/app_delegate_service.h" +#import "drivers/apple_embedded/godot_app_delegate.h" +#import "drivers/apple_embedded/godot_view_apple_embedded.h" +#import "drivers/apple_embedded/godot_view_controller.h" // IWYU pragma: end_exports. diff --git a/drivers/apple_embedded/display_server_apple_embedded.h b/drivers/apple_embedded/display_server_apple_embedded.h index b54056ac52..5dd9793de2 100644 --- a/drivers/apple_embedded/display_server_apple_embedded.h +++ b/drivers/apple_embedded/display_server_apple_embedded.h @@ -37,7 +37,7 @@ #include "servers/rendering/rendering_device.h" #if defined(VULKAN_ENABLED) -#import "rendering_context_driver_vulkan_apple_embedded.h" +#import "drivers/apple_embedded/rendering_context_driver_vulkan_apple_embedded.h" #include #endif // VULKAN_ENABLED diff --git a/drivers/apple_embedded/display_server_apple_embedded.mm b/drivers/apple_embedded/display_server_apple_embedded.mm index 739dbe29a8..9e5764cefb 100644 --- a/drivers/apple_embedded/display_server_apple_embedded.mm +++ b/drivers/apple_embedded/display_server_apple_embedded.mm @@ -30,19 +30,18 @@ #import "display_server_apple_embedded.h" -#import "app_delegate_service.h" -#import "apple_embedded.h" -#import "godot_keyboard_input_view.h" -#import "godot_view_apple_embedded.h" -#import "godot_view_controller.h" -#import "key_mapping_apple_embedded.h" -#import "os_apple_embedded.h" -#import "tts_apple_embedded.h" - #include "core/config/project_settings.h" #include "core/input/input.h" #include "core/io/file_access_pack.h" #include "core/os/os.h" +#import "drivers/apple_embedded/app_delegate_service.h" +#import "drivers/apple_embedded/apple_embedded.h" +#import "drivers/apple_embedded/godot_keyboard_input_view.h" +#import "drivers/apple_embedded/godot_view_apple_embedded.h" +#import "drivers/apple_embedded/godot_view_controller.h" +#import "drivers/apple_embedded/key_mapping_apple_embedded.h" +#import "drivers/apple_embedded/os_apple_embedded.h" +#import "drivers/apple_embedded/tts_apple_embedded.h" #include "servers/display/native_menu.h" #import diff --git a/drivers/apple_embedded/godot_app_delegate.mm b/drivers/apple_embedded/godot_app_delegate.mm index 6dc3f3d9b0..b3360e4a01 100644 --- a/drivers/apple_embedded/godot_app_delegate.mm +++ b/drivers/apple_embedded/godot_app_delegate.mm @@ -30,9 +30,8 @@ #import "godot_app_delegate.h" -#import "app_delegate_service.h" - #include "core/typedefs.h" +#import "drivers/apple_embedded/app_delegate_service.h" @implementation GDTApplicationDelegate diff --git a/drivers/apple_embedded/godot_keyboard_input_view.mm b/drivers/apple_embedded/godot_keyboard_input_view.mm index 9cbc9a0f48..013c8c08d3 100644 --- a/drivers/apple_embedded/godot_keyboard_input_view.mm +++ b/drivers/apple_embedded/godot_keyboard_input_view.mm @@ -30,10 +30,9 @@ #import "godot_keyboard_input_view.h" -#import "display_server_apple_embedded.h" -#import "os_apple_embedded.h" - #include "core/os/keyboard.h" +#import "drivers/apple_embedded/display_server_apple_embedded.h" +#import "drivers/apple_embedded/os_apple_embedded.h" @interface GDTKeyboardInputView () diff --git a/drivers/apple_embedded/godot_view_apple_embedded.mm b/drivers/apple_embedded/godot_view_apple_embedded.mm index 4c94459c92..ffd22c3428 100644 --- a/drivers/apple_embedded/godot_view_apple_embedded.mm +++ b/drivers/apple_embedded/godot_view_apple_embedded.mm @@ -30,13 +30,12 @@ #import "godot_view_apple_embedded.h" -#import "display_layer_apple_embedded.h" -#import "display_server_apple_embedded.h" -#import "godot_view_renderer.h" - #include "core/config/project_settings.h" #include "core/os/keyboard.h" #include "core/string/ustring.h" +#import "drivers/apple_embedded/display_layer_apple_embedded.h" +#import "drivers/apple_embedded/display_server_apple_embedded.h" +#import "drivers/apple_embedded/godot_view_renderer.h" #import diff --git a/drivers/apple_embedded/godot_view_controller.mm b/drivers/apple_embedded/godot_view_controller.mm index abb39f6a00..d3831878ae 100644 --- a/drivers/apple_embedded/godot_view_controller.mm +++ b/drivers/apple_embedded/godot_view_controller.mm @@ -30,14 +30,13 @@ #import "godot_view_controller.h" -#import "display_server_apple_embedded.h" -#import "godot_keyboard_input_view.h" -#import "godot_view_apple_embedded.h" -#import "godot_view_renderer.h" -#import "key_mapping_apple_embedded.h" -#import "os_apple_embedded.h" - #include "core/config/project_settings.h" +#import "drivers/apple_embedded/display_server_apple_embedded.h" +#import "drivers/apple_embedded/godot_keyboard_input_view.h" +#import "drivers/apple_embedded/godot_view_apple_embedded.h" +#import "drivers/apple_embedded/godot_view_renderer.h" +#import "drivers/apple_embedded/key_mapping_apple_embedded.h" +#import "drivers/apple_embedded/os_apple_embedded.h" #include "servers/camera/camera_server.h" #import diff --git a/drivers/apple_embedded/godot_view_renderer.mm b/drivers/apple_embedded/godot_view_renderer.mm index 1cff7767cc..60c6701682 100644 --- a/drivers/apple_embedded/godot_view_renderer.mm +++ b/drivers/apple_embedded/godot_view_renderer.mm @@ -30,12 +30,11 @@ #import "godot_view_renderer.h" -#import "display_server_apple_embedded.h" -#import "os_apple_embedded.h" - #include "core/config/project_settings.h" #include "core/os/keyboard.h" #include "core/os/os.h" +#import "drivers/apple_embedded/display_server_apple_embedded.h" +#import "drivers/apple_embedded/os_apple_embedded.h" #include "main/main.h" #include "servers/audio/audio_server.h" diff --git a/drivers/apple_embedded/os_apple_embedded.h b/drivers/apple_embedded/os_apple_embedded.h index 1bab2bbda8..d801a8652d 100644 --- a/drivers/apple_embedded/os_apple_embedded.h +++ b/drivers/apple_embedded/os_apple_embedded.h @@ -32,8 +32,7 @@ #ifdef APPLE_EMBEDDED_ENABLED -#import "apple_embedded.h" - +#import "drivers/apple_embedded/apple_embedded.h" #import "drivers/coreaudio/audio_driver_coreaudio.h" #include "drivers/unix/os_unix.h" #include "servers/audio/audio_server.h" @@ -43,7 +42,7 @@ #include "servers/rendering/rendering_device.h" #if defined(VULKAN_ENABLED) -#import "rendering_context_driver_vulkan_apple_embedded.h" +#import "drivers/apple_embedded/rendering_context_driver_vulkan_apple_embedded.h" #endif #endif diff --git a/drivers/apple_embedded/os_apple_embedded.mm b/drivers/apple_embedded/os_apple_embedded.mm index 9ebd3a86c6..c1dfa5304c 100644 --- a/drivers/apple_embedded/os_apple_embedded.mm +++ b/drivers/apple_embedded/os_apple_embedded.mm @@ -32,11 +32,6 @@ #ifdef APPLE_EMBEDDED_ENABLED -#import "app_delegate_service.h" -#import "display_server_apple_embedded.h" -#import "godot_view_apple_embedded.h" -#import "godot_view_controller.h" - #include "core/config/engine.h" #include "core/config/project_settings.h" #include "core/io/dir_access.h" @@ -45,6 +40,10 @@ #include "core/os/os.h" #include "core/profiling/profiling.h" #import "drivers/apple/os_log_logger.h" +#import "drivers/apple_embedded/app_delegate_service.h" +#import "drivers/apple_embedded/display_server_apple_embedded.h" +#import "drivers/apple_embedded/godot_view_apple_embedded.h" +#import "drivers/apple_embedded/godot_view_controller.h" #ifdef SDL_ENABLED #include "drivers/sdl/joypad_sdl.h" #endif diff --git a/drivers/metal/metal3_objects.cpp b/drivers/metal/metal3_objects.cpp index f96ead2caa..d0c1f21b74 100644 --- a/drivers/metal/metal3_objects.cpp +++ b/drivers/metal/metal3_objects.cpp @@ -50,10 +50,10 @@ #include "metal3_objects.h" -#include "metal_utils.h" -#include "pixel_formats.h" -#include "rendering_device_driver_metal3.h" -#include "rendering_shader_container_metal.h" +#include "drivers/metal/metal_utils.h" +#include "drivers/metal/pixel_formats.h" +#include "drivers/metal/rendering_device_driver_metal3.h" +#include "drivers/metal/rendering_shader_container_metal.h" #include diff --git a/drivers/metal/metal3_objects.h b/drivers/metal/metal3_objects.h index 3f44de22e6..4e690cdc8f 100644 --- a/drivers/metal/metal3_objects.h +++ b/drivers/metal/metal3_objects.h @@ -50,8 +50,7 @@ /* permissions and limitations under the License. */ /**************************************************************************/ -#include "metal_objects_shared.h" - +#include "drivers/metal/metal_objects_shared.h" #include "servers/rendering/rendering_device_driver.h" #include diff --git a/drivers/metal/metal_device_profile.cpp b/drivers/metal/metal_device_profile.cpp index d373dbd465..d7eb025d0d 100644 --- a/drivers/metal/metal_device_profile.cpp +++ b/drivers/metal/metal_device_profile.cpp @@ -30,7 +30,7 @@ #include "metal_device_profile.h" -#include "metal_utils.h" +#include "drivers/metal/metal_utils.h" Mutex MetalDeviceProfile::profiles_lock; HashMap MetalDeviceProfile::profiles; diff --git a/drivers/metal/metal_device_properties.cpp b/drivers/metal/metal_device_properties.cpp index 04e0857a84..aca31d644b 100644 --- a/drivers/metal/metal_device_properties.cpp +++ b/drivers/metal/metal_device_properties.cpp @@ -50,9 +50,8 @@ #include "metal_device_properties.h" -#include "metal_utils.h" - #include "core/os/os.h" +#include "drivers/metal/metal_utils.h" #include "servers/rendering/renderer_rd/effects/metal_fx.h" #include diff --git a/drivers/metal/metal_objects_shared.cpp b/drivers/metal/metal_objects_shared.cpp index 2193d2af48..49822ba857 100644 --- a/drivers/metal/metal_objects_shared.cpp +++ b/drivers/metal/metal_objects_shared.cpp @@ -30,7 +30,7 @@ #include "metal_objects_shared.h" -#include "rendering_device_driver_metal.h" +#include "drivers/metal/rendering_device_driver_metal.h" #include #include diff --git a/drivers/metal/metal_objects_shared.h b/drivers/metal/metal_objects_shared.h index f929e7a125..e5d01d9041 100644 --- a/drivers/metal/metal_objects_shared.h +++ b/drivers/metal/metal_objects_shared.h @@ -30,10 +30,10 @@ #pragma once -#include "metal_device_properties.h" -#include "metal_utils.h" -#include "pixel_formats.h" -#include "sha256_digest.h" +#include "drivers/metal/metal_device_properties.h" +#include "drivers/metal/metal_utils.h" +#include "drivers/metal/pixel_formats.h" +#include "drivers/metal/sha256_digest.h" #include diff --git a/drivers/metal/pixel_formats.cpp b/drivers/metal/pixel_formats.cpp index b56e117eef..cce5bd349a 100644 --- a/drivers/metal/pixel_formats.cpp +++ b/drivers/metal/pixel_formats.cpp @@ -50,7 +50,7 @@ #include "pixel_formats.h" -#include "metal_utils.h" +#include "drivers/metal/metal_utils.h" #if TARGET_OS_IPHONE || TARGET_OS_TV #if !(__IPHONE_OS_VERSION_MAX_ALLOWED >= 160400) // iOS/tvOS 16.4 diff --git a/drivers/metal/pixel_formats.h b/drivers/metal/pixel_formats.h index bdb936db76..c45bdf9690 100644 --- a/drivers/metal/pixel_formats.h +++ b/drivers/metal/pixel_formats.h @@ -54,9 +54,8 @@ GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wdeprecated-declarations") -#include "inflection_map.h" -#include "metal_device_properties.h" - +#include "drivers/metal/inflection_map.h" +#include "drivers/metal/metal_device_properties.h" #include "servers/rendering/rendering_device_commons.h" #ifdef __OBJC__ diff --git a/drivers/metal/rendering_context_driver_metal.cpp b/drivers/metal/rendering_context_driver_metal.cpp index c25bec76c7..a749de8259 100644 --- a/drivers/metal/rendering_context_driver_metal.cpp +++ b/drivers/metal/rendering_context_driver_metal.cpp @@ -30,12 +30,11 @@ #include "rendering_context_driver_metal.h" -#include "metal3_objects.h" -#include "metal_objects_shared.h" -#include "rendering_device_driver_metal3.h" - #include "core/os/os.h" #include "core/templates/sort_array.h" +#include "drivers/metal/metal3_objects.h" +#include "drivers/metal/metal_objects_shared.h" +#include "drivers/metal/rendering_device_driver_metal3.h" #include #include diff --git a/drivers/metal/rendering_device_driver_metal.cpp b/drivers/metal/rendering_device_driver_metal.cpp index 94677cab66..a989f99b5f 100644 --- a/drivers/metal/rendering_device_driver_metal.cpp +++ b/drivers/metal/rendering_device_driver_metal.cpp @@ -50,10 +50,6 @@ #include "rendering_device_driver_metal.h" -#include "pixel_formats.h" -#include "rendering_context_driver_metal.h" -#include "rendering_shader_container_metal.h" - #include "core/config/engine.h" #include "core/config/project_settings.h" #include "core/io/marshalls.h" @@ -61,6 +57,9 @@ #include "core/string/ustring.h" #include "core/templates/hash_map.h" #include "drivers/apple/foundation_helpers.h" +#include "drivers/metal/pixel_formats.h" +#include "drivers/metal/rendering_context_driver_metal.h" +#include "drivers/metal/rendering_shader_container_metal.h" #include #include diff --git a/drivers/metal/rendering_device_driver_metal.h b/drivers/metal/rendering_device_driver_metal.h index 3e17a5c23d..5bf32ee822 100644 --- a/drivers/metal/rendering_device_driver_metal.h +++ b/drivers/metal/rendering_device_driver_metal.h @@ -30,9 +30,8 @@ #pragma once -#include "metal_device_profile.h" -#include "metal_objects_shared.h" - +#include "drivers/metal/metal_device_profile.h" +#include "drivers/metal/metal_objects_shared.h" #include "servers/rendering/rendering_device_driver.h" #include diff --git a/drivers/metal/rendering_device_driver_metal3.cpp b/drivers/metal/rendering_device_driver_metal3.cpp index 2fc0861a89..1fbd16fbd5 100644 --- a/drivers/metal/rendering_device_driver_metal3.cpp +++ b/drivers/metal/rendering_device_driver_metal3.cpp @@ -30,12 +30,11 @@ #include "rendering_device_driver_metal3.h" -#include "pixel_formats.h" -#include "rendering_context_driver_metal.h" - #include "core/config/project_settings.h" #include "core/os/os.h" #include "core/string/ustring.h" +#include "drivers/metal/pixel_formats.h" +#include "drivers/metal/rendering_context_driver_metal.h" namespace MTL3 { diff --git a/drivers/metal/rendering_device_driver_metal3.h b/drivers/metal/rendering_device_driver_metal3.h index 648fdd57a8..d87fa438ac 100644 --- a/drivers/metal/rendering_device_driver_metal3.h +++ b/drivers/metal/rendering_device_driver_metal3.h @@ -30,8 +30,8 @@ #pragma once -#include "metal3_objects.h" -#include "rendering_device_driver_metal.h" +#include "drivers/metal/metal3_objects.h" +#include "drivers/metal/rendering_device_driver_metal.h" #include diff --git a/drivers/metal/rendering_shader_container_metal.cpp b/drivers/metal/rendering_shader_container_metal.cpp index daf1202195..ce3862d01f 100644 --- a/drivers/metal/rendering_shader_container_metal.cpp +++ b/drivers/metal/rendering_shader_container_metal.cpp @@ -30,19 +30,17 @@ #include "rendering_shader_container_metal.h" -#include "metal_utils.h" - #include "core/io/file_access.h" #include "core/io/marshalls.h" #include "core/os/os.h" #include "core/templates/fixed_vector.h" - -#include "thirdparty/spirv-reflect/spirv_reflect.h" +#include "drivers/metal/metal_utils.h" #include #include #include #include +#include void RenderingShaderContainerMetal::_initialize_toolchain_properties() { if (compiler_props.is_valid()) { diff --git a/drivers/metal/rendering_shader_container_metal.h b/drivers/metal/rendering_shader_container_metal.h index 13097b4ef4..9a3aad83cf 100644 --- a/drivers/metal/rendering_shader_container_metal.h +++ b/drivers/metal/rendering_shader_container_metal.h @@ -30,9 +30,8 @@ #pragma once -#include "metal_device_profile.h" -#include "sha256_digest.h" - +#include "drivers/metal/metal_device_profile.h" +#include "drivers/metal/sha256_digest.h" #include "servers/rendering/rendering_device_driver.h" #include "servers/rendering/rendering_shader_container.h" diff --git a/drivers/pulseaudio/audio_driver_pulseaudio.h b/drivers/pulseaudio/audio_driver_pulseaudio.h index 05246af04e..dde0e34a87 100644 --- a/drivers/pulseaudio/audio_driver_pulseaudio.h +++ b/drivers/pulseaudio/audio_driver_pulseaudio.h @@ -38,7 +38,7 @@ #include "servers/audio/audio_server.h" #ifdef SOWRAP_ENABLED -#include "pulse-so_wrap.h" // IWYU pragma: keep. Relies on pulseaudio.h transitive includes. +#include "drivers/pulseaudio/pulse-so_wrap.h" // IWYU pragma: keep. Relies on pulseaudio.h transitive includes. #else #include #endif diff --git a/drivers/unix/ip_unix.cpp b/drivers/unix/ip_unix.cpp index b290b7cd3d..ce972f7bbe 100644 --- a/drivers/unix/ip_unix.cpp +++ b/drivers/unix/ip_unix.cpp @@ -37,7 +37,7 @@ #ifdef ANDROID_ENABLED // We could drop this file once we up our API level to 24, // where the NDK's ifaddrs.h supports to needed getifaddrs. -#include "thirdparty/misc/ifaddrs-android.h" +#include #else #ifdef __FreeBSD__ #include diff --git a/drivers/vulkan/rendering_device_driver_vulkan.cpp b/drivers/vulkan/rendering_device_driver_vulkan.cpp index 5d97e6dc3e..2165757da2 100644 --- a/drivers/vulkan/rendering_device_driver_vulkan.cpp +++ b/drivers/vulkan/rendering_device_driver_vulkan.cpp @@ -36,14 +36,14 @@ #include "core/templates/fixed_vector.h" #include "drivers/vulkan/vulkan_hooks.h" -#include "thirdparty/misc/smolv.h" +#include #if defined(SWAPPY_FRAME_PACING_ENABLED) #include "platform/android/java_godot_wrapper.h" #include "platform/android/os_android.h" #include "platform/android/thread_jandroid.h" -#include "thirdparty/swappy-frame-pacing/swappyVk.h" +#include #endif #define ARRAY_SIZE(a) std_size(a) diff --git a/drivers/vulkan/rendering_device_driver_vulkan.h b/drivers/vulkan/rendering_device_driver_vulkan.h index 1cdebdccf9..ff58c9e572 100644 --- a/drivers/vulkan/rendering_device_driver_vulkan.h +++ b/drivers/vulkan/rendering_device_driver_vulkan.h @@ -42,10 +42,9 @@ #define _DEBUG #endif #endif -#include "thirdparty/re-spirv/re-spirv.h" -#include "thirdparty/vulkan/vk_mem_alloc.h" - #include +#include +#include class FileAccess; diff --git a/drivers/vulkan/rendering_shader_container_vulkan.cpp b/drivers/vulkan/rendering_shader_container_vulkan.cpp index 0c0220587e..3bb2880ab0 100644 --- a/drivers/vulkan/rendering_shader_container_vulkan.cpp +++ b/drivers/vulkan/rendering_shader_container_vulkan.cpp @@ -30,7 +30,7 @@ #include "rendering_shader_container_vulkan.h" -#include "thirdparty/misc/smolv.h" +#include // RenderingShaderContainerVulkan diff --git a/drivers/windows/dir_access_windows.cpp b/drivers/windows/dir_access_windows.cpp index 79fe27c2fe..1afb7341cd 100644 --- a/drivers/windows/dir_access_windows.cpp +++ b/drivers/windows/dir_access_windows.cpp @@ -32,11 +32,10 @@ #include "dir_access_windows.h" -#include "file_access_windows.h" - #include "core/os/memory.h" #include "core/os/os.h" #include "core/string/print_string.h" +#include "drivers/windows/file_access_windows.h" #include diff --git a/editor/export/editor_export.h b/editor/export/editor_export.h index 457e4fef3e..e20baf4d05 100644 --- a/editor/export/editor_export.h +++ b/editor/export/editor_export.h @@ -30,8 +30,8 @@ #pragma once -#include "editor_export_platform.h" -#include "editor_export_plugin.h" +#include "editor/export/editor_export_platform.h" +#include "editor/export/editor_export_plugin.h" class Timer; diff --git a/editor/export/editor_export_platform_apple_embedded.h b/editor/export/editor_export_platform_apple_embedded.h index b0d4e3f1f5..3a346ef72b 100644 --- a/editor/export/editor_export_platform_apple_embedded.h +++ b/editor/export/editor_export_platform_apple_embedded.h @@ -30,12 +30,11 @@ #pragma once -#include "plugin_config_apple_embedded.h" - #include "core/config/project_settings.h" #include "core/io/dir_access.h" #include "core/templates/safe_refcount.h" #include "editor/export/editor_export_platform.h" +#include "editor/export/plugin_config_apple_embedded.h" #include "scene/resources/image_texture.h" #include diff --git a/editor/export/editor_export_platform_pc.h b/editor/export/editor_export_platform_pc.h index 09747c4a2d..d3318060d9 100644 --- a/editor/export/editor_export_platform_pc.h +++ b/editor/export/editor_export_platform_pc.h @@ -30,7 +30,7 @@ #pragma once -#include "editor_export_platform.h" +#include "editor/export/editor_export_platform.h" class ImageTexture; diff --git a/editor/export/lipo.cpp b/editor/export/lipo.cpp index 079a912b51..e42841d895 100644 --- a/editor/export/lipo.cpp +++ b/editor/export/lipo.cpp @@ -30,7 +30,7 @@ #include "lipo.h" -#include "macho.h" +#include "editor/export/macho.h" bool LipO::is_lipo(const String &p_path) { Ref fb = FileAccess::open(p_path, FileAccess::READ); diff --git a/editor/import/3d/post_import_plugin_skeleton_renamer.h b/editor/import/3d/post_import_plugin_skeleton_renamer.h index 9d11a51c75..1ecb5b7e7f 100644 --- a/editor/import/3d/post_import_plugin_skeleton_renamer.h +++ b/editor/import/3d/post_import_plugin_skeleton_renamer.h @@ -30,7 +30,7 @@ #pragma once -#include "resource_importer_scene.h" +#include "editor/import/3d/resource_importer_scene.h" class PostImportPluginSkeletonRenamer : public EditorScenePostImportPlugin { GDCLASS(PostImportPluginSkeletonRenamer, EditorScenePostImportPlugin); diff --git a/editor/import/3d/post_import_plugin_skeleton_rest_fixer.h b/editor/import/3d/post_import_plugin_skeleton_rest_fixer.h index ee45e17cd9..dd7e3205e7 100644 --- a/editor/import/3d/post_import_plugin_skeleton_rest_fixer.h +++ b/editor/import/3d/post_import_plugin_skeleton_rest_fixer.h @@ -30,7 +30,7 @@ #pragma once -#include "resource_importer_scene.h" +#include "editor/import/3d/resource_importer_scene.h" class PostImportPluginSkeletonRestFixer : public EditorScenePostImportPlugin { GDCLASS(PostImportPluginSkeletonRestFixer, EditorScenePostImportPlugin); diff --git a/editor/import/3d/post_import_plugin_skeleton_track_organizer.h b/editor/import/3d/post_import_plugin_skeleton_track_organizer.h index 7d017ac2ac..baa25aa196 100644 --- a/editor/import/3d/post_import_plugin_skeleton_track_organizer.h +++ b/editor/import/3d/post_import_plugin_skeleton_track_organizer.h @@ -30,7 +30,7 @@ #pragma once -#include "resource_importer_scene.h" +#include "editor/import/3d/resource_importer_scene.h" class PostImportPluginSkeletonTrackOrganizer : public EditorScenePostImportPlugin { GDCLASS(PostImportPluginSkeletonTrackOrganizer, EditorScenePostImportPlugin); diff --git a/editor/import/3d/resource_importer_obj.h b/editor/import/3d/resource_importer_obj.h index ee7eed8c78..4a46deecce 100644 --- a/editor/import/3d/resource_importer_obj.h +++ b/editor/import/3d/resource_importer_obj.h @@ -30,7 +30,7 @@ #pragma once -#include "resource_importer_scene.h" +#include "editor/import/3d/resource_importer_scene.h" class EditorOBJImporter : public EditorSceneFormatImporter { GDCLASS(EditorOBJImporter, EditorSceneFormatImporter); diff --git a/editor/import/dynamic_font_import_settings.cpp b/editor/import/dynamic_font_import_settings.cpp index 394fd930eb..63ed09b5a8 100644 --- a/editor/import/dynamic_font_import_settings.cpp +++ b/editor/import/dynamic_font_import_settings.cpp @@ -30,8 +30,6 @@ #include "dynamic_font_import_settings.h" -#include "unicode_ranges.inc" - #include "core/config/project_settings.h" #include "core/object/callable_mp.h" #include "core/os/os.h" @@ -39,6 +37,7 @@ #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/file_system/editor_file_system.h" +#include "editor/import/unicode_ranges.inc" #include "editor/inspector/editor_inspector.h" #include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" diff --git a/editor/scene/2d/sprite_2d_editor_plugin.cpp b/editor/scene/2d/sprite_2d_editor_plugin.cpp index 54341668e8..a1ad916cf3 100644 --- a/editor/scene/2d/sprite_2d_editor_plugin.cpp +++ b/editor/scene/2d/sprite_2d_editor_plugin.cpp @@ -52,7 +52,7 @@ #include "scene/resources/bit_map.h" #include "scene/resources/mesh.h" -#include "thirdparty/clipper2/include/clipper2/clipper.h" +#include #define PRECISION 1 diff --git a/editor/scene/2d/tiles/tile_data_editors.cpp b/editor/scene/2d/tiles/tile_data_editors.cpp index 1acecfb214..adc5541f94 100644 --- a/editor/scene/2d/tiles/tile_data_editors.cpp +++ b/editor/scene/2d/tiles/tile_data_editors.cpp @@ -30,8 +30,6 @@ #include "tile_data_editors.h" -#include "tile_set_editor.h" - #include "core/math/geometry_2d.h" #include "core/math/random_pcg.h" #include "core/object/callable_mp.h" @@ -41,6 +39,7 @@ #include "editor/editor_string_names.h" #include "editor/editor_undo_redo_manager.h" #include "editor/inspector/editor_properties.h" +#include "editor/scene/2d/tiles/tile_set_editor.h" #include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/gui/control.h" diff --git a/editor/scene/2d/tiles/tile_data_editors.h b/editor/scene/2d/tiles/tile_data_editors.h index 47fdf40387..6945bfd134 100644 --- a/editor/scene/2d/tiles/tile_data_editors.h +++ b/editor/scene/2d/tiles/tile_data_editors.h @@ -30,9 +30,8 @@ #pragma once -#include "tile_atlas_view.h" - #include "editor/inspector/editor_properties.h" +#include "editor/scene/2d/tiles/tile_atlas_view.h" #include "scene/gui/box_container.h" class Label; diff --git a/editor/scene/2d/tiles/tile_map_layer_editor.cpp b/editor/scene/2d/tiles/tile_map_layer_editor.cpp index 2843288b31..9115f6adc7 100644 --- a/editor/scene/2d/tiles/tile_map_layer_editor.cpp +++ b/editor/scene/2d/tiles/tile_map_layer_editor.cpp @@ -30,8 +30,6 @@ #include "tile_map_layer_editor.h" -#include "tiles_editor_plugin.h" - #include "core/input/input.h" #include "core/math/geometry_2d.h" #include "core/math/random_pcg.h" @@ -43,6 +41,7 @@ #include "editor/editor_undo_redo_manager.h" #include "editor/inspector/editor_resource_preview.h" #include "editor/inspector/multi_node_edit.h" +#include "editor/scene/2d/tiles/tiles_editor_plugin.h" #include "editor/scene/canvas_item_editor_plugin.h" #include "editor/settings/editor_command_palette.h" #include "editor/settings/editor_settings.h" diff --git a/editor/scene/2d/tiles/tile_set_atlas_source_editor.h b/editor/scene/2d/tiles/tile_set_atlas_source_editor.h index d6fa75068f..e0cd66fed4 100644 --- a/editor/scene/2d/tiles/tile_set_atlas_source_editor.h +++ b/editor/scene/2d/tiles/tile_set_atlas_source_editor.h @@ -30,9 +30,8 @@ #pragma once -#include "tile_atlas_view.h" -#include "tile_data_editors.h" - +#include "editor/scene/2d/tiles/tile_atlas_view.h" +#include "editor/scene/2d/tiles/tile_data_editors.h" #include "scene/gui/split_container.h" #include "scene/resources/2d/tile_set.h" diff --git a/editor/scene/2d/tiles/tile_set_editor.cpp b/editor/scene/2d/tiles/tile_set_editor.cpp index d30b653f08..a38a04eb52 100644 --- a/editor/scene/2d/tiles/tile_set_editor.cpp +++ b/editor/scene/2d/tiles/tile_set_editor.cpp @@ -30,9 +30,6 @@ #include "tile_set_editor.h" -#include "tile_data_editors.h" -#include "tiles_editor_plugin.h" - #include "core/object/callable_mp.h" #include "core/object/class_db.h" #include "editor/editor_node.h" @@ -40,6 +37,8 @@ #include "editor/file_system/editor_file_system.h" #include "editor/gui/editor_file_dialog.h" #include "editor/inspector/editor_inspector.h" +#include "editor/scene/2d/tiles/tile_data_editors.h" +#include "editor/scene/2d/tiles/tiles_editor_plugin.h" #include "editor/settings/editor_command_palette.h" #include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" diff --git a/editor/scene/2d/tiles/tiles_editor_plugin.cpp b/editor/scene/2d/tiles/tiles_editor_plugin.cpp index 507b5d9b15..891d1539c2 100644 --- a/editor/scene/2d/tiles/tiles_editor_plugin.cpp +++ b/editor/scene/2d/tiles/tiles_editor_plugin.cpp @@ -30,8 +30,6 @@ #include "tiles_editor_plugin.h" -#include "tile_set_editor.h" - #include "core/object/callable_mp.h" #include "core/os/mutex.h" #include "core/os/os.h" @@ -40,6 +38,7 @@ #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/inspector/multi_node_edit.h" +#include "editor/scene/2d/tiles/tile_set_editor.h" #include "editor/scene/canvas_item_editor_plugin.h" #include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" diff --git a/editor/shader/editor_shader_language_plugin.h b/editor/shader/editor_shader_language_plugin.h index 8cbba218b6..77a9e275cf 100644 --- a/editor/shader/editor_shader_language_plugin.h +++ b/editor/shader/editor_shader_language_plugin.h @@ -30,7 +30,7 @@ #pragma once -#include "shader_editor.h" +#include "editor/shader/shader_editor.h" class EditorShaderLanguagePlugin : public RefCounted { GDCLASS(EditorShaderLanguagePlugin, RefCounted); diff --git a/editor/shader/text_shader_language_plugin.cpp b/editor/shader/text_shader_language_plugin.cpp index 48ce7bff71..fef40edb16 100644 --- a/editor/shader/text_shader_language_plugin.cpp +++ b/editor/shader/text_shader_language_plugin.cpp @@ -30,9 +30,8 @@ #include "text_shader_language_plugin.h" -#include "text_shader_editor.h" - #include "core/string/string_builder.h" +#include "editor/shader/text_shader_editor.h" #include "servers/rendering/shader_types.h" bool TextShaderLanguagePlugin::handles_shader(const Ref &p_shader) const { diff --git a/editor/shader/visual_shader_language_plugin.cpp b/editor/shader/visual_shader_language_plugin.cpp index 2d4d86977c..7283fc5646 100644 --- a/editor/shader/visual_shader_language_plugin.cpp +++ b/editor/shader/visual_shader_language_plugin.cpp @@ -30,7 +30,7 @@ #include "visual_shader_language_plugin.h" -#include "visual_shader_editor_plugin.h" +#include "editor/shader/visual_shader_editor_plugin.h" bool VisualShaderLanguagePlugin::handles_shader(const Ref &p_shader) const { return Object::cast_to(p_shader.ptr()) != nullptr; diff --git a/modules/bcdec/image_decompress_bcdec.cpp b/modules/bcdec/image_decompress_bcdec.cpp index 272db0e2cd..dfc805d92e 100644 --- a/modules/bcdec/image_decompress_bcdec.cpp +++ b/modules/bcdec/image_decompress_bcdec.cpp @@ -34,7 +34,7 @@ #include "core/string/print_string.h" #define BCDEC_IMPLEMENTATION -#include "thirdparty/misc/bcdec.h" +#include inline void bcdec_bc6h_half_s(const void *compressedBlock, void *decompressedBlock, int destinationPitch) { bcdec_bc6h_half(compressedBlock, decompressedBlock, destinationPitch, true); diff --git a/modules/csg/csg_shape.h b/modules/csg/csg_shape.h index f285aa3ceb..247c58f0f9 100644 --- a/modules/csg/csg_shape.h +++ b/modules/csg/csg_shape.h @@ -39,7 +39,7 @@ #include "scene/resources/3d/concave_polygon_shape_3d.h" #endif // PHYSICS_3D_DISABLED -#include "thirdparty/misc/mikktspace.h" +#include class Mesh; class NavigationMesh; diff --git a/modules/gdscript/tests/test_lsp.h b/modules/gdscript/tests/test_lsp.h index 62338e85c3..33de0fac8f 100644 --- a/modules/gdscript/tests/test_lsp.h +++ b/modules/gdscript/tests/test_lsp.h @@ -47,7 +47,7 @@ #include "modules/regex/regex.h" -#include "thirdparty/doctest/doctest.h" +#include class TestGDScriptLanguageProtocolInitializer { public: diff --git a/modules/meshoptimizer/register_types.cpp b/modules/meshoptimizer/register_types.cpp index ebfe5d9c5b..a709993a61 100644 --- a/modules/meshoptimizer/register_types.cpp +++ b/modules/meshoptimizer/register_types.cpp @@ -32,7 +32,7 @@ #include "scene/resources/surface_tool.h" -#include "thirdparty/meshoptimizer/meshoptimizer.h" +#include void initialize_meshoptimizer_module(ModuleInitializationLevel p_level) { if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) { diff --git a/modules/mp3/audio_stream_mp3.cpp b/modules/mp3/audio_stream_mp3.cpp index 012372e305..84303dfa8f 100644 --- a/modules/mp3/audio_stream_mp3.cpp +++ b/modules/mp3/audio_stream_mp3.cpp @@ -37,7 +37,7 @@ #include "core/io/file_access.h" #include "core/object/class_db.h" -#include "thirdparty/dr_libs/dr_bridge.h" +#include int AudioStreamPlaybackMP3::_mix_internal(AudioFrame *p_buffer, int p_frames) { if (!active) { diff --git a/modules/mp3/audio_stream_mp3.h b/modules/mp3/audio_stream_mp3.h index 9ffe48b995..15f3a475f5 100644 --- a/modules/mp3/audio_stream_mp3.h +++ b/modules/mp3/audio_stream_mp3.h @@ -32,7 +32,7 @@ #include "servers/audio/audio_stream.h" -#include "thirdparty/dr_libs/dr_mp3.h" +#include class AudioStreamMP3; diff --git a/modules/navigation_2d/2d/nav_mesh_generator_2d.cpp b/modules/navigation_2d/2d/nav_mesh_generator_2d.cpp index 4667e8b579..8f1aebf0f8 100644 --- a/modules/navigation_2d/2d/nav_mesh_generator_2d.cpp +++ b/modules/navigation_2d/2d/nav_mesh_generator_2d.cpp @@ -39,8 +39,8 @@ #include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h" #include "scene/resources/2d/navigation_polygon.h" -#include "thirdparty/clipper2/include/clipper2/clipper.h" -#include "thirdparty/misc/polypartition.h" +#include +#include NavMeshGenerator2D *NavMeshGenerator2D::singleton = nullptr; Mutex NavMeshGenerator2D::baking_navmesh_mutex; diff --git a/modules/noise/fastnoise_lite.h b/modules/noise/fastnoise_lite.h index 6e35aeb1b1..3e74cb0f3c 100644 --- a/modules/noise/fastnoise_lite.h +++ b/modules/noise/fastnoise_lite.h @@ -32,7 +32,7 @@ #include "noise.h" -#include "thirdparty/misc/FastNoiseLite.h" +#include typedef fastnoiselite::FastNoiseLite _FastNoiseLite; diff --git a/modules/openxr/openxr_platform_inc.h b/modules/openxr/openxr_platform_inc.h index 410354b36a..112b8f0537 100644 --- a/modules/openxr/openxr_platform_inc.h +++ b/modules/openxr/openxr_platform_inc.h @@ -57,7 +57,7 @@ #endif // ANDROID_ENABLED #if defined(LINUXBSD_ENABLED) && defined(EGL_ENABLED) #ifdef GLAD_ENABLED -#include "thirdparty/glad/glad/egl.h" +#include #else #include #endif // GLAD_ENABLED @@ -65,8 +65,8 @@ #ifdef X11_ENABLED #define GL_GLEXT_PROTOTYPES 1 #define GL3_PROTOTYPES 1 -#include "thirdparty/glad/glad/gl.h" -#include "thirdparty/glad/glad/glx.h" +#include +#include #endif // X11_ENABLED #endif // defined(GLES3_ENABLED) && !defined(MACOS_ENABLED) diff --git a/modules/theora/video_stream_theora.cpp b/modules/theora/video_stream_theora.cpp index f674282ebb..e25b43adad 100644 --- a/modules/theora/video_stream_theora.cpp +++ b/modules/theora/video_stream_theora.cpp @@ -35,7 +35,7 @@ #include "core/object/class_db.h" #include "scene/resources/image_texture.h" -#include "thirdparty/misc/yuv2rgb.h" +#include int VideoStreamPlaybackTheora::buffer_data() { char *buffer = ogg_sync_buffer(&oy, 4096); diff --git a/modules/vhacd/register_types.cpp b/modules/vhacd/register_types.cpp index d0b35ef0d6..1b7639dd36 100644 --- a/modules/vhacd/register_types.cpp +++ b/modules/vhacd/register_types.cpp @@ -32,7 +32,7 @@ #include "scene/resources/mesh.h" -#include "thirdparty/vhacd/public/VHACD.h" +#include static Vector> convex_decompose(const real_t *p_vertices, int p_vertex_count, const uint32_t *p_triangles, int p_triangle_count, const Ref &p_settings, Vector> *r_convex_indices) { VHACD::IVHACD::Parameters params; diff --git a/modules/zip/zip_packer.h b/modules/zip/zip_packer.h index 247df3dfc3..4c4eaf119e 100644 --- a/modules/zip/zip_packer.h +++ b/modules/zip/zip_packer.h @@ -33,7 +33,7 @@ #include "core/io/file_access.h" #include "core/object/ref_counted.h" -#include "thirdparty/minizip/zip.h" +#include class ZIPPacker : public RefCounted { GDCLASS(ZIPPacker, RefCounted); diff --git a/modules/zip/zip_reader.h b/modules/zip/zip_reader.h index 8135afb687..79acab48dd 100644 --- a/modules/zip/zip_reader.h +++ b/modules/zip/zip_reader.h @@ -33,7 +33,7 @@ #include "core/io/file_access.h" #include "core/object/ref_counted.h" -#include "thirdparty/minizip/unzip.h" +#include class ZIPReader : public RefCounted { GDCLASS(ZIPReader, RefCounted) diff --git a/platform/linuxbsd/platform_gl.h b/platform/linuxbsd/platform_gl.h index 1adb5ef013..0ca40187dd 100644 --- a/platform/linuxbsd/platform_gl.h +++ b/platform/linuxbsd/platform_gl.h @@ -39,6 +39,6 @@ #endif // IWYU pragma: begin_exports. -#include "thirdparty/glad/glad/egl.h" -#include "thirdparty/glad/glad/gl.h" +#include +#include // IWYU pragma: end_exports. diff --git a/platform/linuxbsd/wayland/detect_prime_egl.h b/platform/linuxbsd/wayland/detect_prime_egl.h index 6a29ee81f1..506ff2f65d 100644 --- a/platform/linuxbsd/wayland/detect_prime_egl.h +++ b/platform/linuxbsd/wayland/detect_prime_egl.h @@ -34,8 +34,8 @@ #ifdef EGL_ENABLED #ifdef GLAD_ENABLED -#include "thirdparty/glad/glad/egl.h" -#include "thirdparty/glad/glad/gl.h" +#include +#include #else #include #include diff --git a/platform/linuxbsd/x11/detect_prime_x11.cpp b/platform/linuxbsd/x11/detect_prime_x11.cpp index 83032d1399..07f936efad 100644 --- a/platform/linuxbsd/x11/detect_prime_x11.cpp +++ b/platform/linuxbsd/x11/detect_prime_x11.cpp @@ -36,8 +36,8 @@ #include "core/string/print_string.h" #include "core/variant/variant.h" -#include "thirdparty/glad/glad/gl.h" -#include "thirdparty/glad/glad/glx.h" +#include +#include #ifdef SOWRAP_ENABLED #include "x11/dynwrappers/xlib-so_wrap.h" diff --git a/platform/linuxbsd/x11/gl_manager_x11.cpp b/platform/linuxbsd/x11/gl_manager_x11.cpp index b954c9de2c..afbd4c4a94 100644 --- a/platform/linuxbsd/x11/gl_manager_x11.cpp +++ b/platform/linuxbsd/x11/gl_manager_x11.cpp @@ -35,7 +35,7 @@ #include "core/os/os.h" #include "servers/display/display_server.h" -#include "thirdparty/glad/glad/glx.h" +#include #ifdef SOWRAP_ENABLED #include "dynwrappers/xrender-so_wrap.h" diff --git a/platform/macos/platform_gl.h b/platform/macos/platform_gl.h index 59859cbbda..da7d30a1cd 100644 --- a/platform/macos/platform_gl.h +++ b/platform/macos/platform_gl.h @@ -41,11 +41,11 @@ // IWYU pragma: begin_exports. #ifdef EGL_STATIC #define KHRONOS_STATIC 1 -#include "thirdparty/angle/include/EGL/egl.h" -#include "thirdparty/angle/include/EGL/eglext.h" +#include +#include #undef KHRONOS_STATIC #else -#include "thirdparty/glad/glad/egl.h" +#include #endif -#include "thirdparty/glad/glad/gl.h" +#include // IWYU pragma: end_exports. diff --git a/platform/windows/crash_handler_windows_signal.cpp b/platform/windows/crash_handler_windows_signal.cpp index 6660e6352c..edc80f2549 100644 --- a/platform/windows/crash_handler_windows_signal.cpp +++ b/platform/windows/crash_handler_windows_signal.cpp @@ -40,10 +40,9 @@ #ifdef CRASH_HANDLER_EXCEPTION -#include "thirdparty/libbacktrace/backtrace.h" - #include #include +#include #include #include diff --git a/platform/windows/gl_manager_windows_native.cpp b/platform/windows/gl_manager_windows_native.cpp index 5c7a18887f..4eb5f10750 100644 --- a/platform/windows/gl_manager_windows_native.cpp +++ b/platform/windows/gl_manager_windows_native.cpp @@ -36,9 +36,8 @@ #include "core/os/os.h" #include "core/version.h" -#include "thirdparty/misc/nvapi_minimal.h" - #include +#include #include #include diff --git a/platform/windows/platform_gl.h b/platform/windows/platform_gl.h index c7a0fb1a86..15b70da955 100644 --- a/platform/windows/platform_gl.h +++ b/platform/windows/platform_gl.h @@ -41,12 +41,12 @@ // IWYU pragma: begin_exports. #ifdef EGL_STATIC #define KHRONOS_STATIC 1 -#include "thirdparty/angle/include/EGL/egl.h" -#include "thirdparty/angle/include/EGL/eglext.h" +#include +#include #undef KHRONOS_STATIC #else -#include "thirdparty/glad/glad/egl.h" +#include #endif -#include "thirdparty/glad/glad/gl.h" +#include // IWYU pragma: end_exports. diff --git a/scene/2d/line_builder.h b/scene/2d/line_builder.h index 5ff86e6995..41afe24598 100644 --- a/scene/2d/line_builder.h +++ b/scene/2d/line_builder.h @@ -30,7 +30,7 @@ #pragma once -#include "line_2d.h" +#include "scene/2d/line_2d.h" class LineBuilder { public: diff --git a/scene/2d/mesh_instance_2d.cpp b/scene/2d/mesh_instance_2d.cpp index 75265161f9..33c0ee183e 100644 --- a/scene/2d/mesh_instance_2d.cpp +++ b/scene/2d/mesh_instance_2d.cpp @@ -38,7 +38,7 @@ #include "scene/resources/2d/navigation_polygon.h" #include "servers/navigation_2d/navigation_server_2d.h" -#include "thirdparty/clipper2/include/clipper2/clipper.h" +#include #endif // NAVIGATION_2D_DISABLED Callable MeshInstance2D::_navmesh_source_geometry_parsing_callback; diff --git a/scene/2d/multimesh_instance_2d.cpp b/scene/2d/multimesh_instance_2d.cpp index f3a850cca3..2d826bc395 100644 --- a/scene/2d/multimesh_instance_2d.cpp +++ b/scene/2d/multimesh_instance_2d.cpp @@ -38,7 +38,7 @@ #include "scene/resources/2d/navigation_polygon.h" #include "servers/navigation_2d/navigation_server_2d.h" -#include "thirdparty/clipper2/include/clipper2/clipper.h" +#include #endif // NAVIGATION_2D_DISABLED Callable MultiMeshInstance2D::_navmesh_source_geometry_parsing_callback; diff --git a/scene/2d/parallax_background.cpp b/scene/2d/parallax_background.cpp index bb3562ecbf..6848fd6f05 100644 --- a/scene/2d/parallax_background.cpp +++ b/scene/2d/parallax_background.cpp @@ -30,9 +30,8 @@ #include "parallax_background.h" -#include "parallax_layer.h" - #include "core/object/class_db.h" +#include "scene/2d/parallax_layer.h" void ParallaxBackground::_notification(int p_what) { switch (p_what) { diff --git a/scene/animation/animation_blend_space_1d.cpp b/scene/animation/animation_blend_space_1d.cpp index f0db3a3c49..fc4c7826c0 100644 --- a/scene/animation/animation_blend_space_1d.cpp +++ b/scene/animation/animation_blend_space_1d.cpp @@ -31,9 +31,8 @@ #include "animation_blend_space_1d.h" #include "animation_blend_space_1d.compat.inc" -#include "animation_blend_tree.h" - #include "core/object/class_db.h" +#include "scene/animation/animation_blend_tree.h" void AnimationNodeBlendSpace1D::get_parameter_list(LocalVector *r_list) const { AnimationNode::get_parameter_list(r_list); diff --git a/scene/animation/animation_blend_space_2d.cpp b/scene/animation/animation_blend_space_2d.cpp index 3a6e17e114..aab43918ad 100644 --- a/scene/animation/animation_blend_space_2d.cpp +++ b/scene/animation/animation_blend_space_2d.cpp @@ -31,11 +31,10 @@ #include "animation_blend_space_2d.h" #include "animation_blend_space_2d.compat.inc" -#include "animation_blend_tree.h" - #include "core/math/geometry_2d.h" #include "core/object/callable_mp.h" #include "core/object/class_db.h" +#include "scene/animation/animation_blend_tree.h" void AnimationNodeBlendSpace2D::get_parameter_list(LocalVector *r_list) const { AnimationNode::get_parameter_list(r_list); diff --git a/scene/gui/color_picker_shape.cpp b/scene/gui/color_picker_shape.cpp index 4048d02907..460e2c7292 100644 --- a/scene/gui/color_picker_shape.cpp +++ b/scene/gui/color_picker_shape.cpp @@ -36,7 +36,7 @@ #include "scene/resources/material.h" #include "servers/rendering/rendering_server.h" -#include "thirdparty/misc/ok_color_shader.h" +#include void ColorPickerShape::init_shaders() { wheel_shader.instantiate(); diff --git a/scene/gui/range.cpp b/scene/gui/range.cpp index a5f908d81f..887c78efff 100644 --- a/scene/gui/range.cpp +++ b/scene/gui/range.cpp @@ -34,7 +34,7 @@ #include "core/object/class_db.h" #include "servers/display/accessibility_server.h" -#include "thirdparty/misc/r128.h" +#include double Range::_snapped_r128(double p_value, double p_step) { if (p_step == 0.0) { diff --git a/scene/main/scene_tree_fti.cpp b/scene/main/scene_tree_fti.cpp index 1a2c46b736..88d6f3fefe 100644 --- a/scene/main/scene_tree_fti.cpp +++ b/scene/main/scene_tree_fti.cpp @@ -39,7 +39,7 @@ #include "scene/3d/visual_instance_3d.h" #ifdef GODOT_SCENE_TREE_FTI_VERIFY -#include "scene_tree_fti_tests.h" +#include "scene/main/scene_tree_fti_tests.h" #endif #ifdef DEV_ENABLED diff --git a/scene/resources/2d/navigation_polygon.cpp b/scene/resources/2d/navigation_polygon.cpp index 660f7c7656..7ba7070f7b 100644 --- a/scene/resources/2d/navigation_polygon.cpp +++ b/scene/resources/2d/navigation_polygon.cpp @@ -34,7 +34,7 @@ #include "core/object/class_db.h" #include "core/os/mutex.h" -#include "thirdparty/misc/polypartition.h" +#include #ifdef DEBUG_ENABLED Rect2 NavigationPolygon::_edit_get_rect() const { diff --git a/scene/resources/3d/mesh_library.cpp b/scene/resources/3d/mesh_library.cpp index 766867fdbb..49eaea1514 100644 --- a/scene/resources/3d/mesh_library.cpp +++ b/scene/resources/3d/mesh_library.cpp @@ -35,7 +35,7 @@ #include "servers/rendering/rendering_server.h" // IWYU pragma: keep // Needed to bind RSE enums. #ifndef PHYSICS_3D_DISABLED -#include "box_shape_3d.h" +#include "scene/resources/3d/box_shape_3d.h" #endif // PHYSICS_3D_DISABLED bool MeshLibrary::_set(const StringName &p_name, const Variant &p_value) { diff --git a/scene/resources/3d/mesh_library.h b/scene/resources/3d/mesh_library.h index dbaaac6b48..7b84fd49c2 100644 --- a/scene/resources/3d/mesh_library.h +++ b/scene/resources/3d/mesh_library.h @@ -37,7 +37,7 @@ #include "servers/rendering/rendering_server_enums.h" #ifndef PHYSICS_3D_DISABLED -#include "shape_3d.h" +#include "scene/resources/3d/shape_3d.h" #endif // PHYSICS_3D_DISABLED class MeshLibrary : public Resource { diff --git a/scene/resources/3d/primitive_meshes.cpp b/scene/resources/3d/primitive_meshes.cpp index eaf8a56d3e..37e424e4e2 100644 --- a/scene/resources/3d/primitive_meshes.cpp +++ b/scene/resources/3d/primitive_meshes.cpp @@ -41,7 +41,7 @@ #include "servers/rendering/rendering_server.h" #include "servers/rendering/rendering_server_enums.h" -#include "thirdparty/misc/polypartition.h" +#include #define PADDING_REF_SIZE 1024.0 diff --git a/scene/resources/audio_stream_wav.h b/scene/resources/audio_stream_wav.h index fd67d7b14b..6c930f44d5 100644 --- a/scene/resources/audio_stream_wav.h +++ b/scene/resources/audio_stream_wav.h @@ -32,7 +32,7 @@ #include "servers/audio/audio_stream.h" -#include "thirdparty/misc/qoa.h" +#include class AudioStreamWAV; diff --git a/scene/resources/bone_map.h b/scene/resources/bone_map.h index 0f6ee21d30..7bdbbc781a 100644 --- a/scene/resources/bone_map.h +++ b/scene/resources/bone_map.h @@ -30,7 +30,7 @@ #pragma once -#include "skeleton_profile.h" +#include "scene/resources/skeleton_profile.h" class BoneMap : public Resource { GDCLASS(BoneMap, Resource); diff --git a/scene/resources/gradient.h b/scene/resources/gradient.h index 8e3461a8e2..dd26bfdd4d 100644 --- a/scene/resources/gradient.h +++ b/scene/resources/gradient.h @@ -32,7 +32,7 @@ #include "core/io/resource.h" -#include "thirdparty/misc/ok_color.h" +#include class Gradient : public Resource { GDCLASS(Gradient, Resource); diff --git a/scene/resources/skeleton_profile.h b/scene/resources/skeleton_profile.h index a5689d199a..2e4d394ba4 100644 --- a/scene/resources/skeleton_profile.h +++ b/scene/resources/skeleton_profile.h @@ -30,7 +30,7 @@ #pragma once -#include "texture.h" +#include "scene/resources/texture.h" class SkeletonProfile : public Resource { GDCLASS(SkeletonProfile, Resource); diff --git a/scene/resources/surface_tool.h b/scene/resources/surface_tool.h index b69283db4b..072c958b21 100644 --- a/scene/resources/surface_tool.h +++ b/scene/resources/surface_tool.h @@ -34,7 +34,7 @@ #include "scene/resources/mesh.h" #include "servers/rendering/rendering_server_enums.h" -#include "thirdparty/misc/mikktspace.h" +#include class SurfaceTool : public RefCounted { GDCLASS(SurfaceTool, RefCounted); diff --git a/servers/physics_2d/physics_server_2d_dummy.h b/servers/physics_2d/physics_server_2d_dummy.h index 92bc1c855f..340e10df84 100644 --- a/servers/physics_2d/physics_server_2d_dummy.h +++ b/servers/physics_2d/physics_server_2d_dummy.h @@ -30,7 +30,7 @@ #pragma once -#include "physics_server_2d.h" +#include "servers/physics_2d/physics_server_2d.h" class PhysicsDirectBodyState2DDummy : public PhysicsDirectBodyState2D { GDCLASS(PhysicsDirectBodyState2DDummy, PhysicsDirectBodyState2D); diff --git a/servers/rendering/instance_uniforms.cpp b/servers/rendering/instance_uniforms.cpp index 6fa607fdb4..425e35992c 100644 --- a/servers/rendering/instance_uniforms.cpp +++ b/servers/rendering/instance_uniforms.cpp @@ -30,7 +30,7 @@ #include "instance_uniforms.h" -#include "rendering_server_globals.h" +#include "servers/rendering/rendering_server_globals.h" void InstanceUniforms::free(RID p_self) { ERR_FAIL_COND(p_self.is_null()); diff --git a/servers/rendering/renderer_rd/effects/copy_effects.cpp b/servers/rendering/renderer_rd/effects/copy_effects.cpp index 533b190d95..beccf38f84 100644 --- a/servers/rendering/renderer_rd/effects/copy_effects.cpp +++ b/servers/rendering/renderer_rd/effects/copy_effects.cpp @@ -35,7 +35,7 @@ #include "servers/rendering/renderer_rd/storage_rd/material_storage.h" #include "servers/rendering/renderer_rd/uniform_set_cache_rd.h" -#include "thirdparty/misc/cubemap_coeffs.h" +#include using namespace RendererRD; diff --git a/servers/rendering/renderer_rd/effects/fsr2.h b/servers/rendering/renderer_rd/effects/fsr2.h index 6554588df5..5c1d1fc434 100644 --- a/servers/rendering/renderer_rd/effects/fsr2.h +++ b/servers/rendering/renderer_rd/effects/fsr2.h @@ -45,7 +45,7 @@ #define FFX_GCC #endif -#include "thirdparty/amd-fsr2/ffx_fsr2.h" +#include #define FSR2_MAX_QUEUED_FRAMES (4) #define FSR2_MAX_UNIFORM_BUFFERS (4) diff --git a/servers/rendering/rendering_device_binds.cpp b/servers/rendering/rendering_device_binds.cpp index f170ae1164..f021d8ba48 100644 --- a/servers/rendering/rendering_device_binds.cpp +++ b/servers/rendering/rendering_device_binds.cpp @@ -35,7 +35,7 @@ #include "modules/glslang/shader_compile.h" #endif -#include "shader_include_db.h" +#include "servers/rendering/shader_include_db.h" Error RDShaderFile::parse_versions_from_text(const String &p_text, const String p_defines, OpenIncludeFunction p_include_func, void *p_include_func_userdata) { Vector lines = p_text.split("\n"); diff --git a/servers/rendering/rendering_shader_container.cpp b/servers/rendering/rendering_shader_container.cpp index 90e5d41451..a74bcedc6b 100644 --- a/servers/rendering/rendering_shader_container.cpp +++ b/servers/rendering/rendering_shader_container.cpp @@ -33,7 +33,7 @@ #include "core/io/compression.h" #include "servers/rendering/renderer_rd/shader_rd.h" -#include "thirdparty/spirv-reflect/spirv_reflect.h" +#include static inline uint32_t aligned_to(uint32_t p_size, uint32_t p_alignment) { if (p_size % p_alignment) { diff --git a/servers/xr/xr_positional_tracker.cpp b/servers/xr/xr_positional_tracker.cpp index 235d3462d7..7e1ee27592 100644 --- a/servers/xr/xr_positional_tracker.cpp +++ b/servers/xr/xr_positional_tracker.cpp @@ -30,9 +30,8 @@ #include "xr_positional_tracker.h" -#include "xr_controller_tracker.h" - #include "core/object/class_db.h" +#include "servers/xr/xr_controller_tracker.h" void XRPositionalTracker::_bind_methods() { BIND_ENUM_CONSTANT(TRACKER_HAND_UNKNOWN); diff --git a/tests/test_macros.h b/tests/test_macros.h index d223e6d279..7fb9561e60 100644 --- a/tests/test_macros.h +++ b/tests/test_macros.h @@ -47,7 +47,7 @@ // See documentation for doctest at: // https://github.com/onqtam/doctest/blob/master/doc/markdown/readme.md#reference -#include "thirdparty/doctest/doctest.h" +#include // Forces a test file to be linked. #define TEST_FORCE_LINK(m_name) \ From 4336184ea4accf2cb19715722a24773497267d70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 18 Mar 2026 10:41:47 +0100 Subject: [PATCH 3/3] Style: Tweak ordering of `thirdparty` includes with angle brackets --- .clang-format | 2 +- core/io/compression.cpp | 1 + drivers/alsa/asound-so_wrap.c | 2 +- drivers/alsa/asound-so_wrap.h | 2 +- drivers/d3d12/rendering_context_driver_d3d12.cpp | 3 ++- drivers/d3d12/rendering_device_driver_d3d12.cpp | 3 ++- drivers/metal/rendering_shader_container_metal.cpp | 3 ++- drivers/pulseaudio/pulse-so_wrap.c | 2 +- drivers/pulseaudio/pulse-so_wrap.h | 2 +- drivers/vulkan/rendering_device_driver_vulkan.h | 3 ++- platform/linuxbsd/dbus-so_wrap.c | 2 +- platform/linuxbsd/dbus-so_wrap.h | 2 +- platform/linuxbsd/fontconfig-so_wrap.c | 2 +- platform/linuxbsd/fontconfig-so_wrap.h | 2 +- platform/linuxbsd/speechd-so_wrap.c | 2 +- platform/linuxbsd/speechd-so_wrap.h | 2 +- platform/linuxbsd/x11/dynwrappers/xcursor-so_wrap.c | 2 +- platform/linuxbsd/x11/dynwrappers/xcursor-so_wrap.h | 2 +- platform/linuxbsd/x11/dynwrappers/xext-so_wrap.c | 6 +++--- platform/linuxbsd/x11/dynwrappers/xext-so_wrap.h | 4 ++-- platform/linuxbsd/x11/dynwrappers/xinerama-so_wrap.c | 2 +- platform/linuxbsd/x11/dynwrappers/xinerama-so_wrap.h | 2 +- platform/linuxbsd/x11/dynwrappers/xinput2-so_wrap.c | 2 +- platform/linuxbsd/x11/dynwrappers/xinput2-so_wrap.h | 2 +- platform/linuxbsd/x11/dynwrappers/xlib-so_wrap.c | 6 +++--- platform/linuxbsd/x11/dynwrappers/xlib-so_wrap.h | 6 +++--- platform/linuxbsd/x11/dynwrappers/xrandr-so_wrap.c | 2 +- platform/linuxbsd/x11/dynwrappers/xrandr-so_wrap.h | 2 +- platform/linuxbsd/x11/dynwrappers/xrender-so_wrap.c | 2 +- platform/linuxbsd/x11/dynwrappers/xrender-so_wrap.h | 2 +- platform/windows/crash_handler_windows_signal.cpp | 3 ++- platform/windows/gl_manager_windows_native.cpp | 3 ++- thirdparty/sdl/core/linux/SDL_udev.h | 2 +- thirdparty/sdl/patches/0005-fix-libudev-dbus.patch | 2 +- 34 files changed, 47 insertions(+), 40 deletions(-) diff --git a/.clang-format b/.clang-format index 3ccb29ed2f..59d0158309 100644 --- a/.clang-format +++ b/.clang-format @@ -123,7 +123,7 @@ IncludeCategories: Priority: 20 - Regex: ^"(modules|platform)/.*"$ Priority: 30 - - Regex: ^"thirdparty/.*"$ + - Regex: ^$ Priority: 40 - Regex: ^<(windows|Jolt/Jolt|platform_gl)\.h>$ Priority: 50 diff --git a/core/io/compression.cpp b/core/io/compression.cpp index 3c37f68b7b..76663d9c2c 100644 --- a/core/io/compression.cpp +++ b/core/io/compression.cpp @@ -33,6 +33,7 @@ #include "core/io/zip_io.h" #include + #include #ifdef BROTLI_ENABLED diff --git a/drivers/alsa/asound-so_wrap.c b/drivers/alsa/asound-so_wrap.c index ffe24d4313..20cac9b686 100644 --- a/drivers/alsa/asound-so_wrap.c +++ b/drivers/alsa/asound-so_wrap.c @@ -1276,7 +1276,7 @@ #define snd_midi_event_encode snd_midi_event_encode_dylibloader_orig_asound #define snd_midi_event_encode_byte snd_midi_event_encode_byte_dylibloader_orig_asound #define snd_midi_event_decode snd_midi_event_decode_dylibloader_orig_asound -#include "thirdparty/linuxbsd_headers/alsa/asoundlib.h" +#include #undef snd_asoundlib_version #undef snd_dlopen #undef snd_dlsym diff --git a/drivers/alsa/asound-so_wrap.h b/drivers/alsa/asound-so_wrap.h index 5da6ae76de..6a09959af3 100644 --- a/drivers/alsa/asound-so_wrap.h +++ b/drivers/alsa/asound-so_wrap.h @@ -1278,7 +1278,7 @@ #define snd_midi_event_encode snd_midi_event_encode_dylibloader_orig_asound #define snd_midi_event_encode_byte snd_midi_event_encode_byte_dylibloader_orig_asound #define snd_midi_event_decode snd_midi_event_decode_dylibloader_orig_asound -#include "thirdparty/linuxbsd_headers/alsa/asoundlib.h" // IWYU pragma: export. +#include // IWYU pragma: export. #undef snd_asoundlib_version #undef snd_dlopen #undef snd_dlsym diff --git a/drivers/d3d12/rendering_context_driver_d3d12.cpp b/drivers/d3d12/rendering_context_driver_d3d12.cpp index 6a27f315a2..0e5741e784 100644 --- a/drivers/d3d12/rendering_context_driver_d3d12.cpp +++ b/drivers/d3d12/rendering_context_driver_d3d12.cpp @@ -44,8 +44,9 @@ GODOT_CLANG_WARNING_POP #include #if !defined(_MSC_VER) -#include #include + +#include #endif using Microsoft::WRL::ComPtr; diff --git a/drivers/d3d12/rendering_device_driver_d3d12.cpp b/drivers/d3d12/rendering_device_driver_d3d12.cpp index ad1f7f9f44..aeeedaadf2 100644 --- a/drivers/d3d12/rendering_device_driver_d3d12.cpp +++ b/drivers/d3d12/rendering_device_driver_d3d12.cpp @@ -41,8 +41,9 @@ #include #if !defined(_MSC_VER) -#include #include + +#include #endif using Microsoft::WRL::ComPtr; diff --git a/drivers/metal/rendering_shader_container_metal.cpp b/drivers/metal/rendering_shader_container_metal.cpp index ce3862d01f..cfb781229a 100644 --- a/drivers/metal/rendering_shader_container_metal.cpp +++ b/drivers/metal/rendering_shader_container_metal.cpp @@ -36,11 +36,12 @@ #include "core/templates/fixed_vector.h" #include "drivers/metal/metal_utils.h" +#include + #include #include #include #include -#include void RenderingShaderContainerMetal::_initialize_toolchain_properties() { if (compiler_props.is_valid()) { diff --git a/drivers/pulseaudio/pulse-so_wrap.c b/drivers/pulseaudio/pulse-so_wrap.c index 8f477740ce..0928f9dc21 100644 --- a/drivers/pulseaudio/pulse-so_wrap.c +++ b/drivers/pulseaudio/pulse-so_wrap.c @@ -356,7 +356,7 @@ #define pa_timeval_store pa_timeval_store_dylibloader_orig_pulse #define pa_timeval_load pa_timeval_load_dylibloader_orig_pulse #define pa_rtclock_now pa_rtclock_now_dylibloader_orig_pulse -#include "thirdparty/linuxbsd_headers/pulse/pulseaudio.h" +#include #undef pa_get_library_version #undef pa_bytes_per_second #undef pa_frame_size diff --git a/drivers/pulseaudio/pulse-so_wrap.h b/drivers/pulseaudio/pulse-so_wrap.h index 139e7fe3b4..c02d76efbf 100644 --- a/drivers/pulseaudio/pulse-so_wrap.h +++ b/drivers/pulseaudio/pulse-so_wrap.h @@ -358,7 +358,7 @@ #define pa_timeval_store pa_timeval_store_dylibloader_orig_pulse #define pa_timeval_load pa_timeval_load_dylibloader_orig_pulse #define pa_rtclock_now pa_rtclock_now_dylibloader_orig_pulse -#include "thirdparty/linuxbsd_headers/pulse/pulseaudio.h" // IWYU pragma: export. +#include // IWYU pragma: export. #undef pa_get_library_version #undef pa_bytes_per_second #undef pa_frame_size diff --git a/drivers/vulkan/rendering_device_driver_vulkan.h b/drivers/vulkan/rendering_device_driver_vulkan.h index ff58c9e572..8149259f1c 100644 --- a/drivers/vulkan/rendering_device_driver_vulkan.h +++ b/drivers/vulkan/rendering_device_driver_vulkan.h @@ -42,10 +42,11 @@ #define _DEBUG #endif #endif -#include #include #include +#include + class FileAccess; // Design principles: diff --git a/platform/linuxbsd/dbus-so_wrap.c b/platform/linuxbsd/dbus-so_wrap.c index 4aec9dc48f..792e51422c 100644 --- a/platform/linuxbsd/dbus-so_wrap.c +++ b/platform/linuxbsd/dbus-so_wrap.c @@ -243,7 +243,7 @@ #define dbus_validate_utf8 dbus_validate_utf8_dylibloader_orig_dbus #define dbus_threads_init dbus_threads_init_dylibloader_orig_dbus #define dbus_threads_init_default dbus_threads_init_default_dylibloader_orig_dbus -#include "thirdparty/linuxbsd_headers/dbus/dbus.h" +#include #undef dbus_error_init #undef dbus_error_free #undef dbus_set_error diff --git a/platform/linuxbsd/dbus-so_wrap.h b/platform/linuxbsd/dbus-so_wrap.h index a236209f23..075c652536 100644 --- a/platform/linuxbsd/dbus-so_wrap.h +++ b/platform/linuxbsd/dbus-so_wrap.h @@ -245,7 +245,7 @@ #define dbus_validate_utf8 dbus_validate_utf8_dylibloader_orig_dbus #define dbus_threads_init dbus_threads_init_dylibloader_orig_dbus #define dbus_threads_init_default dbus_threads_init_default_dylibloader_orig_dbus -#include "thirdparty/linuxbsd_headers/dbus/dbus.h" // IWYU pragma: export. +#include // IWYU pragma: export. #undef dbus_error_init #undef dbus_error_free #undef dbus_set_error diff --git a/platform/linuxbsd/fontconfig-so_wrap.c b/platform/linuxbsd/fontconfig-so_wrap.c index 86aacbc647..003710c3c2 100644 --- a/platform/linuxbsd/fontconfig-so_wrap.c +++ b/platform/linuxbsd/fontconfig-so_wrap.c @@ -210,7 +210,7 @@ #define FcStrListDone FcStrListDone_dylibloader_orig_fontconfig #define FcConfigParseAndLoad FcConfigParseAndLoad_dylibloader_orig_fontconfig #define FcConfigParseAndLoadFromMemory FcConfigParseAndLoadFromMemory_dylibloader_orig_fontconfig -#include "thirdparty/linuxbsd_headers/fontconfig/fontconfig.h" +#include #undef FcBlanksCreate #undef FcBlanksDestroy #undef FcBlanksAdd diff --git a/platform/linuxbsd/fontconfig-so_wrap.h b/platform/linuxbsd/fontconfig-so_wrap.h index 6164f5d3ca..e361a137ee 100644 --- a/platform/linuxbsd/fontconfig-so_wrap.h +++ b/platform/linuxbsd/fontconfig-so_wrap.h @@ -212,7 +212,7 @@ #define FcStrListDone FcStrListDone_dylibloader_orig_fontconfig #define FcConfigParseAndLoad FcConfigParseAndLoad_dylibloader_orig_fontconfig #define FcConfigParseAndLoadFromMemory FcConfigParseAndLoadFromMemory_dylibloader_orig_fontconfig -#include "thirdparty/linuxbsd_headers/fontconfig/fontconfig.h" // IWYU pragma: export. +#include // IWYU pragma: export. #undef FcBlanksCreate #undef FcBlanksDestroy #undef FcBlanksAdd diff --git a/platform/linuxbsd/speechd-so_wrap.c b/platform/linuxbsd/speechd-so_wrap.c index 1dc5f08c10..1bb496d338 100644 --- a/platform/linuxbsd/speechd-so_wrap.c +++ b/platform/linuxbsd/speechd-so_wrap.c @@ -80,7 +80,7 @@ #define spd_execute_command_wo_mutex spd_execute_command_wo_mutex_dylibloader_orig_speechd #define spd_send_data spd_send_data_dylibloader_orig_speechd #define spd_send_data_wo_mutex spd_send_data_wo_mutex_dylibloader_orig_speechd -#include "thirdparty/linuxbsd_headers/speechd/libspeechd.h" +#include #undef SPDConnectionAddress__free #undef spd_get_default_address #undef spd_open diff --git a/platform/linuxbsd/speechd-so_wrap.h b/platform/linuxbsd/speechd-so_wrap.h index 4eeaa8e381..eba7d74311 100644 --- a/platform/linuxbsd/speechd-so_wrap.h +++ b/platform/linuxbsd/speechd-so_wrap.h @@ -82,7 +82,7 @@ #define spd_execute_command_wo_mutex spd_execute_command_wo_mutex_dylibloader_orig_speechd #define spd_send_data spd_send_data_dylibloader_orig_speechd #define spd_send_data_wo_mutex spd_send_data_wo_mutex_dylibloader_orig_speechd -#include "thirdparty/linuxbsd_headers/speechd/libspeechd.h" // IWYU pragma: export. +#include // IWYU pragma: export. #undef SPDConnectionAddress__free #undef spd_get_default_address #undef spd_open diff --git a/platform/linuxbsd/x11/dynwrappers/xcursor-so_wrap.c b/platform/linuxbsd/x11/dynwrappers/xcursor-so_wrap.c index 3f4e0d4e26..c3488d3258 100644 --- a/platform/linuxbsd/x11/dynwrappers/xcursor-so_wrap.c +++ b/platform/linuxbsd/x11/dynwrappers/xcursor-so_wrap.c @@ -64,7 +64,7 @@ #define XcursorGetTheme XcursorGetTheme_dylibloader_orig_xcursor #define XcursorGetThemeCore XcursorGetThemeCore_dylibloader_orig_xcursor #define XcursorSetThemeCore XcursorSetThemeCore_dylibloader_orig_xcursor -#include "thirdparty/linuxbsd_headers/X11/Xcursor/Xcursor.h" +#include #undef XcursorImageCreate #undef XcursorImageDestroy #undef XcursorImagesCreate diff --git a/platform/linuxbsd/x11/dynwrappers/xcursor-so_wrap.h b/platform/linuxbsd/x11/dynwrappers/xcursor-so_wrap.h index 3b7f81c750..60211a2652 100644 --- a/platform/linuxbsd/x11/dynwrappers/xcursor-so_wrap.h +++ b/platform/linuxbsd/x11/dynwrappers/xcursor-so_wrap.h @@ -66,7 +66,7 @@ #define XcursorGetTheme XcursorGetTheme_dylibloader_orig_xcursor #define XcursorGetThemeCore XcursorGetThemeCore_dylibloader_orig_xcursor #define XcursorSetThemeCore XcursorSetThemeCore_dylibloader_orig_xcursor -#include "thirdparty/linuxbsd_headers/X11/Xcursor/Xcursor.h" // IWYU pragma: export. +#include // IWYU pragma: export. #undef XcursorImageCreate #undef XcursorImageDestroy #undef XcursorImagesCreate diff --git a/platform/linuxbsd/x11/dynwrappers/xext-so_wrap.c b/platform/linuxbsd/x11/dynwrappers/xext-so_wrap.c index 7b3d33fe39..501b8520d7 100644 --- a/platform/linuxbsd/x11/dynwrappers/xext-so_wrap.c +++ b/platform/linuxbsd/x11/dynwrappers/xext-so_wrap.c @@ -5,7 +5,7 @@ // #include -#include "thirdparty/linuxbsd_headers/X11/Xlib.h" +#include #define XShapeQueryExtension XShapeQueryExtension_dylibloader_orig_xext #define XShapeQueryVersion XShapeQueryVersion_dylibloader_orig_xext #define XShapeCombineRegion XShapeCombineRegion_dylibloader_orig_xext @@ -17,8 +17,8 @@ #define XShapeSelectInput XShapeSelectInput_dylibloader_orig_xext #define XShapeInputSelected XShapeInputSelected_dylibloader_orig_xext #define XShapeGetRectangles XShapeGetRectangles_dylibloader_orig_xext -#include "thirdparty/linuxbsd_headers/X11/extensions/Xext.h" -#include "thirdparty/linuxbsd_headers/X11/extensions/shape.h" +#include +#include #undef XShapeQueryExtension #undef XShapeQueryVersion #undef XShapeCombineRegion diff --git a/platform/linuxbsd/x11/dynwrappers/xext-so_wrap.h b/platform/linuxbsd/x11/dynwrappers/xext-so_wrap.h index 5670971008..545665cd93 100644 --- a/platform/linuxbsd/x11/dynwrappers/xext-so_wrap.h +++ b/platform/linuxbsd/x11/dynwrappers/xext-so_wrap.h @@ -18,8 +18,8 @@ #define XShapeSelectInput XShapeSelectInput_dylibloader_orig_xext #define XShapeInputSelected XShapeInputSelected_dylibloader_orig_xext #define XShapeGetRectangles XShapeGetRectangles_dylibloader_orig_xext -#include "thirdparty/linuxbsd_headers/X11/extensions/Xext.h" // IWYU pragma: export. -#include "thirdparty/linuxbsd_headers/X11/extensions/shape.h" // IWYU pragma: export. +#include // IWYU pragma: export. +#include // IWYU pragma: export. #undef XShapeQueryExtension #undef XShapeQueryVersion #undef XShapeCombineRegion diff --git a/platform/linuxbsd/x11/dynwrappers/xinerama-so_wrap.c b/platform/linuxbsd/x11/dynwrappers/xinerama-so_wrap.c index 554d877556..12c0dbf7fc 100644 --- a/platform/linuxbsd/x11/dynwrappers/xinerama-so_wrap.c +++ b/platform/linuxbsd/x11/dynwrappers/xinerama-so_wrap.c @@ -9,7 +9,7 @@ #define XineramaQueryVersion XineramaQueryVersion_dylibloader_orig_xinerama #define XineramaIsActive XineramaIsActive_dylibloader_orig_xinerama #define XineramaQueryScreens XineramaQueryScreens_dylibloader_orig_xinerama -#include "thirdparty/linuxbsd_headers/X11/extensions/Xinerama.h" +#include #undef XineramaQueryExtension #undef XineramaQueryVersion #undef XineramaIsActive diff --git a/platform/linuxbsd/x11/dynwrappers/xinerama-so_wrap.h b/platform/linuxbsd/x11/dynwrappers/xinerama-so_wrap.h index f040f360f7..b1b9cf087f 100644 --- a/platform/linuxbsd/x11/dynwrappers/xinerama-so_wrap.h +++ b/platform/linuxbsd/x11/dynwrappers/xinerama-so_wrap.h @@ -11,7 +11,7 @@ #define XineramaQueryVersion XineramaQueryVersion_dylibloader_orig_xinerama #define XineramaIsActive XineramaIsActive_dylibloader_orig_xinerama #define XineramaQueryScreens XineramaQueryScreens_dylibloader_orig_xinerama -#include "thirdparty/linuxbsd_headers/X11/extensions/Xinerama.h" // IWYU pragma: export. +#include // IWYU pragma: export. #undef XineramaQueryExtension #undef XineramaQueryVersion #undef XineramaIsActive diff --git a/platform/linuxbsd/x11/dynwrappers/xinput2-so_wrap.c b/platform/linuxbsd/x11/dynwrappers/xinput2-so_wrap.c index 3446bb8ab4..6eb80faf22 100644 --- a/platform/linuxbsd/x11/dynwrappers/xinput2-so_wrap.c +++ b/platform/linuxbsd/x11/dynwrappers/xinput2-so_wrap.c @@ -39,7 +39,7 @@ #define XIBarrierReleasePointers XIBarrierReleasePointers_dylibloader_orig_xinput2 #define XIBarrierReleasePointer XIBarrierReleasePointer_dylibloader_orig_xinput2 #define XIFreeDeviceInfo XIFreeDeviceInfo_dylibloader_orig_xinput2 -#include "thirdparty/linuxbsd_headers/X11/extensions/XInput2.h" +#include #undef XIQueryPointer #undef XIWarpPointer #undef XIDefineCursor diff --git a/platform/linuxbsd/x11/dynwrappers/xinput2-so_wrap.h b/platform/linuxbsd/x11/dynwrappers/xinput2-so_wrap.h index 5554526e36..a635b278a3 100644 --- a/platform/linuxbsd/x11/dynwrappers/xinput2-so_wrap.h +++ b/platform/linuxbsd/x11/dynwrappers/xinput2-so_wrap.h @@ -41,7 +41,7 @@ #define XIBarrierReleasePointers XIBarrierReleasePointers_dylibloader_orig_xinput2 #define XIBarrierReleasePointer XIBarrierReleasePointer_dylibloader_orig_xinput2 #define XIFreeDeviceInfo XIFreeDeviceInfo_dylibloader_orig_xinput2 -#include "thirdparty/linuxbsd_headers/X11/extensions/XInput2.h" // IWYU pragma: export. +#include // IWYU pragma: export. #undef XIQueryPointer #undef XIWarpPointer #undef XIDefineCursor diff --git a/platform/linuxbsd/x11/dynwrappers/xlib-so_wrap.c b/platform/linuxbsd/x11/dynwrappers/xlib-so_wrap.c index 9affd47ce6..cab1ec837a 100644 --- a/platform/linuxbsd/x11/dynwrappers/xlib-so_wrap.c +++ b/platform/linuxbsd/x11/dynwrappers/xlib-so_wrap.c @@ -609,9 +609,9 @@ #define XkbApplyVirtualModChanges XkbApplyVirtualModChanges_dylibloader_orig_xlib #define XkbUpdateActionVirtualMods XkbUpdateActionVirtualMods_dylibloader_orig_xlib #define XkbUpdateKeyTypeVirtualMods XkbUpdateKeyTypeVirtualMods_dylibloader_orig_xlib -#include "thirdparty/linuxbsd_headers/X11/Xlib.h" -#include "thirdparty/linuxbsd_headers/X11/Xutil.h" -#include "thirdparty/linuxbsd_headers/X11/XKBlib.h" +#include +#include +#include #undef _Xmblen #undef XLoadQueryFont #undef XQueryFont diff --git a/platform/linuxbsd/x11/dynwrappers/xlib-so_wrap.h b/platform/linuxbsd/x11/dynwrappers/xlib-so_wrap.h index f1592cfc4c..6f647bbd01 100644 --- a/platform/linuxbsd/x11/dynwrappers/xlib-so_wrap.h +++ b/platform/linuxbsd/x11/dynwrappers/xlib-so_wrap.h @@ -611,9 +611,9 @@ #define XkbApplyVirtualModChanges XkbApplyVirtualModChanges_dylibloader_orig_xlib #define XkbUpdateActionVirtualMods XkbUpdateActionVirtualMods_dylibloader_orig_xlib #define XkbUpdateKeyTypeVirtualMods XkbUpdateKeyTypeVirtualMods_dylibloader_orig_xlib -#include "thirdparty/linuxbsd_headers/X11/Xlib.h" // IWYU pragma: export. -#include "thirdparty/linuxbsd_headers/X11/Xutil.h" // IWYU pragma: export. -#include "thirdparty/linuxbsd_headers/X11/XKBlib.h" // IWYU pragma: export. +#include // IWYU pragma: export. +#include // IWYU pragma: export. +#include // IWYU pragma: export. #undef _Xmblen #undef XLoadQueryFont #undef XQueryFont diff --git a/platform/linuxbsd/x11/dynwrappers/xrandr-so_wrap.c b/platform/linuxbsd/x11/dynwrappers/xrandr-so_wrap.c index f33f35c106..a63fe02425 100644 --- a/platform/linuxbsd/x11/dynwrappers/xrandr-so_wrap.c +++ b/platform/linuxbsd/x11/dynwrappers/xrandr-so_wrap.c @@ -75,7 +75,7 @@ #define XRRSetMonitor XRRSetMonitor_dylibloader_orig_xrandr #define XRRDeleteMonitor XRRDeleteMonitor_dylibloader_orig_xrandr #define XRRFreeMonitors XRRFreeMonitors_dylibloader_orig_xrandr -#include "thirdparty/linuxbsd_headers/X11/extensions/Xrandr.h" +#include #undef XRRQueryExtension #undef XRRQueryVersion #undef XRRGetScreenInfo diff --git a/platform/linuxbsd/x11/dynwrappers/xrandr-so_wrap.h b/platform/linuxbsd/x11/dynwrappers/xrandr-so_wrap.h index 67f3187dc8..d41da5d5bc 100644 --- a/platform/linuxbsd/x11/dynwrappers/xrandr-so_wrap.h +++ b/platform/linuxbsd/x11/dynwrappers/xrandr-so_wrap.h @@ -77,7 +77,7 @@ #define XRRSetMonitor XRRSetMonitor_dylibloader_orig_xrandr #define XRRDeleteMonitor XRRDeleteMonitor_dylibloader_orig_xrandr #define XRRFreeMonitors XRRFreeMonitors_dylibloader_orig_xrandr -#include "thirdparty/linuxbsd_headers/X11/extensions/Xrandr.h" // IWYU pragma: export. +#include // IWYU pragma: export. #undef XRRQueryExtension #undef XRRQueryVersion #undef XRRGetScreenInfo diff --git a/platform/linuxbsd/x11/dynwrappers/xrender-so_wrap.c b/platform/linuxbsd/x11/dynwrappers/xrender-so_wrap.c index 89e90bc92f..f2a551e188 100644 --- a/platform/linuxbsd/x11/dynwrappers/xrender-so_wrap.c +++ b/platform/linuxbsd/x11/dynwrappers/xrender-so_wrap.c @@ -49,7 +49,7 @@ #define XRenderCreateLinearGradient XRenderCreateLinearGradient_dylibloader_orig_xrender #define XRenderCreateRadialGradient XRenderCreateRadialGradient_dylibloader_orig_xrender #define XRenderCreateConicalGradient XRenderCreateConicalGradient_dylibloader_orig_xrender -#include "thirdparty/linuxbsd_headers/X11/extensions/Xrender.h" +#include #undef XRenderQueryExtension #undef XRenderQueryVersion #undef XRenderQueryFormats diff --git a/platform/linuxbsd/x11/dynwrappers/xrender-so_wrap.h b/platform/linuxbsd/x11/dynwrappers/xrender-so_wrap.h index a7abdc2049..252c4daae6 100644 --- a/platform/linuxbsd/x11/dynwrappers/xrender-so_wrap.h +++ b/platform/linuxbsd/x11/dynwrappers/xrender-so_wrap.h @@ -51,7 +51,7 @@ #define XRenderCreateLinearGradient XRenderCreateLinearGradient_dylibloader_orig_xrender #define XRenderCreateRadialGradient XRenderCreateRadialGradient_dylibloader_orig_xrender #define XRenderCreateConicalGradient XRenderCreateConicalGradient_dylibloader_orig_xrender -#include "thirdparty/linuxbsd_headers/X11/extensions/Xrender.h" // IWYU pragma: export. +#include // IWYU pragma: export. #undef XRenderQueryExtension #undef XRenderQueryVersion #undef XRenderQueryFormats diff --git a/platform/windows/crash_handler_windows_signal.cpp b/platform/windows/crash_handler_windows_signal.cpp index edc80f2549..7eac3d27f8 100644 --- a/platform/windows/crash_handler_windows_signal.cpp +++ b/platform/windows/crash_handler_windows_signal.cpp @@ -40,9 +40,10 @@ #ifdef CRASH_HANDLER_EXCEPTION +#include + #include #include -#include #include #include diff --git a/platform/windows/gl_manager_windows_native.cpp b/platform/windows/gl_manager_windows_native.cpp index 4eb5f10750..3323be1143 100644 --- a/platform/windows/gl_manager_windows_native.cpp +++ b/platform/windows/gl_manager_windows_native.cpp @@ -36,9 +36,10 @@ #include "core/os/os.h" #include "core/version.h" -#include #include +#include + #include #include diff --git a/thirdparty/sdl/core/linux/SDL_udev.h b/thirdparty/sdl/core/linux/SDL_udev.h index 05b79342cd..9b18fa228b 100644 --- a/thirdparty/sdl/core/linux/SDL_udev.h +++ b/thirdparty/sdl/core/linux/SDL_udev.h @@ -31,7 +31,7 @@ #endif //#include -#include "thirdparty/linuxbsd_headers/udev/libudev.h" +#include #include #include diff --git a/thirdparty/sdl/patches/0005-fix-libudev-dbus.patch b/thirdparty/sdl/patches/0005-fix-libudev-dbus.patch index 491ef72600..e3af445a41 100644 --- a/thirdparty/sdl/patches/0005-fix-libudev-dbus.patch +++ b/thirdparty/sdl/patches/0005-fix-libudev-dbus.patch @@ -55,7 +55,7 @@ index 738f4bafe3f..50bed36248e 100644 -#include +//#include -+#include "thirdparty/linuxbsd_headers/udev/libudev.h" ++#include #include #include