diff --git a/apps/DataConverter/conversiontask.h b/apps/DataConverter/conversiontask.h
index 4719803e40..5e9d4b6ce2 100644
--- a/apps/DataConverter/conversiontask.h
+++ b/apps/DataConverter/conversiontask.h
@@ -14,4 +14,4 @@ public:
 }
 }
 
-#endif
+#endif // __CONVERSIONTASK_H__
diff --git a/apps/DataConverter/milkywayconversiontask.h b/apps/DataConverter/milkywayconversiontask.h
index 3927debd90..30cf16e824 100644
--- a/apps/DataConverter/milkywayconversiontask.h
+++ b/apps/DataConverter/milkywayconversiontask.h
@@ -38,4 +38,4 @@ private:
 }
 }
 
-#endif
+#endif // __MILKYWAYCONVERSIONTASK_H__
diff --git a/apps/DataConverter/milkywaypointsconversiontask.h b/apps/DataConverter/milkywaypointsconversiontask.h
index 3b5e8abb15..795425646f 100644
--- a/apps/DataConverter/milkywaypointsconversiontask.h
+++ b/apps/DataConverter/milkywaypointsconversiontask.h
@@ -32,4 +32,4 @@ private:
 }
 }
 
-#endif
+#endif // __MILKYWAYPOINTSCONVERSIONTASK_H__
diff --git a/ext/ghoul b/ext/ghoul
index be0ffdb2f1..1e6400a9e6 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit be0ffdb2f132e5b5b7aff99c73e4a4aac1d7b0dd
+Subproject commit 1e6400a9e6d5a4e0b8d2fd656a06168b40ef0f71
diff --git a/include/openspace/engine/configurationmanager.h b/include/openspace/engine/configurationmanager.h
index ef893ce5df..ed4f0fd6b0 100644
--- a/include/openspace/engine/configurationmanager.h
+++ b/include/openspace/engine/configurationmanager.h
@@ -167,4 +167,4 @@ private:
 
 } // namespace openspace
 
-#endif  // __OPENSPACE_CORE___CONFIGURATIONMANAGER___H__
+#endif // __OPENSPACE_CORE___CONFIGURATIONMANAGER___H__
diff --git a/include/openspace/engine/openspaceengine.h b/include/openspace/engine/openspaceengine.h
index 01298c97c6..fcfc69b447 100644
--- a/include/openspace/engine/openspaceengine.h
+++ b/include/openspace/engine/openspaceengine.h
@@ -187,4 +187,4 @@ private:
 
 } // namespace openspace
 
-#endif  // __OPENSPACE_CORE___OPENSPACEENGINE___H__
+#endif // __OPENSPACE_CORE___OPENSPACEENGINE___H__
diff --git a/include/openspace/network/networkengine.h b/include/openspace/network/networkengine.h
index c603c07668..dc0a06de0d 100644
--- a/include/openspace/network/networkengine.h
+++ b/include/openspace/network/networkengine.h
@@ -22,7 +22,7 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __OPENSPACE_CORE___NETWORKENGINE___H__
+#ifndef PARALLELCONNECTION__OPENSPACE_CORE___NETWORKENGINE___H__
 #define PARALLELCONNECTION__OPENSPACE_CORE___NETWORKENGINE___H__
 
 #include <cstdint>
@@ -75,4 +75,4 @@ private:
 
 } // namespace openspace
 
-#endif // __OPENSPACE_CORE___NETWORKENGINE___H__
+#endif // PARALLELCONNECTION__OPENSPACE_CORE___NETWORKENGINE___H__
diff --git a/include/openspace/rendering/abufferrenderer.h b/include/openspace/rendering/abufferrenderer.h
index bd708f1fbf..042c0380dd 100644
--- a/include/openspace/rendering/abufferrenderer.h
+++ b/include/openspace/rendering/abufferrenderer.h
@@ -140,4 +140,4 @@ private:
 
 } // namespace openspace
 
-#endif  // __OPENSPACE_CORE___ABUFFERRENDERER___H__
+#endif // __OPENSPACE_CORE___ABUFFERRENDERER___H__
diff --git a/include/openspace/rendering/raycasterlistener.h b/include/openspace/rendering/raycasterlistener.h
index 142c8ccf49..3efa452113 100644
--- a/include/openspace/rendering/raycasterlistener.h
+++ b/include/openspace/rendering/raycasterlistener.h
@@ -36,4 +36,4 @@ public:
 
 } // openspace
 
-#endif  // __OPENSPACE_CORE___RAYCASTERLISTENER___H__
+#endif // __OPENSPACE_CORE___RAYCASTERLISTENER___H__
diff --git a/include/openspace/rendering/raycastermanager.h b/include/openspace/rendering/raycastermanager.h
index 552f0460f9..64792e48e1 100644
--- a/include/openspace/rendering/raycastermanager.h
+++ b/include/openspace/rendering/raycastermanager.h
@@ -50,4 +50,4 @@ private:
 
 } // namespace openspace
 
-#endif  // __OPENSPACE_CORE___RAYCASTERMANAGER___H__
+#endif // __OPENSPACE_CORE___RAYCASTERMANAGER___H__
diff --git a/include/openspace/rendering/volume.h b/include/openspace/rendering/volume.h
index 206715c4d9..f175a029e0 100644
--- a/include/openspace/rendering/volume.h
+++ b/include/openspace/rendering/volume.h
@@ -129,4 +129,4 @@ public:
 
 } // namespace openspace
 
