Moved more includes.

editor/import/resource_importer_scene.cpp

@@ -45,6 +45,7 @@
 #include "scene/resources/ray_shape.h"
 #include "scene/resources/resource_format_text.h"
 #include "scene/resources/sphere_shape.h"
+#include "scene/resources/navigation_mesh.h"
 
 uint32_t EditorSceneImporter::get_import_flags() const {
 	if (get_script_instance()) {

editor/plugins/mesh_instance_editor_plugin.cpp

@@ -36,6 +36,7 @@
 #include "scene/3d/physics_body.h"
 #include "scene/gui/box_container.h"
 #include "spatial_editor_plugin.h"
+#include "scene/resources/navigation_mesh.h"
 
 void MeshInstanceEditor::_node_removed(Node *p_node) {
 	if (p_node == node) {

editor/spatial_editor_gizmos.cpp

@@ -65,6 +65,7 @@
 #include "scene/resources/ray_shape.h"
 #include "scene/resources/sphere_shape.h"
 #include "scene/resources/surface_tool.h"
+#include "scene/resources/navigation_mesh.h"
 
 #define HANDLE_HALF_SIZE 9.5
 

modules/navigation/godot_navigation_server.cpp

@@ -34,6 +34,8 @@
 
 #ifndef _3D_DISABLED
 #include "navigation_mesh_generator.h"
+#include "scene/resources/mesh.h"
+#include "scene/resources/navigation_mesh.h"
 #endif
 
 /**

modules/navigation/nav_map.cpp

@@ -34,6 +34,8 @@
 #include "nav_region.h"
 #include "rvo_agent.h"
 #include <algorithm>
+#include "scene/resources/mesh.h"
+#include "scene/resources/navigation_mesh.h"
 
 /**
 	@author AndreaCatania

modules/navigation/nav_region.h

@@ -36,6 +36,7 @@
 #include "nav_utils.h"
 #include "scene/3d/navigation.h"
 #include <vector>
+#include "scene/resources/navigation_mesh.h"
 
 /**
 	@author AndreaCatania

modules/navigation/navigation_mesh_editor_plugin.cpp

@@ -36,6 +36,8 @@
 #include "navigation_mesh_generator.h"
 #include "scene/3d/mesh_instance.h"
 #include "scene/gui/box_container.h"
+#include "scene/resources/mesh.h"
+#include "scene/resources/navigation_mesh.h"
 
 void NavigationMeshEditor::_node_removed(Node *p_node) {
 	if (p_node == node) {

modules/navigation/navigation_mesh_generator.cpp

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

scene/3d/navigation_mesh_instance.cpp

@@ -34,6 +34,8 @@
 #include "mesh_instance.h"
 #include "navigation.h"
 #include "servers/navigation_server.h"
+#include "scene/resources/mesh.h"
+#include "scene/resources/navigation_mesh.h"
 
 void NavigationMeshInstance::set_enabled(bool p_enabled) {
 	if (enabled == p_enabled) {

scene/3d/navigation_mesh_instance.h

@@ -32,10 +32,10 @@
 #define NAVIGATION_MESH_INSTANCE_H
 
 #include "scene/3d/spatial.h"
-#include "scene/resources/mesh.h"
-#include "scene/resources/navigation_mesh.h"
 
+class Mesh;
 class Navigation;
+class NavigationMesh;
 
 class NavigationMeshInstance : public Spatial {
 	GDCLASS(NavigationMeshInstance, Spatial);

scene/main/scene_tree.cpp

@@ -50,6 +50,7 @@
 #include "servers/physics_2d_server.h"
 #include "servers/physics_server.h"
 #include "viewport.h"
+#include "scene/3d/spatial.h"
 
 #include "modules/modules_enabled.gen.h" // For freetype.
 

servers/navigation_2d_server.cpp

@@ -33,6 +33,7 @@
 #include "core/math/transform.h"
 #include "core/math/transform_2d.h"
 #include "servers/navigation_server.h"
+#include "scene/resources/navigation_mesh.h"
 
 /**
 	@author AndreaCatania

servers/navigation_server.cpp

@@ -34,6 +34,9 @@
 
 #include "navigation_server.h"
 
+#include "scene/3d/navigation_mesh_instance.h"
+#include "scene/resources/navigation_mesh.h"
+
 NavigationServer *NavigationServer::singleton = nullptr;
 
 void NavigationServer::_bind_methods() {

servers/navigation_server.h

@@ -37,7 +37,10 @@
 
 #include "core/object.h"
 #include "core/rid.h"
-#include "scene/3d/navigation_mesh_instance.h"
+
+#include "core/reference.h"
+
+class NavigationMesh;
 
 /// This server uses the concept of internal mutability.
 /// All the constant functions can be called in multithread because internally