8 files changed, 11 insertions, 9 deletions
diff --git a/scene/main/canvas_item.h b/scene/main/canvas_item.h
index a368a10ad0..2a9e7bac3d 100644
--- a/scene/main/canvas_item.h
+++ b/scene/main/canvas_item.h
@@ -32,10 +32,8 @@
 #define CANVAS_ITEM_H
 
 #include "scene/main/node.h"
-#include "scene/main/scene_tree.h"
 #include "scene/resources/canvas_item_material.h"
 #include "scene/resources/font.h"
-#include "servers/text_server.h"
 
 class CanvasLayer;
 class MultiMesh;
diff --git a/scene/main/canvas_layer.cpp b/scene/main/canvas_layer.cpp
index 3f3e72357b..d4418a3cde 100644
--- a/scene/main/canvas_layer.cpp
+++ b/scene/main/canvas_layer.cpp
@@ -29,8 +29,10 @@
 /*************************************************************************/
 
 #include "canvas_layer.h"
-#include "canvas_item.h"
-#include "viewport.h"
+
+#include "scene/main/canvas_item.h"
+#include "scene/main/viewport.h"
+#include "scene/resources/world_2d.h"
 
 void CanvasLayer::set_layer(int p_xform) {
 	layer = p_xform;
diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index d5bc7d111a..05086541a5 100644
--- a/scene/main/node.cpp
+++ b/scene/main/node.cpp
@@ -30,6 +30,7 @@
 
 #include "node.h"
 
+#include "core/config/project_settings.h"
 #include "core/core_string_names.h"
 #include "core/io/resource_loader.h"
 #include "core/multiplayer/multiplayer_api.h"
diff --git a/scene/main/node.h b/scene/main/node.h
index 0ac10f4381..f2dcdf4b43 100644
--- a/scene/main/node.h
+++ b/scene/main/node.h
@@ -31,9 +31,6 @@
 #ifndef NODE_H
 #define NODE_H
 
-#include "core/config/project_settings.h"
-#include "core/object/class_db.h"
-#include "core/object/script_language.h"
 #include "core/string/node_path.h"
 #include "core/templates/map.h"
 #include "core/variant/typed_array.h"
diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp
index 69d781cbfc..f02032a6c9 100644
--- a/scene/main/scene_tree.cpp
+++ b/scene/main/scene_tree.cpp
@@ -44,10 +44,13 @@
 #include "node.h"
 #include "scene/animation/tween.h"
 #include "scene/debugger/scene_debugger.h"
+#include "scene/main/viewport.h"
 #include "scene/resources/font.h"
 #include "scene/resources/material.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/packed_scene.h"
+#include "scene/resources/world_2d.h"
+#include "scene/resources/world_3d.h"
 #include "scene/scene_string_names.h"
 #include "servers/display_server.h"
 #include "servers/navigation_server_3d.h"
diff --git a/scene/main/scene_tree.h b/scene/main/scene_tree.h
index a5cd52b4ca..5f7c1729e8 100644
--- a/scene/main/scene_tree.h
+++ b/scene/main/scene_tree.h
@@ -35,8 +35,6 @@
 #include "core/os/thread_safe.h"
 #include "core/templates/self_list.h"
 #include "scene/resources/mesh.h"
-#include "scene/resources/world_2d.h"
-#include "scene/resources/world_3d.h"
 
 #undef Window
 
@@ -48,6 +46,7 @@ class Mesh;
 class MultiplayerAPI;
 class SceneDebugger;
 class Tween;
+class Viewport;
 
 class SceneTreeTimer : public RefCounted {
 	GDCLASS(SceneTreeTimer, RefCounted);
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index 522997cdf5..a1ff95ea9a 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -30,6 +30,7 @@
 
 #include "viewport.h"
 
+#include "core/config/project_settings.h"
 #include "core/core_string_names.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/object/message_queue.h"
diff --git a/scene/main/window.cpp b/scene/main/window.cpp
index f2ebe50fa3..b5e0e7b110 100644
--- a/scene/main/window.cpp
+++ b/scene/main/window.cpp
@@ -30,6 +30,7 @@
 
 #include "window.h"
 
+#include "core/config/project_settings.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/string/translation.h"
 #include "scene/gui/control.h"