-#endif  // __OPENSPACE_CORE___VOLUME___H__
+#endif // __OPENSPACE_CORE___VOLUME___H__
diff --git a/include/openspace/rendering/volumeraycaster.h b/include/openspace/rendering/volumeraycaster.h
index 72f3ca95c6..4315ebc5cc 100644
--- a/include/openspace/rendering/volumeraycaster.h
+++ b/include/openspace/rendering/volumeraycaster.h
@@ -126,4 +126,4 @@ public:
 
 } // namespace openspace
 
-#endif  // __OPENSPACE_CORE___VOLUMERAYCASTER___H__ 
+#endif // __OPENSPACE_CORE___VOLUMERAYCASTER___H__ 
diff --git a/include/openspace/util/histogram.h b/include/openspace/util/histogram.h
index 1324b08096..92e807f441 100644
--- a/include/openspace/util/histogram.h
+++ b/include/openspace/util/histogram.h
@@ -90,4 +90,4 @@ private:
 
 }  // namespace openspace
 
-#endif //__OPENSPACE_CORE___HISTOGRAM___H__
+#endif // __OPENSPACE_CORE___HISTOGRAM___H__
diff --git a/include/openspace/util/timerange.h b/include/openspace/util/timerange.h
index fb22514ea5..2bd19e9274 100644
--- a/include/openspace/util/timerange.h
+++ b/include/openspace/util/timerange.h
@@ -78,4 +78,4 @@ struct TimeRange {
 
 } // namespace openspace
 
-#endif //__OPENSPACE_CORE___TIMERANGE___H__
+#endif // __OPENSPACE_CORE___TIMERANGE___H__
diff --git a/include/openspace/util/transformationmanager.h b/include/openspace/util/transformationmanager.h
index c2b655fd5b..29d2e54f7b 100644
--- a/include/openspace/util/transformationmanager.h
+++ b/include/openspace/util/transformationmanager.h
@@ -61,4 +61,4 @@ private:
 
 } // namespace openspace
 
- #endif //__OPENSPACE_CORE___TRANSFORMATIONMANAGER___H__
+#endif // __OPENSPACE_CORE___TRANSFORMATIONMANAGER___H__
diff --git a/modules/base/rendering/modelgeometry.h b/modules/base/rendering/modelgeometry.h
index 355f9ce1fb..690e7271c3 100644
--- a/modules/base/rendering/modelgeometry.h
+++ b/modules/base/rendering/modelgeometry.h
@@ -81,4 +81,4 @@ protected:
 }  // namespace modelgeometry
 }  // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_BASE___MODELGEOMETRY___H__
+#endif // __OPENSPACE_MODULE_BASE___MODELGEOMETRY___H__
diff --git a/modules/base/rendering/renderablemodel.h b/modules/base/rendering/renderablemodel.h
index c8c066e233..c885b8dd84 100644
--- a/modules/base/rendering/renderablemodel.h
+++ b/modules/base/rendering/renderablemodel.h
@@ -87,4 +87,4 @@ private:
 
 }  // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_BASE___RENDERABLEMODEL___H__
+#endif // __OPENSPACE_MODULE_BASE___RENDERABLEMODEL___H__
diff --git a/modules/base/rendering/screenspaceframebuffer.h b/modules/base/rendering/screenspaceframebuffer.h
index 21ccd5ab09..33a04a3655 100644
--- a/modules/base/rendering/screenspaceframebuffer.h
+++ b/modules/base/rendering/screenspaceframebuffer.h
@@ -68,4 +68,4 @@ private:
 
 } //namespace openspace
 
-#endif //__OPENSPACE_MODULE_BASE___SCREENSPACEFRAMEBUFFER___H__
+#endif // __OPENSPACE_MODULE_BASE___SCREENSPACEFRAMEBUFFER___H__
diff --git a/modules/base/rendering/screenspaceimage.h b/modules/base/rendering/screenspaceimage.h
index 9ae890cac1..7316722608 100644
--- a/modules/base/rendering/screenspaceimage.h
+++ b/modules/base/rendering/screenspaceimage.h
@@ -61,6 +61,6 @@ private:
     properties::StringProperty _texturePath;
 };
 
-} //namespace openspace
+} // namespace openspace
 
-#endif //__OPENSPACE_MODULE_BASE___SCREENSPACEIMAGE___H__
+#endif // __OPENSPACE_MODULE_BASE___SCREENSPACEIMAGE___H__
diff --git a/modules/base/rendering/wavefrontgeometry.h b/modules/base/rendering/wavefrontgeometry.h
index 838149bd67..d4a315dbe1 100644
--- a/modules/base/rendering/wavefrontgeometry.h
+++ b/modules/base/rendering/wavefrontgeometry.h
@@ -48,4 +48,4 @@ namespace modelgeometry {
 }  // namespace modelgeometry
 }  // namespace openspace
 
-#endif // __WAVEFRONTOBJECT_H__
+#endif // __WAVEFRONTGEOMETRY_H__
diff --git a/modules/galaxy/rendering/galaxyraycaster.h b/modules/galaxy/rendering/galaxyraycaster.h
index b55a98df86..dcd34063e6 100644
--- a/modules/galaxy/rendering/galaxyraycaster.h
+++ b/modules/galaxy/rendering/galaxyraycaster.h
@@ -85,4 +85,4 @@ private:
 
 } // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_GALAXY___GALAXYRAYCASTER___H__
