From f26667ec852bd091b91523630f9c7412749a3b13 Mon Sep 17 00:00:00 2001
From: Elderme <talsi.elderme@gmail.com>
Date: Sat, 6 Feb 2016 23:38:15 +0100
Subject: [PATCH] Removed unnessary #include in header files

---
 src/graphics/draw_calls.cpp            |  5 +++++
 src/graphics/draw_calls.hpp            | 10 +++-------
 src/graphics/shader_based_renderer.cpp |  3 +++
 src/graphics/shader_based_renderer.hpp |  5 ++---
 src/graphics/stk_scene_manager.cpp     | 26 ++------------------------
 src/graphics/stk_scene_manager.hpp     | 12 +++++-------
 6 files changed, 20 insertions(+), 41 deletions(-)

diff --git a/src/graphics/draw_calls.cpp b/src/graphics/draw_calls.cpp
index 12309c846..e12f47d8b 100644
--- a/src/graphics/draw_calls.cpp
+++ b/src/graphics/draw_calls.cpp
@@ -16,8 +16,13 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "graphics/draw_calls.hpp"
+#include "graphics/draw_tools.hpp"
+#include "graphics/gpu_particles.hpp"
 #include "graphics/lod_node.hpp"
 #include "graphics/materials.hpp"
+#include "graphics/shadow_matrices.hpp"
+#include "graphics/stk_billboard.hpp"
+#include "graphics/stk_mesh.hpp"
 #include "graphics/stk_mesh_scene_node.hpp"
 #include "graphics/stk_scene_manager.hpp"
 #include "graphics/vao_manager.hpp"
diff --git a/src/graphics/draw_calls.hpp b/src/graphics/draw_calls.hpp
index 31743b786..1b46702e1 100644
--- a/src/graphics/draw_calls.hpp
+++ b/src/graphics/draw_calls.hpp
@@ -19,20 +19,16 @@
 #define HEADER_DRAW_CALLS_HPP
 
 #include "graphics/command_buffer.hpp"
-#include "graphics/draw_tools.hpp"
-#include "graphics/gpu_particles.hpp"
-#include "graphics/shadow_matrices.hpp"
-#include "graphics/stk_billboard.hpp"
-#include "graphics/stk_mesh.hpp"
 #include <irrlicht.h>
-
 #include <unordered_map>
 
+class ParticleSystemProxy;
+class STKBillboard;
 
 class DrawCalls
 {  
 private:
-    std::vector <STKMeshCommon *>         m_deferred_update;
+    std::vector<STKMeshCommon *>          m_deferred_update;
     irr::core::vector3df                  m_wind_dir;
     GLsync                                m_sync = 0;
     
diff --git a/src/graphics/shader_based_renderer.cpp b/src/graphics/shader_based_renderer.cpp
index d514b2eca..525447bf4 100644
--- a/src/graphics/shader_based_renderer.cpp
+++ b/src/graphics/shader_based_renderer.cpp
@@ -18,12 +18,15 @@
 #include "graphics/shader_based_renderer.hpp"
 
 #include "graphics/central_settings.hpp"
+#include "graphics/draw_policies.hpp"
+#include "graphics/geometry_passes.hpp"
 #include "graphics/glwrap.hpp"
 #include "graphics/graphics_restrictions.hpp"
 #include "graphics/lod_node.hpp"
 #include "graphics/post_processing.hpp"
 #include "graphics/render_target.hpp"
 #include "graphics/shaders.hpp"
+#include "graphics/skybox.hpp"
 #include "graphics/stk_scene_manager.hpp"
 #include "graphics/texture_manager.hpp"
 #include "items/item_manager.hpp"
diff --git a/src/graphics/shader_based_renderer.hpp b/src/graphics/shader_based_renderer.hpp
index e31b24e12..cc2fdba7e 100644
--- a/src/graphics/shader_based_renderer.hpp
+++ b/src/graphics/shader_based_renderer.hpp
@@ -20,17 +20,16 @@
 
 #include "graphics/abstract_renderer.hpp"
 #include "graphics/draw_calls.hpp"
-#include "graphics/draw_policies.hpp"
-#include "graphics/geometry_passes.hpp"
 #include "graphics/lighting_passes.hpp"
 #include "graphics/shadow_matrices.hpp"
-#include "graphics/skybox.hpp"
 #include <map>
 #include <string>
 
+class AbstractGeometryPasses;
 class GL3RenderTarget;
 class RenderTarget;
 class RTT;
+class Skybox;
 class PostProcessing;
 
 class ShaderBasedRenderer: public AbstractRenderer
diff --git a/src/graphics/stk_scene_manager.cpp b/src/graphics/stk_scene_manager.cpp
index 4d0e994ab..a39ce4ada 100644
--- a/src/graphics/stk_scene_manager.cpp
+++ b/src/graphics/stk_scene_manager.cpp
@@ -16,32 +16,10 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "graphics/stk_scene_manager.hpp"
-
-#include "graphics/callbacks.hpp"
-#include "graphics/central_settings.hpp"
-#include "graphics/glwrap.hpp"
-#include "graphics/irr_driver.hpp"
-#include "graphics/lod_node.hpp"
-#include "graphics/shadow_matrices.hpp"
-#include "graphics/stk_animated_mesh.hpp"
-#include "graphics/stk_mesh.hpp"
-#include "graphics/stk_mesh_scene_node.hpp"
-#include "modes/world.hpp"
-#include "tracks/track.hpp"
-#include "utils/cpp2011.hpp"
-#include "utils/profiler.hpp"
-#include "utils/ptr_vector.hpp"
-#include "utils/time.hpp"
-
-#include <ICameraSceneNode.h>
-#include <ISceneManager.h>
-#include <ISceneNode.h>
 #include <SViewFrustum.h>
+#include <vector>
 
-#include <unordered_map>
-#include <SViewFrustum.h>
-#include <functional>
-
+using namespace irr;
 
 // From irrlicht code
 static
diff --git a/src/graphics/stk_scene_manager.hpp b/src/graphics/stk_scene_manager.hpp
index 806ae4813..aae792da0 100644
--- a/src/graphics/stk_scene_manager.hpp
+++ b/src/graphics/stk_scene_manager.hpp
@@ -22,14 +22,12 @@
 #ifndef HEADER_STKSCENEMANAGER_HPP
 #define HEADER_STKSCENEMANAGER_HPP
 
-#include "graphics/central_settings.hpp"
-#include "graphics/gl_headers.hpp"
-#include "graphics/gpu_particles.hpp"
-#include "graphics/stk_billboard.hpp"
-#include "graphics/stk_mesh.hpp"
+#include <ICameraSceneNode.h>
+#include <ISceneNode.h>
+#include <vector3d.h>
 
-void addEdge(const core::vector3df &P0, const core::vector3df &P1);
+void addEdge(const irr::core::vector3df &P0, const irr::core::vector3df &P1);
 
-bool isCulledPrecise(const scene::ICameraSceneNode *cam, const scene::ISceneNode *node);
+bool isCulledPrecise(const irr::scene::ICameraSceneNode *cam, const irr::scene::ISceneNode *node);
 
 #endif