Merge pull request #117054 from akien-mga/os-explicit-includes

Explicitly include `os.h` and `engine.h` where used

core/config/project_settings.cpp

@@ -41,12 +41,14 @@
 #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"
 #include "core/version.h"
 
 #ifdef TOOLS_ENABLED
+#include "core/config/engine.h"
 #include "modules/modules_enabled.gen.h" // For mono.
 #endif // TOOLS_ENABLED
 

core/core_bind.cpp

@@ -31,6 +31,7 @@
 #include "core_bind.h"
 #include "core_bind.compat.inc"
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/crypto/crypto_core.h"
 #include "core/debugger/engine_debugger.h"
@@ -42,6 +43,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/debugger/remote_debugger.cpp

@@ -30,6 +30,7 @@
 
 #include "remote_debugger.h"
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/debugger/debugger_marshalls.h"
 #include "core/debugger/engine_debugger.h"

core/extension/gdextension_library_loader.cpp

@@ -30,8 +30,10 @@
 
 #include "gdextension_library_loader.h"
 
+#include "core/config/engine.h"
 #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

@@ -30,6 +30,7 @@
 
 #include "gdextension_manager.h"
 
+#include "core/config/engine.h"
 #include "core/extension/gdextension_function_loader.h"
 #include "core/extension/gdextension_library_loader.h"
 #include "core/extension/gdextension_special_compat_hashes.h"
@@ -37,6 +38,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/input/input.cpp

@@ -31,6 +31,7 @@
 #include "input.h"
 #include "input.compat.inc"
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/input/default_controller_mappings.h"
 #include "core/input/input_map.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/io/resource_loader.cpp

@@ -30,6 +30,7 @@
 
 #include "resource_loader.h"
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/core_bind.h"
 #include "core/io/dir_access.h"

core/object/object.cpp

@@ -30,6 +30,7 @@
 
 #include "object.h"
 
+#include "core/config/engine.h"
 #include "core/extension/gdextension_manager.h"
 #include "core/io/resource.h"
 #include "core/object/class_db.h"

core/object/script_language.cpp

@@ -30,12 +30,14 @@
 
 #include "script_language.h"
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/core_bind.h"
 #include "core/debugger/engine_debugger.h"
 #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"

core/string/translation_server.cpp

@@ -31,6 +31,7 @@
 #include "translation_server.h"
 #include "translation_server.compat.inc"
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/io/resource_loader.h"
 #include "core/object/class_db.h"

drivers/alsa/audio_driver_alsa.cpp

@@ -32,6 +32,7 @@
 
 #ifdef ALSA_ENABLED
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/os/os.h"
 

drivers/gles3/rasterizer_canvas_gles3.cpp

@@ -32,6 +32,7 @@
 
 #ifdef GLES3_ENABLED
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/math/geometry_2d.h"
 #include "core/math/transform_interpolator.h"

drivers/gles3/rasterizer_gles3.cpp

@@ -32,6 +32,7 @@
 
 #ifdef GLES3_ENABLED
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/io/image.h"

drivers/gles3/storage/material_storage.cpp

@@ -32,6 +32,7 @@
 
 #ifdef GLES3_ENABLED
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/io/resource_loader.h"
 #include "drivers/gles3/rasterizer_canvas_gles3.h"

drivers/metal/rendering_device_driver_metal.cpp

@@ -54,6 +54,7 @@
 #include "rendering_context_driver_metal.h"
 #include "rendering_shader_container_metal.h"
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/io/marshalls.h"
 #include "core/os/os.h"

drivers/pulseaudio/audio_driver_pulseaudio.cpp

@@ -32,6 +32,7 @@
 
 #ifdef PULSEAUDIO_ENABLED
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/os/os.h"
 #include "core/version.h"

drivers/wasapi/audio_driver_wasapi.cpp

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

drivers/xaudio2/audio_driver_xaudio2.cpp

@@ -30,6 +30,7 @@
 
 #include "audio_driver_xaudio2.h"
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/os/os.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

@@ -30,11 +30,13 @@
 
 #include "asset_library_editor_plugin.h"
 