+#endif // __OPENSPACE_MODULE_GALAXY___GALAXYRAYCASTER___H__
diff --git a/modules/globebrowsing/chunk/culling.h b/modules/globebrowsing/chunk/culling.h
index 899e426040..5e0758b42d 100644
--- a/modules/globebrowsing/chunk/culling.h
+++ b/modules/globebrowsing/chunk/culling.h
@@ -85,4 +85,4 @@ public:
 } // namespace globebrowsing
 } // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_GLOBEBROWSING___CULLING___H__
+#endif // __OPENSPACE_MODULE_GLOBEBROWSING___CULLING___H__
diff --git a/modules/globebrowsing/geometry/aabb.h b/modules/globebrowsing/geometry/aabb.h
index b2310d85b7..5cc2bdf660 100644
--- a/modules/globebrowsing/geometry/aabb.h
+++ b/modules/globebrowsing/geometry/aabb.h
@@ -88,4 +88,4 @@ struct AABB3 {
 } // namespace globebrowsing   
 } // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_GLOBEBROWSING___AABB___H__
+#endif // __OPENSPACE_MODULE_GLOBEBROWSING___AABB___H__
diff --git a/modules/globebrowsing/geometry/convexhull.h b/modules/globebrowsing/geometry/convexhull.h
index 31a87f366f..048201c295 100644
--- a/modules/globebrowsing/geometry/convexhull.h
+++ b/modules/globebrowsing/geometry/convexhull.h
@@ -69,4 +69,4 @@ private:
 } // namespace globebrowsing   
 } // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_GLOBEBROWSING___CONVEX_HULL___H__
+#endif // __OPENSPACE_MODULE_GLOBEBROWSING___CONVEX_HULL___H__
diff --git a/modules/globebrowsing/globes/chunkedlodglobe.h b/modules/globebrowsing/globes/chunkedlodglobe.h
index 7a830c8ff9..965bc627d3 100644
--- a/modules/globebrowsing/globes/chunkedlodglobe.h
+++ b/modules/globebrowsing/globes/chunkedlodglobe.h
@@ -137,4 +137,4 @@ private:
 } // namespace globebrowsing
 } // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_GLOBEBROWSING___CHUNKED_LOD_GLOBE___H__
+#endif // __OPENSPACE_MODULE_GLOBEBROWSING___CHUNKED_LOD_GLOBE___H__
diff --git a/modules/globebrowsing/globes/pointglobe.h b/modules/globebrowsing/globes/pointglobe.h
index e8b24ddc19..5407f9a49e 100644
--- a/modules/globebrowsing/globes/pointglobe.h
+++ b/modules/globebrowsing/globes/pointglobe.h
@@ -59,4 +59,4 @@ private:
 } // namespace globebrowsing
 } // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_GLOBEBROWSING___POINTGLOBE___H__
+#endif // __OPENSPACE_MODULE_GLOBEBROWSING___POINTGLOBE___H__
diff --git a/modules/globebrowsing/globes/renderableglobe.h b/modules/globebrowsing/globes/renderableglobe.h
index df9e58fe0c..bd5c5b4ea3 100644
--- a/modules/globebrowsing/globes/renderableglobe.h
+++ b/modules/globebrowsing/globes/renderableglobe.h
@@ -128,4 +128,4 @@ private:
 } // namespace globebrowsing
 } // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_GLOBEBROWSING___RENDERABLEGLOBE___H__
+#endif // __OPENSPACE_MODULE_GLOBEBROWSING___RENDERABLEGLOBE___H__
diff --git a/modules/globebrowsing/other/distanceswitch.h b/modules/globebrowsing/other/distanceswitch.h
index 7a884cd5f1..ddff5a156e 100644
--- a/modules/globebrowsing/other/distanceswitch.h
+++ b/modules/globebrowsing/other/distanceswitch.h
@@ -67,4 +67,4 @@ private:
 } // namespace globebrowsing
 } // openspace
 
-#endif //__OPENSPACE_MODULE_GLOBEBROWSING___DISTANCESWITCH___H__
+#endif // __OPENSPACE_MODULE_GLOBEBROWSING___DISTANCESWITCH___H__
diff --git a/modules/globebrowsing/other/statscollector.h b/modules/globebrowsing/other/statscollector.h
index 043d2757a5..5d12d3159c 100644
--- a/modules/globebrowsing/other/statscollector.h
+++ b/modules/globebrowsing/other/statscollector.h
@@ -121,4 +121,4 @@ private:
 
 #include "statscollector.inl"
 
-#endif  // __OPENSPACE_MODULE_GLOBEBROWSING___STATS_TRACKER___H__
+#endif // __OPENSPACE_MODULE_GLOBEBROWSING___STATS_TRACKER___H__
diff --git a/modules/globebrowsing/rendering/chunkrenderer.h b/modules/globebrowsing/rendering/chunkrenderer.h
index 7a4c3ef41a..026263905f 100644
--- a/modules/globebrowsing/rendering/chunkrenderer.h
+++ b/modules/globebrowsing/rendering/chunkrenderer.h
@@ -100,4 +100,4 @@ private:
 } // namespace globebrowsing
 } // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_GLOBEBROWSING___CHUNK_RENDERER___H__
