Decouple RenderingServer from as much of the codebase as possible

Notably decouples it from:
- AccessibilityServer
- DisplayServer
- Viewport
- Window

drivers/accesskit/accessibility_server_accesskit.cpp

@@ -33,7 +33,9 @@
 #include "accessibility_server_accesskit.h"
 
 #ifdef ACCESSKIT_DYNAMIC
+#include "core/config/engine.h"
 #include "core/io/file_access.h"
+#include "core/os/os.h"
 #endif
 
 #include "servers/text/text_server.h"

drivers/d3d12/rendering_context_driver_d3d12.h

@@ -34,7 +34,7 @@
 #include "core/string/ustring.h"
 #include "core/templates/rid_owner.h"
 #include "rendering_device_driver_d3d12.h"
-#include "servers/display/display_server.h"
+#include "servers/display/display_server_enums.h"
 #include "servers/rendering/rendering_context_driver.h"
 
 #if !defined(_MSC_VER) && !defined(__REQUIRED_RPCNDR_H_VERSION__)

drivers/d3d12/rendering_device_driver_d3d12.cpp

@@ -32,8 +32,11 @@
 
 #include "d3d12_hooks.h"
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/io/marshalls.h"
+#include "core/os/os.h"
+
 #include "thirdparty/zlib/zlib.h"
 
 #include "d3d12_godot_nir_bridge.h"

drivers/egl/egl_manager.cpp

@@ -30,9 +30,11 @@
 
 #include "egl_manager.h"
 
+#include "core/config/engine.h"
 #include "core/crypto/crypto_core.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
+#include "core/os/os.h"
 
 #ifdef WINDOWS_ENABLED
 #include "drivers/gles3/rasterizer_gles3.h"

drivers/egl/egl_manager.h

@@ -36,7 +36,7 @@
 #include "platform_gl.h"
 
 #include "core/templates/local_vector.h"
