diff --git a/ext/ghoul b/ext/ghoul
index 68c53264aa..dee11fd362 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 68c53264aaf05e1fc9526a857ac38db2d620557e
+Subproject commit dee11fd362a8aea1cbd1621449d0b8f770c20dec
diff --git a/include/openspace/engine/openspaceengine.h b/include/openspace/engine/openspaceengine.h
index 1555a2694e..d15766f2ff 100644
--- a/include/openspace/engine/openspaceengine.h
+++ b/include/openspace/engine/openspaceengine.h
@@ -25,12 +25,6 @@
 #ifndef __OPENSPACEENGINE_H__
 #define __OPENSPACEENGINE_H__
 
-#include <ghoul/logging/logmanager.h>
-
-// sgct header has to be included before all others due to Windows header
-#define SGCT_WINDOWS_INCLUDE
-#include <sgct.h>
-
 #include <openspace/interaction/interactionhandler.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/engine/configurationmanager.h>
@@ -74,7 +68,6 @@ public:
     void mousePositionCallback(int x, int y);
     void mouseScrollWheelCallback(int pos);
 	void externalControlCallback(const char* receivedChars, int size, int clientId);
-
     void encode();
     void decode();
 
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index a020a0e972..ea0284ae32 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -24,6 +24,10 @@
 
 #include <openspace/engine/openspaceengine.h>
 
+// sgct header has to be included before all others due to Windows header
+#define SGCT_WINDOWS_INCLUDE
+#include <sgct.h>
+
 #include <openspace/interaction/deviceidentifier.h>
 #include <openspace/interaction/interactionhandler.h>
 #include <openspace/interaction/luaconsole.h>
@@ -421,22 +425,7 @@ void OpenSpaceEngine::postDraw() {
     if (sgct::Engine::instance()->isMaster())
         _interactionHandler.unlockControls();
 
-#ifdef OPENSPACE_VIDEO_EXPORT
-    float speed = 0.01;
-    glm::vec3 euler(0.0, speed, 0.0);
-    glm::quat rot = glm::quat(euler);
-    glm::vec3 euler2(0.0, -speed, 0.0);
-    glm::quat rot2 = glm::quat(euler2);
-    _interactionHandler->orbit(rot);
-    _interactionHandler->rotate(rot2);
-	if(_doVideoExport)
-		_renderEngine.takeScreenshot();
-#endif
 	_renderEngine.postDraw();
-
-#ifdef FLARE_ONLY
-    _flare->postDraw();
-#endif
 }
 
 void OpenSpaceEngine::keyboardCallback(int key, int action) {
diff --git a/src/interaction/interactionhandler.cpp b/src/interaction/interactionhandler.cpp
index 6d08d3762b..9e183eecd4 100644
--- a/src/interaction/interactionhandler.cpp
+++ b/src/interaction/interactionhandler.cpp
@@ -23,8 +23,11 @@
  ****************************************************************************************/
 
 // open space includes
-#include <ghoul/logging/logmanager.h>
 #include <openspace/interaction/interactionhandler.h>
+
+#include <ghoul/logging/logmanager.h>
+#include <sgct.h>
+
 #include <openspace/interaction/deviceidentifier.h>
 #include <openspace/interaction/externalcontrol/randomexternalcontrol.h>
 #include <openspace/interaction/externalcontrol/joystickexternalcontrol.h>
diff --git a/src/rendering/renderabletrail.cpp b/src/rendering/renderabletrail.cpp
index dfa3deb649..bfa2203f85 100644
--- a/src/rendering/renderabletrail.cpp
+++ b/src/rendering/renderabletrail.cpp
@@ -22,6 +22,8 @@
 * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
 ****************************************************************************************/
 #include <openspace/rendering/renderabletrail.h>
+
+#include <sgct.h>
 #include <openspace/engine/openspaceengine.h>
 #include <openspace/util/constants.h>