+#endif // __OPENSPACE_MODULE_GLOBEBROWSING___CHUNK_RENDERER___H__
diff --git a/modules/globebrowsing/rendering/gpulayermanager.h b/modules/globebrowsing/rendering/gpulayermanager.h
index f901118286..bc15df9bd5 100644
--- a/modules/globebrowsing/rendering/gpulayermanager.h
+++ b/modules/globebrowsing/rendering/gpulayermanager.h
@@ -317,4 +317,4 @@ private:
 } // namespace globebrowsing
 } // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_GLOBEBROWSING___GPU_LAYER_MANAGER___H__
+#endif // __OPENSPACE_MODULE_GLOBEBROWSING___GPU_LAYER_MANAGER___H__
diff --git a/modules/globebrowsing/rendering/layermanager.h b/modules/globebrowsing/rendering/layermanager.h
index 964545ee31..6ec735b455 100644
--- a/modules/globebrowsing/rendering/layermanager.h
+++ b/modules/globebrowsing/rendering/layermanager.h
@@ -129,4 +129,4 @@ private:
 } // namespace globebrowsing
 } // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_GLOBEBROWSING___LAYERMANAGER___H__
+#endif // __OPENSPACE_MODULE_GLOBEBROWSING___LAYERMANAGER___H__
diff --git a/modules/globebrowsing/rendering/layershadermanager.h b/modules/globebrowsing/rendering/layershadermanager.h
index 03b0cc1d40..12074ab1ee 100644
--- a/modules/globebrowsing/rendering/layershadermanager.h
+++ b/modules/globebrowsing/rendering/layershadermanager.h
@@ -104,4 +104,4 @@ private:
 } // namespace globebrowsing
 } // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_GLOBEBROWSING___LAYER_SHADER_MANAGER___H__
+#endif // __OPENSPACE_MODULE_GLOBEBROWSING___LAYER_SHADER_MANAGER___H__
diff --git a/modules/globebrowsing/tile/asynctilereader.h b/modules/globebrowsing/tile/asynctilereader.h
index d24f8d98b2..1e34209002 100644
--- a/modules/globebrowsing/tile/asynctilereader.h
+++ b/modules/globebrowsing/tile/asynctilereader.h
@@ -107,4 +107,4 @@ private:
 } // namespace globebrowsing
 } // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_GLOBEBROWSING___ASYNC_TILE_DATA_PROVIDER___H__
+#endif // __OPENSPACE_MODULE_GLOBEBROWSING___ASYNC_TILE_DATA_PROVIDER___H__
diff --git a/modules/globebrowsing/tile/chunktile.h b/modules/globebrowsing/tile/chunktile.h
index 071c605616..313c92965e 100644
--- a/modules/globebrowsing/tile/chunktile.h
+++ b/modules/globebrowsing/tile/chunktile.h
@@ -46,4 +46,4 @@ struct ChunkTilePile {
 } // namespace globebrowsing
 } // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_GLOBEBROWSING___CHUNKTILE___H__
+#endif // __OPENSPACE_MODULE_GLOBEBROWSING___CHUNKTILE___H__
diff --git a/modules/globebrowsing/tile/pixelregion.h b/modules/globebrowsing/tile/pixelregion.h
index e77d51b289..d364929053 100644
--- a/modules/globebrowsing/tile/pixelregion.h
+++ b/modules/globebrowsing/tile/pixelregion.h
@@ -103,4 +103,4 @@ struct PixelRegion {
 } // namespace globebrowsing
 } // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_GLOBEBROWSING___PIXELREGION___H__
+#endif // __OPENSPACE_MODULE_GLOBEBROWSING___PIXELREGION___H__
diff --git a/modules/globebrowsing/tile/tile.h b/modules/globebrowsing/tile/tile.h
index ccc2bac62a..4c2dc4f7a0 100644
--- a/modules/globebrowsing/tile/tile.h
+++ b/modules/globebrowsing/tile/tile.h
@@ -140,4 +140,4 @@ struct Tile {
 } // namespace openspace
 
 
-#endif  // __OPENSPACE_MODULE_GLOBEBROWSING___TILE___H__
+#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE___H__
diff --git a/modules/globebrowsing/tile/tiledataset.h b/modules/globebrowsing/tile/tiledataset.h
index 7fc27bff82..84a685271b 100644
--- a/modules/globebrowsing/tile/tiledataset.h
+++ b/modules/globebrowsing/tile/tiledataset.h
@@ -195,4 +195,4 @@ private:
 } // namespace globebrowsing
 } // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_DATASET___H__
+#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_DATASET___H__
diff --git a/modules/globebrowsing/tile/tiledatatype.h b/modules/globebrowsing/tile/tiledatatype.h
index 8b26bc7e19..e69fb50673 100644
--- a/modules/globebrowsing/tile/tiledatatype.h
+++ b/modules/globebrowsing/tile/tiledatatype.h
@@ -51,4 +51,4 @@ struct TileDataType {
 } // namespace globebrowsing
 } // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_DATA_TYPE___H__