+#include "core/config/engine.h"
 #include "core/io/dir_access.h"
 #include "core/io/json.h"
 #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/debugger/editor_debugger_node.cpp

@@ -30,6 +30,7 @@
 
 #include "editor_debugger_node.h"
 
+#include "core/config/engine.h"
 #include "core/io/resource_loader.h"
 #include "core/object/class_db.h"
 #include "core/object/undo_redo.h"

editor/doc/editor_help.cpp

@@ -30,6 +30,7 @@
 
 #include "editor_help.h"
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/core_constants.h"
 #include "core/extension/gdextension.h"
@@ -38,6 +39,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_interface.cpp

@@ -31,6 +31,7 @@
 #include "editor_interface.h"
 #include "editor_interface.compat.inc"
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/io/resource_loader.h"
 #include "core/object/class_db.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/editor_node.cpp

@@ -30,6 +30,7 @@
 
 #include "editor_node.h"
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/extension/gdextension_manager.h"
 #include "core/input/input.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/export/shader_baker_export_plugin.cpp

@@ -30,6 +30,7 @@
 
 #include "shader_baker_export_plugin.h"
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/string/string_builder.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/plugins/editor_plugin_settings.cpp

@@ -30,6 +30,7 @@
 
 #include "editor_plugin_settings.h"
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/io/config_file.h"
 #include "core/io/dir_access.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/project_manager/project_manager.cpp

@@ -30,6 +30,7 @@
 
 #include "project_manager.h"
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
 #include "core/io/config_file.h"

editor/register_editor_types.cpp

@@ -30,7 +30,9 @@
 
 #include "register_editor_types.h"
 
+#include "core/config/engine.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/run/editor_run_bar.cpp

@@ -30,6 +30,7 @@
 
 #include "editor_run_bar.h"
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/object/class_db.h"
 #include "editor/debugger/editor_debugger_node.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/canvas_item_editor_plugin.cpp

@@ -30,6 +30,7 @@
 
 #include "canvas_item_editor_plugin.h"
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
 #include "core/object/class_db.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/scene/scene_tree_editor.cpp

@@ -30,6 +30,7 @@
 
 #include "scene_tree_editor.h"
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/object/class_db.h"
 #include "core/object/script_language.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/settings/editor_settings.cpp

@@ -30,6 +30,7 @@
 
 #include "editor_settings.h"
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/input/input_event.h"
 #include "core/input/input_map.h"

editor/settings/editor_settings_dialog.cpp

@@ -30,6 +30,7 @@
 
 #include "editor_settings_dialog.h"
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/input/input_map.h"
 #include "core/object/class_db.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"

main/main.cpp

@@ -30,6 +30,7 @@
 
 #include "main.h"
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/core_globals.h"
 #include "core/crypto/crypto.h"

main/performance.cpp

@@ -31,6 +31,7 @@
 #include "performance.h"
 #include "performance.compat.inc"
 
+#include "core/config/engine.h"
 #include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "core/variant/typed_array.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/csg/csg_shape.cpp

@@ -30,6 +30,7 @@
 
 #include "csg_shape.h"
 
+#include "core/config/engine.h"
 #include "core/math/geometry_2d.h"
 #include "core/object/class_db.h"
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.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/fbx/fbx_document.cpp

@@ -30,6 +30,7 @@
 
 #include "fbx_document.h"
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/crypto/crypto_core.h"
 #include "core/io/config_file.h"

modules/fbx/register_types.cpp

@@ -33,6 +33,8 @@
 #include "../gltf/extensions/gltf_document_extension_convert_importer_mesh.h"
 #include "fbx_document.h"
 
+#include "core/config/engine.h"
+
 #ifdef TOOLS_ENABLED
 #include "editor/editor_scene_importer_fbx2gltf.h"
 #include "editor/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/gltf/gltf_document.cpp

@@ -30,13 +30,13 @@
 
 #include "gltf_document.h"
 
-#include "core/object/class_db.h"
 #include "extensions/gltf_document_extension_convert_importer_mesh.h"
 #include "extensions/gltf_spec_gloss.h"
 #include "gltf_state.h"
 #include "gltf_template_convert.h"
 #include "skin_tool.h"
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/crypto/crypto_core.h"
 #include "core/io/config_file.h"