-#include "servers/display/display_server.h"
+#include "servers/display/display_server_enums.h"
 
 class EGLManager {
 private:

drivers/gles3/rasterizer_gles3.cpp

@@ -36,6 +36,7 @@
 #include "core/io/dir_access.h"
 #include "core/io/image.h"
 #include "core/os/os.h"
+#include "servers/display/display_server.h"
 #include "servers/rendering/rendering_server.h"
 #include "servers/rendering/rendering_server_types.h"
 

drivers/gles3/rasterizer_gles3.h

@@ -32,6 +32,7 @@
 
 #ifdef GLES3_ENABLED
 
+#include "core/os/os.h"
 #include "drivers/gles3/effects/copy_effects.h"
 #include "drivers/gles3/effects/cubemap_filter.h"
 #include "drivers/gles3/effects/feed_effects.h"

drivers/gles3/storage/texture_storage.cpp

@@ -32,6 +32,7 @@
 
 #ifdef GLES3_ENABLED
 
+#include "core/config/engine.h"
 #include "drivers/gles3/effects/copy_effects.h"
 #include "drivers/gles3/rasterizer_gles3.h"
 #include "drivers/gles3/rasterizer_util_gles3.h"

drivers/gles3/storage/utilities.cpp

@@ -32,6 +32,8 @@
 
 #ifdef GLES3_ENABLED
 
+#include "core/config/engine.h"
+#include "core/os/os.h"
 #include "drivers/gles3/rasterizer_util_gles3.h"
 #include "drivers/gles3/storage/config.h"
 #include "drivers/gles3/storage/light_storage.h"

drivers/metal/metal_device_properties.cpp

@@ -52,6 +52,7 @@
 
 #include "metal_utils.h"
 
+#include "core/os/os.h"
 #include "servers/rendering/renderer_rd/effects/metal_fx.h"
 
 #include <MetalFX/MetalFX.hpp>

drivers/metal/rendering_context_driver_metal.cpp

@@ -34,6 +34,7 @@
 #include "metal_objects_shared.h"
 #include "rendering_device_driver_metal3.h"
 
+#include "core/os/os.h"
 #include "core/templates/sort_array.h"
 
 #include <os/log.h>

drivers/metal/rendering_device_driver_metal.cpp

@@ -56,6 +56,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/marshalls.h"
+#include "core/os/os.h"
 #include "core/string/ustring.h"
 #include "core/templates/hash_map.h"
 #include "drivers/apple/foundation_helpers.h"

drivers/metal/rendering_device_driver_metal3.cpp

@@ -34,6 +34,7 @@
 #include "rendering_context_driver_metal.h"
 
 #include "core/config/project_settings.h"
+#include "core/os/os.h"
 #include "core/string/ustring.h"
 
 namespace MTL3 {

drivers/metal/rendering_shader_container_metal.cpp

@@ -34,6 +34,7 @@
 
 #include "core/io/file_access.h"
 #include "core/io/marshalls.h"
+#include "core/os/os.h"
 #include "core/templates/fixed_vector.h"
 
 #include "thirdparty/spirv-reflect/spirv_reflect.h"

drivers/vulkan/rendering_context_driver_vulkan.cpp

@@ -34,7 +34,9 @@
 
 #include "vk_enum_string_helper.h"
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
+#include "core/os/os.h"
 #include "core/version.h"
 
 #include "rendering_device_driver_vulkan.h"

drivers/vulkan/rendering_context_driver_vulkan.h

@@ -32,6 +32,8 @@
 
 #ifdef VULKAN_ENABLED
 
+#include "core/templates/hash_set.h"
+#include "core/templates/local_vector.h"
 #include "servers/rendering/rendering_context_driver.h"
 
 #if defined(DEBUG_ENABLED) || defined(DEV_ENABLED)

drivers/vulkan/rendering_device_driver_vulkan.cpp

@@ -30,8 +30,10 @@
 
 #include "rendering_device_driver_vulkan.h"
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/io/marshalls.h"
+#include "core/os/os.h"
 #include "core/templates/fixed_vector.h"
 #include "vulkan_hooks.h"
 

drivers/vulkan/rendering_device_driver_vulkan.h

@@ -47,6 +47,8 @@
 
 #include "drivers/vulkan/godot_vulkan.h"
 
+class FileAccess;
+
 // Design principles:
 // - Vulkan structs are zero-initialized and fields not requiring a non-zero value are omitted (except in cases where expresivity reasons apply).
 class RenderingDeviceDriverVulkan : public RenderingDeviceDriver {

editor/animation/animation_player_editor_plugin.cpp

@@ -53,6 +53,7 @@
 #include "scene/main/window.h"
 #include "scene/resources/animation.h"
 #include "scene/resources/image_texture.h"
+#include "servers/display/display_server.h"
 #include "servers/rendering/rendering_server.h"
 
 ///////////////////////////////////

editor/debugger/editor_debugger_node.cpp

@@ -51,6 +51,7 @@
 #include "scene/gui/menu_button.h"
 #include "scene/gui/tab_container.h"
 #include "scene/resources/packed_scene.h"
+#include "servers/display/display_server.h"
 
 template <typename Func>
 void _for_all(TabContainer *p_node, const Func &p_func) {

editor/doc/editor_help.cpp

@@ -53,6 +53,7 @@
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/line_edit.h"
+#include "servers/display/display_server.h"
 
 #include "modules/modules_enabled.gen.h" // For gdscript, mono.
 

editor/doc/editor_help_search.cpp

@@ -41,6 +41,7 @@
 #include "editor/themes/editor_theme_manager.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/margin_container.h"
+#include "servers/display/display_server.h"
 
 bool EditorHelpSearch::_all_terms_in_name(const Vector<String> &p_terms, const String &p_name) const {
 	for (int i = 0; i < p_terms.size(); i++) {

editor/docks/editor_dock_manager.cpp

@@ -31,13 +31,6 @@
 #include "editor_dock_manager.h"
 
 #include "core/object/class_db.h"
-#include "scene/gui/box_container.h"
-#include "scene/gui/button.h"
-#include "scene/gui/label.h"
-#include "scene/gui/split_container.h"
-#include "scene/gui/tab_container.h"
-#include "scene/main/window.h"
-
 #include "editor/docks/dock_tab_container.h"
 #include "editor/docks/editor_dock.h"
 #include "editor/editor_node.h"
@@ -45,6 +38,13 @@
 #include "editor/gui/window_wrapper.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/box_container.h"
+#include "scene/gui/button.h"
+#include "scene/gui/label.h"
+#include "scene/gui/split_container.h"
+#include "scene/gui/tab_container.h"
+#include "scene/main/window.h"
+#include "servers/display/display_server.h"
 
 ////////////////////////////////////////////////
 ////////////////////////////////////////////////

editor/docks/groups_editor.cpp

@@ -44,6 +44,7 @@
 #include "scene/gui/grid_container.h"
 #include "scene/gui/label.h"
 #include "scene/resources/packed_scene.h"
+#include "servers/display/display_server.h"
 
 static bool can_edit(Node *p_node, const String &p_group) {
 	Node *n = p_node;

editor/editor_interface.cpp

@@ -62,6 +62,7 @@
 #include "scene/main/window.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/theme.h"
+#include "servers/display/display_server.h"
 #include "servers/rendering/rendering_server.h"
 
 EditorInterface *EditorInterface::singleton = nullptr;

editor/editor_log.cpp

@@ -48,6 +48,7 @@
 #include "scene/gui/separator.h"
 #include "scene/main/timer.h"
 #include "scene/resources/font.h"
+#include "servers/display/display_server.h"
 
 void EditorLog::_error_handler(void *p_self, const char *p_func, const char *p_file, int p_line, const char *p_error, const char *p_errorexp, bool p_editor_notify, ErrorHandlerType p_type) {
 	EditorLog *self = static_cast<EditorLog *>(p_self);

editor/editor_node.h

@@ -31,11 +31,12 @@
 #pragma once
 
 #include "core/object/script_language.h"
+#include "core/os/os.h"
 #include "core/templates/safe_refcount.h"
 #include "editor/editor_data.h"
 #include "editor/plugins/editor_plugin.h"
 #include "editor/settings/editor_folding.h"
-#include "servers/display/display_server.h"
+#include "servers/display/display_server_enums.h"
 
 typedef void (*EditorNodeInitCallback)();
 typedef void (*EditorPluginInitializeCallback)();

editor/export/editor_export_platform_apple_embedded.cpp

@@ -43,6 +43,7 @@
 #include "editor/script/script_editor_plugin.h"
 #include "editor/themes/editor_scale.h"
 #include "main/main.h"
+#include "servers/display/display_server.h"
 
 #include "modules/modules_enabled.gen.h" // For mono.
 #include "modules/svg/image_loader_svg.h"

editor/export/export_template_manager.cpp

@@ -52,6 +52,7 @@
 #include "scene/gui/separator.h"
 #include "scene/gui/tree.h"
 #include "scene/main/http_request.h"
+#include "servers/display/display_server.h"
 
 enum DownloadsAvailability {
 	DOWNLOADS_AVAILABLE,

editor/export/project_export.cpp

@@ -57,6 +57,7 @@
 #include "scene/gui/tab_container.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/gui/tree.h"
+#include "servers/display/display_server.h"
 
 #include <zstd.h>
 

editor/file_system/editor_file_system.cpp

@@ -47,6 +47,7 @@
 #include "editor/settings/editor_settings.h"
 #include "editor/settings/project_settings_editor.h"
 #include "scene/resources/packed_scene.h"
+#include "servers/display/display_server.h"
 
 EditorFileSystem *EditorFileSystem::singleton = nullptr;
 int EditorFileSystem::nb_files_total = 0;

editor/gui/editor_spin_slider.cpp

@@ -30,10 +30,12 @@
 
 #include "editor_spin_slider.h"
 
+#include "core/config/engine.h"
 #include "core/input/input.h"
 #include "core/math/expression.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/editor_string_names.h"
 #include "editor/settings/editor_settings.h"

editor/gui/editor_title_bar.cpp

@@ -31,6 +31,7 @@
 #include "editor_title_bar.h"
 
 #include "core/object/callable_method_pointer.h"
+#include "servers/display/display_server.h"
 
 void EditorTitleBar::gui_input(const Ref<InputEvent> &p_event) {
 	if (!can_move) {

editor/gui/window_wrapper.cpp

@@ -41,6 +41,7 @@
 #include "scene/gui/panel.h"
 #include "scene/gui/popup.h"
 #include "scene/main/window.h"
+#include "servers/display/display_server.h"
 
 // WindowWrapper
 

editor/import/3d/scene_import_settings.cpp

@@ -47,6 +47,7 @@
 #include "scene/resources/3d/importer_mesh.h"
 #include "scene/resources/sky.h"
 #include "scene/resources/surface_tool.h"
+#include "servers/display/display_server.h"
 
 class SceneImportSettingsData : public Object {
 	GDCLASS(SceneImportSettingsData, Object)

editor/inspector/editor_inspector.cpp

@@ -64,6 +64,7 @@
 #include "scene/resources/style_box_flat.h"
 #include "scene/scene_string_names.h"
 #include "servers/display/accessibility_server.h"
+#include "servers/display/display_server.h"
 #include "servers/rendering/rendering_server.h"
 
 void EditorInspectorActionButton::_notification(int p_what) {

editor/inspector/editor_properties.cpp

@@ -63,6 +63,7 @@
 #include "scene/resources/mesh.h"
 #include "scene/resources/sky.h"
 #include "scene/resources/visual_shader_nodes.h"
+#include "servers/display/display_server.h"
 
 ///////////////////// NIL /////////////////////////
 

editor/inspector/editor_resource_preview.cpp

@@ -43,6 +43,7 @@
 #include "editor/themes/editor_scale.h"
 #include "scene/main/window.h"
 #include "scene/resources/image_texture.h"
+#include "servers/display/display_server.h"
 #include "servers/rendering/renderer_compositor.h"
 #include "servers/rendering/rendering_server.h"
 #include "servers/rendering/rendering_server_globals.h"

editor/project_manager/project_dialog.cpp

@@ -49,6 +49,7 @@
 #include "scene/gui/option_button.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/texture_rect.h"
+#include "servers/display/display_server.h"
 #include "servers/rendering/rendering_server.h"
 
 void ProjectDialog::_set_message(const String &p_msg, MessageType p_type, InputType p_input_type) {

editor/project_manager/project_list.cpp

@@ -34,6 +34,7 @@
 #include "core/input/input.h"
 #include "core/io/dir_access.h"
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "core/os/time.h"
 #include "core/version.h"
 #include "editor/editor_string_names.h"
@@ -52,6 +53,7 @@
 #include "scene/gui/texture_rect.h"
 #include "scene/resources/image_texture.h"
 #include "servers/display/accessibility_server.h"
+#include "servers/display/display_server.h"
 
 void ProjectListItemControl::_notification(int p_what) {
 	switch (p_what) {

editor/project_manager/quick_settings_dialog.cpp

@@ -43,6 +43,7 @@
 #include "scene/gui/label.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/panel_container.h"
+#include "servers/display/display_server.h"
 
 void QuickSettingsDialog::_fetch_setting_values() {
 #ifndef ANDROID_ENABLED

editor/run/embedded_process.cpp

@@ -33,11 +33,13 @@
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "editor/editor_string_names.h"
 #include "scene/main/timer.h"
 #include "scene/main/window.h"
 #include "scene/resources/style_box_flat.h"
 #include "scene/theme/theme_db.h"
+#include "servers/display/display_server.h"
 
 void EmbeddedProcessBase::_notification(int p_what) {
 	switch (p_what) {

editor/run/game_view_plugin.cpp

@@ -54,6 +54,7 @@
 #include "scene/gui/menu_button.h"
 #include "scene/gui/panel.h"
 #include "scene/gui/separator.h"
+#include "servers/display/display_server.h"
 
 void GameViewDebugger::_session_started(Ref<EditorDebuggerSession> p_session) {
 	if (!is_feature_enabled) {

editor/run/run_instances_dialog.cpp

@@ -31,6 +31,7 @@
 #include "run_instances_dialog.h"
 
 #include "core/config/project_settings.h"
+#include "core/os/os.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/check_box.h"

editor/scene/3d/lightmap_gi_editor_plugin.cpp

@@ -34,6 +34,7 @@
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_file_dialog.h"
+#include "servers/display/display_server.h"
 #include "servers/rendering/rendering_server.h"
 
 #include "modules/modules_enabled.gen.h" // For lightmapper_rd.

editor/scene/connections_dialog.cpp

@@ -55,6 +55,7 @@
 #include "scene/gui/margin_container.h"
 #include "scene/gui/popup_menu.h"
 #include "scene/gui/spin_box.h"
+#include "servers/display/display_server.h"
 
 static Node *_find_first_script(Node *p_root, Node *p_node) {
 	if (p_node != p_root && p_node->get_owner() != p_root) {

editor/script/script_editor_base.cpp

@@ -39,6 +39,7 @@
 #include "scene/gui/menu_button.h"
 #include "scene/gui/rich_text_label.h"
 #include "scene/gui/split_container.h"
+#include "servers/display/display_server.h"
 
 void ScriptEditorBase::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("name_changed"));

editor/settings/editor_settings.cpp

@@ -60,6 +60,7 @@
 #include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "scene/resources/animation.h"
+#include "servers/display/display_server.h"
 
 // PRIVATE METHODS
 

editor/settings/event_listener_line_edit.cpp

@@ -32,6 +32,7 @@
 
 #include "core/input/input_map.h"
 #include "core/object/class_db.h"
+#include "core/os/os.h"
 #include "scene/gui/dialogs.h"
 #include "servers/display/accessibility_server.h"
 

editor/shader/shader_editor_plugin.cpp

@@ -46,6 +46,7 @@
 #include "scene/gui/item_list.h"
 #include "scene/gui/tab_container.h"
 #include "scene/gui/texture_rect.h"
+#include "servers/display/display_server.h"
 
 Ref<Resource> ShaderEditorPlugin::_get_current_shader() {
 	int index = shader_tabs->get_current_tab();

editor/shader/shader_file_editor_plugin.cpp

@@ -38,13 +38,10 @@
 #include "scene/gui/flow_container.h"
 #include "scene/gui/item_list.h"
 #include "scene/gui/split_container.h"
-#include "servers/display/display_server.h"
 #include "servers/rendering/rendering_device_binds.h"
 
 /*** SHADER SCRIPT EDITOR ****/
 
-/*** SCRIPT EDITOR ******/
-
 void ShaderFileEditor::_update_version(const StringName &p_version_txt, const RD::ShaderStage p_stage) {
 }
 

editor/shader/text_shader_editor.cpp

@@ -40,6 +40,7 @@
 #include "editor/themes/editor_scale.h"
 #include "editor/themes/editor_theme_manager.h"
 #include "scene/gui/split_container.h"
+#include "servers/display/display_server.h"
 #include "servers/rendering/rendering_server.h"
 #include "servers/rendering/shader_preprocessor.h"
 #include "servers/rendering/shader_types.h"

modules/gltf/editor/editor_scene_importer_blend.cpp

@@ -42,6 +42,7 @@
 #include "editor/themes/editor_scale.h"
 #include "main/main.h"
 #include "scene/gui/line_edit.h"
+#include "servers/display/display_server.h"
 
 #ifdef WINDOWS_ENABLED
 #include <shlwapi.h>

modules/jolt_physics/objects/jolt_soft_body_3d.cpp

@@ -38,6 +38,7 @@
 #include "jolt_body_3d.h"
 #include "jolt_group_filter.h"
 
+#include "core/config/engine.h"
 #include "servers/rendering/rendering_server.h"
 
 #include "Jolt/Physics/SoftBody/SoftBodyMotionProperties.h"

modules/noise/noise_texture_2d.cpp

@@ -32,6 +32,7 @@
 
 #include "noise.h"
 
+#include "core/config/engine.h"
 #include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 

modules/noise/noise_texture_3d.cpp

@@ -32,6 +32,7 @@
 
 #include "noise.h"
 
+#include "core/config/engine.h"
 #include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 

modules/openxr/extensions/platform/openxr_opengl_extension.cpp

@@ -35,6 +35,7 @@
 #include "../../openxr_util.h"
 
 #include "drivers/gles3/storage/texture_storage.h"
+#include "servers/display/display_server.h"
 
 // OpenXR requires us to submit sRGB textures so that it recognizes the content
 // as being in sRGB color space. We do fall back on "normal" textures but this

modules/openxr/openxr_api.cpp

@@ -36,6 +36,7 @@
 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/os/memory.h"
+#include "core/os/os.h"
 #include "core/profiling/profiling.h"
 #include "core/version.h"
 #include "servers/rendering/rendering_server.h"

modules/webxr/webxr_interface_js.cpp

@@ -40,6 +40,7 @@
 #include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "scene/scene_string_names.h"
+#include "servers/display/display_server.h"
 #include "servers/xr/xr_hand_tracker.h"
 
 #include <emscripten.h>

platform/android/export/gradle_export_util.h

@@ -37,7 +37,7 @@
 #include "core/os/os.h"
 #include "editor/export/editor_export.h"
 #include "editor/export/editor_export_platform.h"
-#include "servers/display/display_server.h"
+#include "servers/display/display_server_enums.h"
 
 const String GODOT_PROJECT_NAME_XML_STRING = R"(<?xml version="1.0" encoding="utf-8"?>
 <!--WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->

platform/android/tts_android.cpp

@@ -34,6 +34,8 @@
 #include "os_android.h"
 #include "thread_jandroid.h"
 
+#include "servers/display/display_server.h"
+
 bool TTS_Android::initialized = false;
 jobject TTS_Android::tts = nullptr;
 jclass TTS_Android::cls = nullptr;

platform/android/tts_android.h

@@ -34,7 +34,6 @@
 #include "core/string/ustring.h"
 #include "core/templates/hash_map.h"
 #include "core/variant/array.h"
-#include "servers/display/display_server.h"
 
 #include <jni.h>
 

platform/linuxbsd/freedesktop_portal_desktop.cpp

@@ -37,7 +37,9 @@
 #include "core/object/callable_method_pointer.h"
 #include "core/os/os.h"
 #include "core/string/ustring.h"
+#include "core/variant/typed_array.h"
 #include "core/variant/variant.h"
+#include "servers/display/display_server.h"
 
 #ifdef SOWRAP_ENABLED
 #include "dbus-so_wrap.h"

platform/linuxbsd/freedesktop_portal_desktop.h

@@ -32,9 +32,10 @@
 
 #ifdef DBUS_ENABLED
 
+#include "core/object/object.h"
 #include "core/os/thread.h"
 #include "core/os/thread_safe.h"
-#include "servers/display/display_server.h"
+#include "servers/display/display_server_enums.h"
 
 struct DBusMessage;
 struct DBusConnection;

platform/linuxbsd/wayland/wayland_thread.cpp

@@ -31,6 +31,7 @@
 #include "wayland_thread.h"
 
 #include "core/config/engine.h"
+#include "core/io/image.h"
 
 #ifdef WAYLAND_ENABLED
 

platform/linuxbsd/wayland/wayland_thread.h

@@ -88,11 +88,14 @@
 #endif // LIBDECOR_ENABLED
 
 #include "core/input/input_event.h"
+#include "core/os/os.h"
 #include "core/os/thread.h"
-#include "servers/display/display_server.h"
+#include "servers/display/display_server_enums.h"
 
 #include "wayland_embedder.h"
 
+class Image;
+
 class WaylandThread {
 public:
 	// Messages used for exchanging information between Godot's and Wayland's thread.

platform/linuxbsd/x11/gl_manager_x11.cpp

@@ -32,6 +32,8 @@
 
 #if defined(X11_ENABLED) && defined(GLES3_ENABLED)
 
+#include "servers/display/display_server.h"
+
 #include "thirdparty/glad/glad/glx.h"
 
 #include <unistd.h>

platform/linuxbsd/x11/gl_manager_x11.h

@@ -34,7 +34,7 @@
 
 #include "core/os/os.h"
 #include "core/templates/local_vector.h"
-#include "servers/display/display_server.h"
+#include "servers/display/display_server_enums.h"
 
 #ifdef SOWRAP_ENABLED
 #include "dynwrappers/xlib-so_wrap.h"

platform/linuxbsd/x11/gl_manager_x11_egl.h

@@ -35,7 +35,7 @@
 #include "core/os/os.h"
 #include "core/templates/local_vector.h"
 #include "drivers/egl/egl_manager.h"
-#include "servers/display/display_server.h"
+#include "servers/display/display_server_enums.h"
 
 #include <X11/Xlib.h>
 

platform/macos/editor/embedded_game_view_plugin.mm

@@ -35,6 +35,7 @@
 #include "core/input/input.h"
 #include "editor/editor_node.h"
 #include "editor/gui/window_wrapper.h"
+#include "servers/display/display_server.h"
 
 HashMap<String, GameViewDebuggerMacOS::ParseMessageFunc> GameViewDebuggerMacOS::parse_message_handlers;
 

platform/macos/editor/embedded_process_macos.h

@@ -30,8 +30,10 @@
 
 #pragma once
 
+#include "core/object/class_db.h"
 #include "editor/run/embedded_process.h"
-#include "servers/display/display_server.h"
+#include "scene/gui/control.h"
+#include "servers/display/display_server_enums.h"
 
 class DisplayServerMacOS;
 class EmbeddedProcessMacOS;

platform/macos/embedded_debugger.mm

@@ -37,6 +37,7 @@
 #include "core/input/input_event.h"
 #include "core/input/input_event_codec.h"
 #include "core/os/main_loop.h"
+#include "core/os/os.h"
 
 #ifdef DEBUG_ENABLED
 HashMap<String, EmbeddedDebugger::ParseMessageFunc> EmbeddedDebugger::parse_message_handlers;

platform/macos/embedded_gl_manager.h

@@ -32,8 +32,10 @@
 
 #if defined(MACOS_ENABLED) && defined(GLES3_ENABLED)
 
+#include "core/error/error_list.h"
+#include "core/math/vector2i.h"
 #include "core/templates/rb_map.h"
-#include "servers/display/display_server.h"
+#include "servers/display/display_server_enums.h"
 
 #import <AppKit/AppKit.h>
 #import <ApplicationServices/ApplicationServices.h>

platform/macos/gl_manager_macos_angle.h

@@ -32,10 +32,9 @@
 
 #if defined(MACOS_ENABLED) && defined(GLES3_ENABLED)
 
-#include "core/os/os.h"
-#include "core/templates/local_vector.h"
+#include "core/templates/vector.h"
 #include "drivers/egl/egl_manager.h"
-#include "servers/display/display_server.h"
+#include "servers/display/display_server_enums.h"
 
 // Suppress redefinition conflicts
 #define FontVariation __FontVariation

platform/macos/gl_manager_macos_legacy.h

@@ -32,8 +32,9 @@
 
 #if defined(MACOS_ENABLED) && defined(GLES3_ENABLED)
 
+#include "core/error/error_list.h"
 #include "core/templates/rb_map.h"
-#include "servers/display/display_server.h"
+#include "servers/display/display_server_enums.h"
 
 #import <AppKit/AppKit.h>
 #import <ApplicationServices/ApplicationServices.h>

platform/macos/gl_manager_macos_legacy.mm

@@ -32,6 +32,8 @@
 
 #if defined(MACOS_ENABLED) && defined(GLES3_ENABLED)
 
+#include "core/os/os.h"
+
 #include <dlfcn.h>
 #include <cstdio>
 #include <cstdlib>

platform/macos/godot_button_view.h

@@ -30,8 +30,6 @@
 
 #pragma once
 
-#include "servers/display/display_server.h"
-
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>
 

platform/macos/godot_content_view.h

@@ -30,7 +30,9 @@
 
 #pragma once
 
-#include "servers/display/display_server.h"
+#include "core/input/input_enums.h"
+#include "core/typedefs.h"
+#include "servers/display/display_server_enums.h"
 
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>

platform/macos/godot_menu_item.h

@@ -30,7 +30,11 @@
 
 #pragma once
 
-#include "servers/display/display_server.h"
+#include "core/io/image.h"
+#include "core/object/ref_counted.h"
+#include "core/os/keyboard.h"
+#include "core/variant/callable.h"
+#include "core/variant/variant.h"
 
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>

platform/macos/godot_window.h

@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/display/display_server.h"
+#include "servers/display/display_server_enums.h"
 
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>

platform/macos/godot_window_delegate.h

@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "servers/display/display_server.h"
+#include "servers/display/display_server_enums.h"
 
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>

platform/windows/gl_manager_windows_angle.h

@@ -35,7 +35,7 @@
 #include "core/os/os.h"
 #include "core/templates/local_vector.h"
 #include "drivers/egl/egl_manager.h"
-#include "servers/display/display_server.h"
+#include "servers/display/display_server_enums.h"
 
 #include <windows.h>
 

platform/windows/gl_manager_windows_native.h

@@ -35,7 +35,7 @@
 #include "core/os/os.h"
 #include "core/templates/local_vector.h"
 #include "core/templates/rb_map.h"
-#include "servers/display/display_server.h"
+#include "servers/display/display_server_enums.h"
 
 #include <windows.h>
 

scene/2d/animated_sprite_2d.cpp

@@ -30,6 +30,7 @@
 
 #include "animated_sprite_2d.h"
 
+#include "core/config/engine.h"
 #include "core/object/class_db.h"
 #include "scene/main/viewport.h"
 #include "servers/display/accessibility_server.h"

scene/2d/back_buffer_copy.cpp

@@ -30,6 +30,7 @@
 
 #include "back_buffer_copy.h"
 
+#include "core/config/engine.h"
 #include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 

scene/2d/camera_2d.cpp

@@ -30,6 +30,7 @@
 
 #include "camera_2d.h"
 
+#include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
 #include "core/object/class_db.h"

scene/2d/light_2d.cpp

@@ -30,6 +30,7 @@
 
 #include "light_2d.h"
 
+#include "core/config/engine.h"
 #include "core/object/class_db.h"
 #include "servers/rendering/rendering_server.h"
 

scene/2d/parallax_2d.cpp

@@ -30,6 +30,7 @@
 
 #include "parallax_2d.h"
 
+#include "core/config/engine.h"
 #include "core/object/class_db.h"
 #include "scene/main/viewport.h"
 #include "servers/rendering/rendering_server.h"

scene/2d/parallax_layer.cpp

@@ -30,9 +30,9 @@
 
 #include "parallax_layer.h"
 
-#include "parallax_background.h"
-
+#include "core/config/engine.h"
 #include "core/object/class_db.h"
+#include "scene/2d/parallax_background.h"
 #include "servers/rendering/rendering_server.h"
 
 void ParallaxLayer::set_motion_scale(const Size2 &p_scale) {

scene/2d/physics/animatable_body_2d.cpp

@@ -30,6 +30,7 @@
 
 #include "animatable_body_2d.h"
 
+#include "core/config/engine.h"
 #include "core/object/class_db.h"
 
 void AnimatableBody2D::set_sync_to_physics(bool p_enable) {

scene/2d/physics/character_body_2d.cpp

@@ -30,6 +30,7 @@
 
 #include "character_body_2d.h"
 
+#include "core/config/engine.h"
 #include "core/object/class_db.h"
 
 #ifndef DISABLE_DEPRECATED

scene/2d/physics/collision_polygon_2d.cpp

@@ -30,6 +30,7 @@
 
 #include "collision_polygon_2d.h"
 
+#include "core/config/engine.h"
 #include "core/math/geometry_2d.h"
 #include "core/object/class_db.h"
 #include "scene/2d/physics/area_2d.h"

scene/2d/physics/collision_shape_2d.cpp

@@ -30,6 +30,7 @@
 
 #include "collision_shape_2d.h"
 
+#include "core/config/engine.h"
 #include "core/object/class_db.h"
 #include "scene/2d/physics/area_2d.h"
 #include "scene/2d/physics/collision_object_2d.h"

scene/2d/physics/joints/damped_spring_joint_2d.cpp

@@ -30,6 +30,7 @@
 
 #include "damped_spring_joint_2d.h"
 
+#include "core/config/engine.h"
 #include "core/object/class_db.h"
 #include "scene/2d/physics/physics_body_2d.h"
 

scene/2d/physics/joints/groove_joint_2d.cpp

@@ -30,6 +30,7 @@
 
 #include "groove_joint_2d.h"
 
+#include "core/config/engine.h"
 #include "core/object/class_db.h"
 #include "scene/2d/physics/physics_body_2d.h"
 

scene/2d/physics/joints/joint_2d.cpp

@@ -30,6 +30,7 @@
 
 #include "joint_2d.h"
 
+#include "core/config/engine.h"
 #include "core/object/class_db.h"
 #include "scene/2d/physics/physics_body_2d.h"
 

scene/2d/physics/joints/pin_joint_2d.cpp

@@ -30,6 +30,7 @@
 
 #include "pin_joint_2d.h"
 
+#include "core/config/engine.h"
 #include "core/object/class_db.h"
 #include "scene/2d/physics/physics_body_2d.h"
 

scene/2d/physics/ray_cast_2d.cpp

@@ -30,6 +30,7 @@
 
 #include "ray_cast_2d.h"
 
+#include "core/config/engine.h"
 #include "core/object/class_db.h"
 #include "scene/2d/physics/collision_object_2d.h"
 #include "scene/resources/world_2d.h"

scene/2d/physics/rigid_body_2d.cpp

@@ -30,6 +30,7 @@
 
 #include "rigid_body_2d.h"
 
+#include "core/config/engine.h"
 #include "core/object/class_db.h"
 
 void RigidBody2D::_body_enter_tree(ObjectID p_id) {

scene/2d/physics/touch_screen_button.cpp

@@ -30,10 +30,12 @@
 
 #include "touch_screen_button.h"
 
+#include "core/config/engine.h"
 #include "core/input/input.h"
 #include "core/object/class_db.h"
 #include "scene/main/viewport.h"
 #include "servers/display/accessibility_server.h"
+#include "servers/display/display_server.h"
 
 void TouchScreenButton::set_texture_normal(const Ref<Texture2D> &p_texture) {
 	if (texture_normal == p_texture) {