+#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_DATA_TYPE___H__
diff --git a/modules/globebrowsing/tile/tilediskcache.h b/modules/globebrowsing/tile/tilediskcache.h
index 9abb901573..cacff0ab89 100644
--- a/modules/globebrowsing/tile/tilediskcache.h
+++ b/modules/globebrowsing/tile/tilediskcache.h
@@ -60,4 +60,4 @@ private:
 } // namespace globebrowsing
 } // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_DISK_CACHE___H__
+#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_DISK_CACHE___H__
diff --git a/modules/globebrowsing/tile/tileprovider/cachingtileprovider.h b/modules/globebrowsing/tile/tileprovider/cachingtileprovider.h
index cb7a6fd56a..2263b1d10e 100644
--- a/modules/globebrowsing/tile/tileprovider/cachingtileprovider.h
+++ b/modules/globebrowsing/tile/tileprovider/cachingtileprovider.h
@@ -95,4 +95,4 @@ private:
 } // namespace globebrowsing
 } // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_GLOBEBROWSING___CACHING_TILE_PROVIDER___H__
+#endif // __OPENSPACE_MODULE_GLOBEBROWSING___CACHING_TILE_PROVIDER___H__
diff --git a/modules/globebrowsing/tile/tileprovider/singleimageprovider.h b/modules/globebrowsing/tile/tileprovider/singleimageprovider.h
index 33f30635e2..e5c4b8ad7b 100644
--- a/modules/globebrowsing/tile/tileprovider/singleimageprovider.h
+++ b/modules/globebrowsing/tile/tileprovider/singleimageprovider.h
@@ -54,4 +54,4 @@ private:
 } // namespace globebrowsing
 } // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_GLOBEBROWSING___SINGLE_IMAGE_PROVIDER___H__
+#endif // __OPENSPACE_MODULE_GLOBEBROWSING___SINGLE_IMAGE_PROVIDER___H__
diff --git a/modules/globebrowsing/tile/tileprovider/temporaltileprovider.h b/modules/globebrowsing/tile/tileprovider/temporaltileprovider.h
index 09b7f64e06..7733393561 100644
--- a/modules/globebrowsing/tile/tileprovider/temporaltileprovider.h
+++ b/modules/globebrowsing/tile/tileprovider/temporaltileprovider.h
@@ -295,4 +295,4 @@ private:
 } // namespace globebrowsing
 } // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_GLOBEBROWSING___TEMPORAL_TILE_PROVIDER___H__
+#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TEMPORAL_TILE_PROVIDER___H__
diff --git a/modules/globebrowsing/tile/tileprovider/texttileprovider.h b/modules/globebrowsing/tile/tileprovider/texttileprovider.h
index 1db21fa6fa..4d952cab21 100644
--- a/modules/globebrowsing/tile/tileprovider/texttileprovider.h
+++ b/modules/globebrowsing/tile/tileprovider/texttileprovider.h
@@ -134,4 +134,4 @@ private:
 } // namespace globebrowsing
 } // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_GLOBEBROWSING___TEXT_TILE_PROVIDER___H__
+#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TEXT_TILE_PROVIDER___H__
diff --git a/modules/globebrowsing/tile/tileprovider/tileprovider.h b/modules/globebrowsing/tile/tileprovider/tileprovider.h
index 8d2e1008ff..a46bf100cd 100644
--- a/modules/globebrowsing/tile/tileprovider/tileprovider.h
+++ b/modules/globebrowsing/tile/tileprovider/tileprovider.h
@@ -146,4 +146,4 @@ using TileCache = LRUCache<TileHashKey, Tile>;
 } // namespace globebrowsing
 } // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_PROVIDER___H__
+#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_PROVIDER___H__
diff --git a/modules/globebrowsing/tile/tileprovider/tileproviderbyindex.h b/modules/globebrowsing/tile/tileprovider/tileproviderbyindex.h
index 58673ad5ee..a4d9a3bc66 100644
--- a/modules/globebrowsing/tile/tileprovider/tileproviderbyindex.h
+++ b/modules/globebrowsing/tile/tileprovider/tileproviderbyindex.h
@@ -54,4 +54,4 @@ private:
 } // namespace globebrowsing
 } // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_PROVIDER_BY_INDEX___H__
+#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_PROVIDER_BY_INDEX___H__
diff --git a/modules/globebrowsing/tile/tileprovider/tileproviderbylevel.h b/modules/globebrowsing/tile/tileprovider/tileproviderbylevel.h
index 05c9dba3b3..8419f30523 100644
--- a/modules/globebrowsing/tile/tileprovider/tileproviderbylevel.h
+++ b/modules/globebrowsing/tile/tileprovider/tileproviderbylevel.h
@@ -54,4 +54,4 @@ private:
 } // namespace globebrowsing
 } // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_PROVIDER_BY_LEVEL___H__
+#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_PROVIDER_BY_LEVEL___H__
diff --git a/modules/globebrowsing/tile/tileselector.h b/modules/globebrowsing/tile/tileselector.h
index 61f6ee2cc1..2faaa7a5a1 100644
--- a/modules/globebrowsing/tile/tileselector.h
+++ b/modules/globebrowsing/tile/tileselector.h
@@ -49,4 +49,4 @@ public:
 } // namespace globebrowsing
 } // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_SELECTOR___H__