@@ -45,6 +45,7 @@
 #include "core/io/file_access_memory.h"
 #include "core/io/json.h"
 #include "core/io/stream_peer.h"
+#include "core/object/class_db.h"
 #include "core/object/object_id.h"
 #include "core/version.h"
 #include "scene/2d/node_2d.h"

modules/gltf/register_types.cpp

@@ -38,6 +38,8 @@
 #include "gltf_state.h"
 #include "structures/gltf_object_model_property.h"
 
+#include "core/config/engine.h"
+
 #ifndef PHYSICS_3D_DISABLED
 #include "extensions/physics/gltf_document_extension_physics.h"
 #endif // PHYSICS_3D_DISABLED

modules/gridmap/grid_map.cpp

@@ -30,6 +30,7 @@
 
 #include "grid_map.h"
 
+#include "core/config/engine.h"
 #include "core/io/marshalls.h"
 #include "core/object/class_db.h"
 #include "core/templates/a_hash_map.h"

modules/interactive_music/audio_stream_interactive.cpp

@@ -30,6 +30,7 @@
 
 #include "audio_stream_interactive.h"
 
+#include "core/config/engine.h"
 #include "core/math/math_funcs.h"
 #include "core/object/class_db.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/mono/csharp_script.cpp

@@ -30,7 +30,6 @@
 
 #include "csharp_script.h"
 
-#include "core/object/class_db.h"
 #include "godotsharp_dirs.h"
 #include "managed_callable.h"
 #include "mono_gd/gd_mono_cache.h"
@@ -49,10 +48,12 @@
 #include "editor/script_templates/templates.gen.h"
 #endif
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/debugger/script_debugger.h"
 #include "core/io/file_access.h"
+#include "core/object/class_db.h"
 #include "core/os/mutex.h"
 #include "core/os/os.h"
 #include "core/os/thread.h"

modules/mono/godotsharp_dirs.cpp

@@ -33,6 +33,7 @@
 #include "mono_gd/gd_mono.h"
 #include "utils/path_utils.h"
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/os/os.h"

modules/mono/mono_gd/gd_mono.cpp

@@ -47,6 +47,7 @@
 #include "../editor/semver.h"
 #endif
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/io/dir_access.h"

modules/multiplayer/multiplayer_spawner.cpp

@@ -30,6 +30,7 @@
 
 #include "multiplayer_spawner.h"
 
+#include "core/config/engine.h"
 #include "core/io/resource_loader.h"
 #include "core/object/class_db.h"
 #include "scene/main/multiplayer_api.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/openxr_interface.cpp

@@ -35,6 +35,7 @@
 #include "extensions/openxr_performance_settings_extension.h"
 #include "extensions/openxr_user_presence_extension.h"
 
+#include "core/config/engine.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
 #include "core/object/class_db.h"

modules/openxr/register_types.cpp

@@ -99,7 +99,9 @@
 #include "extensions/platform/openxr_android_extension.h"
 #endif
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
+#include "core/os/os.h"
 #include "main/main.h"
 
 #ifdef TOOLS_ENABLED

modules/openxr/scene/openxr_composition_layer.cpp

@@ -34,6 +34,7 @@
 #include "../openxr_api.h"
 #include "../openxr_interface.h"
 
+#include "core/config/engine.h"
 #include "core/object/class_db.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/xr/xr_nodes.h"

modules/openxr/scene/openxr_render_model_manager.cpp

@@ -34,6 +34,7 @@
 #include "../extensions/openxr_render_model_extension.h"
 #include "../openxr_api.h"
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/object/class_db.h"
 #include "scene/3d/xr/xr_nodes.h"

modules/raycast/raycast_occlusion_cull.cpp

@@ -30,9 +30,11 @@
 
 #include "raycast_occlusion_cull.h"
 
+#include "core/config/engine.h"
 #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/svg/register_types.cpp

@@ -32,6 +32,8 @@
 
 #include "image_loader_svg.h"
 
+#include "core/config/engine.h"
+
 #include <thorvg.h>
 
 #ifdef THREADS_ENABLED

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"