Moved more includes from headers to cpp files.

editor/plugins/material_editor_plugin.cpp

@@ -33,6 +33,7 @@
 #include "editor/editor_scale.h"
 #include "scene/gui/viewport_container.h"
 #include "scene/resources/particles_material.h"
+#include "scene/main/viewport.h"
 
 void MaterialEditor::_notification(int p_what) {
 	if (p_what == NOTIFICATION_READY) {

editor/plugins/mesh_editor_plugin.cpp

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

editor/plugins/spatial_editor_plugin.cpp

@@ -52,6 +52,7 @@
 #include "scene/gui/viewport_container.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/surface_tool.h"
+#include "scene/main/viewport.h"
 
 #define DISTANCE_DEFAULT 4
 

modules/props/prop_instance_merger.cpp

@@ -52,6 +52,7 @@ typedef class RenderingServer VS;
 #include "lights/prop_light.h"
 #include "material_cache/prop_material_cache.h"
 #include "scene/3d/camera.h"
+#include "scene/main/viewport.h"
 
 #if TEXTURE_PACKER_PRESENT
 #include "./singleton/prop_cache.h"

modules/skeleton_editor/skeleton_editor_plugin.cpp

@@ -42,6 +42,7 @@
 #include "scene/3d/physics_joint.h"
 #include "scene/resources/capsule_shape.h"
 #include "scene/resources/sphere_shape.h"
+#include "scene/main/viewport.h"
 
 #define DISTANCE_DEFAULT 4
 

scene/3d/audio_stream_player_3d.cpp

@@ -34,6 +34,8 @@
 #include "scene/3d/camera.h"
 #include "scene/3d/listener.h"
 #include "scene/main/viewport.h"
+#include "scene/3d/spatial_velocity_tracker.h"
+#include "servers/audio/audio_stream.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/audio_stream_player_3d.h

@@ -33,12 +33,13 @@
 
 #include "core/safe_refcount.h"
 #include "scene/3d/spatial.h"
-#include "scene/3d/spatial_velocity_tracker.h"
 #include "servers/audio/audio_filter_sw.h"
-#include "servers/audio/audio_stream.h"
 #include "servers/audio_server.h"
 
 class Camera;
+class AudioStreamPlayback;
+class SpatialVelocityTracker;
+
 class AudioStreamPlayer3D : public Spatial {
 	GDCLASS(AudioStreamPlayer3D, Spatial);
 

scene/3d/camera.cpp

@@ -35,6 +35,11 @@
 #include "core/math/camera_matrix.h"
 #include "scene/resources/material.h"
 #include "scene/resources/surface_tool.h"
+#include "scene/3d/spatial_velocity_tracker.h"
+#include "scene/main/viewport.h"
+#include "scene/resources/environment.h"
+
+
 void Camera::_update_audio_listener_state() {
 }
 

scene/3d/camera.h

@@ -32,9 +32,11 @@
 #define CAMERA_H
 
 #include "scene/3d/spatial.h"
-#include "scene/3d/spatial_velocity_tracker.h"
-#include "scene/main/viewport.h"
-#include "scene/resources/environment.h"
+#include "core/reference.h"
+
+class SpatialVelocityTracker;
+class Viewport;
+class Environment;
 
 class Camera : public Spatial {
 	GDCLASS(Camera, Spatial);

scene/3d/collision_object.cpp

@@ -34,6 +34,7 @@
 #include "mesh_instance.h"
 #include "scene/scene_string_names.h"
 #include "servers/physics_server.h"
+#include "scene/resources/shape.h"
 
 void CollisionObject::_notification(int p_what) {
 	switch (p_what) {

scene/3d/collision_object.h

@@ -32,7 +32,9 @@
 #define COLLISION_OBJECT_H
 
 #include "scene/3d/spatial.h"
-#include "scene/resources/shape.h"
+#include "core/reference.h"
+
+class Shape;
 
 class CollisionObject : public Spatial {
 	GDCLASS(CollisionObject, Spatial);

scene/3d/cpu_particles.cpp

@@ -34,6 +34,7 @@
 #include "scene/3d/camera.h"
 #include "scene/resources/particles_material.h"
 #include "servers/visual_server.h"
+#include "scene/main/viewport.h"
 
 AABB CPUParticles::get_aabb() const {
 	return AABB();

scene/register_scene_types.cpp

@@ -213,6 +213,7 @@
 #include "scene/resources/environment.h"
 #include "scene/resources/occluder_shape.h"
 #include "scene/resources/occluder_shape_polygon.h"
+#include "scene/3d/spatial_velocity_tracker.h"
 #endif
 
 #include "modules/modules_enabled.gen.h" // For freetype.