+#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_SELECTOR___H__
diff --git a/modules/iswa/rendering/datacygnet.h b/modules/iswa/rendering/datacygnet.h
index f31cf037e3..fcd5f2389f 100644
--- a/modules/iswa/rendering/datacygnet.h
+++ b/modules/iswa/rendering/datacygnet.h
@@ -113,4 +113,4 @@ private:
 
 } //namespace openspace
 
-#endif //__OPENSPACE_MODULE_ISWA___DATACYGNET___H__
+#endif // __OPENSPACE_MODULE_ISWA___DATACYGNET___H__
diff --git a/modules/iswa/rendering/dataplane.h b/modules/iswa/rendering/dataplane.h
index 7a6b998691..149ba8f2d2 100644
--- a/modules/iswa/rendering/dataplane.h
+++ b/modules/iswa/rendering/dataplane.h
@@ -59,4 +59,4 @@ private:
 
 } // namespace openspace
 
-#endif //__OPENSPACE_MODULE_ISWA___DATAPLANE___H__
+#endif // __OPENSPACE_MODULE_ISWA___DATAPLANE___H__
diff --git a/modules/iswa/rendering/datasphere.h b/modules/iswa/rendering/datasphere.h
index f85c0da21e..57aac2fcfd 100644
--- a/modules/iswa/rendering/datasphere.h
+++ b/modules/iswa/rendering/datasphere.h
@@ -58,4 +58,4 @@ protected:
 
 } // namespace openspace 
 
-#endif //__OPENSPACE_MODULE_ISWA___DATASPHERE___H__
+#endif // __OPENSPACE_MODULE_ISWA___DATASPHERE___H__
diff --git a/modules/iswa/rendering/kameleonplane.h b/modules/iswa/rendering/kameleonplane.h
index fb8ad4016b..4b6be6c4c3 100644
--- a/modules/iswa/rendering/kameleonplane.h
+++ b/modules/iswa/rendering/kameleonplane.h
@@ -106,4 +106,4 @@ private:
  
 } // namespace openspace
 
-#endif //__OPENSPACE_MODULE_ISWA___KAMELEONPLANE___H__
+#endif // __OPENSPACE_MODULE_ISWA___KAMELEONPLANE___H__
diff --git a/modules/iswa/rendering/screenspacecygnet.h b/modules/iswa/rendering/screenspacecygnet.h
index afc52d7769..924a74fc70 100644
--- a/modules/iswa/rendering/screenspacecygnet.h
+++ b/modules/iswa/rendering/screenspacecygnet.h
@@ -56,4 +56,4 @@ private:
 
 } // namespace openspace
 
-#endif //__OPENSPACE_MODULE_ISWA___SCREENSPACECYGNET___H__
+#endif // __OPENSPACE_MODULE_ISWA___SCREENSPACECYGNET___H__
diff --git a/modules/iswa/rendering/texturecygnet.h b/modules/iswa/rendering/texturecygnet.h
index 3bba1b2df0..65351125be 100644
--- a/modules/iswa/rendering/texturecygnet.h
+++ b/modules/iswa/rendering/texturecygnet.h
@@ -58,4 +58,4 @@ private:
 };
 } //namespace openspace
 
-#endif //__OPENSPACE_MODULE_ISWA___TEXTURECYGNET___H__
+#endif // __OPENSPACE_MODULE_ISWA___TEXTURECYGNET___H__
diff --git a/modules/iswa/util/dataprocessor.h b/modules/iswa/util/dataprocessor.h
index 5bcb75bbd4..3f62a8557a 100644
--- a/modules/iswa/util/dataprocessor.h
+++ b/modules/iswa/util/dataprocessor.h
@@ -78,4 +78,4 @@ protected:
 
 } // namespace openspace
 
-#endif //__OPENSPACE_MODULE_ISWA___DATAPROCESSOR___H__
+#endif // __OPENSPACE_MODULE_ISWA___DATAPROCESSOR___H__
diff --git a/modules/iswa/util/dataprocessorjson.h b/modules/iswa/util/dataprocessorjson.h
index cec8253430..a2f1a411de 100644
--- a/modules/iswa/util/dataprocessorjson.h
+++ b/modules/iswa/util/dataprocessorjson.h
@@ -39,6 +39,6 @@ public:
     virtual std::vector<float*> processData(std::string data, properties::SelectionProperty& dataOptions, glm::size3_t& dimensions) override;
 };
  
-}// namespace openspace
+} // namespace openspace
 
-#endif __OPENSPACE_MODULE_ISWA___DATAPROCESSORJSON___H__
+#endif // __OPENSPACE_MODULE_ISWA___DATAPROCESSORJSON___H__
diff --git a/modules/iswa/util/dataprocessorkameleon.h b/modules/iswa/util/dataprocessorkameleon.h
index 891c1eba94..f7206bea11 100644
--- a/modules/iswa/util/dataprocessorkameleon.h
+++ b/modules/iswa/util/dataprocessorkameleon.h
@@ -54,4 +54,4 @@ private:
 
 } // namespace openspace
 
-#endif __OPENSPACE_MODULE_ISWA___DATAPROCESSORKAMELEON___H__
+#endif // __OPENSPACE_MODULE_ISWA___DATAPROCESSORKAMELEON___H__
diff --git a/modules/iswa/util/dataprocessortext.h b/modules/iswa/util/dataprocessortext.h
index 3ecf61c68b..6e67aee407 100644
--- a/modules/iswa/util/dataprocessortext.h
+++ b/modules/iswa/util/dataprocessortext.h
@@ -46,4 +46,4 @@ private:
 
 } // namespace openspace
 
