From f4ad2ce4c2aa021193c665ac9e2cf58c259c669c Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@me.com>
Date: Mon, 15 May 2017 15:27:38 -0400
Subject: [PATCH] More include file cleanup

---
 .../openspace/network/parallelconnection.h    |  1 +
 include/openspace/rendering/renderable.h      |  6 ++----
 include/openspace/rendering/renderengine.h    | 21 ++++++++-----------
 include/openspace/scene/scenegraphnode.h      | 20 +++++++++++-------
 modules/base/rendering/renderablemodel.cpp    |  1 +
 modules/base/rendering/renderableplane.h      |  2 ++
 modules/base/rendering/renderabletrail.cpp    |  2 ++
 modules/base/rendering/renderabletrail.h      |  2 ++
 .../base/rendering/renderabletrailorbit.cpp   |  2 ++
 .../rendering/renderabletrailtrajectory.h     |  2 ++
 .../rendering/renderabledebugplane.h          |  1 +
 .../rendering/renderablefieldlines.cpp        |  2 ++
 modules/galaxy/rendering/renderablegalaxy.cpp |  2 ++
 modules/globebrowsing/globes/pointglobe.cpp   |  2 ++
 modules/globebrowsing/globes/pointglobe.h     |  2 ++
 modules/iswa/rendering/datacygnet.cpp         |  2 ++
 modules/iswa/rendering/dataplane.cpp          |  2 ++
 modules/iswa/rendering/datasphere.cpp         |  2 ++
 modules/iswa/rendering/iswacygnet.cpp         |  2 ++
 modules/iswa/rendering/textureplane.cpp       |  1 +
 .../rendering/renderablecrawlingline.cpp      |  2 ++
 .../rendering/renderablecrawlingline.h        |  1 +
 modules/newhorizons/rendering/renderablefov.h |  1 +
 .../rendering/renderablemodelprojection.cpp   |  1 +
 .../rendering/renderableplaneprojection.cpp   |  1 +
 .../rendering/renderableplaneprojection.h     |  2 ++
 .../rendering/renderableshadowcylinder.h      |  6 +++---
 .../newhorizons/util/projectioncomponent.cpp  |  1 +
 .../onscreengui/src/guiorigincomponent.cpp    |  1 +
 modules/space/rendering/renderablerings.cpp   |  1 +
 modules/space/rendering/renderablestars.h     |  2 ++
 .../space/rendering/simplespheregeometry.cpp  |  1 +
 src/interaction/interactionmode.cpp           |  1 +
 src/rendering/renderengine.cpp                |  6 ++++++
 src/rendering/screenspacerenderable.cpp       |  2 +-
 src/scene/scenegraphnode.cpp                  | 19 ++++++++++-------
 tests/test_sceneloader.inl                    |  1 +
 37 files changed, 92 insertions(+), 34 deletions(-)

diff --git a/include/openspace/network/parallelconnection.h b/include/openspace/network/parallelconnection.h
index db3d000413..f14c871599 100644
--- a/include/openspace/network/parallelconnection.h
+++ b/include/openspace/network/parallelconnection.h
@@ -30,6 +30,7 @@
 #include <openspace/properties/propertyowner.h>
 #include <openspace/properties/stringproperty.h>
 #include <openspace/properties/numericalproperty.h>
+#include <openspace/properties/scalar/floatproperty.h>
 
 //glm includes
 #include <glm/gtx/quaternion.hpp>
diff --git a/include/openspace/rendering/renderable.h b/include/openspace/rendering/renderable.h
index aed925b2aa..b9fe5cf7a3 100644
--- a/include/openspace/rendering/renderable.h
+++ b/include/openspace/rendering/renderable.h
@@ -29,15 +29,13 @@
 
 #include <openspace/properties/scalar/boolproperty.h>
 
