Moved more includes to cpp files.

editor/dependency_editor.cpp

@@ -36,6 +36,8 @@
 #include "editor_scale.h"
 #include "scene/gui/margin_container.h"
 
+#include "core/project_settings.h"
+
 void DependencyEditor::_searched(const String &p_path) {
 	Map<String, String> dep_rename;
 	dep_rename[replacing] = p_path;

editor/editor_audio_buses.cpp

@@ -39,6 +39,8 @@
 #include "scene/resources/font.h"
 #include "servers/audio_server.h"
 
+#include "core/project_settings.h"
+
 void EditorAudioBus::_update_visible_channels() {
 	int i = 0;
 	for (; i < cc; i++) {

editor/editor_file_dialog.cpp

@@ -44,6 +44,9 @@
 #include "scene/gui/margin_container.h"
 #include "scene/gui/popup_menu.h"
 #include "scene/gui/scroll_bar.h"
+#include "scene/resources/world.h"
+
+#include "core/project_settings.h"
 
 EditorFileDialog::GetIconFunc EditorFileDialog::get_icon_func = nullptr;
 EditorFileDialog::GetIconFunc EditorFileDialog::get_large_icon_func = nullptr;

editor/editor_node.cpp

@@ -159,6 +159,8 @@
 #include "editor/run_settings_dialog.h"
 #include "editor/script_editor_debugger.h"
 #include "editor/settings_config_dialog.h"
+#include "scene/resources/environment.h"
+#include "scene/resources/world.h"
 
 #include <stdio.h>
 #include <stdlib.h>

editor/editor_properties.cpp

@@ -36,6 +36,7 @@
 #include "editor_properties_array_dict.h"
 #include "editor_scale.h"
 #include "scene/main/viewport.h"
+#include "core/project_settings.h"
 
 ///////////////////// NULL /////////////////////////
 

editor/find_in_files.cpp

@@ -43,6 +43,7 @@
 #include "scene/gui/line_edit.h"
 #include "scene/gui/progress_bar.h"
 #include "scene/gui/tree.h"
+#include "core/project_settings.h"
 
 const char *FindInFiles::SIGNAL_RESULT_FOUND = "result_found";
 const char *FindInFiles::SIGNAL_FINISHED = "finished";

editor/import/resource_importer_layered_texture.cpp

@@ -37,6 +37,7 @@
 #include "editor/editor_file_system.h"
 #include "editor/editor_node.h"
 #include "scene/resources/texture.h"
+#include "core/project_settings.h"
 
 String ResourceImporterLayeredTexture::get_importer_name() const {
 	return is_3d ? "texture_3d" : "texture_array";

editor/import/resource_importer_texture.cpp

@@ -35,6 +35,7 @@
 #include "editor/editor_file_system.h"
 #include "editor/editor_node.h"
 #include "scene/resources/texture.h"
+#include "core/project_settings.h"
 
 void ResourceImporterTexture::_texture_reimport_srgb(const Ref<StreamTexture> &p_tex) {
 	singleton->mutex.lock();

editor/import_defaults_editor.cpp

@@ -30,6 +30,8 @@
 
 #include "import_defaults_editor.h"
 
+#include "core/project_settings.h"
+
 class ImportDefaultsEditorSettings : public Object {
 	GDCLASS(ImportDefaultsEditorSettings, Object)
 	friend class ImportDefaultsEditor;

editor/import_dock.cpp

@@ -32,6 +32,7 @@
 #include "editor_node.h"
 #include "editor_resource_preview.h"
 #include "editor_scale.h"
+#include "core/project_settings.h"
 
 class ImportDockParameters : public Object {
 	GDCLASS(ImportDockParameters, Object);

editor/plugins/editor_preview_plugins.cpp

@@ -42,6 +42,8 @@
 #include "scene/resources/mesh.h"
 #include "servers/audio/audio_stream.h"
 
+#include "core/project_settings.h"
+
 void post_process_preview(Ref<Image> p_image) {
 	if (p_image->get_format() != Image::FORMAT_RGBA8) {
 		p_image->convert(Image::FORMAT_RGBA8);

editor/plugins/material_editor_plugin.cpp

@@ -35,6 +35,9 @@
 #include "scene/resources/particles_material.h"
 #include "scene/main/viewport.h"
 #include "scene/gui/texture_button.h"
+#include "scene/resources/sky.h"
+#include "scene/resources/environment.h"
+#include "scene/resources/world.h"
 
 void MaterialEditor::_notification(int p_what) {
 	if (p_what == NOTIFICATION_READY) {

editor/plugins/mesh_editor_plugin.cpp

@@ -33,6 +33,7 @@
 #include "editor/editor_scale.h"
 #include "scene/main/viewport.h"
 #include "scene/gui/texture_button.h"
+#include "scene/resources/world.h"
 
 void MeshEditor::_gui_input(Ref<InputEvent> p_event) {
 	Ref<InputEventMouseMotion> mm = p_event;

editor/plugins/particles_editor_plugin.cpp

@@ -34,6 +34,7 @@
 #include "editor/plugins/spatial_editor_plugin.h"
 #include "scene/3d/cpu_particles.h"
 #include "scene/resources/particles_material.h"
+#include "scene/resources/world.h"
 
 bool ParticlesEditorBase::_generate(PoolVector<Vector3> &points, PoolVector<Vector3> &normals) {
 	bool use_normals = emission_fill->get_selected() == 1;

editor/plugins/path_2d_editor_plugin.cpp

@@ -35,6 +35,7 @@
 #include "core/os/keyboard.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
+#include "scene/resources/world.h"
 
 void Path2DEditor::_notification(int p_what) {
 	switch (p_what) {

editor/plugins/path_editor_plugin.cpp

@@ -33,6 +33,7 @@
 #include "core/os/keyboard.h"
 #include "scene/resources/curve.h"
 #include "spatial_editor_plugin.h"
+#include "scene/resources/world.h"
 
 String PathSpatialGizmo::get_handle_name(int p_idx) const {
 	Ref<Curve3D> c = path->get_curve();

editor/plugins/physical_bone_plugin.cpp

@@ -31,6 +31,7 @@
 #include "physical_bone_plugin.h"
 #include "editor/plugins/spatial_editor_plugin.h"
 #include "scene/3d/physics_body.h"
+#include "scene/resources/world.h"
 
 void PhysicalBoneEditor::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("_on_toggle_button_transform_joint", "is_pressed"), &PhysicalBoneEditor::_on_toggle_button_transform_joint);

editor/plugins/polygon_2d_editor_plugin.cpp

@@ -38,6 +38,7 @@
 #include "editor/editor_settings.h"
 #include "scene/2d/skeleton_2d.h"
 #include "scene/gui/panel.h"
+#include "scene/resources/world.h"
 
 Node2D *Polygon2DEditor::_get_node() const {
 	return node;

editor/plugins/resource_preloader_editor_plugin.cpp

@@ -34,6 +34,7 @@
 #include "core/project_settings.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
+#include "scene/resources/world.h"
 
 void ResourcePreloaderEditor::_gui_input(Ref<InputEvent> p_event) {
 }

editor/plugins/room_manager_editor_plugin.cpp

@@ -32,6 +32,7 @@
 
 #include "editor/spatial_editor_gizmos.h"
 #include "scene/resources/occluder_shape.h"
+#include "scene/resources/world.h"
 
 void RoomManagerEditorPlugin::_flip_portals() {
 	if (_room_manager) {

editor/plugins/script_text_editor.cpp

@@ -37,6 +37,7 @@
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 #include "editor/script_editor_debugger.h"
+#include "core/project_settings.h"
 
 void ConnectionInfoDialog::ok_pressed() {
 }

editor/plugins/skeleton_2d_editor_plugin.cpp

@@ -34,6 +34,7 @@
 #include "scene/2d/mesh_instance_2d.h"
 #include "scene/gui/box_container.h"
 #include "thirdparty/misc/clipper.hpp"
+#include "scene/resources/world.h"
 
 void Skeleton2DEditor::_node_removed(Node *p_node) {
 	if (p_node == node) {

editor/plugins/spatial_editor_plugin.cpp

@@ -52,9 +52,11 @@
 #include "scene/3d/visual_instance.h"
 #include "scene/gui/viewport_container.h"
 #include "scene/main/viewport.h"
+#include "scene/resources/environment.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/skin.h"
 #include "scene/resources/surface_tool.h"
+#include "scene/resources/world.h"
 
 #define DISTANCE_DEFAULT 4
 
@@ -4975,6 +4977,10 @@ void SpatialEditor::set_state(const Dictionary &p_state) {
 	}
 }
 
+Ref<Environment> SpatialEditor::get_viewport_environment() {
+	return viewport_environment;
+}
+
 void SpatialEditor::edit(Spatial *p_spatial) {
 	if (p_spatial != selected) {
 		if (selected) {

editor/plugins/spatial_editor_plugin.h

@@ -39,12 +39,14 @@
 #include "scene/3d/visual_instance.h"
 #include "scene/gui/panel_container.h"
 #include "scene/3d/skeleton.h"
+#include "core/reference.h"
 
 class Camera;
 class SpatialEditor;
 class EditorSpatialGizmoPlugin;
 class ViewportContainer;
 class SpatialEditorViewport;
+class Environment;
 
 class EditorSpatialGizmo : public SpatialGizmo {
 	GDCLASS(EditorSpatialGizmo, SpatialGizmo);
@@ -823,7 +825,7 @@ public:
 	Dictionary get_state() const;
 	void set_state(const Dictionary &p_state);
 
-	Ref<Environment> get_viewport_environment() { return viewport_environment; }
+	Ref<Environment> get_viewport_environment();
 
 	UndoRedo *get_undo_redo() { return undo_redo; }
 

editor/plugins/sprite_frames_editor_plugin.cpp

@@ -40,6 +40,7 @@
 #include "scene/gui/center_container.h"
 #include "scene/gui/margin_container.h"
 #include "scene/gui/panel_container.h"
+#include "scene/resources/world.h"
 
 void SpriteFramesEditor::_gui_input(Ref<InputEvent> p_event) {
 }

editor/plugins/theme_editor_preview.cpp

@@ -33,6 +33,7 @@
 #include "core/math/math_funcs.h"
 #include "core/os/input.h"
 #include "scene/resources/packed_scene.h"
+#include "core/project_settings.h"
 
 #include "editor/editor_scale.h"
 

editor/project_manager.cpp

@@ -55,6 +55,9 @@
 #include "scene/gui/texture_button.h"
 #include "scene/gui/panel.h"
 #include "scene/gui/option_button.h"
+#include "core/project_settings.h"
+#include "servers/physics_2d_server.h"
+#include "servers/physics_server.h"
 
 static inline String get_project_key_from_path(const String &dir) {
 	return dir.replace("/", "::");

editor/project_settings_editor.cpp

@@ -40,6 +40,7 @@
 #include "editor/editor_scale.h"
 #include "scene/gui/margin_container.h"
 #include "scene/gui/tab_container.h"
+#include "core/project_settings.h"
 
 ProjectSettingsEditor *ProjectSettingsEditor::singleton = nullptr;
 

editor/spatial_editor_gizmos.cpp

@@ -70,6 +70,8 @@
 #include "scene/main/viewport.h"
 #include "scene/resources/skin.h"
 #include "scene/3d/skeleton.h"
+#include "servers/physics_server.h"
+#include "scene/resources/world.h"
 
 #define HANDLE_HALF_SIZE 9.5
 

modules/entity_spell_system/singletons/ess.cpp

@@ -26,6 +26,7 @@ SOFTWARE.
 #include "../material_cache/ess_material_cache.h"
 #include "../spawners/ess_entity_spawner.h"
 #include "../utility/entity_create_info.h"
+#include "core/project_settings.h"
 
 ESS *ESS::instance;
 

modules/gdscript/gdscript_editor.cpp

@@ -34,6 +34,7 @@
 #include "core/global_constants.h"
 #include "core/os/file_access.h"
 #include "gdscript_compiler.h"
+#include "core/project_settings.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/editor_file_system.h"

modules/navigation/navigation_mesh_generator.cpp

@@ -51,6 +51,7 @@
 #include "scene/resources/multimesh.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/navigation_mesh.h"
+#include "scene/resources/shape.h"
 
 #include "modules/modules_enabled.gen.h" // For csg, gridmap.
 

modules/props/prop_instance_merger.cpp

@@ -5,6 +5,8 @@
 //#include "../thread_pool/thread_pool.h"
 
 #include "core/version.h"
+#include "servers/visual_server.h"
+#include "scene/resources/world.h"
 
 #if VERSION_MAJOR > 3
 #include "core/config/engine.h"

modules/props/prop_instance_prop_job.cpp

@@ -38,6 +38,8 @@ SOFTWARE.
 #include "prop_mesher.h"
 #include "scene/resources/shape.h"
 #include "singleton/prop_cache.h"
+#include "servers/physics_server.h"
+#include "scene/resources/world.h"
 
 #ifdef MESH_DATA_RESOURCE_PRESENT
 #include "../mesh_data_resource/mesh_data_resource.h"

modules/props/tiled_wall/tiled_wall.cpp

@@ -24,6 +24,8 @@
 
 #include "core/core_string_names.h"
 #include "tiled_wall_data.h"
+#include "servers/physics_server.h"
+#include "scene/resources/world.h"
 
 int TiledWall::get_width() const {
 	return _width;

modules/props_2d/prop_2d_instance_merger.cpp

@@ -3,7 +3,8 @@
 #include "../mesh_data_resource/nodes/mesh_data_instance.h"
 
 //#include "../thread_pool/thread_pool.h"
-
+#include "servers/physics_server.h"
+#include "scene/resources/world_2d.h"
 #include "core/version.h"
 
 #if VERSION_MAJOR > 3

modules/rtile_map/tile_map.cpp

@@ -36,6 +36,7 @@
 #include "scene/2d/area_2d.h"
 #include "scene/2d/collision_object_2d.h"
 #include "servers/physics_2d_server.h"
+#include "scene/resources/world_2d.h"
 
 #if VERSION_MINOR >= 5
 #include "servers/navigation_2d_server.h"

modules/terraman/world/default/terrain_chunk_default.cpp

@@ -38,6 +38,7 @@ SOFTWARE.
 #include "../jobs/terrain_light_job.h"
 #include "../jobs/terrain_prop_job.h"
 #include "../jobs/terrain_terrain_job.h"
+#include "scene/resources/world.h"
 
 const String TerrainChunkDefault::BINDING_STRING_BUILD_FLAGS = "Use Isolevel,Use Lighting,Use AO,Use RAO,Generate AO,Generate RAO,Bake Lights,Create Collider,Create Lods";
 

modules/terraman/world/default/terrain_world_default.cpp

@@ -30,6 +30,7 @@ SOFTWARE.
 #include "../jobs/terrain_light_job.h"
 #include "../jobs/terrain_prop_job.h"
 #include "../jobs/terrain_terrain_job.h"
+#include "servers/physics_server.h"
 
 _FORCE_INLINE_ int TerrainWorldDefault::get_build_flags() const {
 	return _build_flags;

modules/terraman/world/jobs/terrain_prop_job.cpp

@@ -31,6 +31,8 @@ SOFTWARE.
 #include "../../meshers/default/terrain_mesher_default.h"
 #include "../../meshers/terrain_mesher.h"
 #include "../default/terrain_chunk_default.h"
+#include "servers/physics_server.h"
+#include "scene/resources/world.h"
 
 #ifdef MESH_DATA_RESOURCE_PRESENT
 #include "../../../mesh_data_resource/mesh_data_resource.h"

modules/terraman/world/jobs/terrain_terrain_job.cpp

@@ -30,6 +30,7 @@ SOFTWARE.
 #include "../../meshers/terrain_mesher.h"
 
 #include "../default/terrain_chunk_default.h"
+#include "servers/physics_server.h"
 
 #ifdef MESH_UTILS_PRESENT
 #include "../../../mesh_utils/fast_quadratic_mesh_simplifier.h"

modules/terraman/world/terrain_chunk.cpp

@@ -31,6 +31,7 @@ SOFTWARE.
 #include "core/message_queue.h"
 #include "jobs/terrain_job.h"
 #include "terrain_structure.h"
+#include "servers/physics_server.h"
 
 #if THREAD_POOL_PRESENT
 #include "../../thread_pool/thread_pool.h"

modules/terraman/world/terrain_environment_data.cpp

@@ -22,6 +22,8 @@ SOFTWARE.
 
 #include "terrain_environment_data.h"
 
+#include "scene/resources/environment.h"
+
 Ref<Environment> TerrainEnvironmentData::get_environment() {
 	return _environment;
 }

modules/terraman/world/terrain_world_editor.cpp

@@ -35,6 +35,8 @@ SOFTWARE.
 
 #include "../library/terrain_surface.h"
 #include "../library/terrain_library.h"
+#include "servers/physics_server.h"
+#include "scene/resources/world.h"
 
 #include "../defines.h"
 

modules/terraman_2d/meshers/default/terrain_2d_mesher_default.cpp

@@ -30,6 +30,9 @@ SOFTWARE.
 #include visual_server_h
 #include mesh_instance_h
 
+#include "servers/physics_2d_server.h"
+#include "scene/resources/world_2d.h"
+
 _FORCE_INLINE_ int Terrain2DMesherDefault::get_build_flags() const {
 	return _build_flags;
 }

modules/terraman_2d/world/default/terrain_2d_chunk_default.cpp

@@ -39,6 +39,8 @@ SOFTWARE.
 #include "../jobs/terrain_2d_prop_job.h"
 #include "../jobs/terrain_2d_terrain_job.h"
 #include "servers/physics_2d_server.h"
+#include "scene/resources/world.h"
+#include "scene/resources/world_2d.h"
 
 const String Terrain2DChunkDefault::BINDING_STRING_BUILD_FLAGS = "Use Lighting,Use AO,Use RAO,Generate AO,Generate RAO,Bake Lights,Create Collider";
 

modules/terraman_2d/world/jobs/terrain_2d_terrain_job.cpp

@@ -30,6 +30,7 @@ SOFTWARE.
 #include "../../meshers/terrain_2d_mesher.h"
 
 #include "../default/terrain_2d_chunk_default.h"
+#include "servers/physics_2d_server.h"
 
 #ifdef MESH_UTILS_PRESENT
 #include "../../../mesh_utils/fast_quadratic_mesh_simplifier.h"

modules/terraman_2d/world/terrain_2d_environment_data.cpp

@@ -22,6 +22,8 @@ SOFTWARE.
 
 #include "terrain_2d_environment_data.h"
 
+#include "scene/resources/environment.h"
+
 Ref<Environment> Terrain2DEnvironmentData::get_environment() {
 	return _environment;
 }

modules/voxelman/world/default/voxel_chunk_default.cpp

@@ -38,6 +38,7 @@ SOFTWARE.
 #include "../jobs/voxel_light_job.h"
 #include "../jobs/voxel_prop_job.h"
 #include "../jobs/voxel_terrain_job.h"
+#include "scene/resources/world.h"
 
 const String VoxelChunkDefault::BINDING_STRING_BUILD_FLAGS = "Use Isolevel,Use Lighting,Use AO,Use RAO,Generate AO,Generate RAO,Bake Lights,Create Collider,Create Lods";
 

modules/voxelman/world/environment_data.cpp

@@ -22,6 +22,8 @@ SOFTWARE.
 
 #include "environment_data.h"
 
+#include "scene/resources/environment.h"
+
 Ref<Environment> EnvironmentData::get_environment() {
 	return _environment;
 }

modules/voxelman/world/environment_data.h

@@ -37,9 +37,13 @@ SOFTWARE.
 
 #include light_h
 
+#include "core/reference.h"
+
 #include "scene/3d/world_environment.h"
 #include "scene/main/node.h"
 
+class Environment;
+
 class EnvironmentData : public Resource {
 	GDCLASS(EnvironmentData, Resource);
 

modules/voxelman/world/jobs/voxel_prop_job.cpp

@@ -32,6 +32,8 @@ SOFTWARE.
 
 #include "../../library/voxel_material_cache.h"
 #include "../default/voxel_chunk_default.h"
+#include "servers/physics_server.h"
+#include "scene/resources/world.h"
 
 #ifdef MESH_DATA_RESOURCE_PRESENT
 #include "../../../mesh_data_resource/mesh_data_resource.h"

modules/voxelman/world/jobs/voxel_terrain_job.cpp

@@ -30,6 +30,7 @@ SOFTWARE.
 
 #include "../../library/voxel_material_cache.h"
 #include "../default/voxel_chunk_default.h"
+#include "servers/physics_server.h"
 
 #ifdef MESH_UTILS_PRESENT
 #include "../../../mesh_utils/fast_quadratic_mesh_simplifier.h"

modules/voxelman/world/voxel_chunk.cpp

@@ -30,6 +30,7 @@ SOFTWARE.
 
 #include "jobs/voxel_job.h"
 #include "voxel_structure.h"
+#include "servers/physics_server.h"
 
 #if THREAD_POOL_PRESENT
 #include "../../thread_pool/thread_pool.h"

modules/voxelman/world/voxel_world_editor.cpp

@@ -35,6 +35,8 @@ SOFTWARE.
 
 #include "../library/voxel_surface.h"
 #include "../library/voxel_library.h"
+#include "servers/physics_server.h"
+#include "scene/resources/world.h"
 
 #include "../defines.h"
 

platform/android/export/export.cpp

@@ -32,6 +32,8 @@
 
 #include "export_plugin.h"
 
+#include "editor/editor_settings.h"
+
 void register_android_exporter() {
 	String exe_ext;
 	if (OS::get_singleton()->get_name() == "Windows") {

platform/android/export/gradle_export_util.cpp

@@ -30,6 +30,8 @@
 
 #include "gradle_export_util.h"
 
+#include "core/project_settings.h"
+
 int _get_android_orientation_value(OS::ScreenOrientation screen_orientation) {
 	switch (screen_orientation) {
 		case OS::SCREEN_PORTRAIT:

platform/javascript/export/export.cpp

@@ -41,6 +41,8 @@
 #include "platform/javascript/logo.gen.h"
 #include "platform/javascript/run_icon.gen.h"
 
+#include "core/project_settings.h"
+
 class EditorHTTPServer : public Reference {
 private:
 	Ref<TCP_Server> server;

platform/osx/export/export.cpp

@@ -44,6 +44,7 @@
 #include "editor/editor_settings.h"
 #include "modules/modules_enabled.gen.h" // For regex.
 #include "platform/osx/logo.gen.h"
+#include "editor/editor_settings.h"
 
 #include <sys/stat.h>
 

platform/windows/export/export.cpp

@@ -37,6 +37,8 @@
 #include "editor/editor_settings.h"
 #include "platform/windows/logo.gen.h"
 
+#include "core/project_settings.h"
+
 static Error fixup_embedded_pck(const String &p_path, int64_t p_embedded_start, int64_t p_embedded_size);
 
 class EditorExportPlatformWindows : public EditorExportPlatformPC {

scene/2d/area_2d.cpp

@@ -32,6 +32,7 @@
 #include "scene/scene_string_names.h"
 #include "servers/audio_server.h"
 #include "servers/physics_2d_server.h"
+#include "scene/resources/world.h"
 
 void Area2D::set_space_override_mode(SpaceOverride p_mode) {
 	space_override = p_mode;

scene/2d/audio_stream_player_2d.cpp

@@ -36,6 +36,8 @@
 #include "scene/main/viewport.h"
 #include "servers/audio_server.h"
 #include "servers/audio/audio_stream.h"
+#include "servers/physics_2d_server.h"
+#include "scene/resources/world_2d.h"
 
 void AudioStreamPlayer2D::_mix_audio() {
 	if (!stream_playback.is_valid() || !active.is_set() ||

scene/2d/canvas_item.cpp

@@ -41,6 +41,8 @@
 #include "scene/scene_string_names.h"
 #include "servers/visual/visual_server_raster.h"
 #include "servers/visual_server.h"
+#include "scene/resources/world.h"
+#include "scene/resources/world_2d.h"
 
 #include "scene/main/scene_tree.h"
 #include "scene/resources/multimesh.h"

scene/2d/canvas_item.h

@@ -39,6 +39,7 @@ class Viewport;
 class Font;
 class MultiMesh;
 class StyleBox;
+class World2D;
 
 class CanvasItemMaterial : public Material {
 	GDCLASS(CanvasItemMaterial, Material);

scene/2d/collision_object_2d.cpp

@@ -32,6 +32,7 @@
 
 #include "scene/scene_string_names.h"
 #include "servers/physics_2d_server.h"
+#include "scene/resources/world_2d.h"
 
 void CollisionObject2D::_notification(int p_what) {
 	switch (p_what) {

scene/2d/mesh_instance_2d.cpp

@@ -30,6 +30,8 @@
 
 #include "mesh_instance_2d.h"
 
+#include "scene/resources/mesh.h"
+
 void MeshInstance2D::_notification(int p_what) {
 	if (p_what == NOTIFICATION_DRAW) {
 		if (mesh.is_valid()) {

scene/2d/physics_body_2d.cpp

@@ -40,6 +40,7 @@
 #include "scene/scene_string_names.h"
 #include "scene/resources/physics_material.h"
 #include "servers/physics_2d_server.h"
+#include "core/project_settings.h"
 
 void PhysicsBody2D::_notification(int p_what) {
 }

scene/2d/physics_body_2d.h

@@ -33,6 +33,7 @@
 
 #include "core/vset.h"
 #include "scene/2d/collision_object_2d.h"
+#include "servers/physics_2d_server.h"
 
 class PhysicsMaterial;
 class KinematicCollision2D;

scene/2d/ray_cast_2d.cpp

@@ -34,6 +34,7 @@
 #include "core/engine.h"
 #include "physics_body_2d.h"
 #include "servers/physics_2d_server.h"
+#include "scene/resources/world_2d.h"
 
 void RayCast2D::set_cast_to(const Vector2 &p_point) {
 	cast_to = p_point;

scene/2d/visibility_notifier_2d.cpp

@@ -36,6 +36,8 @@
 #include "scene/animation/animation_player.h"
 #include "scene/main/viewport.h"
 #include "scene/scene_string_names.h"
+#include "scene/resources/world_2d.h"
+
 
 #ifdef TOOLS_ENABLED
 Rect2 VisibilityNotifier2D::_edit_get_rect() const {

scene/3d/area.cpp

@@ -32,6 +32,7 @@
 #include "scene/scene_string_names.h"
 #include "servers/audio_server.h"
 #include "servers/physics_server.h"
+#include "scene/resources/shape.h"
 
 void Area::set_space_override_mode(SpaceOverride p_mode) {
 	space_override = p_mode;

scene/3d/audio_stream_player_3d.cpp

@@ -36,6 +36,9 @@
 #include "scene/main/viewport.h"
 #include "scene/3d/spatial_velocity_tracker.h"
 #include "servers/audio/audio_stream.h"
+#include "servers/physics_server.h"
+#include "scene/resources/world.h"
+#include "scene/resources/shape.h"
 
 // Based on "A Novel Multichannel Panning Method for Standard and Arbitrary Loudspeaker Configurations" by Ramy Sadek and Chris Kyriakakis (2004)
 // Speaker-Placement Correction Amplitude Panning (SPCAP)

scene/3d/camera.cpp

@@ -38,7 +38,7 @@
 #include "scene/3d/spatial_velocity_tracker.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/environment.h"
-
+#include "scene/resources/world.h"
 
 void Camera::_update_audio_listener_state() {
 }

scene/3d/collision_object.cpp

@@ -35,6 +35,8 @@
 #include "scene/scene_string_names.h"
 #include "servers/physics_server.h"
 #include "scene/resources/shape.h"
+#include "scene/resources/world.h"
+#include "scene/resources/mesh.h"
 
 void CollisionObject::_notification(int p_what) {
 	switch (p_what) {

scene/3d/collision_polygon.cpp

@@ -34,6 +34,7 @@
 #include "scene/resources/concave_polygon_shape.h"
 #include "scene/resources/convex_polygon_shape.h"
 #include "scene/resources/shape.h"
+#include "core/math/geometry.h"
 
 void CollisionPolygon::_build_polygon() {
 	if (!parent) {

scene/3d/collision_shape.cpp

@@ -42,6 +42,7 @@
 #include "scene/resources/sphere_shape.h"
 #include "servers/visual_server.h"
 #include "scene/resources/shape.h"
+#include "scene/resources/mesh.h"
 
 void CollisionShape::make_convex_from_brothers() {
 	Node *p = get_parent();

scene/3d/collision_shape.h

@@ -35,7 +35,7 @@
 #include "core/reference.h"
 
 class CollisionObject;
-class shape;
+class Shape;
 
 class CollisionShape : public Spatial {
 	GDCLASS(CollisionShape, Spatial);

scene/3d/cpu_particles.cpp

@@ -35,6 +35,9 @@
 #include "scene/resources/particles_material.h"
 #include "servers/visual_server.h"
 #include "scene/main/viewport.h"
+#include "scene/resources/curve.h"
+#include "scene/resources/gradient.h"
+#include "scene/resources/mesh.h"
 
 AABB CPUParticles::get_aabb() const {
 	return AABB();

scene/3d/cpu_particles.h

@@ -34,6 +34,10 @@
 #include "core/rid.h"
 #include "core/safe_refcount.h"
 #include "scene/3d/visual_instance.h"
+#include "core/reference.h"
+
+class Curve;
+class Gradient;
 
 class CPUParticles : public GeometryInstance {
 private:

scene/3d/navigation_agent.cpp

@@ -33,6 +33,7 @@
 #include "core/engine.h"
 #include "scene/3d/navigation.h"
 #include "servers/navigation_server.h"
+#include "core/math/geometry.h"
 
 void NavigationAgent::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_rid"), &NavigationAgent::get_rid);

scene/3d/navigation_mesh_instance.cpp

@@ -30,7 +30,6 @@
 
 #include "navigation_mesh_instance.h"
 
-#include "core/os/thread.h"
 #include "mesh_instance.h"
 #include "navigation.h"
 #include "servers/navigation_server.h"

scene/3d/navigation_mesh_instance.h

@@ -32,6 +32,7 @@
 #define NAVIGATION_MESH_INSTANCE_H
 
 #include "scene/3d/spatial.h"
+#include "core/os/thread.h"
 
 class Mesh;
 class Navigation;

scene/3d/navigation_obstacle.cpp

@@ -35,6 +35,7 @@
 #include "scene/3d/physics_body.h"
 #include "servers/navigation_server.h"
 #include "scene/3d/spatial.h"
+#include "scene/resources/shape.h"
 
 void NavigationObstacle::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_navigation", "navigation"), &NavigationObstacle::set_navigation_node);

scene/3d/occluder.cpp

@@ -33,6 +33,8 @@
 #include "core/engine.h"
 #include "servers/visual/portals/portal_occlusion_culler.h"
 #include "scene/resources/occluder_shape.h"
+#include "servers/visual_server.h"
+#include "scene/resources/world.h"
 
 void Occluder::resource_changed(RES res) {
 	update_gizmo();

scene/3d/physics_body.cpp

@@ -39,6 +39,7 @@
 #include "scene/scene_string_names.h"
 #include "scene/resources/physics_material.h"
 #include "skeleton.h"
+#include "core/project_settings.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/plugins/spatial_editor_plugin.h"

scene/3d/physics_joint.cpp

@@ -32,6 +32,7 @@
 
 #include "scene/scene_string_names.h"
 #include "scene/3d/physics_body.h"
+#include "scene/resources/shape.h"
 
 void Joint::_disconnect_signals() {
 	Node *node_a = get_node_or_null(a);

scene/3d/physics_joint.h

@@ -32,6 +32,7 @@
 #define PHYSICS_JOINT_H
 
 #include "scene/3d/spatial.h"
+#include "servers/physics_server.h"
 
 class PhysicsBody;
 

scene/3d/portal.cpp

@@ -37,6 +37,8 @@
 #include "room_manager.h"
 #include "scene/main/viewport.h"
 #include "servers/visual_server.h"
+#include "scene/resources/world.h"
+#include "scene/resources/mesh.h"
 
 bool Portal::_portal_plane_convention = false;
 bool Portal::_settings_gizmo_show_margins = true;

scene/3d/ray_cast.cpp

@@ -34,6 +34,9 @@
 #include "core/engine.h"
 #include "mesh_instance.h"
 #include "servers/physics_server.h"
+#include "scene/resources/material.h"
+#include "scene/resources/world.h"
+#include "scene/resources/mesh.h"
 
 void RayCast::set_cast_to(const Vector3 &p_point) {
 	cast_to = p_point;
@@ -515,3 +518,6 @@ RayCast::RayCast() {
 	collide_with_areas = false;
 	collide_with_bodies = true;
 }
+
+RayCast::~RayCast() {
+}

scene/3d/ray_cast.h

@@ -33,6 +33,8 @@
 
 #include "scene/3d/spatial.h"
 
+class SpatialMaterial;
+
 class RayCast : public Spatial {
 	GDCLASS(RayCast, Spatial);
 
@@ -117,6 +119,7 @@ public:
 	void clear_exceptions();
 
 	RayCast();
+	~RayCast();
 };
 
 #endif // RAY_CAST_H

scene/3d/room.cpp

@@ -34,6 +34,7 @@
 #include "room_group.h"
 #include "room_manager.h"
 #include "servers/visual_server.h"
+#include "scene/resources/world.h"
 
 void Room::SimplifyInfo::set_simplify(real_t p_value, real_t p_room_size) {
 	_plane_simplify = CLAMP(p_value, 0.0, 1.0);

scene/3d/room.h

@@ -34,6 +34,7 @@
 #include "core/local_vector.h"
 #include "core/rid.h"
 #include "spatial.h"
+#include "core/math/geometry.h"
 
 class Portal;
 

scene/3d/room_group.cpp

@@ -32,6 +32,10 @@
 
 #include "room.h"
 #include "room_manager.h"
+#include "core/math/geometry.h"
+#include "servers/visual_server.h"
+#include "scene/resources/world.h"
+#include "scene/resources/mesh.h"
 
 void RoomGroup::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_roomgroup_priority", "p_priority"), &RoomGroup::set_roomgroup_priority);

scene/3d/room_manager.cpp

@@ -44,6 +44,9 @@
 #include "scene/3d/sprite_3d.h"
 #include "visibility_notifier.h"
 #include "scene/resources/multimesh.h"
+#include "core/math/geometry.h"
+#include "scene/resources/world.h"
+#include "core/project_settings.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/plugins/spatial_editor_plugin.h"

scene/3d/soft_body.cpp

@@ -37,6 +37,8 @@
 #include "scene/3d/physics_body.h"
 #include "scene/3d/skeleton.h"
 #include "servers/physics_server.h"
+#include "scene/resources/world.h"
+#include "scene/resources/mesh.h"
 
 SoftBodyVisualServerHandler::SoftBodyVisualServerHandler() {}
 

scene/3d/spatial.cpp

@@ -37,6 +37,7 @@
 #include "scene/main/viewport.h"
 #include "scene/scene_string_names.h"
 #include "servers/visual_server_callbacks.h"
+#include "scene/resources/world.h"
 
 /*
 

scene/3d/spatial.h

@@ -34,6 +34,8 @@
 #include "scene/main/node.h"
 #include "scene/main/scene_tree.h"
 
+class World;
+
 class SpatialGizmo : public Reference {
 	GDCLASS(SpatialGizmo, Reference);
 

scene/3d/spring_arm.cpp

@@ -33,6 +33,8 @@
 #include "scene/3d/collision_object.h"
 #include "scene/resources/sphere_shape.h"
 #include "servers/physics_server.h"
+#include "scene/resources/shape.h"
+#include "scene/resources/world.h"
 
 SpringArm::SpringArm() :
 		spring_length(1),

scene/3d/spring_arm.h

@@ -32,6 +32,9 @@
 #define SPRING_ARM_H
 
 #include "scene/3d/spatial.h"
+#include "core/reference.h"
+
+class Shape;
 
 class SpringArm : public Spatial {
 	GDCLASS(SpringArm, Spatial);

scene/3d/sprite_3d.cpp

@@ -32,6 +32,7 @@
 #include "core/core_string_names.h"
 #include "scene/scene_string_names.h"
 #include "scene/2d/animated_sprite.h"
+#include "core/math/triangle_mesh.h"
 
 Color SpriteBase3D::_get_color_accum() {
 	if (!color_dirty) {