-#endif __OPENSPACE_MODULE_ISWA___DATAPROCESSORTEXT___H__
+#endif // __OPENSPACE_MODULE_ISWA___DATAPROCESSORTEXT___H__
diff --git a/modules/iswa/util/iswamanager.h b/modules/iswa/util/iswamanager.h
index e7cc410f54..3af0a8048f 100644
--- a/modules/iswa/util/iswamanager.h
+++ b/modules/iswa/util/iswamanager.h
@@ -139,4 +139,4 @@ private:
 
 } //namespace openspace
 
-#endif //__OPENSPACE_MODULE_ISWA___ISWAMANAGER___H__
+#endif // __OPENSPACE_MODULE_ISWA___ISWAMANAGER___H__
diff --git a/modules/multiresvolume/rendering/multiresvolumeraycaster.h b/modules/multiresvolume/rendering/multiresvolumeraycaster.h
index 2309cacf98..c08a75e0c4 100644
--- a/modules/multiresvolume/rendering/multiresvolumeraycaster.h
+++ b/modules/multiresvolume/rendering/multiresvolumeraycaster.h
@@ -95,4 +95,4 @@ private:
 
 } // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_MULTIRESVOLUME___MULTIRESVOLUMERAYCASTER___H__ 
+#endif // __OPENSPACE_MODULE_MULTIRESVOLUME___MULTIRESVOLUMERAYCASTER___H__ 
diff --git a/modules/newhorizons/rendering/renderablemodelprojection.h b/modules/newhorizons/rendering/renderablemodelprojection.h
index 59211b9024..5e9fb2d47e 100644
--- a/modules/newhorizons/rendering/renderablemodelprojection.h
+++ b/modules/newhorizons/rendering/renderablemodelprojection.h
@@ -110,4 +110,4 @@ private:
 
 } // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_NEWHORIZONS___RENDERABLEMODELPROJECTION___H__
+#endif // __OPENSPACE_MODULE_NEWHORIZONS___RENDERABLEMODELPROJECTION___H__
diff --git a/modules/newhorizons/rendering/renderableplanetprojection.h b/modules/newhorizons/rendering/renderableplanetprojection.h
index c44b5a9de0..8c94c4a66b 100644
--- a/modules/newhorizons/rendering/renderableplanetprojection.h
+++ b/modules/newhorizons/rendering/renderableplanetprojection.h
@@ -103,4 +103,4 @@ private:
 
 }  // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_NEWHORIZONS___RENDERABLEPLANETPROJECTION___H__
+#endif // __OPENSPACE_MODULE_NEWHORIZONS___RENDERABLEPLANETPROJECTION___H__
diff --git a/modules/newhorizons/rendering/writeToTexture.h b/modules/newhorizons/rendering/writeToTexture.h
deleted file mode 100644
index b7b1004432..0000000000
--- a/modules/newhorizons/rendering/writeToTexture.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2017                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#ifndef __RENDERABLEPLANET_H__
-#define __RENDERABLEPLANET_H__
-
-// open space includes
-#include <openspace/rendering/renderable.h>
-
-#include <openspace/properties/stringproperty.h>
-#include <openspace/util/updatestructures.h>
-
-// ghoul includes
-#include <ghoul/opengl/programobject.h>
-#include <ghoul/opengl/texture.h>
-
-namespace openspace {
-
-namespace planetgeometry {
-class PlanetGeometry;
-}
-
-class RenderablePlanet : public Renderable {
-public:
-    RenderablePlanet(const ghoul::Dictionary& dictionary);
-    ~RenderablePlanet();
-
-    bool initialize() override;
-    bool deinitialize() override;
-
-    void render(const RenderData& data) override;
-    void update(const UpdateData& data) override;
-
-protected:
-    void loadTexture();
-
-private:
-    properties::StringProperty _colorTexturePath;
-    ghoul::opengl::ProgramObject* _programObject;
-    ghoul::opengl::Texture* _texture;
-    planetgeometry::PlanetGeometry* _geometry;
-
-    glm::dmat3 _stateMatrix;
-
-    std::string _target;
-};
-
-}  // namespace openspace
-
-#endif  // __RENDERABLEPLANET_H__
\ No newline at end of file
diff --git a/modules/newhorizons/util/hongkangparser.h b/modules/newhorizons/util/hongkangparser.h
index 8eb5169670..8a20e21faa 100644
--- a/modules/newhorizons/util/hongkangparser.h
+++ b/modules/newhorizons/util/hongkangparser.h
@@ -58,4 +58,4 @@ private:
 
 } // namespace openspace
 
-#endif //__OPENSPACE_MODULE_NEWHORIZONS___HONGKANGPARSER___H__
+#endif // __OPENSPACE_MODULE_NEWHORIZONS___HONGKANGPARSER___H__
diff --git a/modules/newhorizons/util/instrumenttimesparser.h b/modules/newhorizons/util/instrumenttimesparser.h
index 23a08b3f35..0238bb20ec 100644
--- a/modules/newhorizons/util/instrumenttimesparser.h
+++ b/modules/newhorizons/util/instrumenttimesparser.h
@@ -59,4 +59,4 @@ private:
 
 } // namespace openspace
 