-#include <ghoul/opengl/programobject.h>
-
-// Forward declare to minimize dependencies
 namespace ghoul {
     namespace opengl {
+        class ProgramObject;
         class Texture;
     }
     class Dictionary;
-}
+} // namespace ghoul
 
 namespace openspace {
 
diff --git a/include/openspace/rendering/renderengine.h b/include/openspace/rendering/renderengine.h
index cb5cdb8382..2486f6426e 100644
--- a/include/openspace/rendering/renderengine.h
+++ b/include/openspace/rendering/renderengine.h
@@ -25,20 +25,13 @@
 #ifndef __OPENSPACE_CORE___RENDERENGINE___H__
 #define __OPENSPACE_CORE___RENDERENGINE___H__
 
-#include <openspace/performance/performancemanager.h>
-#include <openspace/properties/optionproperty.h>
 #include <openspace/properties/propertyowner.h>
+
+#include <openspace/properties/optionproperty.h>
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/properties/scalar/intproperty.h>
 #include <openspace/properties/triggerproperty.h>
 
-#include <openspace/rendering/raycastermanager.h>
-#include <openspace/rendering/renderer.h>
-#include <openspace/rendering/screenspacerenderable.h>
-
-#include <openspace/scripting/scriptengine.h>
-
-#include <openspace/util/syncdata.h>
 
 namespace ghoul {
 namespace fontrendering {
@@ -49,17 +42,21 @@ namespace opengl {
 }
 class Dictionary;
 class SharedMemory;
-}
+} // namespace ghoul
 
 namespace openspace {
 
-// Forward declare to minimize dependencies
+namespace performance { class PerformanceManager; }
+namespace scripting { struct LuaLibrary; }
 class Camera;
-class SyncBuffer;
+class RaycasterManager;
+class Renderer;
 class Scene;
 class SceneManager;
 class ScreenLog;
 class ScreenSpaceRenderable;
+class Syncable;
+class SyncBuffer;
 
 class RenderEngine : public properties::PropertyOwner {
 public:
diff --git a/include/openspace/scene/scenegraphnode.h b/include/openspace/scene/scenegraphnode.h
index 9298e670ae..de8d49b787 100644
--- a/include/openspace/scene/scenegraphnode.h
+++ b/include/openspace/scene/scenegraphnode.h
@@ -25,16 +25,12 @@
 #ifndef __OPENSPACE_CORE___SCENEGRAPHNODE___H__
 #define __OPENSPACE_CORE___SCENEGRAPHNODE___H__
 
-#include <openspace/rendering/renderable.h>
-#include <openspace/scene/translation.h>
-#include <openspace/scene/rotation.h>
-#include <openspace/scene/scale.h>
 #include <openspace/properties/propertyowner.h>
 
-#include <openspace/scene/scene.h>
-#include <openspace/util/updatestructures.h>
+#include <ghoul/glm.h>
+#include <ghoul/misc/boolean.h>
 
-#include <iostream>
+#include <functional>
 #include <memory>
 #include <string>
 #include <vector>
@@ -43,6 +39,16 @@ namespace ghoul { class Dictionary; }
 
 namespace openspace {
 
+class Camera;
+struct RenderData;
+class Renderable;
+struct RendererTasks;
+class Rotation;
+class Translation;
+class Scale;
+class Scene;
+struct UpdateData;
+
 namespace documentation { struct Documentation; }
 
 class SceneGraphNode : public properties::PropertyOwner {
diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp
index 8fc7f385ef..97175e9d9c 100644
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -33,6 +33,7 @@
 #include <openspace/scene/scenegraphnode.h>
 #include <openspace/util/time.h>
 #include <openspace/util/updatestructures.h>
+#include <openspace/scene/scene.h>
 
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/io/texture/texturereader.h>
diff --git a/modules/base/rendering/renderableplane.h b/modules/base/rendering/renderableplane.h
index 7b81ec0ed2..aad6a2b2e9 100644
--- a/modules/base/rendering/renderableplane.h
+++ b/modules/base/rendering/renderableplane.h
@@ -31,6 +31,8 @@
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
 
+#include <ghoul/opengl/ghoul_gl.h>
+
 namespace ghoul {
 namespace filesystem { class File; }
 
diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp
index 7124c72bb3..159dc60c61 100644
--- a/modules/base/rendering/renderabletrail.cpp
+++ b/modules/base/rendering/renderabletrail.cpp
@@ -31,6 +31,8 @@
 #include <openspace/scene/translation.h>
 #include <openspace/util/updatestructures.h>
 
+#include <ghoul/opengl/programobject.h>
+
 namespace {
     const char* KeyTranslation = "Translation";
     const char* KeyColor = "Color";
diff --git a/modules/base/rendering/renderabletrail.h b/modules/base/rendering/renderabletrail.h
index c8a73fdb10..f96f5d7bed 100644
--- a/modules/base/rendering/renderabletrail.h
+++ b/modules/base/rendering/renderabletrail.h
@@ -73,6 +73,8 @@ class Translation;
  */
 class RenderableTrail : public Renderable {
 public:
+    ~RenderableTrail() = default;
+
     bool initialize() override;
     bool deinitialize() override;
 
diff --git a/modules/base/rendering/renderabletrailorbit.cpp b/modules/base/rendering/renderabletrailorbit.cpp
index eff3ad8b42..47a723d301 100644
--- a/modules/base/rendering/renderabletrailorbit.cpp
+++ b/modules/base/rendering/renderabletrailorbit.cpp
@@ -29,6 +29,8 @@
 #include <openspace/scene/translation.h>
 #include <openspace/util/updatestructures.h>
 
+#include <ghoul/opengl/programobject.h>
+
 #include <numeric>
 
 // This class is using a VBO ring buffer + a constantly updated point as follows:
diff --git a/modules/base/rendering/renderabletrailtrajectory.h b/modules/base/rendering/renderabletrailtrajectory.h
index 2e02ee6f3a..62f600d5a4 100644
--- a/modules/base/rendering/renderabletrailtrajectory.h
+++ b/modules/base/rendering/renderabletrailtrajectory.h
@@ -32,6 +32,8 @@
 #include <openspace/properties/scalar/intproperty.h>
 #include <openspace/properties/stringproperty.h>
 
+#include <ghoul/opengl/programobject.h>
+
 namespace openspace {
 
 namespace documentation { struct Documentation; }
diff --git a/modules/debugging/rendering/renderabledebugplane.h b/modules/debugging/rendering/renderabledebugplane.h
index b007cef5dd..6a5aaafb6d 100644
--- a/modules/debugging/rendering/renderabledebugplane.h
+++ b/modules/debugging/rendering/renderabledebugplane.h
@@ -28,6 +28,7 @@
 #include <openspace/rendering/renderable.h>
 
 #include <openspace/properties/stringproperty.h>
+#include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/util/updatestructures.h>
 
 namespace ghoul {
diff --git a/modules/fieldlines/rendering/renderablefieldlines.cpp b/modules/fieldlines/rendering/renderablefieldlines.cpp
index 060701141a..9a61c48b46 100644
--- a/modules/fieldlines/rendering/renderablefieldlines.cpp
+++ b/modules/fieldlines/rendering/renderablefieldlines.cpp
@@ -28,10 +28,12 @@
 #include <openspace/util/powerscaledcoordinate.h>
 #include <modules/kameleon/include/kameleonwrapper.h>
 #include <openspace/scene/scenegraphnode.h>
+#include <openspace/util/updatestructures.h>
 
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/misc/assert.h>
+#include <ghoul/opengl/programobject.h>
 
 #include <fstream>
 
diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp
index 812dc33619..b3f8bae0df 100644
--- a/modules/galaxy/rendering/renderablegalaxy.cpp
+++ b/modules/galaxy/rendering/renderablegalaxy.cpp
@@ -41,6 +41,8 @@
 #include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureunit.h>
 
+#include <ghoul/opengl/programobject.h>
+
 #include <fstream>
 
 
diff --git a/modules/globebrowsing/globes/pointglobe.cpp b/modules/globebrowsing/globes/pointglobe.cpp
index d6a66d2160..eff28b2f52 100644
--- a/modules/globebrowsing/globes/pointglobe.cpp
+++ b/modules/globebrowsing/globes/pointglobe.cpp
@@ -31,6 +31,8 @@
 #include <openspace/rendering/renderengine.h>
 #include <openspace/util/updatestructures.h>
 
+#include <ghoul/opengl/programobject.h>
+
 namespace openspace {
 namespace globebrowsing {
 
diff --git a/modules/globebrowsing/globes/pointglobe.h b/modules/globebrowsing/globes/pointglobe.h
index b52c151821..9750444785 100644
--- a/modules/globebrowsing/globes/pointglobe.h
+++ b/modules/globebrowsing/globes/pointglobe.h
@@ -27,6 +27,8 @@
 
 #include <openspace/rendering/renderable.h>
 
+#include <ghoul/opengl/ghoul_gl.h>
+
 namespace ghoul { namespace opengl {
 class ProgramObject;
 } }
diff --git a/modules/iswa/rendering/datacygnet.cpp b/modules/iswa/rendering/datacygnet.cpp
index aebb3bedd1..b706741c1b 100644
--- a/modules/iswa/rendering/datacygnet.cpp
+++ b/modules/iswa/rendering/datacygnet.cpp
@@ -30,6 +30,8 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <modules/iswa/util/dataprocessortext.h>
 
+#include <ghoul/opengl/programobject.h>
+
 namespace {
     const std::string _loggerCat = "DataCygnet";
 }
diff --git a/modules/iswa/rendering/dataplane.cpp b/modules/iswa/rendering/dataplane.cpp
index 8df05c92a5..df06111031 100644
--- a/modules/iswa/rendering/dataplane.cpp
+++ b/modules/iswa/rendering/dataplane.cpp
@@ -25,6 +25,8 @@
 #include <modules/iswa/rendering/dataplane.h>
 #include <modules/iswa/util/dataprocessortext.h>
 
+#include <ghoul/opengl/programobject.h>
+
 namespace {
     const std::string _loggerCat = "DataPlane";
 }
diff --git a/modules/iswa/rendering/datasphere.cpp b/modules/iswa/rendering/datasphere.cpp
index 28ec37e580..a899cf36bf 100644
--- a/modules/iswa/rendering/datasphere.cpp
+++ b/modules/iswa/rendering/datasphere.cpp
@@ -26,6 +26,8 @@
 #include <openspace/util/powerscaledsphere.h>
 #include <modules/iswa/util/dataprocessorjson.h>
 
+#include <ghoul/opengl/programobject.h>
+
 #ifdef WIN32
 #define _USE_MATH_DEFINES
 #include <math.h>
diff --git a/modules/iswa/rendering/iswacygnet.cpp b/modules/iswa/rendering/iswacygnet.cpp
index 250438f4a1..491eeda6ac 100644
--- a/modules/iswa/rendering/iswacygnet.cpp
+++ b/modules/iswa/rendering/iswacygnet.cpp
@@ -31,6 +31,8 @@
 #include <openspace/util/powerscaledcoordinate.h>
 #include <openspace/util/updatestructures.h>
 
+#include <ghoul/opengl/programobject.h>
+
 namespace {
     const std::string _loggerCat = "IswaCygnet";
 }
diff --git a/modules/iswa/rendering/textureplane.cpp b/modules/iswa/rendering/textureplane.cpp
index e6106e7e38..a8cdb47310 100644
--- a/modules/iswa/rendering/textureplane.cpp
+++ b/modules/iswa/rendering/textureplane.cpp
@@ -26,6 +26,7 @@
 #include <openspace/engine/openspaceengine.h>
 #include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureunit.h>
+#include <ghoul/opengl/programobject.h>
 
 namespace {
     const std::string _loggerCat = "TexturePlane";
diff --git a/modules/newhorizons/rendering/renderablecrawlingline.cpp b/modules/newhorizons/rendering/renderablecrawlingline.cpp
index 14fed21b53..9b26b94903 100644
--- a/modules/newhorizons/rendering/renderablecrawlingline.cpp
+++ b/modules/newhorizons/rendering/renderablecrawlingline.cpp
@@ -32,6 +32,8 @@
 #include <openspace/util/spicemanager.h>
 #include <openspace/util/updatestructures.h>
 
+#include <ghoul/opengl/programobject.h>
+
 #include <ghoul/glm.h>
 
 namespace {
diff --git a/modules/newhorizons/rendering/renderablecrawlingline.h b/modules/newhorizons/rendering/renderablecrawlingline.h
index 1f350834e5..c31b2981c7 100644
--- a/modules/newhorizons/rendering/renderablecrawlingline.h
+++ b/modules/newhorizons/rendering/renderablecrawlingline.h
@@ -28,6 +28,7 @@
 #include <openspace/rendering/renderable.h>
 
 #include <ghoul/glm.h>
+#include <ghoul/opengl/ghoul_gl.h>
 
 namespace openspace {
 
diff --git a/modules/newhorizons/rendering/renderablefov.h b/modules/newhorizons/rendering/renderablefov.h
index fbcda8be87..29e8ce3cde 100644
--- a/modules/newhorizons/rendering/renderablefov.h
+++ b/modules/newhorizons/rendering/renderablefov.h
@@ -34,6 +34,7 @@
 #include <openspace/util/spicemanager.h>
 
 #include <ghoul/glm.h>
+#include <ghoul/opengl/ghoul_gl.h>
 
 namespace ghoul {
 namespace opengl {
diff --git a/modules/newhorizons/rendering/renderablemodelprojection.cpp b/modules/newhorizons/rendering/renderablemodelprojection.cpp
index 20900c9790..150ddafd6e 100644
--- a/modules/newhorizons/rendering/renderablemodelprojection.cpp
+++ b/modules/newhorizons/rendering/renderablemodelprojection.cpp
@@ -31,6 +31,7 @@
 #include <openspace/engine/openspaceengine.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/scene/scenegraphnode.h>
+#include <openspace/scene/scene.h>
 #include <openspace/util/spicemanager.h>
 #include <openspace/util/time.h>
 #include <openspace/util/updatestructures.h>
diff --git a/modules/newhorizons/rendering/renderableplaneprojection.cpp b/modules/newhorizons/rendering/renderableplaneprojection.cpp
index 5c9dd95685..a9a3917f3b 100644
--- a/modules/newhorizons/rendering/renderableplaneprojection.cpp
+++ b/modules/newhorizons/rendering/renderableplaneprojection.cpp
@@ -30,6 +30,7 @@
 #include <openspace/engine/configurationmanager.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/scene/scenegraphnode.h>
+#include <openspace/scene/scene.h>
 #include <openspace/util/spicemanager.h>
 #include <openspace/util/updatestructures.h>
 
diff --git a/modules/newhorizons/rendering/renderableplaneprojection.h b/modules/newhorizons/rendering/renderableplaneprojection.h
index d1963b18e6..310833b9e8 100644
--- a/modules/newhorizons/rendering/renderableplaneprojection.h
+++ b/modules/newhorizons/rendering/renderableplaneprojection.h
@@ -27,6 +27,8 @@
 
 #include <openspace/rendering/renderable.h>
 
+#include <ghoul/opengl/ghoul_gl.h>
+
 #include <memory>
 
 namespace ghoul {
diff --git a/modules/newhorizons/rendering/renderableshadowcylinder.h b/modules/newhorizons/rendering/renderableshadowcylinder.h
index 9e214a3581..394680c48f 100644
--- a/modules/newhorizons/rendering/renderableshadowcylinder.h
+++ b/modules/newhorizons/rendering/renderableshadowcylinder.h
@@ -33,10 +33,10 @@
 
 #include <openspace/util/spicemanager.h>
 
+#include <ghoul/opengl/ghoul_gl.h>
+
 namespace ghoul {
-namespace opengl {
-class ProgramObject;
-}
+namespace opengl { class ProgramObject; }
 }
 
 namespace openspace {
diff --git a/modules/newhorizons/util/projectioncomponent.cpp b/modules/newhorizons/util/projectioncomponent.cpp
index 68d4fb1313..676c071a0a 100644
--- a/modules/newhorizons/util/projectioncomponent.cpp
+++ b/modules/newhorizons/util/projectioncomponent.cpp
@@ -36,6 +36,7 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/io/texture/texturereader.h>
 #include <ghoul/misc/dictionary.h>
+#include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/framebufferobject.h>
 #include <ghoul/opengl/textureconversion.h>
 #include <ghoul/opengl/textureunit.h>
diff --git a/modules/onscreengui/src/guiorigincomponent.cpp b/modules/onscreengui/src/guiorigincomponent.cpp
index 80032549bc..7c732583a8 100644
--- a/modules/onscreengui/src/guiorigincomponent.cpp
+++ b/modules/onscreengui/src/guiorigincomponent.cpp
@@ -28,6 +28,7 @@
 #include <openspace/interaction/interactionhandler.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/scene/scenegraphnode.h>
+#include <openspace/scene/scene.h>
 
 #include <ghoul/misc/assert.h>
 
diff --git a/modules/space/rendering/renderablerings.cpp b/modules/space/rendering/renderablerings.cpp
index ac5d88e822..b77287111d 100644
--- a/modules/space/rendering/renderablerings.cpp
+++ b/modules/space/rendering/renderablerings.cpp
@@ -29,6 +29,7 @@
 #include <openspace/engine/openspaceengine.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/scene/scenegraphnode.h>
+#include <openspace/scene/scene.h>
 
 #include <ghoul/filesystem/filesystem>
 #include <ghoul/io/texture/texturereader.h>
diff --git a/modules/space/rendering/renderablestars.h b/modules/space/rendering/renderablestars.h
index d453255eb1..896b2fafc4 100644
--- a/modules/space/rendering/renderablestars.h
+++ b/modules/space/rendering/renderablestars.h
@@ -31,6 +31,8 @@
 #include <openspace/properties/optionproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
 
+#include <ghoul/opengl/ghoul_gl.h>
+
 namespace ghoul {
 namespace filesystem { class File; }
 namespace opengl {
diff --git a/modules/space/rendering/simplespheregeometry.cpp b/modules/space/rendering/simplespheregeometry.cpp
index 4b4eef96ec..93c29c4d14 100644
--- a/modules/space/rendering/simplespheregeometry.cpp
+++ b/modules/space/rendering/simplespheregeometry.cpp
@@ -25,6 +25,7 @@
 #include <modules/space/rendering/simplespheregeometry.h>
 #include <openspace/util/powerscaledsphere.h>
 #include <openspace/scene/scenegraphnode.h>
+#include <openspace/rendering/renderable.h>
 
 namespace {
     const std::string _loggerCat = "SimpleSphereGeometry";
diff --git a/src/interaction/interactionmode.cpp b/src/interaction/interactionmode.cpp
index c8f2c333f2..42992093a1 100644
--- a/src/interaction/interactionmode.cpp
+++ b/src/interaction/interactionmode.cpp
@@ -29,6 +29,7 @@
 #include <openspace/query/query.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/scene/scenegraphnode.h>
+#include <openspace/scene/scene.h>
 #include <openspace/util/time.h>
 #include <openspace/util/keys.h>
 
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index 27b05ed8e9..d78da44f53 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -27,6 +27,7 @@
 #ifdef OPENSPACE_MODULE_NEWHORIZONS_ENABLED
 #include <modules/newhorizons/util/imagesequencer.h>
 #endif
+#include <openspace/util/syncdata.h>
 
 #include <openspace/engine/configurationmanager.h>
 #include <openspace/engine/openspaceengine.h>
@@ -38,11 +39,16 @@
 #include <openspace/rendering/framebufferrenderer.h>
 #include <openspace/rendering/raycastermanager.h>
 #include <openspace/scene/scene.h>
+#include <openspace/performance/performancemanager.h>
+#include <openspace/rendering/renderer.h>
 
 #include <openspace/util/camera.h>
 #include <openspace/util/time.h>
 #include <openspace/util/screenlog.h>
 #include <openspace/util/spicemanager.h>
+#include <openspace/rendering/raycastermanager.h>
+#include <openspace/rendering/screenspacerenderable.h>
+#include <openspace/scripting/scriptengine.h>
 
 #include <ghoul/glm.h>
 #include <ghoul/font/font.h>
diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp
index f04461bf0b..0b03377d3c 100644
--- a/src/rendering/screenspacerenderable.cpp
+++ b/src/rendering/screenspacerenderable.cpp
@@ -31,7 +31,7 @@
 #include <openspace/rendering/renderengine.h>
 #include <openspace/util/camera.h>
 #include <openspace/util/factorymanager.h>
-
+#include <openspace/scripting/scriptengine.h>
 
 #ifdef WIN32
 #define _USE_MATH_DEFINES
diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp
index 4362054249..79baf099e8 100644
--- a/src/scene/scenegraphnode.cpp
+++ b/src/scene/scenegraphnode.cpp
@@ -24,9 +24,21 @@
 
 #include <openspace/scene/scenegraphnode.h>
 
+#include <modules/base/translation/statictranslation.h>
+#include <modules/base/rotation/staticrotation.h>
+#include <modules/base/scale/staticscale.h>
+
+#include <openspace/engine/openspaceengine.h>
 #include <openspace/query/query.h>
+#include <openspace/rendering/renderable.h>
+#include <openspace/scene/rotation.h>
+#include <openspace/scene/scale.h>
+#include <openspace/scene/scene.h>
+#include <openspace/scene/translation.h>
+#include <openspace/util/factorymanager.h>
 #include <openspace/util/spicemanager.h>
 #include <openspace/util/time.h>
+#include <openspace/util/updatestructures.h>
 
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/logging/consolelog.h>
@@ -36,13 +48,6 @@
 #include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/shaderobject.h>
 
-#include <modules/base/translation/statictranslation.h>
-#include <modules/base/rotation/staticrotation.h>
-#include <modules/base/scale/staticscale.h>
-
-#include <openspace/engine/openspaceengine.h>
-#include <openspace/util/factorymanager.h>
-
 #include <cctype>
 #include <chrono>
 
diff --git a/tests/test_sceneloader.inl b/tests/test_sceneloader.inl
index 8291958824..04c3a0fb32 100644
--- a/tests/test_sceneloader.inl
+++ b/tests/test_sceneloader.inl
@@ -28,6 +28,7 @@
 #include <openspace/scene/scenegraphnode.h>
 #include <openspace/documentation/documentation.h>
 #include <ghoul/misc/dictionaryluaformatter.h>
+#include <openspace/scene/scene.h>
 
 #include <ghoul/lua/lua_helper.h>
 #include <fstream>