Explicitly include core/os/os.h where used

core/config/project_settings.cpp

@@ -41,6 +41,7 @@
 #include "core/object/class_db.h"
 #include "core/object/message_queue.h"
 #include "core/object/script_language.h"
+#include "core/os/os.h"
 #include "core/templates/rb_set.h"
 #include "core/variant/typed_array.h"
 #include "core/variant/variant_parser.h"

core/core_bind.cpp

@@ -42,6 +42,7 @@
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
 #include "core/os/main_loop.h"
+#include "core/os/os.h"
 #include "core/os/thread_safe.h"
 #include "core/variant/typed_array.h"
 

core/extension/gdextension_library_loader.cpp

@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
+#include "core/os/os.h"
 #include "core/version.h"
 #include "gdextension.h"
 

core/extension/gdextension_manager.cpp

@@ -37,6 +37,7 @@
 #include "core/io/file_access.h"
 #include "core/object/class_db.h"
 #include "core/object/script_language.h"
+#include "core/os/os.h"
 
 GDExtensionManager::LoadStatus GDExtensionManager::_load_extension_internal(const Ref<GDExtension> &p_extension, bool p_first_load) {
 	if (level >= 0) { // Already initialized up to some level.

core/extension/godot_instance.cpp

@@ -33,6 +33,7 @@
 #include "core/extension/gdextension_manager.h"
 #include "core/object/class_db.h"
 #include "core/os/main_loop.h"
+#include "core/os/os.h"
 #include "main/main.h"
 #include "servers/display/display_server.h"
 

core/io/http_client_tcp.cpp

@@ -34,6 +34,7 @@
 
 #include "core/io/stream_peer_tls.h"
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "core/version.h"
 
 HTTPClient *HTTPClientTCP::_create_func(bool p_notify_postinitialize) {

core/object/script_language.cpp

@@ -36,6 +36,7 @@
 #include "core/debugger/script_debugger.h"
 #include "core/io/resource_loader.h"
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "core/templates/sort_array.h"
 
 ScriptLanguage *ScriptServer::_languages[MAX_LANGUAGES];

core/os/os.cpp

@@ -35,6 +35,7 @@
 #include "core/io/file_access.h"
 #include "core/io/json.h"
 #include "core/os/midi_driver.h"
+#include "core/os/os.h"
 #include "core/version_generated.gen.h"
 
 #include <cstdarg>

core/register_core_types.cpp

@@ -77,6 +77,7 @@
 #include "core/object/undo_redo.h"
 #include "core/object/worker_thread_pool.h"
 #include "core/os/main_loop.h"
+#include "core/os/os.h"
 #include "core/os/time.h"
 #include "core/string/optimized_translation.h"
 #include "core/string/translation.h"

editor/animation/animation_player_editor_plugin.cpp

@@ -34,6 +34,7 @@
 #include "core/input/input.h"
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
+#include "core/os/os.h"
 #include "editor/animation/animation_tree_editor_plugin.h"
 #include "editor/docks/editor_dock_manager.h"
 #include "editor/docks/inspector_dock.h"

editor/asset_library/asset_library_editor_plugin.cpp

@@ -35,6 +35,7 @@
 #include "core/io/stream_peer_tls.h"
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
+#include "core/os/os.h"
 #include "core/version.h"
 #include "editor/editor_main_screen.h"
 #include "editor/editor_node.h"

editor/debugger/debug_adapter/debug_adapter_parser.cpp

@@ -31,6 +31,7 @@
 #include "debug_adapter_parser.h"
 
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "editor/debugger/debug_adapter/debug_adapter_protocol.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/debugger/script_editor_debugger.h"

editor/debugger/debug_adapter/debug_adapter_protocol.cpp

@@ -34,6 +34,7 @@
 #include "core/debugger/debugger_marshalls.h"
 #include "core/io/json.h"
 #include "core/io/marshalls.h"
+#include "core/os/os.h"
 #include "editor/debugger/debug_adapter/debug_adapter_parser.h"
 #include "editor/debugger/script_editor_debugger.h"
 #include "editor/editor_log.h"

editor/doc/editor_help.cpp

@@ -38,6 +38,7 @@
 #include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "core/os/keyboard.h"
+#include "core/os/os.h"
 #include "core/string/string_builder.h"
 #include "core/version.h"
 #include "editor/doc/doc_data_compressed.gen.h"

editor/doc/editor_help_search.cpp

@@ -31,6 +31,7 @@
 #include "editor_help_search.h"
 
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "editor/editor_main_screen.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"

editor/editor_log.cpp

@@ -33,6 +33,7 @@
 #include "core/io/resource_loader.h"
 #include "core/object/undo_redo.h"
 #include "core/os/keyboard.h"
+#include "core/os/os.h"
 #include "core/version.h"
 #include "editor/docks/editor_dock.h"
 #include "editor/docks/inspector_dock.h"

editor/export/editor_export_platform_pc.cpp

@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
+#include "core/os/os.h"
 #include "core/os/shared_object.h"
 #include "scene/resources/image_texture.h"
 

editor/export/editor_export_preset.cpp

@@ -34,6 +34,7 @@
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "editor/export/editor_export.h"
 #include "editor/settings/editor_settings.h"
 

editor/export/export_template_manager.cpp

@@ -33,6 +33,7 @@
 #include "core/io/dir_access.h"
 #include "core/io/json.h"
 #include "core/io/zip_io.h"
+#include "core/os/os.h"
 #include "core/templates/rb_set.h"
 #include "core/version.h"
 #include "editor/editor_node.h"

editor/export/project_export.cpp

@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "core/version.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"

editor/file_system/dependency_editor.cpp

@@ -34,6 +34,7 @@
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/file_system/editor_file_system.h"

editor/gui/editor_about.cpp

@@ -33,6 +33,7 @@
 #include "core/authors.gen.h"
 #include "core/donors.gen.h"
 #include "core/license.gen.h"
+#include "core/os/os.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/credits_roll.h"

editor/gui/editor_file_dialog.cpp

@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "editor/docks/filesystem_dock.h"
 #include "editor/editor_string_names.h"
 #include "editor/file_system/dependency_editor.h"

editor/gui/editor_quick_open_dialog.cpp

@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "core/string/fuzzy_search.h"
 #include "editor/docks/filesystem_dock.h"
 #include "editor/editor_node.h"

editor/import/dynamic_font_import_settings.cpp

@@ -33,6 +33,7 @@
 #include "unicode_ranges.inc"
 
 #include "core/config/project_settings.h"
+#include "core/os/os.h"
 #include "core/string/translation.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"

editor/import/fbx_importer_manager.cpp

@@ -31,6 +31,7 @@
 #include "fbx_importer_manager.h"
 
 #include "core/config/project_settings.h"
+#include "core/os/os.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/settings/editor_settings.h"

editor/inspector/editor_resource_picker.cpp

@@ -32,6 +32,7 @@
 
 #include "core/input/input.h"
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "editor/audio/audio_stream_preview.h"
 #include "editor/doc/editor_help.h"
 #include "editor/docks/filesystem_dock.h"

editor/inspector/editor_resource_preview.cpp

@@ -35,6 +35,7 @@
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "core/variant/variant_utility.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"

editor/project_manager/engine_update_label.cpp

@@ -32,6 +32,7 @@
 
 #include "core/io/json.h"
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "core/version.h"
 #include "editor/editor_string_names.h"
 #include "editor/settings/editor_settings.h"

editor/project_manager/project_dialog.cpp

@@ -34,6 +34,7 @@
 #include "core/io/dir_access.h"
 #include "core/io/zip_io.h"
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "core/version.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"

editor/register_editor_types.cpp

@@ -31,6 +31,7 @@
 #include "register_editor_types.h"
 
 #include "core/object/script_language.h"
+#include "core/os/os.h"
 #include "editor/animation/animation_tree_editor_plugin.h"
 #include "editor/audio/audio_stream_editor_plugin.h"
 #include "editor/audio/audio_stream_randomizer_editor_plugin.h"

editor/scene/2d/particles_2d_editor_plugin.cpp

@@ -31,6 +31,7 @@
 #include "particles_2d_editor_plugin.h"
 
 #include "core/io/image_loader.h"
+#include "core/os/os.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"

editor/scene/2d/polygon_2d_editor_plugin.cpp

@@ -33,6 +33,7 @@
 #include "core/input/input_event.h"
 #include "core/math/geometry_2d.h"
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "editor/docks/editor_dock.h"
 #include "editor/docks/editor_dock_manager.h"
 #include "editor/editor_node.h"

editor/scene/2d/tiles/tiles_editor_plugin.cpp

@@ -33,7 +33,7 @@
 #include "tile_set_editor.h"
 
 #include "core/os/mutex.h"
-
+#include "core/os/os.h"
 #include "editor/docks/editor_dock_manager.h"
 #include "editor/editor_interface.h"
 #include "editor/editor_node.h"

editor/scene/3d/lightmap_gi_editor_plugin.cpp

@@ -31,6 +31,7 @@
 #include "lightmap_gi_editor_plugin.h"
 
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_file_dialog.h"

editor/scene/3d/node_3d_editor_plugin.cpp

@@ -38,6 +38,7 @@
 #include "core/math/projection.h"
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
+#include "core/os/os.h"
 #include "core/string/translation_server.h"
 #include "editor/animation/animation_player_editor_plugin.h"
 #include "editor/debugger/editor_debugger_node.h"

editor/scene/3d/particles_3d_editor_plugin.cpp

@@ -30,6 +30,7 @@
 
 #include "particles_3d_editor_plugin.h"
 
+#include "core/os/os.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/scene/scene_tree_editor.h"

editor/scene/editor_scene_tabs.cpp

@@ -33,6 +33,7 @@
 #include "core/config/project_settings.h"
 #include "core/io/resource_loader.h"
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "editor/docks/inspector_dock.h"
 #include "editor/editor_main_screen.h"
 #include "editor/editor_node.h"

editor/scene/gui/font_config_plugin.cpp

@@ -31,6 +31,7 @@
 #include "font_config_plugin.h"
 
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "core/string/translation_server.h"
 #include "editor/import/dynamic_font_import_settings.h"
 #include "editor/settings/editor_settings.h"

editor/settings/editor_command_palette.cpp

@@ -32,6 +32,7 @@
 
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
+#include "core/os/os.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_toaster.h"

editor/shader/text_shader_editor.cpp

@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "core/version_generated.gen.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"

editor/shader/visual_shader_editor_plugin.cpp

@@ -36,6 +36,7 @@
 #include "core/math/math_defs.h"
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
+#include "core/os/os.h"
 #include "core/version_generated.gen.h"
 #include "editor/docks/filesystem_dock.h"
 #include "editor/docks/inspector_dock.h"

editor/themes/editor_theme_manager.cpp

@@ -32,6 +32,7 @@
 
 #include "core/error/error_macros.h"
 #include "core/io/resource_loader.h"
+#include "core/os/os.h"
 #include "editor/editor_string_names.h"
 #include "editor/file_system/editor_paths.h"
 #include "editor/settings/editor_settings.h"

editor/version_control/version_control_editor_plugin.cpp

@@ -33,6 +33,7 @@
 #include "core/config/project_settings.h"
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
+#include "core/os/os.h"
 #include "core/os/time.h"
 #include "editor/docks/editor_dock.h"
 #include "editor/docks/editor_dock_manager.h"

modules/betsy/image_compress_betsy.cpp

@@ -39,6 +39,7 @@
 #include "rgb_to_rgba.glsl.gen.h"
 
 #include "core/config/project_settings.h"
+#include "core/os/os.h"
 #include "servers/display/display_server.h"
 #include "servers/rendering/rendering_context_driver.h"
 #include "servers/rendering/rendering_device.h"

modules/fbx/editor/editor_scene_importer_fbx2gltf.cpp

@@ -31,6 +31,7 @@
 #include "editor_scene_importer_fbx2gltf.h"
 
 #include "core/config/project_settings.h"
+#include "core/os/os.h"
 #include "editor/settings/editor_settings.h"
 #include "editor_scene_importer_ufbx.h"
 

modules/gdscript/language_server/gdscript_language_protocol.cpp

@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "editor/doc/doc_tools.h"
 #include "editor/doc/editor_help.h"
 #include "editor/editor_log.h"

modules/gltf/editor/editor_scene_importer_blend.cpp

@@ -35,6 +35,7 @@
 #include "editor_import_blend_runner.h"
 
 #include "core/config/project_settings.h"
+#include "core/os/os.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_file_dialog.h"

modules/lightmapper_rd/lightmapper_rd.cpp

@@ -30,7 +30,6 @@
 
 #include "lightmapper_rd.h"
 
-#include "core/string/print_string.h"
 #include "lm_blendseams.glsl.gen.h"
 #include "lm_compute.glsl.gen.h"
 #include "lm_raster.glsl.gen.h"
@@ -39,6 +38,8 @@
 #include "core/io/dir_access.h"
 #include "core/math/geometry_2d.h"
 #include "core/math/geometry_3d.h"
+#include "core/os/os.h"
+#include "core/string/print_string.h"
 #include "editor/file_system/editor_paths.h"
 #include "editor/settings/editor_settings.h"
 #include "servers/rendering/rendering_device.h"

modules/mbedtls/register_types.cpp

@@ -36,6 +36,7 @@
 #include "stream_peer_mbedtls.h"
 
 #include "core/config/project_settings.h"
+#include "core/os/os.h"
 
 #if MBEDTLS_VERSION_MAJOR >= 3
 #include <psa/crypto.h>

modules/navigation_2d/nav_map_2d.cpp

@@ -40,6 +40,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/object/worker_thread_pool.h"
+#include "core/os/os.h"
 #include "servers/navigation_2d/navigation_server_2d.h"
 
 #include <Obstacle2d.h>

modules/navigation_3d/nav_map_3d.cpp

@@ -40,6 +40,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/object/worker_thread_pool.h"
+#include "core/os/os.h"
 #include "servers/navigation_3d/navigation_server_3d.h"
 
 #include <Obstacle2d.h>

modules/objectdb_profiler/editor/objectdb_profiler_panel.cpp

@@ -38,6 +38,7 @@
 #include "data_viewers/summary_view.h"
 
 #include "core/config/project_settings.h"
+#include "core/os/os.h"
 #include "core/os/time.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/debugger/script_editor_debugger.h"

modules/openxr/extensions/platform/openxr_android_extension.cpp

@@ -36,6 +36,8 @@
 #include "os_android.h"
 #include "thread_jandroid.h"
 
+#include "core/os/os.h"
+
 #include <openxr/openxr.h>
 #include <openxr/openxr_platform.h>
 

modules/openxr/register_types.cpp

@@ -100,6 +100,7 @@
 #endif
 
 #include "core/config/project_settings.h"
+#include "core/os/os.h"
 #include "main/main.h"
 
 #ifdef TOOLS_ENABLED

modules/raycast/raycast_occlusion_cull.cpp

@@ -33,6 +33,7 @@
 #include "core/config/project_settings.h"
 #include "core/math/projection.h"
 #include "core/object/worker_thread_pool.h"
+#include "core/os/os.h"
 
 #ifdef __SSE2__
 #include <pmmintrin.h>

modules/text_server_adv/text_server_adv.cpp

@@ -30,8 +30,6 @@
 
 #include "text_server_adv.h"
 
-#include "core/object/callable_method_pointer.h"
-
 #ifdef GDEXTENSION
 // Headers for building as GDExtension plug-in.
 
@@ -40,6 +38,7 @@
 #include <godot_cpp/classes/project_settings.hpp>
 #include <godot_cpp/classes/translation_server.hpp>
 #include <godot_cpp/core/error_macros.hpp>
+#include <godot_cpp/variant/callable_method_pointer.hpp>
 
 using namespace godot;
 
@@ -51,7 +50,9 @@ using namespace godot;
 #include "core/config/project_settings.h"
 #include "core/error/error_macros.h"
 #include "core/io/file_access.h"
+#include "core/object/callable_method_pointer.h"
 #include "core/object/worker_thread_pool.h"
+#include "core/os/os.h"
 #include "core/string/translation_server.h"
 #include "scene/resources/image_texture.h"
 

modules/text_server_fb/text_server_fb.cpp

@@ -30,8 +30,6 @@
 
 #include "text_server_fb.h"
 
-#include "core/object/callable_method_pointer.h"
-
 #ifdef GDEXTENSION
 // Headers for building as GDExtension plug-in.
 
@@ -40,6 +38,7 @@
 #include <godot_cpp/classes/project_settings.hpp>
 #include <godot_cpp/classes/translation_server.hpp>
 #include <godot_cpp/core/error_macros.hpp>
+#include <godot_cpp/variant/callable_method_pointer.hpp>
 
 #define OT_TAG(m_c1, m_c2, m_c3, m_c4) ((int32_t)((((uint32_t)(m_c1) & 0xff) << 24) | (((uint32_t)(m_c2) & 0xff) << 16) | (((uint32_t)(m_c3) & 0xff) << 8) | ((uint32_t)(m_c4) & 0xff)))
 
@@ -53,6 +52,8 @@ using namespace godot;
 #include "core/config/project_settings.h"
 #include "core/error/error_macros.h"
 #include "core/io/file_access.h"
+#include "core/object/callable_method_pointer.h"
+#include "core/os/os.h"
 #include "core/string/print_string.h"
 #include "core/string/translation_server.h"
 

modules/websocket/editor/editor_debugger_server_websocket.cpp

@@ -32,6 +32,7 @@
 
 #include "../remote_debugger_peer_websocket.h"
 
+#include "core/os/os.h"
 #include "editor/editor_log.h"
 #include "editor/editor_node.h"
 #include "editor/settings/editor_settings.h"

modules/websocket/wsl_peer.cpp

@@ -33,6 +33,7 @@
 #ifndef WEB_ENABLED
 
 #include "core/io/stream_peer_tls.h"
+#include "core/os/os.h"
 
 CryptoCore::RandomGenerator *WSLPeer::_static_rng = nullptr;
 

platform/android/audio_driver_opensl.cpp

@@ -30,6 +30,8 @@
 
 #include "audio_driver_opensl.h"
 
+#include "core/os/os.h"
+
 #define MAX_NUMBER_INTERFACES 3
 #define MAX_NUMBER_OUTPUT_DEVICES 6
 

platform/android/display_server_android.cpp

@@ -38,6 +38,7 @@
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
 #include "core/input/input_event.h"
+#include "core/os/os.h"
 #include "servers/display/native_menu.h"
 
 #if defined(RD_ENABLED)

platform/android/editor/editor_utils_jni.cpp

@@ -33,6 +33,7 @@
 #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"
 #include "editor/run/editor_run_bar.h"

platform/android/java_godot_lib_jni.cpp

@@ -49,6 +49,7 @@
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
 #include "core/os/main_loop.h"
+#include "core/os/os.h"
 #include "core/profiling/profiling.h"
 #include "main/main.h"
 #include "servers/rendering/rendering_server.h"

platform/android/os_android.cpp

@@ -43,6 +43,7 @@
 #include "core/input/input.h"
 #include "core/io/xml_parser.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"

platform/android/tts_android.cpp

@@ -34,6 +34,7 @@
 #include "os_android.h"
 #include "thread_jandroid.h"
 
+#include "core/os/os.h"
 #include "servers/display/display_server.h"
 
 bool TTS_Android::initialized = false;

platform/linuxbsd/export/export_plugin.cpp

@@ -35,6 +35,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
+#include "core/os/os.h"
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/export/editor_export.h"

platform/linuxbsd/os_linuxbsd.cpp

@@ -34,14 +34,16 @@
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/os/main_loop.h"
-#ifdef SDL_ENABLED
-#include "drivers/sdl/joypad_sdl.h"
-#endif
+#include "core/os/os.h"
 #include "core/profiling/profiling.h"
 #include "main/main.h"
 #include "servers/display/display_server.h"
 #include "servers/rendering/rendering_server.h"
 
+#ifdef SDL_ENABLED
+#include "drivers/sdl/joypad_sdl.h"
+#endif
+
 #ifdef X11_ENABLED
 #include "x11/detect_prime_x11.h"
 #include "x11/display_server_x11.h"

platform/linuxbsd/wayland/display_server_wayland.cpp

@@ -43,6 +43,7 @@
 #include "core/input/input.h"
 #include "core/input/input_event.h"
 #include "core/os/main_loop.h"
+#include "core/os/os.h"
 #include "servers/display/accessibility_server.h"
 #include "servers/display/native_menu.h"
 #include "servers/rendering/dummy/rasterizer_dummy.h"

platform/linuxbsd/x11/display_server_x11.cpp

@@ -40,6 +40,7 @@
 #include "core/math/math_funcs.h"
 #include "core/object/callable_method_pointer.h"
 #include "core/os/main_loop.h"
+#include "core/os/os.h"
 #include "core/string/print_string.h"
 #include "core/string/ustring.h"
 #include "drivers/png/png_driver_common.h"

platform/web/display_server_web.cpp

@@ -39,6 +39,7 @@
 #include "core/input/input_event.h"
 #include "core/object/callable_method_pointer.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"
 

platform/web/export/editor_http_server.cpp

@@ -30,6 +30,8 @@
 
 #include "editor_http_server.h"
 
+#include "core/os/os.h"
+
 void EditorHTTPServer::_server_thread_poll(void *data) {
 	EditorHTTPServer *web_server = static_cast<EditorHTTPServer *>(data);
 	while (!web_server->server_quit.is_set()) {

platform/web/export/export_plugin.cpp

@@ -35,6 +35,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
+#include "core/os/os.h"
 #include "editor/editor_string_names.h"
 #include "editor/export/editor_export.h"
 #include "editor/import/resource_importer_texture_settings.h"

platform/web/os_web.cpp

@@ -40,6 +40,7 @@
 #include "core/debugger/engine_debugger.h"
 #include "core/io/file_access.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"

platform/web/web_main.cpp

@@ -35,6 +35,7 @@
 #include "core/config/engine.h"
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
+#include "core/os/os.h"
 #include "core/profiling/profiling.h"
 #include "main/main.h"
 #include "scene/main/scene_tree.h"

platform/windows/wgl_detect_version.cpp

@@ -31,8 +31,10 @@
 #if defined(WINDOWS_ENABLED) && defined(GLES3_ENABLED)
 
 #include "wgl_detect_version.h"
+
 #include "os_windows.h"
 
+#include "core/os/os.h"
 #include "core/string/print_string.h"
 #include "core/string/ustring.h"
 #include "core/variant/dictionary.h"

scene/2d/gpu_particles_2d.cpp

@@ -32,6 +32,7 @@
 #include "gpu_particles_2d.compat.inc"
 
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "scene/2d/cpu_particles_2d.h"
 #include "scene/resources/atlas_texture.h"
 #include "scene/resources/canvas_item_material.h"

scene/3d/fog_volume.cpp

@@ -31,6 +31,7 @@
 #include "fog_volume.h"
 
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/environment.h"
 #include "servers/rendering/rendering_server.h"

scene/3d/gpu_particles_3d.cpp

@@ -32,6 +32,7 @@
 #include "gpu_particles_3d.compat.inc"
 
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "scene/3d/cpu_particles_3d.h"
 #include "scene/resources/curve_texture.h"
 #include "scene/resources/gradient_texture.h"

scene/3d/gpu_particles_collision_3d.cpp

@@ -33,6 +33,7 @@
 #include "core/math/geometry_3d.h"
 #include "core/object/class_db.h"
 #include "core/object/worker_thread_pool.h"
+#include "core/os/os.h"
 #include "scene/3d/camera_3d.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/main/viewport.h"

scene/3d/lightmap_gi.cpp

@@ -36,6 +36,7 @@
 #include "core/math/geometry_3d.h"
 #include "core/object/class_db.h"
 #include "core/object/object.h"
+#include "core/os/os.h"
 #include "scene/3d/light_3d.h"
 #include "scene/3d/lightmap_probe.h"
 #include "scene/3d/mesh_instance_3d.h"

scene/3d/visual_instance_3d.cpp

@@ -34,6 +34,7 @@ STATIC_ASSERT_INCOMPLETE_TYPE(class, RenderingServer);
 
 #include "core/config/project_settings.h"
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "scene/resources/material.h"
 #include "servers/rendering/rendering_server.h"
 

scene/3d/voxel_gi.cpp

@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/multimesh_instance_3d.h"
 #include "scene/3d/voxelizer.h"

scene/animation/animation_player.cpp

@@ -33,6 +33,7 @@
 
 #include "core/config/engine.h"
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 
 bool AnimationPlayer::_set(const StringName &p_name, const Variant &p_value) {
 	String name = p_name;

scene/debugger/scene_debugger.cpp

@@ -37,6 +37,7 @@
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
 #include "core/math/math_fieldwise.h"
+#include "core/os/os.h"
 #include "core/os/time.h"
 #include "core/templates/local_vector.h"
 #include "core/variant/array.h"

scene/gui/color_picker.cpp

@@ -34,6 +34,7 @@
 #include "core/io/image.h"
 #include "core/math/expression.h"
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "scene/gui/color_mode.h"
 #include "scene/gui/color_picker_shape.h"
 #include "scene/gui/file_dialog.h"

scene/gui/file_dialog.cpp

@@ -36,6 +36,7 @@
 #include "core/io/file_access.h"
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
+#include "core/os/os.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/flow_container.h"

scene/main/http_request.cpp

@@ -33,6 +33,7 @@
 #include "core/io/file_access.h"
 #include "core/io/stream_peer_gzip.h"
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "core/os/thread.h"
 #include "scene/main/timer.h"
 

scene/main/window.cpp

@@ -36,6 +36,7 @@ STATIC_ASSERT_INCOMPLETE_TYPE(class, RenderingServer);
 #include "core/debugger/engine_debugger.h"
 #include "core/input/input.h"
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "scene/gui/control.h"
 #include "scene/theme/theme_db.h"
 #include "scene/theme/theme_owner.h"

scene/resources/environment.cpp

@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "scene/resources/gradient_texture.h"
 #include "scene/resources/sky.h"
 #include "servers/rendering/rendering_server.h"

scene/resources/font.cpp

@@ -33,6 +33,7 @@
 
 #include "core/io/image_loader.h"
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "core/templates/hash_map.h"
 #include "core/templates/hashfuncs.h"
 #include "scene/resources/image_texture.h"

scene/resources/material.cpp

@@ -34,6 +34,7 @@
 #include "core/config/project_settings.h"
 #include "core/error/error_macros.h"
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "core/version.h"
 #include "scene/main/scene_tree.h"
 #include "scene/resources/texture.h"

scene/resources/visual_shader_nodes.cpp

@@ -32,6 +32,7 @@
 #include "visual_shader_nodes.compat.inc"
 
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "servers/rendering/rendering_server.h"
 
 ////////////// Vector Base

servers/audio/effects/audio_effect_record.cpp

@@ -32,6 +32,7 @@
 
 #include "core/io/marshalls.h"
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 
 void AudioEffectRecordInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
 	if (!is_recording) {

servers/debugger/servers_debugger.cpp

@@ -35,6 +35,7 @@
 #include "core/debugger/engine_profiler.h"
 #include "core/io/resource_loader.h"
 #include "core/object/script_language.h"
+#include "core/os/os.h"
 #include "servers/display/display_server.h"
 #include "servers/rendering/rendering_server.h"
 

servers/register_server_types.cpp

@@ -32,6 +32,7 @@
 
 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
+#include "core/os/os.h"
 
 #include "audio/audio_effect.h"
 #include "audio/audio_server.h"

servers/rendering/renderer_rd/renderer_compositor_rd.cpp

@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
+#include "core/os/os.h"
 #include "servers/display/display_server.h"
 #include "servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.h"
 #include "servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.h"

servers/rendering/renderer_rd/shader_rd.cpp

@@ -33,6 +33,7 @@
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/object/worker_thread_pool.h"
+#include "core/os/os.h"
 #include "core/string/string_builder.h"
 #include "core/version.h"
 #include "servers/rendering/shader_include_db.h"

servers/rendering/renderer_rd/storage_rd/light_storage.cpp

@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/math/geometry_3d.h"
+#include "core/os/os.h"
 #include "servers/rendering/renderer_rd/renderer_scene_render_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/texture_storage.h"
 #include "servers/rendering/rendering_server_globals.h"

servers/rendering/renderer_scene_cull.cpp

@@ -34,6 +34,7 @@
 #include "core/math/geometry_3d.h"
 #include "core/object/callable_method_pointer.h"
 #include "core/object/worker_thread_pool.h"
+#include "core/os/os.h"
 #include "servers/rendering/rendering_light_culler.h"
 #include "servers/rendering/rendering_server.h"
 #include "servers/rendering/rendering_server_default.h"