From d9b81615e526bd0049552360dd2f66febf8a10f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 11 Mar 2026 10:21:44 +0100 Subject: [PATCH] Remove unused includes in `platform` with clangd-tidy Handled Linux, Windows, Android, and (partially) Web. --- drivers/alsa/asound-so_wrap.h | 2 +- drivers/d3d12/dxil_hash.h | 1 - drivers/pulseaudio/pulse-so_wrap.h | 2 +- drivers/wasapi/audio_driver_wasapi.h | 1 - drivers/windows/dir_access_windows.cpp | 3 +-- drivers/windows/file_access_windows.cpp | 1 - drivers/windows/file_access_windows_pipe.h | 1 - drivers/windows/ip_windows.cpp | 1 - drivers/windows/thread_windows.cpp | 1 - drivers/winmidi/midi_driver_winmidi.h | 3 +-- drivers/xaudio2/audio_driver_xaudio2.h | 1 - editor/editor_interface.h | 2 ++ editor/settings/editor_settings.h | 2 ++ modules/mono/editor/hostfxr_resolver.cpp | 1 - modules/mono/utils/path_utils.cpp | 1 - modules/openxr/editor/openxr_select_runtime.cpp | 1 - platform/android/android_input_handler.h | 1 - platform/android/dir_access_jandroid.h | 5 +---- platform/android/editor/editor_utils_jni.cpp | 2 +- platform/android/export/export_plugin.cpp | 14 +++++++------- platform/android/export/godot_plugin_config.cpp | 2 ++ platform/android/export/godot_plugin_config.h | 1 - platform/android/export/gradle_export_util.cpp | 4 ++++ platform/android/export/gradle_export_util.h | 4 ---- platform/android/file_access_android.h | 1 - .../android/file_access_filesystem_jandroid.h | 4 ++-- platform/android/java_godot_io_wrapper.cpp | 3 +++ platform/android/java_godot_io_wrapper.h | 2 -- platform/android/java_godot_view_wrapper.cpp | 2 ++ platform/android/java_godot_view_wrapper.h | 2 -- platform/android/java_godot_wrapper.h | 3 ++- platform/android/jni_utils.h | 1 - platform/android/os_android.cpp | 17 ++++++++++------- platform/android/os_android.h | 1 - platform/android/platform_gl.h | 2 ++ platform/android/tts_android.cpp | 4 ++-- platform/android/tts_android.h | 3 ++- platform/ios/platform_gl.h | 2 +- platform/linuxbsd/dbus-so_wrap.h | 2 +- platform/linuxbsd/export/export_plugin.cpp | 3 ++- platform/linuxbsd/export/export_plugin.h | 2 -- platform/linuxbsd/fontconfig-so_wrap.h | 2 +- platform/linuxbsd/freedesktop_at_spi_monitor.h | 2 +- platform/linuxbsd/freedesktop_portal_desktop.h | 3 ++- platform/linuxbsd/godot_linuxbsd.cpp | 1 - platform/linuxbsd/os_linuxbsd.cpp | 8 ++++++++ platform/linuxbsd/os_linuxbsd.h | 15 +++++---------- platform/linuxbsd/platform_gl.h | 2 ++ platform/linuxbsd/speechd-so_wrap.h | 2 +- platform/linuxbsd/wayland/detect_prime_egl.cpp | 3 ++- .../wayland/dynwrappers/libdecor-so_wrap.h | 2 +- .../dynwrappers/wayland-client-core-so_wrap.h | 2 +- .../dynwrappers/wayland-cursor-so_wrap.h | 2 +- .../dynwrappers/wayland-egl-core-so_wrap.h | 2 +- platform/linuxbsd/wayland/key_mapping_xkb.cpp | 6 ++++++ platform/linuxbsd/wayland/key_mapping_xkb.h | 7 ++----- platform/linuxbsd/wayland/wayland_embedder.h | 17 +++++------------ .../linuxbsd/x11/dynwrappers/xcursor-so_wrap.h | 2 +- .../linuxbsd/x11/dynwrappers/xext-so_wrap.h | 4 ++-- .../linuxbsd/x11/dynwrappers/xinerama-so_wrap.h | 2 +- .../linuxbsd/x11/dynwrappers/xinput2-so_wrap.h | 2 +- .../linuxbsd/x11/dynwrappers/xlib-so_wrap.h | 6 +++--- .../linuxbsd/x11/dynwrappers/xrandr-so_wrap.h | 2 +- .../linuxbsd/x11/dynwrappers/xrender-so_wrap.h | 2 +- platform/linuxbsd/x11/gl_manager_x11.cpp | 8 ++++++-- platform/linuxbsd/x11/gl_manager_x11.h | 8 -------- platform/linuxbsd/x11/gl_manager_x11_egl.cpp | 3 --- platform/linuxbsd/x11/gl_manager_x11_egl.h | 3 --- platform/linuxbsd/xkbcommon-so_wrap.h | 6 +++--- platform/macos/dir_access_macos.h | 1 - platform/macos/platform_gl.h | 2 ++ platform/web/audio_driver_web.cpp | 2 -- platform/web/audio_driver_web.h | 1 - platform/web/display_server_web.cpp | 2 +- platform/web/editor/web_tools_editor_plugin.cpp | 2 -- platform/web/editor/web_tools_editor_plugin.h | 1 - platform/web/export/editor_http_server.cpp | 2 ++ platform/web/export/editor_http_server.h | 3 --- platform/web/export/export_plugin.cpp | 2 ++ platform/web/export/export_plugin.h | 5 ----- platform/web/os_web.cpp | 5 ----- platform/web/os_web.h | 2 -- platform/web/platform_gl.h | 2 +- platform/web/web_main.cpp | 7 ++++--- platform/web/webmidi_driver.cpp | 2 ++ platform/web/webmidi_driver.h | 1 - platform/windows/console_wrapper_windows.cpp | 2 +- platform/windows/crash_handler_windows.h | 1 - platform/windows/crash_handler_windows_seh.cpp | 1 - .../windows/crash_handler_windows_signal.cpp | 4 ---- platform/windows/display_server_windows.cpp | 4 +++- platform/windows/display_server_windows.h | 11 +---------- platform/windows/export/export.cpp | 1 + platform/windows/export/export_plugin.cpp | 3 ++- platform/windows/export/export_plugin.h | 2 -- platform/windows/export/template_modifier.cpp | 2 +- platform/windows/export/template_modifier.h | 3 ++- platform/windows/gl_manager_windows_angle.cpp | 3 --- platform/windows/gl_manager_windows_angle.h | 1 - platform/windows/godot_windows.cpp | 1 - platform/windows/key_mapping_windows.h | 1 - platform/windows/native_menu_windows.h | 1 - platform/windows/os_windows.cpp | 4 +--- platform/windows/os_windows.h | 6 ------ platform/windows/platform_gl.h | 2 ++ .../rendering_context_driver_vulkan_windows.h | 1 - platform/windows/tts_windows.h | 5 +---- platform/windows/windows_terminal_logger.cpp | 1 - platform/windows/windows_utils.cpp | 1 - tests/core/io/test_config_file.cpp | 3 +++ tests/scene/test_packed_scene.cpp | 1 - tests/servers/test_navigation_server_3d.cpp | 1 - tests/test_macros.h | 2 +- 113 files changed, 143 insertions(+), 202 deletions(-) diff --git a/drivers/alsa/asound-so_wrap.h b/drivers/alsa/asound-so_wrap.h index 8d12d15ba8a..5da6ae76de6 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" +#include "thirdparty/linuxbsd_headers/alsa/asoundlib.h" // IWYU pragma: export. #undef snd_asoundlib_version #undef snd_dlopen #undef snd_dlsym diff --git a/drivers/d3d12/dxil_hash.h b/drivers/d3d12/dxil_hash.h index 8dd24835d29..a0763033560 100644 --- a/drivers/d3d12/dxil_hash.h +++ b/drivers/d3d12/dxil_hash.h @@ -30,7 +30,6 @@ #pragma once -#define WIN32_LEAN_AND_MEAN #include void compute_dxil_hash(const BYTE *pData, UINT byteCount, BYTE *pOutHash); diff --git a/drivers/pulseaudio/pulse-so_wrap.h b/drivers/pulseaudio/pulse-so_wrap.h index bba8fd36a6d..139e7fe3b49 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" +#include "thirdparty/linuxbsd_headers/pulse/pulseaudio.h" // IWYU pragma: export. #undef pa_get_library_version #undef pa_bytes_per_second #undef pa_frame_size diff --git a/drivers/wasapi/audio_driver_wasapi.h b/drivers/wasapi/audio_driver_wasapi.h index 409dafe0354..c95ca3f2427 100644 --- a/drivers/wasapi/audio_driver_wasapi.h +++ b/drivers/wasapi/audio_driver_wasapi.h @@ -39,7 +39,6 @@ #include #include -#define WIN32_LEAN_AND_MEAN #include class AudioDriverWASAPI : public AudioDriver { diff --git a/drivers/windows/dir_access_windows.cpp b/drivers/windows/dir_access_windows.cpp index 73df578cf82..a74bbd8d71e 100644 --- a/drivers/windows/dir_access_windows.cpp +++ b/drivers/windows/dir_access_windows.cpp @@ -38,10 +38,9 @@ #include "core/os/os.h" #include "core/string/print_string.h" +#include #include #include -#define WIN32_LEAN_AND_MEAN -#include typedef struct _NT_IO_STATUS_BLOCK { union { diff --git a/drivers/windows/file_access_windows.cpp b/drivers/windows/file_access_windows.cpp index 7330bd63365..eed5ac7a545 100644 --- a/drivers/windows/file_access_windows.cpp +++ b/drivers/windows/file_access_windows.cpp @@ -38,7 +38,6 @@ #include // _SH_DENYNO #include -#define WIN32_LEAN_AND_MEAN #include #include diff --git a/drivers/windows/file_access_windows_pipe.h b/drivers/windows/file_access_windows_pipe.h index 38a5d452347..42b740c555c 100644 --- a/drivers/windows/file_access_windows_pipe.h +++ b/drivers/windows/file_access_windows_pipe.h @@ -35,7 +35,6 @@ #include "core/io/file_access.h" #include "core/os/memory.h" -#define WIN32_LEAN_AND_MEAN #include class FileAccessWindowsPipe : public FileAccess { diff --git a/drivers/windows/ip_windows.cpp b/drivers/windows/ip_windows.cpp index 60f2378ee12..4626adb9fcb 100644 --- a/drivers/windows/ip_windows.cpp +++ b/drivers/windows/ip_windows.cpp @@ -32,7 +32,6 @@ #include "ip_windows.h" -#define WIN32_LEAN_AND_MEAN #include #include #include diff --git a/drivers/windows/thread_windows.cpp b/drivers/windows/thread_windows.cpp index 183d104a610..c46299b1583 100644 --- a/drivers/windows/thread_windows.cpp +++ b/drivers/windows/thread_windows.cpp @@ -35,7 +35,6 @@ #include "core/os/thread.h" #include "core/string/ustring.h" -#define WIN32_LEAN_AND_MEAN #include typedef HRESULT(WINAPI *SetThreadDescriptionPtr)(HANDLE p_thread, PCWSTR p_thread_description); diff --git a/drivers/winmidi/midi_driver_winmidi.h b/drivers/winmidi/midi_driver_winmidi.h index 833f1123a13..94724480b95 100644 --- a/drivers/winmidi/midi_driver_winmidi.h +++ b/drivers/winmidi/midi_driver_winmidi.h @@ -35,9 +35,8 @@ #include "core/os/midi_driver.h" #include "core/templates/vector.h" -#include -#define WIN32_LEAN_AND_MEAN #include +#include #include diff --git a/drivers/xaudio2/audio_driver_xaudio2.h b/drivers/xaudio2/audio_driver_xaudio2.h index 393836b5a29..f3ef68100a8 100644 --- a/drivers/xaudio2/audio_driver_xaudio2.h +++ b/drivers/xaudio2/audio_driver_xaudio2.h @@ -36,7 +36,6 @@ #include "servers/audio/audio_server.h" #include -#define WIN32_LEAN_AND_MEAN #include #include #include diff --git a/editor/editor_interface.h b/editor/editor_interface.h index 190227f4f53..9bb588f86ba 100644 --- a/editor/editor_interface.h +++ b/editor/editor_interface.h @@ -203,7 +203,9 @@ public: void set_movie_maker_enabled(bool p_enabled); bool is_movie_maker_enabled() const; +#ifdef TOOLS_ENABLED virtual void get_argument_options(const StringName &p_function, int p_idx, List *r_options) const override; +#endif // Base. static void create(); diff --git a/editor/settings/editor_settings.h b/editor/settings/editor_settings.h index 4232ac9be9c..2cf12c5aa30 100644 --- a/editor/settings/editor_settings.h +++ b/editor/settings/editor_settings.h @@ -214,7 +214,9 @@ public: void notify_changes(); +#ifdef TOOLS_ENABLED virtual void get_argument_options(const StringName &p_function, int p_idx, List *r_options) const override; +#endif EditorSettings(); }; diff --git a/modules/mono/editor/hostfxr_resolver.cpp b/modules/mono/editor/hostfxr_resolver.cpp index f3a07180652..cc316b4c78a 100644 --- a/modules/mono/editor/hostfxr_resolver.cpp +++ b/modules/mono/editor/hostfxr_resolver.cpp @@ -69,7 +69,6 @@ SOFTWARE. #include "core/os/os.h" #ifdef WINDOWS_ENABLED -#define WIN32_LEAN_AND_MEAN #include #endif diff --git a/modules/mono/utils/path_utils.cpp b/modules/mono/utils/path_utils.cpp index f9bb35425bd..3052f0b0d5a 100644 --- a/modules/mono/utils/path_utils.cpp +++ b/modules/mono/utils/path_utils.cpp @@ -38,7 +38,6 @@ #include #ifdef WINDOWS_ENABLED -#define WIN32_LEAN_AND_MEAN #include #define ENV_PATH_SEP ";" diff --git a/modules/openxr/editor/openxr_select_runtime.cpp b/modules/openxr/editor/openxr_select_runtime.cpp index 389547fbc1d..4852e20837c 100644 --- a/modules/openxr/editor/openxr_select_runtime.cpp +++ b/modules/openxr/editor/openxr_select_runtime.cpp @@ -31,7 +31,6 @@ #include "openxr_select_runtime.h" #ifdef WINDOWS_ENABLED -#define WIN32_LEAN_AND_MEAN #include #endif diff --git a/platform/android/android_input_handler.h b/platform/android/android_input_handler.h index 99d937bbfa9..1fd747831b7 100644 --- a/platform/android/android_input_handler.h +++ b/platform/android/android_input_handler.h @@ -31,7 +31,6 @@ #pragma once #include "core/input/input_event.h" -#include "core/templates/rb_map.h" // This class encapsulates all the handling of input events that come from the Android UI thread. // Remarks: diff --git a/platform/android/dir_access_jandroid.h b/platform/android/dir_access_jandroid.h index 7787f47cd33..7de4e11cd74 100644 --- a/platform/android/dir_access_jandroid.h +++ b/platform/android/dir_access_jandroid.h @@ -30,12 +30,9 @@ #pragma once -#include "java_godot_lib_jni.h" - -#include "core/io/dir_access.h" #include "drivers/unix/dir_access_unix.h" -#include +#include /// Android implementation of the DirAccess interface used to provide access to /// ACCESS_FILESYSTEM and ACCESS_RESOURCES directory resources. diff --git a/platform/android/editor/editor_utils_jni.cpp b/platform/android/editor/editor_utils_jni.cpp index 59d1a710ac3..c606d2aff13 100644 --- a/platform/android/editor/editor_utils_jni.cpp +++ b/platform/android/editor/editor_utils_jni.cpp @@ -30,9 +30,9 @@ #include "editor_utils_jni.h" +#ifdef TOOLS_ENABLED #include "jni_utils.h" -#ifdef TOOLS_ENABLED #include "core/os/os.h" #include "editor/debugger/editor_debugger_node.h" #include "editor/debugger/script_editor_debugger.h" diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp index 0c1182f2cd7..6c11b7db747 100644 --- a/platform/android/export/export_plugin.cpp +++ b/platform/android/export/export_plugin.cpp @@ -36,26 +36,24 @@ #include "core/config/project_settings.h" #include "core/io/dir_access.h" #include "core/io/file_access.h" -#include "core/io/image_loader.h" #include "core/io/json.h" #include "core/io/marshalls.h" #include "core/math/random_pcg.h" -#include "core/object/callable_mp.h" #include "core/os/os.h" +#include "core/os/shared_object.h" #include "core/string/translation_server.h" #include "core/version.h" -#include "editor/editor_log.h" #include "editor/editor_node.h" -#include "editor/editor_string_names.h" +#include "editor/export/editor_export.h" +#include "editor/export/editor_export_plugin.h" #include "editor/export/export_template_manager.h" #include "editor/file_system/editor_paths.h" #include "editor/import/resource_importer_texture_settings.h" #include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" -#include "main/splash.gen.h" #include "scene/resources/image_texture.h" -#include "modules/modules_enabled.gen.h" // For mono. +#include "modules/modules_enabled.gen.h" // IWYU pragma: keep. For mono. #include "modules/svg/image_loader_svg.h" #ifdef MODULE_MONO_ENABLED @@ -63,12 +61,14 @@ #endif #ifdef ANDROID_ENABLED -#include "../java_godot_wrapper.h" #include "../os_android.h" #include "android_editor_gradle_runner.h" #endif #ifndef ANDROID_ENABLED +#include "core/object/callable_mp.h" +#include "editor/editor_log.h" +#include "editor/editor_string_names.h" #endif static const char *ANDROID_PERMS[] = { diff --git a/platform/android/export/godot_plugin_config.cpp b/platform/android/export/godot_plugin_config.cpp index cdec5f55b71..70b01164e33 100644 --- a/platform/android/export/godot_plugin_config.cpp +++ b/platform/android/export/godot_plugin_config.cpp @@ -32,6 +32,8 @@ #ifndef DISABLE_DEPRECATED +#include "core/config/project_settings.h" + /* * Set of prebuilt plugins. * Currently unused, this is just for future reference: diff --git a/platform/android/export/godot_plugin_config.h b/platform/android/export/godot_plugin_config.h index 1b69262c214..36cd6fc067e 100644 --- a/platform/android/export/godot_plugin_config.h +++ b/platform/android/export/godot_plugin_config.h @@ -32,7 +32,6 @@ #ifndef DISABLE_DEPRECATED -#include "core/config/project_settings.h" #include "core/io/config_file.h" #include "core/string/ustring.h" diff --git a/platform/android/export/gradle_export_util.cpp b/platform/android/export/gradle_export_util.cpp index 4d16cb2e61c..42bfe6dd554 100644 --- a/platform/android/export/gradle_export_util.cpp +++ b/platform/android/export/gradle_export_util.cpp @@ -30,8 +30,12 @@ #include "gradle_export_util.h" +#include "core/io/dir_access.h" +#include "core/io/file_access.h" #include "core/os/os.h" #include "core/string/translation_server.h" +#include "editor/export/editor_export.h" +#include "editor/export/editor_export_plugin.h" #include "modules/regex/regex.h" int _get_android_orientation_value(DisplayServerEnums::ScreenOrientation screen_orientation) { diff --git a/platform/android/export/gradle_export_util.h b/platform/android/export/gradle_export_util.h index 3aea2786c98..048c912f9fa 100644 --- a/platform/android/export/gradle_export_util.h +++ b/platform/android/export/gradle_export_util.h @@ -31,10 +31,6 @@ #pragma once #include "core/crypto/crypto_core.h" -#include "core/io/dir_access.h" -#include "core/io/file_access.h" -#include "core/io/zip_io.h" -#include "editor/export/editor_export.h" #include "editor/export/editor_export_platform.h" #include "servers/display/display_server_enums.h" diff --git a/platform/android/file_access_android.h b/platform/android/file_access_android.h index d6c63f883cf..4d2ce1926ff 100644 --- a/platform/android/file_access_android.h +++ b/platform/android/file_access_android.h @@ -35,7 +35,6 @@ #include #include #include -#include class FileAccessAndroid : public FileAccess { GDSOFTCLASS(FileAccessAndroid, FileAccess); diff --git a/platform/android/file_access_filesystem_jandroid.h b/platform/android/file_access_filesystem_jandroid.h index 03b66d4844e..cf0cb15c168 100644 --- a/platform/android/file_access_filesystem_jandroid.h +++ b/platform/android/file_access_filesystem_jandroid.h @@ -30,10 +30,10 @@ #pragma once -#include "java_godot_lib_jni.h" - #include "core/io/file_access.h" +#include + class FileAccessFilesystemJAndroid : public FileAccess { GDSOFTCLASS(FileAccessFilesystemJAndroid, FileAccess); static jobject file_access_handler; diff --git a/platform/android/java_godot_io_wrapper.cpp b/platform/android/java_godot_io_wrapper.cpp index 1d0f6dac720..561f2c5ef26 100644 --- a/platform/android/java_godot_io_wrapper.cpp +++ b/platform/android/java_godot_io_wrapper.cpp @@ -30,6 +30,9 @@ #include "java_godot_io_wrapper.h" +#include "jni_utils.h" +#include "thread_jandroid.h" + #include "core/math/rect2.h" #include "core/variant/variant.h" diff --git a/platform/android/java_godot_io_wrapper.h b/platform/android/java_godot_io_wrapper.h index 6fe8e05010a..d8aae15f02c 100644 --- a/platform/android/java_godot_io_wrapper.h +++ b/platform/android/java_godot_io_wrapper.h @@ -30,8 +30,6 @@ #pragma once -#include "jni_utils.h" - #include "core/math/rect2i.h" #include "core/variant/typed_array.h" diff --git a/platform/android/java_godot_view_wrapper.cpp b/platform/android/java_godot_view_wrapper.cpp index 010b374f2ab..4de482e4f28 100644 --- a/platform/android/java_godot_view_wrapper.cpp +++ b/platform/android/java_godot_view_wrapper.cpp @@ -32,6 +32,8 @@ #include "thread_jandroid.h" +#include "core/string/ustring.h" + GodotJavaViewWrapper::GodotJavaViewWrapper(jobject godot_view) { JNIEnv *env = get_jni_env(); ERR_FAIL_NULL(env); diff --git a/platform/android/java_godot_view_wrapper.h b/platform/android/java_godot_view_wrapper.h index 991e64c46e7..7dd7aefe50b 100644 --- a/platform/android/java_godot_view_wrapper.h +++ b/platform/android/java_godot_view_wrapper.h @@ -30,8 +30,6 @@ #pragma once -#include "jni_utils.h" - #include "core/math/vector2.h" #include diff --git a/platform/android/java_godot_wrapper.h b/platform/android/java_godot_wrapper.h index 6e433eb4dfe..7b56f72e256 100644 --- a/platform/android/java_godot_wrapper.h +++ b/platform/android/java_godot_wrapper.h @@ -34,8 +34,9 @@ #include "core/math/color.h" #include "core/templates/list.h" +#include "core/templates/vector.h" +#include "core/variant/callable.h" -#include #include // Class that makes functions in java/src/org/godotengine/godot/Godot.kt callable from C++ diff --git a/platform/android/jni_utils.h b/platform/android/jni_utils.h index c41e38a5ab1..bd15ce77612 100644 --- a/platform/android/jni_utils.h +++ b/platform/android/jni_utils.h @@ -32,7 +32,6 @@ #include "thread_jandroid.h" -#include "core/config/engine.h" #include "core/string/ustring.h" #include "core/variant/variant.h" diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp index e62e0688e0c..78247d614e8 100644 --- a/platform/android/os_android.cpp +++ b/platform/android/os_android.cpp @@ -32,31 +32,34 @@ #include "dir_access_jandroid.h" #include "display_server_android.h" -#include "file_access_android.h" #include "file_access_filesystem_jandroid.h" #include "java_godot_io_wrapper.h" #include "java_godot_wrapper.h" #include "net_socket_android.h" +#ifndef TOOLS_ENABLED +#include "file_access_android.h" +#endif + #include "core/config/engine.h" -#include "core/config/project_settings.h" #include "core/extension/gdextension_manager.h" #include "core/input/input.h" #include "core/io/xml_parser.h" -#include "core/object/callable_mp.h" #include "core/os/main_loop.h" #include "core/os/os.h" #include "core/profiling/profiling.h" #include "drivers/unix/dir_access_unix.h" #include "drivers/unix/file_access_unix.h" -#ifdef TOOLS_ENABLED -#include "editor/editor_node.h" -#include "editor/run/game_view_plugin.h" -#endif #include "main/main.h" #include "scene/main/scene_tree.h" #include "servers/rendering/rendering_server.h" +#ifdef TOOLS_ENABLED +#include "core/object/callable_mp.h" +#include "editor/editor_node.h" +#include "editor/run/game_view_plugin.h" +#endif + #include #include diff --git a/platform/android/os_android.h b/platform/android/os_android.h index f25caa4c8a5..df9c4e3ff06 100644 --- a/platform/android/os_android.h +++ b/platform/android/os_android.h @@ -34,7 +34,6 @@ #include "core/os/main_loop.h" #include "drivers/unix/os_unix.h" -#include "servers/audio/audio_server.h" class GodotJavaWrapper; class GodotIOJavaWrapper; diff --git a/platform/android/platform_gl.h b/platform/android/platform_gl.h index bf990e254dd..d1f53e14b96 100644 --- a/platform/android/platform_gl.h +++ b/platform/android/platform_gl.h @@ -34,7 +34,9 @@ #define GLES_API_ENABLED // Allow using GLES. #endif +// IWYU pragma: begin_exports. #include #include #include #include +// IWYU pragma: end_exports. diff --git a/platform/android/tts_android.cpp b/platform/android/tts_android.cpp index aef857952bd..ea444b57286 100644 --- a/platform/android/tts_android.cpp +++ b/platform/android/tts_android.cpp @@ -30,10 +30,10 @@ #include "tts_android.h" -#include "java_godot_wrapper.h" -#include "os_android.h" +#include "jni_utils.h" #include "thread_jandroid.h" +#include "core/config/project_settings.h" #include "core/os/os.h" #include "servers/display/display_server.h" diff --git a/platform/android/tts_android.h b/platform/android/tts_android.h index 4e56fa6fe2a..9d4b1c173c8 100644 --- a/platform/android/tts_android.h +++ b/platform/android/tts_android.h @@ -30,9 +30,10 @@ #pragma once -#include "core/config/project_settings.h" +#include "core/os/thread.h" #include "core/string/ustring.h" #include "core/templates/hash_map.h" +#include "core/templates/safe_refcount.h" #include "core/variant/array.h" #include diff --git a/platform/ios/platform_gl.h b/platform/ios/platform_gl.h index ec7cb2108fc..a3f97cf64f0 100644 --- a/platform/ios/platform_gl.h +++ b/platform/ios/platform_gl.h @@ -35,5 +35,5 @@ #define GLES_API_ENABLED // Allow using GLES. #endif -#include +#include // IWYU pragma: export. #endif diff --git a/platform/linuxbsd/dbus-so_wrap.h b/platform/linuxbsd/dbus-so_wrap.h index 2c63757932a..a236209f236 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" +#include "thirdparty/linuxbsd_headers/dbus/dbus.h" // IWYU pragma: export. #undef dbus_error_init #undef dbus_error_free #undef dbus_set_error diff --git a/platform/linuxbsd/export/export_plugin.cpp b/platform/linuxbsd/export/export_plugin.cpp index 326f5712099..5c2e31020ac 100644 --- a/platform/linuxbsd/export/export_plugin.cpp +++ b/platform/linuxbsd/export/export_plugin.cpp @@ -33,13 +33,14 @@ #include "logo_svg.gen.h" #include "run_icon_svg.gen.h" -#include "core/config/project_settings.h" #include "core/io/dir_access.h" +#include "core/io/file_access.h" #include "core/os/os.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/export/editor_export.h" #include "editor/file_system/editor_paths.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "modules/svg/image_loader_svg.h" diff --git a/platform/linuxbsd/export/export_plugin.h b/platform/linuxbsd/export/export_plugin.h index 5b223876f82..397098efd0e 100644 --- a/platform/linuxbsd/export/export_plugin.h +++ b/platform/linuxbsd/export/export_plugin.h @@ -30,10 +30,8 @@ #pragma once -#include "core/io/file_access.h" #include "core/os/process_id.h" #include "editor/export/editor_export_platform_pc.h" -#include "editor/settings/editor_settings.h" #include "scene/resources/image_texture.h" class EditorExportPlatformLinuxBSD : public EditorExportPlatformPC { diff --git a/platform/linuxbsd/fontconfig-so_wrap.h b/platform/linuxbsd/fontconfig-so_wrap.h index 956c094711d..6164f5d3cad 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" +#include "thirdparty/linuxbsd_headers/fontconfig/fontconfig.h" // IWYU pragma: export. #undef FcBlanksCreate #undef FcBlanksDestroy #undef FcBlanksAdd diff --git a/platform/linuxbsd/freedesktop_at_spi_monitor.h b/platform/linuxbsd/freedesktop_at_spi_monitor.h index 56ce401fa35..6e836ce7d43 100644 --- a/platform/linuxbsd/freedesktop_at_spi_monitor.h +++ b/platform/linuxbsd/freedesktop_at_spi_monitor.h @@ -33,7 +33,7 @@ #ifdef DBUS_ENABLED #include "core/os/thread.h" -#include "core/os/thread_safe.h" +#include "core/templates/safe_refcount.h" class FreeDesktopAtSPIMonitor { private: diff --git a/platform/linuxbsd/freedesktop_portal_desktop.h b/platform/linuxbsd/freedesktop_portal_desktop.h index 3ae27274f38..7d102d44134 100644 --- a/platform/linuxbsd/freedesktop_portal_desktop.h +++ b/platform/linuxbsd/freedesktop_portal_desktop.h @@ -33,8 +33,9 @@ #ifdef DBUS_ENABLED #include "core/object/object.h" +#include "core/os/mutex.h" #include "core/os/thread.h" -#include "core/os/thread_safe.h" +#include "core/templates/safe_refcount.h" #include "servers/display/display_server_enums.h" struct DBusMessage; diff --git a/platform/linuxbsd/godot_linuxbsd.cpp b/platform/linuxbsd/godot_linuxbsd.cpp index f0443dc1ca0..84d8387012b 100644 --- a/platform/linuxbsd/godot_linuxbsd.cpp +++ b/platform/linuxbsd/godot_linuxbsd.cpp @@ -34,7 +34,6 @@ #include "main/main.h" #include -#include #include #include #include diff --git a/platform/linuxbsd/os_linuxbsd.cpp b/platform/linuxbsd/os_linuxbsd.cpp index 33cbc659eb7..6c3f7b31dfb 100644 --- a/platform/linuxbsd/os_linuxbsd.cpp +++ b/platform/linuxbsd/os_linuxbsd.cpp @@ -91,6 +91,14 @@ #include #endif +#ifdef FONTCONFIG_ENABLED +#ifdef SOWRAP_ENABLED +#include "fontconfig-so_wrap.h" +#else +#include +#endif +#endif + void OS_LinuxBSD::alert(const String &p_alert, const String &p_title) { const char *message_programs[] = { "zenity", "kdialog", "Xdialog", "xmessage" }; diff --git a/platform/linuxbsd/os_linuxbsd.h b/platform/linuxbsd/os_linuxbsd.h index ea736ec6ab3..d483e619375 100644 --- a/platform/linuxbsd/os_linuxbsd.h +++ b/platform/linuxbsd/os_linuxbsd.h @@ -33,23 +33,18 @@ #include "crash_handler_linuxbsd.h" #include "core/input/input_event.h" -#include "core/templates/rb_map.h" #include "drivers/alsa/audio_driver_alsa.h" #include "drivers/alsamidi/midi_driver_alsamidi.h" #include "drivers/pulseaudio/audio_driver_pulseaudio.h" #include "drivers/unix/os_unix.h" -#include "servers/audio/audio_server.h" - -#ifdef FONTCONFIG_ENABLED -#ifdef SOWRAP_ENABLED -#include "fontconfig-so_wrap.h" -#else -#include -#endif -#endif class JoypadSDL; +#ifdef FONTCONFIG_ENABLED +typedef struct _FcConfig FcConfig; +typedef struct _FcObjectSet FcObjectSet; +#endif + class OS_LinuxBSD : public OS_Unix { virtual void delete_main_loop() override; diff --git a/platform/linuxbsd/platform_gl.h b/platform/linuxbsd/platform_gl.h index 73477b501a1..1adb5ef013c 100644 --- a/platform/linuxbsd/platform_gl.h +++ b/platform/linuxbsd/platform_gl.h @@ -38,5 +38,7 @@ #define GLES_API_ENABLED // Allow using GLES. #endif +// IWYU pragma: begin_exports. #include "thirdparty/glad/glad/egl.h" #include "thirdparty/glad/glad/gl.h" +// IWYU pragma: end_exports. diff --git a/platform/linuxbsd/speechd-so_wrap.h b/platform/linuxbsd/speechd-so_wrap.h index 2967cfa9297..4eeaa8e3813 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" +#include "thirdparty/linuxbsd_headers/speechd/libspeechd.h" // IWYU pragma: export. #undef SPDConnectionAddress__free #undef spd_get_default_address #undef spd_open diff --git a/platform/linuxbsd/wayland/detect_prime_egl.cpp b/platform/linuxbsd/wayland/detect_prime_egl.cpp index 74bff7a08f0..78101c403a9 100644 --- a/platform/linuxbsd/wayland/detect_prime_egl.cpp +++ b/platform/linuxbsd/wayland/detect_prime_egl.cpp @@ -35,7 +35,8 @@ #include "core/core_globals.h" #include "core/string/print_string.h" -#include "core/variant/variant.h" +#include "core/string/ustring.h" +#include "core/variant/variant.h" // IWYU pragma: keep. Needed for print_verbose. #include #include diff --git a/platform/linuxbsd/wayland/dynwrappers/libdecor-so_wrap.h b/platform/linuxbsd/wayland/dynwrappers/libdecor-so_wrap.h index b89ff9e3df9..d2eda767ba9 100644 --- a/platform/linuxbsd/wayland/dynwrappers/libdecor-so_wrap.h +++ b/platform/linuxbsd/wayland/dynwrappers/libdecor-so_wrap.h @@ -48,7 +48,7 @@ #define libdecor_state_free libdecor_state_free_dylibloader_orig_libdecor #define libdecor_configuration_get_content_size libdecor_configuration_get_content_size_dylibloader_orig_libdecor #define libdecor_configuration_get_window_state libdecor_configuration_get_window_state_dylibloader_orig_libdecor -#include "./thirdparty/linuxbsd_headers/libdecor-0/libdecor.h" +#include "./thirdparty/linuxbsd_headers/libdecor-0/libdecor.h" // IWYU pragma: export. #undef libdecor_unref #undef libdecor_new #undef libdecor_get_fd diff --git a/platform/linuxbsd/wayland/dynwrappers/wayland-client-core-so_wrap.h b/platform/linuxbsd/wayland/dynwrappers/wayland-client-core-so_wrap.h index 86c51573a54..53cb4502a9d 100644 --- a/platform/linuxbsd/wayland/dynwrappers/wayland-client-core-so_wrap.h +++ b/platform/linuxbsd/wayland/dynwrappers/wayland-client-core-so_wrap.h @@ -61,7 +61,7 @@ #define wl_display_cancel_read wl_display_cancel_read_dylibloader_orig_wayland_client #define wl_display_read_events wl_display_read_events_dylibloader_orig_wayland_client #define wl_log_set_handler_client wl_log_set_handler_client_dylibloader_orig_wayland_client -#include "./thirdparty/linuxbsd_headers/wayland/wayland-client-core.h" +#include "./thirdparty/linuxbsd_headers/wayland/wayland-client-core.h" // IWYU pragma: export. #undef wl_list_init #undef wl_list_insert #undef wl_list_remove diff --git a/platform/linuxbsd/wayland/dynwrappers/wayland-cursor-so_wrap.h b/platform/linuxbsd/wayland/dynwrappers/wayland-cursor-so_wrap.h index 43520e74a16..3aa66db1906 100644 --- a/platform/linuxbsd/wayland/dynwrappers/wayland-cursor-so_wrap.h +++ b/platform/linuxbsd/wayland/dynwrappers/wayland-cursor-so_wrap.h @@ -13,7 +13,7 @@ #define wl_cursor_image_get_buffer wl_cursor_image_get_buffer_dylibloader_orig_wayland_cursor #define wl_cursor_frame wl_cursor_frame_dylibloader_orig_wayland_cursor #define wl_cursor_frame_and_duration wl_cursor_frame_and_duration_dylibloader_orig_wayland_cursor -#include "./thirdparty/linuxbsd_headers/wayland/wayland-cursor.h" +#include "./thirdparty/linuxbsd_headers/wayland/wayland-cursor.h" // IWYU pragma: export. #undef wl_cursor_theme_load #undef wl_cursor_theme_destroy #undef wl_cursor_theme_get_cursor diff --git a/platform/linuxbsd/wayland/dynwrappers/wayland-egl-core-so_wrap.h b/platform/linuxbsd/wayland/dynwrappers/wayland-egl-core-so_wrap.h index c2643f973f3..d6b32282eb1 100644 --- a/platform/linuxbsd/wayland/dynwrappers/wayland-egl-core-so_wrap.h +++ b/platform/linuxbsd/wayland/dynwrappers/wayland-egl-core-so_wrap.h @@ -11,7 +11,7 @@ #define wl_egl_window_destroy wl_egl_window_destroy_dylibloader_orig_wayland_egl #define wl_egl_window_resize wl_egl_window_resize_dylibloader_orig_wayland_egl #define wl_egl_window_get_attached_size wl_egl_window_get_attached_size_dylibloader_orig_wayland_egl -#include "./thirdparty/linuxbsd_headers/wayland/wayland-egl-core.h" +#include "./thirdparty/linuxbsd_headers/wayland/wayland-egl-core.h" // IWYU pragma: export. #undef wl_egl_window_create #undef wl_egl_window_destroy #undef wl_egl_window_resize diff --git a/platform/linuxbsd/wayland/key_mapping_xkb.cpp b/platform/linuxbsd/wayland/key_mapping_xkb.cpp index bd1a1e38351..0edbb940fb7 100644 --- a/platform/linuxbsd/wayland/key_mapping_xkb.cpp +++ b/platform/linuxbsd/wayland/key_mapping_xkb.cpp @@ -30,6 +30,12 @@ #include "key_mapping_xkb.h" +#ifdef SOWRAP_ENABLED +#include "xkbcommon-so_wrap.h" +#else +#include +#endif // SOWRAP_ENABLED + void KeyMappingXKB::initialize() { // XKB keycode to Godot Key map. diff --git a/platform/linuxbsd/wayland/key_mapping_xkb.h b/platform/linuxbsd/wayland/key_mapping_xkb.h index b95385ebc3d..ad9c3344cb3 100644 --- a/platform/linuxbsd/wayland/key_mapping_xkb.h +++ b/platform/linuxbsd/wayland/key_mapping_xkb.h @@ -33,11 +33,8 @@ #include "core/os/keyboard.h" #include "core/templates/hash_map.h" -#ifdef SOWRAP_ENABLED -#include "xkbcommon-so_wrap.h" -#else -#include -#endif // SOWRAP_ENABLED +typedef uint32_t xkb_keycode_t; +typedef uint32_t xkb_keysym_t; class KeyMappingXKB { struct HashMapHasherKeys { diff --git a/platform/linuxbsd/wayland/wayland_embedder.h b/platform/linuxbsd/wayland/wayland_embedder.h index 5fc3da0e283..f07f912b528 100644 --- a/platform/linuxbsd/wayland/wayland_embedder.h +++ b/platform/linuxbsd/wayland/wayland_embedder.h @@ -37,12 +37,6 @@ #include "core/templates/a_hash_map.h" #include "core/templates/pooled_list.h" -#ifdef SOWRAP_ENABLED -#include "wayland/dynwrappers/wayland-client-core-so_wrap.h" -#else -#include -#endif - #include "protocol/wayland.gen.h" #include "protocol/linux_dmabuf_v1.gen.h" @@ -61,7 +55,7 @@ #include "protocol/pointer_warp.gen.h" #include "protocol/primary_selection.gen.h" #include "protocol/relative_pointer.gen.h" -#include "protocol/tablet.gen.h" +// #include "protocol/tablet.gen.h" // TODO: Needs some extra work #include "protocol/tearing_control_v1.gen.h" #include "protocol/text_input.gen.h" #include "protocol/viewporter.gen.h" @@ -74,13 +68,12 @@ #include "protocol/xdg_system_bell.gen.h" #include "protocol/xdg_toplevel_icon.gen.h" -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include #include diff --git a/platform/linuxbsd/x11/dynwrappers/xcursor-so_wrap.h b/platform/linuxbsd/x11/dynwrappers/xcursor-so_wrap.h index eb425ba7ba6..3b7f81c750e 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" +#include "thirdparty/linuxbsd_headers/X11/Xcursor/Xcursor.h" // IWYU pragma: export. #undef XcursorImageCreate #undef XcursorImageDestroy #undef XcursorImagesCreate diff --git a/platform/linuxbsd/x11/dynwrappers/xext-so_wrap.h b/platform/linuxbsd/x11/dynwrappers/xext-so_wrap.h index 41a3bfac14e..56709710081 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" -#include "thirdparty/linuxbsd_headers/X11/extensions/shape.h" +#include "thirdparty/linuxbsd_headers/X11/extensions/Xext.h" // IWYU pragma: export. +#include "thirdparty/linuxbsd_headers/X11/extensions/shape.h" // IWYU pragma: export. #undef XShapeQueryExtension #undef XShapeQueryVersion #undef XShapeCombineRegion diff --git a/platform/linuxbsd/x11/dynwrappers/xinerama-so_wrap.h b/platform/linuxbsd/x11/dynwrappers/xinerama-so_wrap.h index 59783eb8b67..f040f360f7e 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" +#include "thirdparty/linuxbsd_headers/X11/extensions/Xinerama.h" // IWYU pragma: export. #undef XineramaQueryExtension #undef XineramaQueryVersion #undef XineramaIsActive diff --git a/platform/linuxbsd/x11/dynwrappers/xinput2-so_wrap.h b/platform/linuxbsd/x11/dynwrappers/xinput2-so_wrap.h index 128df4b1c96..5554526e363 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" +#include "thirdparty/linuxbsd_headers/X11/extensions/XInput2.h" // IWYU pragma: export. #undef XIQueryPointer #undef XIWarpPointer #undef XIDefineCursor diff --git a/platform/linuxbsd/x11/dynwrappers/xlib-so_wrap.h b/platform/linuxbsd/x11/dynwrappers/xlib-so_wrap.h index 69802fd2e89..f1592cfc4c4 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" -#include "thirdparty/linuxbsd_headers/X11/Xutil.h" -#include "thirdparty/linuxbsd_headers/X11/XKBlib.h" +#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. #undef _Xmblen #undef XLoadQueryFont #undef XQueryFont diff --git a/platform/linuxbsd/x11/dynwrappers/xrandr-so_wrap.h b/platform/linuxbsd/x11/dynwrappers/xrandr-so_wrap.h index 12278f90796..67f3187dc8c 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" +#include "thirdparty/linuxbsd_headers/X11/extensions/Xrandr.h" // IWYU pragma: export. #undef XRRQueryExtension #undef XRRQueryVersion #undef XRRGetScreenInfo diff --git a/platform/linuxbsd/x11/dynwrappers/xrender-so_wrap.h b/platform/linuxbsd/x11/dynwrappers/xrender-so_wrap.h index 339037e18d6..a7abdc20495 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" +#include "thirdparty/linuxbsd_headers/X11/extensions/Xrender.h" // IWYU pragma: export. #undef XRenderQueryExtension #undef XRenderQueryVersion #undef XRenderQueryFormats diff --git a/platform/linuxbsd/x11/gl_manager_x11.cpp b/platform/linuxbsd/x11/gl_manager_x11.cpp index 85093fce71d..b954c9de2c3 100644 --- a/platform/linuxbsd/x11/gl_manager_x11.cpp +++ b/platform/linuxbsd/x11/gl_manager_x11.cpp @@ -37,9 +37,13 @@ #include "thirdparty/glad/glad/glx.h" +#ifdef SOWRAP_ENABLED +#include "dynwrappers/xrender-so_wrap.h" +#else +#include +#endif + #include -#include -#include #define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091 #define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092 diff --git a/platform/linuxbsd/x11/gl_manager_x11.h b/platform/linuxbsd/x11/gl_manager_x11.h index 523d6ac1bbb..77e370e5863 100644 --- a/platform/linuxbsd/x11/gl_manager_x11.h +++ b/platform/linuxbsd/x11/gl_manager_x11.h @@ -38,17 +38,9 @@ #ifdef SOWRAP_ENABLED #include "dynwrappers/xlib-so_wrap.h" - -#include "dynwrappers/xext-so_wrap.h" -#include "dynwrappers/xrender-so_wrap.h" #else -#include #include #include - -#include -#include -#include #endif struct GLManager_X11_Private; diff --git a/platform/linuxbsd/x11/gl_manager_x11_egl.cpp b/platform/linuxbsd/x11/gl_manager_x11_egl.cpp index 23ba8d8bb8a..d7c177484d2 100644 --- a/platform/linuxbsd/x11/gl_manager_x11_egl.cpp +++ b/platform/linuxbsd/x11/gl_manager_x11_egl.cpp @@ -32,9 +32,6 @@ #if defined(X11_ENABLED) && defined(GLES3_ENABLED) -#include -#include - const char *GLManagerEGL_X11::_get_platform_extension_name() const { return "EGL_KHR_platform_x11"; } diff --git a/platform/linuxbsd/x11/gl_manager_x11_egl.h b/platform/linuxbsd/x11/gl_manager_x11_egl.h index 325f5e376d2..253709bed88 100644 --- a/platform/linuxbsd/x11/gl_manager_x11_egl.h +++ b/platform/linuxbsd/x11/gl_manager_x11_egl.h @@ -32,12 +32,9 @@ #if defined(X11_ENABLED) && defined(GLES3_ENABLED) -#include "core/templates/local_vector.h" #include "drivers/egl/egl_manager.h" #include "servers/display/display_server_enums.h" -#include - class GLManagerEGL_X11 : public EGLManager { private: virtual const char *_get_platform_extension_name() const override; diff --git a/platform/linuxbsd/xkbcommon-so_wrap.h b/platform/linuxbsd/xkbcommon-so_wrap.h index 4ae69fdf1f2..b18aff5e939 100644 --- a/platform/linuxbsd/xkbcommon-so_wrap.h +++ b/platform/linuxbsd/xkbcommon-so_wrap.h @@ -97,9 +97,9 @@ #define xkb_compose_state_get_status xkb_compose_state_get_status_dylibloader_orig_xkbcommon #define xkb_compose_state_get_utf8 xkb_compose_state_get_utf8_dylibloader_orig_xkbcommon #define xkb_compose_state_get_one_sym xkb_compose_state_get_one_sym_dylibloader_orig_xkbcommon -#include "./thirdparty/linuxbsd_headers/xkbcommon/xkbcommon.h" -#include "./thirdparty/linuxbsd_headers/xkbcommon/xkbcommon-compose.h" -#include "./thirdparty/linuxbsd_headers/xkbcommon/xkbcommon-keysyms.h" +#include "./thirdparty/linuxbsd_headers/xkbcommon/xkbcommon.h" // IWYU pragma: export. +#include "./thirdparty/linuxbsd_headers/xkbcommon/xkbcommon-compose.h" // IWYU pragma: export. +#include "./thirdparty/linuxbsd_headers/xkbcommon/xkbcommon-keysyms.h" // IWYU pragma: export. #undef xkb_keysym_get_name #undef xkb_keysym_from_name #undef xkb_keysym_to_utf8 diff --git a/platform/macos/dir_access_macos.h b/platform/macos/dir_access_macos.h index d69aa0fd903..acd889aefee 100644 --- a/platform/macos/dir_access_macos.h +++ b/platform/macos/dir_access_macos.h @@ -32,7 +32,6 @@ #if defined(UNIX_ENABLED) -#include "core/io/dir_access.h" #include "drivers/unix/dir_access_unix.h" #include diff --git a/platform/macos/platform_gl.h b/platform/macos/platform_gl.h index 4aefbc4d644..59859cbbdad 100644 --- a/platform/macos/platform_gl.h +++ b/platform/macos/platform_gl.h @@ -38,6 +38,7 @@ #define GLES_API_ENABLED // Allow using GLES (ANGLE). #endif +// IWYU pragma: begin_exports. #ifdef EGL_STATIC #define KHRONOS_STATIC 1 #include "thirdparty/angle/include/EGL/egl.h" @@ -47,3 +48,4 @@ #include "thirdparty/glad/glad/egl.h" #endif #include "thirdparty/glad/glad/gl.h" +// IWYU pragma: end_exports. diff --git a/platform/web/audio_driver_web.cpp b/platform/web/audio_driver_web.cpp index 22635cfcbee..2fd5004999d 100644 --- a/platform/web/audio_driver_web.cpp +++ b/platform/web/audio_driver_web.cpp @@ -33,10 +33,8 @@ #include "godot_audio.h" #include "core/config/engine.h" -#include "core/config/project_settings.h" #include "core/math/math_funcs_binary.h" #include "core/object/object.h" -#include "scene/main/node.h" #include "servers/audio/audio_stream.h" #include diff --git a/platform/web/audio_driver_web.h b/platform/web/audio_driver_web.h index 8255823743d..49e107a8cf1 100644 --- a/platform/web/audio_driver_web.h +++ b/platform/web/audio_driver_web.h @@ -30,7 +30,6 @@ #pragma once -#include "godot_audio.h" #include "godot_js.h" #include "core/os/mutex.h" diff --git a/platform/web/display_server_web.cpp b/platform/web/display_server_web.cpp index afbd22bc7cf..496bf898268 100644 --- a/platform/web/display_server_web.cpp +++ b/platform/web/display_server_web.cpp @@ -37,13 +37,13 @@ #include "core/config/project_settings.h" #include "core/input/input.h" #include "core/input/input_event.h" -#include "core/object/callable_mp.h" #include "core/os/main_loop.h" #include "core/os/os.h" #include "servers/display/native_menu.h" #include "servers/rendering/dummy/rasterizer_dummy.h" #ifdef PROXY_TO_PTHREAD_ENABLED +#include "core/object/callable_mp.h" #endif #ifdef GLES3_ENABLED diff --git a/platform/web/editor/web_tools_editor_plugin.cpp b/platform/web/editor/web_tools_editor_plugin.cpp index 812106c52a8..32de94fc93a 100644 --- a/platform/web/editor/web_tools_editor_plugin.cpp +++ b/platform/web/editor/web_tools_editor_plugin.cpp @@ -31,11 +31,9 @@ #include "web_tools_editor_plugin.h" #include "core/config/engine.h" -#include "core/config/project_settings.h" #include "core/io/dir_access.h" #include "core/io/file_access.h" #include "core/object/callable_mp.h" -#include "core/os/time.h" #include "editor/editor_node.h" #include "editor/export/project_zip_packer.h" diff --git a/platform/web/editor/web_tools_editor_plugin.h b/platform/web/editor/web_tools_editor_plugin.h index b71de0b9364..b095ca434eb 100644 --- a/platform/web/editor/web_tools_editor_plugin.h +++ b/platform/web/editor/web_tools_editor_plugin.h @@ -30,7 +30,6 @@ #pragma once -#include "core/io/zip_io.h" #include "editor/plugins/editor_plugin.h" class WebToolsEditorPlugin : public EditorPlugin { diff --git a/platform/web/export/editor_http_server.cpp b/platform/web/export/editor_http_server.cpp index ee2b2709158..72b188a5580 100644 --- a/platform/web/export/editor_http_server.cpp +++ b/platform/web/export/editor_http_server.cpp @@ -30,7 +30,9 @@ #include "editor_http_server.h" +#include "core/io/file_access.h" #include "core/os/os.h" +#include "editor/file_system/editor_paths.h" void EditorHTTPServer::_server_thread_poll(void *data) { EditorHTTPServer *web_server = static_cast(data); diff --git a/platform/web/export/editor_http_server.h b/platform/web/export/editor_http_server.h index b454c6d1945..45ea0a590da 100644 --- a/platform/web/export/editor_http_server.h +++ b/platform/web/export/editor_http_server.h @@ -30,11 +30,8 @@ #pragma once -#include "core/io/image_loader.h" #include "core/io/stream_peer_tls.h" #include "core/io/tcp_server.h" -#include "core/io/zip_io.h" -#include "editor/file_system/editor_paths.h" class EditorHTTPServer : public RefCounted { GDSOFTCLASS(EditorHTTPServer, RefCounted); diff --git a/platform/web/export/export_plugin.cpp b/platform/web/export/export_plugin.cpp index 11bc8fce71c..49178e6abcb 100644 --- a/platform/web/export/export_plugin.cpp +++ b/platform/web/export/export_plugin.cpp @@ -35,9 +35,11 @@ #include "core/config/project_settings.h" #include "core/io/dir_access.h" +#include "core/io/zip_io.h" #include "core/os/os.h" #include "editor/editor_string_names.h" #include "editor/export/editor_export.h" +#include "editor/file_system/editor_paths.h" #include "editor/import/resource_importer_texture_settings.h" #include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" diff --git a/platform/web/export/export_plugin.h b/platform/web/export/export_plugin.h index 2f8efcd240c..5de8ff06dd9 100644 --- a/platform/web/export/export_plugin.h +++ b/platform/web/export/export_plugin.h @@ -32,11 +32,6 @@ #include "editor_http_server.h" -#include "core/config/project_settings.h" -#include "core/io/image_loader.h" -#include "core/io/stream_peer_tls.h" -#include "core/io/tcp_server.h" -#include "core/io/zip_io.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/export/editor_export_platform.h" diff --git a/platform/web/os_web.cpp b/platform/web/os_web.cpp index 726141341e3..b3e8784a40c 100644 --- a/platform/web/os_web.cpp +++ b/platform/web/os_web.cpp @@ -36,8 +36,6 @@ #include "ip_web.h" #include "net_socket_web.h" -#include "core/config/project_settings.h" -#include "core/debugger/engine_debugger.h" #include "core/io/file_access.h" #include "core/os/main_loop.h" #include "core/os/os.h" @@ -46,11 +44,8 @@ #include "drivers/unix/file_access_unix.h" #include "main/main.h" -#include "modules/modules_enabled.gen.h" // For websocket. - #include #include -#include void OS_Web::alert(const String &p_alert, const String &p_title) { godot_js_display_alert(p_alert.utf8().get_data()); diff --git a/platform/web/os_web.h b/platform/web/os_web.h index 8794b53cdea..7a4f27422a8 100644 --- a/platform/web/os_web.h +++ b/platform/web/os_web.h @@ -36,9 +36,7 @@ #include "godot_js.h" #include "core/input/input_event.h" -#include "core/templates/rb_map.h" #include "drivers/unix/os_unix.h" -#include "servers/audio/audio_server.h" #include diff --git a/platform/web/platform_gl.h b/platform/web/platform_gl.h index 20ac8c557de..ebbcd9216d0 100644 --- a/platform/web/platform_gl.h +++ b/platform/web/platform_gl.h @@ -38,4 +38,4 @@ #define glGetProcAddress(n) static_assert(false, "Usage of glGetProcessAddress() on the web is a bug.") #define eglGetProcAddress(n) static_assert(false, "Usage of eglGetProcessAddress() on the web is a bug.") -#include "platform/web/godot_webgl2.h" +#include "platform/web/godot_webgl2.h" // IWYU pragma: export. diff --git a/platform/web/web_main.cpp b/platform/web/web_main.cpp index 590b8023daf..a19840d76f4 100644 --- a/platform/web/web_main.cpp +++ b/platform/web/web_main.cpp @@ -33,16 +33,17 @@ #include "os_web.h" #include "core/config/engine.h" -#include "core/io/file_access.h" #include "core/io/resource_loader.h" +#include "core/os/main_loop.h" #include "core/os/os.h" #include "core/profiling/profiling.h" #include "main/main.h" -#include "scene/main/scene_tree.h" -#include "scene/main/window.h" // SceneTree only forward declares it. #ifdef TOOLS_ENABLED +#include "core/io/file_access.h" #include "editor/web_tools_editor_plugin.h" +#include "scene/main/scene_tree.h" +#include "scene/main/window.h" // SceneTree only forward declares it. #endif #include diff --git a/platform/web/webmidi_driver.cpp b/platform/web/webmidi_driver.cpp index 6925f82e954..8be5a25861e 100644 --- a/platform/web/webmidi_driver.cpp +++ b/platform/web/webmidi_driver.cpp @@ -30,6 +30,8 @@ #include "webmidi_driver.h" +#include "godot_midi.h" + #ifdef PROXY_TO_PTHREAD_ENABLED #include "core/object/callable_mp.h" #endif diff --git a/platform/web/webmidi_driver.h b/platform/web/webmidi_driver.h index 57944bf3cc7..2e4026a295e 100644 --- a/platform/web/webmidi_driver.h +++ b/platform/web/webmidi_driver.h @@ -33,7 +33,6 @@ #include "core/os/midi_driver.h" #include "godot_js.h" -#include "godot_midi.h" class MIDIDriverWebMidi : public MIDIDriver { private: diff --git a/platform/windows/console_wrapper_windows.cpp b/platform/windows/console_wrapper_windows.cpp index c72a8e236e9..070a3e045f2 100644 --- a/platform/windows/console_wrapper_windows.cpp +++ b/platform/windows/console_wrapper_windows.cpp @@ -31,8 +31,8 @@ #include #include -#include #include +#include #ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING #define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x4 diff --git a/platform/windows/crash_handler_windows.h b/platform/windows/crash_handler_windows.h index 358d0ce3cfe..8cfee486ffb 100644 --- a/platform/windows/crash_handler_windows.h +++ b/platform/windows/crash_handler_windows.h @@ -30,7 +30,6 @@ #pragma once -#define WIN32_LEAN_AND_MEAN #include // Crash handler exception only enabled with MSVC diff --git a/platform/windows/crash_handler_windows_seh.cpp b/platform/windows/crash_handler_windows_seh.cpp index f2b3cd27a09..0ca7da3cad9 100644 --- a/platform/windows/crash_handler_windows_seh.cpp +++ b/platform/windows/crash_handler_windows_seh.cpp @@ -36,7 +36,6 @@ #include "core/os/os.h" #include "core/string/print_string.h" #include "core/version.h" -#include "main/main.h" #ifdef CRASH_HANDLER_EXCEPTION diff --git a/platform/windows/crash_handler_windows_signal.cpp b/platform/windows/crash_handler_windows_signal.cpp index 9622f3c2bf6..612589a23e9 100644 --- a/platform/windows/crash_handler_windows_signal.cpp +++ b/platform/windows/crash_handler_windows_signal.cpp @@ -37,16 +37,12 @@ #include "core/os/os.h" #include "core/string/print_string.h" #include "core/version.h" -#include "main/main.h" #ifdef CRASH_HANDLER_EXCEPTION #include -#include #include #include -#include -#include #include diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp index be172866bca..da10ad1649a 100644 --- a/platform/windows/display_server_windows.cpp +++ b/platform/windows/display_server_windows.cpp @@ -31,8 +31,10 @@ #include "display_server_windows.h" #include "drop_target_windows.h" +#include "key_mapping_windows.h" #include "native_menu_windows.h" #include "os_windows.h" +#include "tts_windows.h" #include "wgl_detect_version.h" #include "core/config/engine.h" @@ -48,10 +50,10 @@ #include "core/version.h" #include "drivers/png/png_driver_common.h" #include "main/main.h" -#include "scene/main/window.h" #include "scene/resources/texture.h" #include "servers/display/accessibility_server.h" #include "servers/rendering/dummy/rasterizer_dummy.h" +#include "servers/rendering/renderer_rd/renderer_compositor_rd.h" #ifdef SDL_ENABLED #include "drivers/sdl/joypad_sdl.h" diff --git a/platform/windows/display_server_windows.h b/platform/windows/display_server_windows.h index fce9f60846d..eabe3b7f251 100644 --- a/platform/windows/display_server_windows.h +++ b/platform/windows/display_server_windows.h @@ -30,22 +30,14 @@ #pragma once -#include "crash_handler_windows.h" -#include "key_mapping_windows.h" -#include "tts_windows.h" - #include "core/config/project_settings.h" #include "core/input/input_event.h" #include "core/io/image.h" #include "core/os/process_id.h" #include "core/templates/a_hash_map.h" #include "core/templates/rb_map.h" -#include "drivers/wasapi/audio_driver_wasapi.h" -#include "drivers/winmidi/midi_driver_winmidi.h" -#include "servers/audio/audio_server.h" #include "servers/display/display_server.h" #include "servers/rendering/renderer_compositor.h" -#include "servers/rendering/renderer_rd/renderer_compositor_rd.h" #ifdef XAUDIO2_ENABLED #include "drivers/xaudio2/audio_driver_xaudio2.h" @@ -61,9 +53,7 @@ #endif // GLES3_ENABLED #include -#include -#define WIN32_LEAN_AND_MEAN #include #include #include @@ -191,6 +181,7 @@ typedef struct { class DropTargetWindows; class NativeMenuWindows; +class TTS_Windows; #ifndef WDA_EXCLUDEFROMCAPTURE #define WDA_EXCLUDEFROMCAPTURE 0x00000011 diff --git a/platform/windows/export/export.cpp b/platform/windows/export/export.cpp index 811ceaa7382..cc74901fac3 100644 --- a/platform/windows/export/export.cpp +++ b/platform/windows/export/export.cpp @@ -34,6 +34,7 @@ #include "core/object/class_db.h" #include "editor/export/editor_export.h" +#include "editor/settings/editor_settings.h" void register_windows_exporter_types() { GDREGISTER_VIRTUAL_CLASS(EditorExportPlatformWindows); diff --git a/platform/windows/export/export_plugin.cpp b/platform/windows/export/export_plugin.cpp index 84178646159..68037588995 100644 --- a/platform/windows/export/export_plugin.cpp +++ b/platform/windows/export/export_plugin.cpp @@ -36,12 +36,13 @@ #include "core/config/project_settings.h" #include "core/io/dir_access.h" -#include "core/io/image_loader.h" +#include "core/io/file_access.h" #include "core/os/os.h" #include "editor/editor_node.h" #include "editor/editor_string_names.h" #include "editor/export/editor_export.h" #include "editor/file_system/editor_paths.h" +#include "editor/settings/editor_settings.h" #include "editor/themes/editor_scale.h" #include "scene/resources/image_texture.h" diff --git a/platform/windows/export/export_plugin.h b/platform/windows/export/export_plugin.h index 076f58ec00a..5fb56d844e1 100644 --- a/platform/windows/export/export_plugin.h +++ b/platform/windows/export/export_plugin.h @@ -30,10 +30,8 @@ #pragma once -#include "core/io/file_access.h" #include "core/os/process_id.h" #include "editor/export/editor_export_platform_pc.h" -#include "editor/settings/editor_settings.h" // Optional environment variables for defining confidential information. If any // of these is set, they will override the values set in the credentials file. diff --git a/platform/windows/export/template_modifier.cpp b/platform/windows/export/template_modifier.cpp index 6a76c33db17..3575dc0d21a 100644 --- a/platform/windows/export/template_modifier.cpp +++ b/platform/windows/export/template_modifier.cpp @@ -30,9 +30,9 @@ #include "template_modifier.h" -#include "core/config/project_settings.h" #include "core/io/dir_access.h" #include "core/io/image.h" +#include "editor/export/editor_export_preset.h" void TemplateModifier::ByteStream::save(uint8_t p_value, Vector &r_bytes) const { save(p_value, r_bytes, 1); diff --git a/platform/windows/export/template_modifier.h b/platform/windows/export/template_modifier.h index 5608b1c8a3a..e230a314404 100644 --- a/platform/windows/export/template_modifier.h +++ b/platform/windows/export/template_modifier.h @@ -31,7 +31,8 @@ #pragma once #include "core/io/file_access.h" -#include "editor/export/editor_export_platform_pc.h" + +class EditorExportPreset; class TemplateModifier { const uint32_t PE_PAGE_SIZE = 4096; diff --git a/platform/windows/gl_manager_windows_angle.cpp b/platform/windows/gl_manager_windows_angle.cpp index e748b2ddd81..43f4bc267e7 100644 --- a/platform/windows/gl_manager_windows_angle.cpp +++ b/platform/windows/gl_manager_windows_angle.cpp @@ -32,9 +32,6 @@ #if defined(WINDOWS_ENABLED) && defined(GLES3_ENABLED) -#include -#include - #include const char *GLManagerANGLE_Windows::_get_platform_extension_name() const { diff --git a/platform/windows/gl_manager_windows_angle.h b/platform/windows/gl_manager_windows_angle.h index ca3c76d1416..0e5f84a5a78 100644 --- a/platform/windows/gl_manager_windows_angle.h +++ b/platform/windows/gl_manager_windows_angle.h @@ -32,7 +32,6 @@ #if defined(WINDOWS_ENABLED) && defined(GLES3_ENABLED) -#include "core/templates/local_vector.h" #include "drivers/egl/egl_manager.h" #include "servers/display/display_server_enums.h" diff --git a/platform/windows/godot_windows.cpp b/platform/windows/godot_windows.cpp index 086d8f0d21b..0acfb06ca9e 100644 --- a/platform/windows/godot_windows.cpp +++ b/platform/windows/godot_windows.cpp @@ -34,7 +34,6 @@ #include "main/main.h" #include -#include // For export templates, add a section; the exporter will patch it to enclose // the data appended to the executable (bundled PCK). diff --git a/platform/windows/key_mapping_windows.h b/platform/windows/key_mapping_windows.h index be4988e8819..7df988ea29c 100644 --- a/platform/windows/key_mapping_windows.h +++ b/platform/windows/key_mapping_windows.h @@ -32,7 +32,6 @@ #include "core/os/keyboard.h" -#define WIN32_LEAN_AND_MEAN #include #include diff --git a/platform/windows/native_menu_windows.h b/platform/windows/native_menu_windows.h index 63a8ccc7e67..840304ced7c 100644 --- a/platform/windows/native_menu_windows.h +++ b/platform/windows/native_menu_windows.h @@ -35,7 +35,6 @@ #include "core/templates/rid_owner.h" #include "servers/display/native_menu.h" -#define WIN32_LEAN_AND_MEAN #include class NativeMenuWindows : public NativeMenu { diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index ddb67e06707..894429dd0d8 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -38,7 +38,6 @@ #include "core/config/engine.h" #include "core/debugger/engine_debugger.h" #include "core/debugger/script_debugger.h" -#include "core/io/marshalls.h" #include "core/os/main_loop.h" #include "core/profiling/profiling.h" #include "core/version_generated.gen.h" @@ -51,7 +50,6 @@ #include "main/main.h" #include "servers/audio/audio_server.h" #include "servers/rendering/rendering_server.h" -#include "servers/rendering/rendering_server_default.h" #include "servers/text/text_server.h" #include @@ -84,7 +82,7 @@ extern "C" { #endif #if defined(VULKAN_ENABLED) -#include "rendering_context_driver_vulkan_windows.h" +#include "drivers/vulkan/rendering_context_driver_vulkan.h" #endif #if defined(D3D12_ENABLED) #include "drivers/d3d12/rendering_context_driver_d3d12.h" diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h index ea1896318f2..79c6a708dc4 100644 --- a/platform/windows/os_windows.h +++ b/platform/windows/os_windows.h @@ -31,15 +31,11 @@ #pragma once #include "crash_handler_windows.h" -#include "key_mapping_windows.h" -#include "core/config/project_settings.h" #include "core/input/input_event.h" #include "core/os/os.h" -#include "core/templates/rb_map.h" #include "drivers/wasapi/audio_driver_wasapi.h" #include "drivers/winmidi/midi_driver_winmidi.h" -#include "servers/audio/audio_server.h" #ifdef XAUDIO2_ENABLED #include "drivers/xaudio2/audio_driver_xaudio2.h" @@ -47,9 +43,7 @@ #include #include -#include -#define WIN32_LEAN_AND_MEAN #include #include #include diff --git a/platform/windows/platform_gl.h b/platform/windows/platform_gl.h index 3d4a05c0db2..c7a0fb1a86e 100644 --- a/platform/windows/platform_gl.h +++ b/platform/windows/platform_gl.h @@ -38,6 +38,7 @@ #define GLES_API_ENABLED // Allow using GLES (ANGLE). #endif +// IWYU pragma: begin_exports. #ifdef EGL_STATIC #define KHRONOS_STATIC 1 #include "thirdparty/angle/include/EGL/egl.h" @@ -48,3 +49,4 @@ #endif #include "thirdparty/glad/glad/gl.h" +// IWYU pragma: end_exports. diff --git a/platform/windows/rendering_context_driver_vulkan_windows.h b/platform/windows/rendering_context_driver_vulkan_windows.h index be674c480a3..d9e384b476b 100644 --- a/platform/windows/rendering_context_driver_vulkan_windows.h +++ b/platform/windows/rendering_context_driver_vulkan_windows.h @@ -34,7 +34,6 @@ #include "drivers/vulkan/rendering_context_driver_vulkan.h" -#define WIN32_LEAN_AND_MEAN #include class RenderingContextDriverVulkanWindows : public RenderingContextDriverVulkan { diff --git a/platform/windows/tts_windows.h b/platform/windows/tts_windows.h index 91dae4d2fa3..7900ad76fec 100644 --- a/platform/windows/tts_windows.h +++ b/platform/windows/tts_windows.h @@ -37,11 +37,8 @@ #include #include -#include -#include - -#define WIN32_LEAN_AND_MEAN #include +#include struct TTSUtterance; diff --git a/platform/windows/windows_terminal_logger.cpp b/platform/windows/windows_terminal_logger.cpp index e9ed9104ff7..f7ea636cc31 100644 --- a/platform/windows/windows_terminal_logger.cpp +++ b/platform/windows/windows_terminal_logger.cpp @@ -37,7 +37,6 @@ #include -#define WIN32_LEAN_AND_MEAN #include void WindowsTerminalLogger::logv(const char *p_format, va_list p_list, bool p_err) { diff --git a/platform/windows/windows_utils.cpp b/platform/windows/windows_utils.cpp index 7015f63386d..b1cc566b63a 100644 --- a/platform/windows/windows_utils.cpp +++ b/platform/windows/windows_utils.cpp @@ -36,7 +36,6 @@ #include "core/io/dir_access.h" #include "core/io/file_access.h" -#define WIN32_LEAN_AND_MEAN #include #undef FAILED // Overrides Error::FAILED diff --git a/tests/core/io/test_config_file.cpp b/tests/core/io/test_config_file.cpp index 1b50a3beabd..77d4f2c1736 100644 --- a/tests/core/io/test_config_file.cpp +++ b/tests/core/io/test_config_file.cpp @@ -33,7 +33,10 @@ TEST_FORCE_LINK(test_config_file) #include "core/io/config_file.h" + +#ifdef WINDOWS_ENABLED #include "core/os/os.h" +#endif namespace TestConfigFile { diff --git a/tests/scene/test_packed_scene.cpp b/tests/scene/test_packed_scene.cpp index bdec46d0b6a..48e3b53d41d 100644 --- a/tests/scene/test_packed_scene.cpp +++ b/tests/scene/test_packed_scene.cpp @@ -33,7 +33,6 @@ TEST_FORCE_LINK(test_packed_scene) #include "core/object/callable_mp.h" -#include "core/object/class_db.h" #include "scene/resources/packed_scene.h" namespace TestPackedScene { diff --git a/tests/servers/test_navigation_server_3d.cpp b/tests/servers/test_navigation_server_3d.cpp index 8849bae38a4..062f6f8ce49 100644 --- a/tests/servers/test_navigation_server_3d.cpp +++ b/tests/servers/test_navigation_server_3d.cpp @@ -37,7 +37,6 @@ TEST_FORCE_LINK(test_navigation_server_3d) #ifdef MODULE_NAVIGATION_3D_ENABLED #include "core/object/callable_mp.h" -#include "core/object/class_db.h" #include "scene/3d/mesh_instance_3d.h" #include "scene/main/scene_tree.h" #include "scene/main/window.h" diff --git a/tests/test_macros.h b/tests/test_macros.h index aa5b08422f5..4ecffad93df 100644 --- a/tests/test_macros.h +++ b/tests/test_macros.h @@ -30,7 +30,7 @@ #pragma once -#include "core/core_globals.h" // IWYU pragma: Used in macro. +#include "core/core_globals.h" // IWYU pragma: keep. Used in macro. #include "core/variant/variant.h" #if defined(_MSC_VER) && !defined(DOCTEST_THREAD_LOCAL)