diff --git a/modules/kameleonvolume/rendering/kameleonvolumeraycaster.cpp b/modules/kameleonvolume/rendering/kameleonvolumeraycaster.cpp
index aaa7c86539..5667f73ac9 100644
--- a/modules/kameleonvolume/rendering/kameleonvolumeraycaster.cpp
+++ b/modules/kameleonvolume/rendering/kameleonvolumeraycaster.cpp
@@ -28,6 +28,7 @@
 #include <ghoul/opengl/ghoul_gl.h>
 #include <sstream>
 #include <ghoul/opengl/programobject.h>
+#include <ghoul/opengl/textureunit.h>
 #include <openspace/util/powerscaledcoordinate.h>
 #include <openspace/util/updatestructures.h>
 #include <openspace/rendering/renderable.h>
diff --git a/modules/kameleonvolume/rendering/kameleonvolumeraycaster.h b/modules/kameleonvolume/rendering/kameleonvolumeraycaster.h
index e007676a35..1892736d01 100644
--- a/modules/kameleonvolume/rendering/kameleonvolumeraycaster.h
+++ b/modules/kameleonvolume/rendering/kameleonvolumeraycaster.h
@@ -45,6 +45,7 @@ namespace ghoul {
     namespace opengl {
         class Texture;
         class ProgramObject;
+        class TextureUnit;
     }
 }
 
diff --git a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
index cfeb9ac169..3ec80484d6 100644
--- a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
+++ b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
@@ -58,7 +58,7 @@ RenderableKameleonVolume::RenderableKameleonVolume(const ghoul::Dictionary& dict
     , _lowerValueBound("lowerValueBound", "Lower Value Bound", 0.0, 0.0, 1)
     , _upperValueBound("upperValueBound", "Upper Value Bound", 1, 0.01, 1)
     , _autoValueBounds(false)
-    , _gridType("gridType", "Grid Type", properties::OptionProperty::DisplayType::DROPDOWN)
+    , _gridType("gridType", "Grid Type", properties::OptionProperty::DisplayType::Dropdown)
     , _autoGridType(false)
     , _clipPlanes(nullptr)
     , _stepSize("stepSize", "Step Size", 0.02, 0.01, 1)
diff --git a/modules/kameleonvolume/rendering/renderablekameleonvolume.h b/modules/kameleonvolume/rendering/renderablekameleonvolume.h
index d5f2cba378..cddb542942 100644
--- a/modules/kameleonvolume/rendering/renderablekameleonvolume.h
+++ b/modules/kameleonvolume/rendering/renderablekameleonvolume.h
@@ -27,6 +27,7 @@
 
 #include <openspace/properties/vectorproperty.h>
 #include <openspace/properties/optionproperty.h>
+#include <openspace/properties/stringproperty.h>
 #include <openspace/util/boxgeometry.h>
 #include <openspace/util/blockplaneintersectiongeometry.h>
 
diff --git a/modules/volume/CMakeLists.txt b/modules/volume/CMakeLists.txt
index 83dff7d4ea..11da446b0e 100644
--- a/modules/volume/CMakeLists.txt
+++ b/modules/volume/CMakeLists.txt
@@ -35,6 +35,7 @@ set(HEADER_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/textureslicevolumereader.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/lrucache.h
     ${CMAKE_CURRENT_SOURCE_DIR}/linearlrucache.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/volumegridtype.h
     ${CMAKE_CURRENT_SOURCE_DIR}/volumesampler.h
     ${CMAKE_CURRENT_SOURCE_DIR}/volumesampler.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/volumeutils.h
diff --git a/modules/volume/volumegridtype.h b/modules/volume/volumegridtype.h
index 6ff5027861..b7768cec6e 100644
--- a/modules/volume/volumegridtype.h
+++ b/modules/volume/volumegridtype.h
@@ -22,8 +22,8 @@
 * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
 ****************************************************************************************/
 
-#ifndef __VOLUMEGRIDTYPE_H__
-#define __VOLUMEGRIDTYPE_H__
+#ifndef __OPENSPACE_MODULE_VOLUME___VOLUMEGRIDTYPE_H__
+#define __OPENSPACE_MODULE_VOLUME___VOLUMEGRIDTYPE_H__
 
 enum class VolumeGridType : int {
     Cartesian = 0,