diff --git a/include/openspace/network/parallelconnection.h b/include/openspace/network/parallelconnection.h
index caa9b3bdfb..f377ab0457 100644
--- a/include/openspace/network/parallelconnection.h
+++ b/include/openspace/network/parallelconnection.h
@@ -47,8 +47,8 @@
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #endif
-#include <windows.h>
 #include <winsock2.h>
+#include <windows.h>
 #include <ws2tcpip.h>
 #endif
 
diff --git a/include/openspace/util/camera.h b/include/openspace/util/camera.h
index bf15d1492b..ce80f10dbe 100644
--- a/include/openspace/util/camera.h
+++ b/include/openspace/util/camera.h
@@ -29,7 +29,7 @@
 
 // open space includes
 #include <openspace/util/powerscaledcoordinate.h>
-#include <openspace/util/syncbuffer.h>
+//#include <openspace/util/syncbuffer.h>
 #include <openspace/rendering/renderengine.h>
 
 // glm includes
@@ -39,6 +39,8 @@
 #include <glm/gtc/quaternion.hpp>
 
 namespace openspace {
+    class SyncBuffer;
+
     /**
     This class still needs some more love. Suggested improvements:
     - Remove psc from the camera class interface.
diff --git a/include/openspace/util/powerscaledscalar.h b/include/openspace/util/powerscaledscalar.h
index 531819b88c..106070a8a1 100644
--- a/include/openspace/util/powerscaledscalar.h
+++ b/include/openspace/util/powerscaledscalar.h
@@ -42,9 +42,9 @@ public:
     PowerScaledScalar(float f1, float f2);
     static PowerScaledScalar CreatePSS(double d1);
 
-	const glm::vec2& vec2() const;
-	float lengthf() const;
-	double lengthd() const;
+    const glm::vec2& vec2() const;
+    float lengthf() const;
+    double lengthd() const;
 
 
     // operator overloading
diff --git a/include/openspace/util/syncbuffer.h b/include/openspace/util/syncbuffer.h
index 6e9b0e6701..dcff2e7435 100644
--- a/include/openspace/util/syncbuffer.h
+++ b/include/openspace/util/syncbuffer.h
@@ -27,6 +27,7 @@
 
 #include <vector>
 #include <ghoul/opengl/ghoul_gl.h>
+
 #include <sgct.h>
 #include <stdint.h>