Various cleanup

Add script that counts the number of includes

include/openspace/properties/property.h

@@ -314,10 +314,10 @@ public:
      * Property::ViewOptions::PowerScaledCoordinate = <code>powerScaledCoordinate</code>.
      */
     struct ViewOptions {
-        static const std::string Color;
-        static const std::string LightPosition;
-        static const std::string PowerScaledScalar;
-        static const std::string PowerScaledCoordinate;
+        static const char* Color;
+        static const char* LightPosition;
+        static const char* PowerScaledScalar;
+        static const char* PowerScaledCoordinate;
     };
 
     /**
@@ -329,10 +329,10 @@ public:
     const ghoul::Dictionary& metaData() const;
 
 protected:
-    static const std::string IdentifierKey;
-    static const std::string NameKey;
-    static const std::string TypeKey;
-    static const std::string MetaDataKey;
+    static const char* IdentifierKey;
+    static const char* NameKey;
+    static const char* TypeKey;
+    static const char* MetaDataKey;
 
     /**
      * Creates the information that is general to every Property and adds the

include/openspace/properties/propertyowner.h

@@ -25,7 +25,6 @@
 #ifndef __OPENSPACE_CORE___PROPERTYOWNER___H__
 #define __OPENSPACE_CORE___PROPERTYOWNER___H__
 
-#include <openspace/properties/property.h>
 #include <map>
 #include <string>
 #include <vector>
@@ -33,6 +32,8 @@
 namespace openspace {
 namespace properties {
 
+class Property;
+
 /**
  * A PropertyOwner can own Propertys or other PropertyOwner and provide access to both in
  * a unified way. The <code>identifier</code>s and <code>name</code>s of Propertys and

include/openspace/rendering/abufferrenderer.h

@@ -43,14 +43,14 @@
 
 namespace ghoul {
     
-    namespace filesystem {
-        class File;
-    }
-    namespace opengl {
-        class ProgramObject;
-        class Texture;
-    }
-}
+namespace filesystem { class File; }
+
+namespace opengl {
+    class ProgramObject;
+    class Texture;
+} // namepsace opengl
+
+} // namespace ghoul
 
 namespace openspace {