Remove unused includes in platform with clangd-tidy

Handled Linux, Windows, Android, and (partially) Web.
2026-03-11 10:21:44 +01:00
parent a596178702
commit d9b81615e5
113 changed files with 143 additions and 202 deletions
@@ -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
@@ -30,7 +30,6 @@

 #pragma once

-#define WIN32_LEAN_AND_MEAN
 #include <windows.h>

 void compute_dxil_hash(const BYTE *pData, UINT byteCount, BYTE *pOutHash);
@@ -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
@@ -39,7 +39,6 @@

 #include <audioclient.h>
 #include <mmdeviceapi.h>
-#define WIN32_LEAN_AND_MEAN
 #include <windows.h>

 class AudioDriverWASAPI : public AudioDriver {
@@ -38,10 +38,9 @@
 #include "core/os/os.h"
 #include "core/string/print_string.h"

+#include <windows.h>
 #include <cstdio>
 #include <cwchar>
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>

 typedef struct _NT_IO_STATUS_BLOCK {
 	union {
@@ -38,7 +38,6 @@

 #include <share.h> // _SH_DENYNO
 #include <shlwapi.h>
-#define WIN32_LEAN_AND_MEAN
 #include <windows.h>

 #include <io.h>
@@ -35,7 +35,6 @@
 #include "core/io/file_access.h"
 #include "core/os/memory.h"

-#define WIN32_LEAN_AND_MEAN
 #include <windows.h>

 class FileAccessWindowsPipe : public FileAccess {
@@ -32,7 +32,6 @@

 #include "ip_windows.h"

-#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <winsock2.h>
 #include <ws2tcpip.h>
@@ -35,7 +35,6 @@
 #include "core/os/thread.h"
 #include "core/string/ustring.h"

-#define WIN32_LEAN_AND_MEAN
 #include <windows.h>

 typedef HRESULT(WINAPI *SetThreadDescriptionPtr)(HANDLE p_thread, PCWSTR p_thread_description);
@@ -35,9 +35,8 @@
 #include "core/os/midi_driver.h"
 #include "core/templates/vector.h"

-#include <cstdio>
-#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#include <cstdio>

 #include <mmsystem.h>

@@ -36,7 +36,6 @@
 #include "servers/audio/audio_server.h"

 #include <mmsystem.h>
-#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <wrl/client.h>
 #include <xaudio2.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<String> *r_options) const override;
+#endif

 	// Base.
 	static void create();
@@ -214,7 +214,9 @@ public:

 	void notify_changes();

+#ifdef TOOLS_ENABLED
 	virtual void get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const override;
+#endif

 	EditorSettings();
 };
@@ -69,7 +69,6 @@ SOFTWARE.
 #include "core/os/os.h"

 #ifdef WINDOWS_ENABLED
-#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #endif

@@ -38,7 +38,6 @@
 #include <cstdlib>

 #ifdef WINDOWS_ENABLED
-#define WIN32_LEAN_AND_MEAN
 #include <windows.h>

 #define ENV_PATH_SEP ";"
@@ -31,7 +31,6 @@
 #include "openxr_select_runtime.h"

 #ifdef WINDOWS_ENABLED
-#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #endif

@@ -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:
@@ -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 <cstdio>
+#include <jni.h>

 /// Android implementation of the DirAccess interface used to provide access to
 /// ACCESS_FILESYSTEM and ACCESS_RESOURCES directory resources.
@@ -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"
@@ -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[] = {
@@ -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:
@@ -32,7 +32,6 @@

 #ifndef DISABLE_DEPRECATED

-#include "core/config/project_settings.h"
 #include "core/io/config_file.h"
 #include "core/string/ustring.h"

@@ -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) {
@@ -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"

@@ -35,7 +35,6 @@
 #include <android/asset_manager.h>
 #include <android/log.h>
 #include <jni.h>
-#include <cstdio>

 class FileAccessAndroid : public FileAccess {
 	GDSOFTCLASS(FileAccessAndroid, FileAccess);
@@ -30,10 +30,10 @@

 #pragma once

-#include "java_godot_lib_jni.h"
-
 #include "core/io/file_access.h"

+#include <jni.h>
+
 class FileAccessFilesystemJAndroid : public FileAccess {
 	GDSOFTCLASS(FileAccessFilesystemJAndroid, FileAccess);
 	static jobject file_access_handler;
@@ -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"

@@ -30,8 +30,6 @@

 #pragma once

-#include "jni_utils.h"
-
 #include "core/math/rect2i.h"
 #include "core/variant/typed_array.h"

@@ -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);
@@ -30,8 +30,6 @@

 #pragma once

-#include "jni_utils.h"
-
 #include "core/math/vector2.h"

 #include <android/log.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 <android/log.h>
 #include <jni.h>

 // Class that makes functions in java/src/org/godotengine/godot/Godot.kt callable from C++
@@ -32,7 +32,6 @@

 #include "thread_jandroid.h"

-#include "core/config/engine.h"
 #include "core/string/ustring.h"
 #include "core/variant/variant.h"

@@ -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 <dlfcn.h>
 #include <sys/system_properties.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;
@@ -34,7 +34,9 @@
 #define GLES_API_ENABLED // Allow using GLES.
 #endif

+// IWYU pragma: begin_exports.
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 #include <GLES3/gl3.h>
 #include <GLES3/gl3ext.h>
+// IWYU pragma: end_exports.
@@ -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"

@@ -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 <jni.h>
@@ -35,5 +35,5 @@
 #define GLES_API_ENABLED // Allow using GLES.
 #endif

-#include <ES3/gl.h>
+#include <ES3/gl.h> // IWYU pragma: export.
 #endif
@@ -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
@@ -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"
@@ -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 {
@@ -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
@@ -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:
@@ -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;
@@ -34,7 +34,6 @@
 #include "main/main.h"

 #include <unistd.h>
-#include <climits>
 #include <clocale>
 #include <cstdio>
 #include <cstdlib>
@@ -91,6 +91,14 @@
 #include <sys/sysctl.h>
 #endif

+#ifdef FONTCONFIG_ENABLED
+#ifdef SOWRAP_ENABLED
+#include "fontconfig-so_wrap.h"
+#else
+#include <fontconfig/fontconfig.h>
+#endif
+#endif
+
 void OS_LinuxBSD::alert(const String &p_alert, const String &p_title) {
 	const char *message_programs[] = { "zenity", "kdialog", "Xdialog", "xmessage" };

@@ -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 <fontconfig/fontconfig.h>
-#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;

@@ -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.
@@ -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
@@ -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 <sys/types.h>
 #include <sys/wait.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
@@ -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
@@ -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
@@ -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
@@ -30,6 +30,12 @@

 #include "key_mapping_xkb.h"

+#ifdef SOWRAP_ENABLED
+#include "xkbcommon-so_wrap.h"
+#else
+#include <xkbcommon/xkbcommon.h>
+#endif // SOWRAP_ENABLED
+
 void KeyMappingXKB::initialize() {
 	// XKB keycode to Godot Key map.

@@ -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 <xkbcommon/xkbcommon.h>
-#endif // SOWRAP_ENABLED
+typedef uint32_t xkb_keycode_t;
+typedef uint32_t xkb_keysym_t;

 class KeyMappingXKB {
 	struct HashMapHasherKeys {
@@ -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 <wayland-client-core.h>
-#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 <errno.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>

 #include <poll.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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -37,9 +37,13 @@

 #include "thirdparty/glad/glad/glx.h"

+#ifdef SOWRAP_ENABLED
+#include "dynwrappers/xrender-so_wrap.h"
+#else
+#include <X11/extensions/Xrender.h>
+#endif
+
 #include <unistd.h>
-#include <cstdio>
-#include <cstdlib>

 #define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091
 #define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092
@@ -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 <X11/XKBlib.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-
-#include <X11/extensions/Xext.h>
-#include <X11/extensions/Xrender.h>
-#include <X11/extensions/shape.h>
 #endif

 struct GLManager_X11_Private;
@@ -32,9 +32,6 @@

 #if defined(X11_ENABLED) && defined(GLES3_ENABLED)

-#include <cstdio>
-#include <cstdlib>
-
 const char *GLManagerEGL_X11::_get_platform_extension_name() const {
 	return "EGL_KHR_platform_x11";
 }
@@ -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 <X11/Xlib.h>
-
 class GLManagerEGL_X11 : public EGLManager {
 private:
 	virtual const char *_get_platform_extension_name() const override;
@@ -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
@@ -32,7 +32,6 @@

 #if defined(UNIX_ENABLED)

-#include "core/io/dir_access.h"
 #include "drivers/unix/dir_access_unix.h"

 #include <dirent.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.
@@ -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 <emscripten.h>
@@ -30,7 +30,6 @@

 #pragma once

-#include "godot_audio.h"
 #include "godot_js.h"

 #include "core/os/mutex.h"
@@ -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
@@ -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"

@@ -30,7 +30,6 @@

 #pragma once

-#include "core/io/zip_io.h"
 #include "editor/plugins/editor_plugin.h"

 class WebToolsEditorPlugin : public EditorPlugin {
@@ -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<EditorHTTPServer *>(data);
@@ -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);
@@ -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"
@@ -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"
@@ -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 <dlfcn.h>
 #include <emscripten.h>
-#include <cstdlib>

 void OS_Web::alert(const String &p_alert, const String &p_title) {
 	godot_js_display_alert(p_alert.utf8().get_data());
@@ -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 <emscripten/html5.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.
@@ -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 <emscripten/emscripten.h>
@@ -30,6 +30,8 @@

 #include "webmidi_driver.h"

+#include "godot_midi.h"
+
 #ifdef PROXY_TO_PTHREAD_ENABLED
 #include "core/object/callable_mp.h"
 #endif
@@ -33,7 +33,6 @@
 #include "core/os/midi_driver.h"

 #include "godot_js.h"
-#include "godot_midi.h"

 class MIDIDriverWebMidi : public MIDIDriver {
 private:
@@ -31,8 +31,8 @@
 #include <windows.h>

 #include <shlwapi.h>
-#include <cstdio>
 #include <cstdlib>
+#include <cwchar>

 #ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING
 #define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x4
@@ -30,7 +30,6 @@

 #pragma once

-#define WIN32_LEAN_AND_MEAN
 #include <windows.h>

 // Crash handler exception only enabled with MSVC
@@ -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

@@ -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 <cxxabi.h>
-#include <algorithm>
 #include <csignal>
 #include <cstdlib>
-#include <string>
-#include <vector>

 #include <psapi.h>

@@ -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"
@@ -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 <io.h>
-#include <cstdio>

-#define WIN32_LEAN_AND_MEAN
 #include <shobjidl.h>
 #include <windows.h>
 #include <windowsx.h>
@@ -191,6 +181,7 @@ typedef struct {

 class DropTargetWindows;
 class NativeMenuWindows;
+class TTS_Windows;

 #ifndef WDA_EXCLUDEFROMCAPTURE
 #define WDA_EXCLUDEFROMCAPTURE 0x00000011
@@ -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);
@@ -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"

@@ -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.
@@ -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<uint8_t> &r_bytes) const {
 	save(p_value, r_bytes, 1);
@@ -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;
@@ -32,9 +32,6 @@

 #if defined(WINDOWS_ENABLED) && defined(GLES3_ENABLED)

-#include <cstdio>
-#include <cstdlib>
-
 #include <EGL/eglext_angle.h>

 const char *GLManagerANGLE_Windows::_get_platform_extension_name() const {
@@ -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"

@@ -34,7 +34,6 @@
 #include "main/main.h"

 #include <clocale>
-#include <cstdio>

 // For export templates, add a section; the exporter will patch it to enclose
 // the data appended to the executable (bundled PCK).
--- a/Show More
+++ b/Show More