-#endif //__OPENSPACE_MODULE_NEWHORIZONS___INSTRUMENTTIMESPARSER___H__
+#endif // __OPENSPACE_MODULE_NEWHORIZONS___INSTRUMENTTIMESPARSER___H__
diff --git a/modules/newhorizons/util/labelparser.h b/modules/newhorizons/util/labelparser.h
index 69c6ceaa4b..d55c555022 100644
--- a/modules/newhorizons/util/labelparser.h
+++ b/modules/newhorizons/util/labelparser.h
@@ -72,4 +72,4 @@ private:
 
 } // namespace openspace
 
-#endif //__OPENSPACE_MODULE_NEWHORIZONS___LABELPARSER___H__
+#endif // __OPENSPACE_MODULE_NEWHORIZONS___LABELPARSER___H__
diff --git a/modules/newhorizons/util/sequenceparser.h b/modules/newhorizons/util/sequenceparser.h
index 0ecd106149..974046cacb 100644
--- a/modules/newhorizons/util/sequenceparser.h
+++ b/modules/newhorizons/util/sequenceparser.h
@@ -74,4 +74,4 @@ protected:
 
 } // namespace openspace
 
-#endif //__OPENSPACE_MODULE_NEWHORIZONS___SEQUENCEPARSER___H__
+#endif // __OPENSPACE_MODULE_NEWHORIZONS___SEQUENCEPARSER___H__
diff --git a/modules/onscreengui/include/renderproperties.h b/modules/onscreengui/include/renderproperties.h
index c1ecb539f8..8f6cb2de88 100644
--- a/modules/onscreengui/include/renderproperties.h
+++ b/modules/onscreengui/include/renderproperties.h
@@ -54,4 +54,4 @@ void renderTriggerProperty(properties::Property* prop, const std::string& ownerN
 
 } // namespace openspace
 
-#endif __OPENSPACE_MODULE_ONSCREENGUI___RENDERPROPERTIES___H__
+#endif // __OPENSPACE_MODULE_ONSCREENGUI___RENDERPROPERTIES___H__
diff --git a/modules/space/rendering/planetgeometry.h b/modules/space/rendering/planetgeometry.h
index 1bb73add6c..2d735b79d4 100644
--- a/modules/space/rendering/planetgeometry.h
+++ b/modules/space/rendering/planetgeometry.h
@@ -53,4 +53,4 @@ protected:
 }  // namespace planetgeometry
 }  // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_SPACE___PLANETGEOMETRY___H__
+#endif // __OPENSPACE_MODULE_SPACE___PLANETGEOMETRY___H__
diff --git a/modules/space/rendering/renderableplanet.h b/modules/space/rendering/renderableplanet.h
index 7a83462834..9c2bd4d08a 100644
--- a/modules/space/rendering/renderableplanet.h
+++ b/modules/space/rendering/renderableplanet.h
@@ -111,6 +111,6 @@ private:
     bool tempPic;
 };
 
-}  // namespace openspace
+} // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_SPACE___RENDERABLEPLANET___H__
+#endif // __OPENSPACE_MODULE_SPACE___RENDERABLEPLANET___H__
diff --git a/modules/space/rendering/renderablestars.h b/modules/space/rendering/renderablestars.h
index bd8b7d3f80..0f79e88924 100644
--- a/modules/space/rendering/renderablestars.h
+++ b/modules/space/rendering/renderablestars.h
@@ -105,4 +105,4 @@ private:
 
 } // namespace openspace
 
-#endif  // __OPENSPACE_MODULE_SPACE___RENDERABLESTARS___H__
+#endif // __OPENSPACE_MODULE_SPACE___RENDERABLESTARS___H__
diff --git a/modules/toyvolume/rendering/toyvolumeraycaster.h b/modules/toyvolume/rendering/toyvolumeraycaster.h
index 9a8848ad55..08569987bf 100644
--- a/modules/toyvolume/rendering/toyvolumeraycaster.h
+++ b/modules/toyvolume/rendering/toyvolumeraycaster.h
@@ -77,4 +77,4 @@ private:
 
 } // openspace
 
-#endif  // __OPENSPACE_MODULE_TOYVOLUME___TOYVOLUMERAYCASTER___H__ 
+#endif // __OPENSPACE_MODULE_TOYVOLUME___TOYVOLUMERAYCASTER___H__ 
diff --git a/modules/volume/rendering/renderablevolume.h b/modules/volume/rendering/renderablevolume.h
index 1b82fa25a5..4ef03bbe72 100644
--- a/modules/volume/rendering/renderablevolume.h
+++ b/modules/volume/rendering/renderablevolume.h
@@ -60,4 +60,4 @@ private:
 
 } // namespace openspace
 
-#endif
+#endif // __RENDERABLEVOLUME_H__
diff --git a/modules/volume/rendering/renderablevolumegl.h b/modules/volume/rendering/renderablevolumegl.h
index c3d484edad..99e6efe9f3 100644
--- a/modules/volume/rendering/renderablevolumegl.h
+++ b/modules/volume/rendering/renderablevolumegl.h
@@ -83,4 +83,4 @@ private:
 
 } // namespace openspace
 
-#endif
+#endif // __RENDERABLEVOLUMEGL_H__