diff --git a/include/lvr2/types/ByteEncoding.hpp b/include/lvr2/types/ByteEncoding.hpp
index 072b7ac63..d78f1756b 100644
--- a/include/lvr2/types/ByteEncoding.hpp
+++ b/include/lvr2/types/ByteEncoding.hpp
@@ -1,6 +1,9 @@
 #ifndef LVR2_TYPES_BYTE_ENCODING_HPP
 #define LVR2_TYPES_BYTE_ENCODING_HPP
 
+#include <boost/shared_array.hpp>
+#include <boost/optional.hpp>
+
 namespace lvr2 {
 
 /**
diff --git a/include/lvr2/types/ColorTypes.hpp b/include/lvr2/types/ColorTypes.hpp
index ca141e60f..3653b6387 100644
--- a/include/lvr2/types/ColorTypes.hpp
+++ b/include/lvr2/types/ColorTypes.hpp
@@ -1,6 +1,7 @@
-#ifndef COLORTYPES
-#define COLORTYPES
+#ifndef LVR2_TYPES_COLORTYPES_HPP
+#define LVR2_TYPES_COLORTYPES_HPP
 
+#include <cstdint>
 #include <array>
 
 namespace lvr2
@@ -11,4 +12,4 @@ using RGBFColor = std::array<float, 3>;
 
 } // namespace lvr2
 
-#endif // COLORTYPES
+#endif // LVR2_TYPES_COLORTYPES_HPP
diff --git a/include/lvr2/types/DistortionModels.hpp b/include/lvr2/types/DistortionModels.hpp
index 6d1a456c5..46e509abe 100644
--- a/include/lvr2/types/DistortionModels.hpp
+++ b/include/lvr2/types/DistortionModels.hpp
@@ -2,6 +2,9 @@
 /// @author Justus Braun (jubraun@uos.de)
 /// @brief This file contains distortion models which model lens distortion of real cameras.
 #pragma once
+#ifndef LVR2_TYPES_DISTORTION_MODELS_HPP
+#define LVR2_TYPES_DISTORTION_MODELS_HPP
+
 #include <lvr2/types/MatrixTypes.hpp>
 
 namespace lvr2
@@ -172,4 +175,6 @@ struct OpenCVDistortion: DistortionModelInterface
 
 } // namespace lvr2
 
-#include "DistortionModels.tcc"
\ No newline at end of file
+#include "DistortionModels.tcc"
+
+#endif // LVR2_TYPES_DISTORTION_MODELS_HPP
\ No newline at end of file
diff --git a/include/lvr2/types/ElementProxy.hpp b/include/lvr2/types/ElementProxy.hpp
index 0086b450c..85900678a 100644
--- a/include/lvr2/types/ElementProxy.hpp
+++ b/include/lvr2/types/ElementProxy.hpp
@@ -26,9 +26,8 @@
  */
 
 #pragma once
-
-#ifndef LVR2_TYPES_ELEMENTPROXY
-#define LVR2_TYPES_ELEMENTPROXY
+#ifndef LVR2_TYPES_ELEMENTPROXY_HPP
+#define LVR2_TYPES_ELEMENTPROXY_HPP
 
 #include <array>
 #include <iostream>
@@ -314,4 +313,4 @@ class ElementProxy
 
 } // namespace lvr2
 
-#endif // LVR2_TYPES_ELEMENTPROXY
\ No newline at end of file
+#endif // LVR2_TYPES_ELEMENTPROXY_HPP
\ No newline at end of file
diff --git a/include/lvr2/types/LabelBuffer.hpp b/include/lvr2/types/LabelBuffer.hpp
index 7c1b246ce..936a640c1 100644
--- a/include/lvr2/types/LabelBuffer.hpp
+++ b/include/lvr2/types/LabelBuffer.hpp
@@ -30,6 +30,8 @@
 
 #include "lvr2/types/BaseBuffer.hpp"
 #include "lvr2/types/ScanTypes.hpp"
+#include "lvr2/io/DataStruct.hpp"
+#include <vector>
 
 namespace lvr2
 {
diff --git a/include/lvr2/types/MeshBuffer.hpp b/include/lvr2/types/MeshBuffer.hpp
index 005e13f86..248e1c6a9 100644
--- a/include/lvr2/types/MeshBuffer.hpp
+++ b/include/lvr2/types/MeshBuffer.hpp
@@ -25,13 +25,16 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef MESHBUFFER2_HPP
-#define MESHBUFFER2_HPP
+#ifndef LVR2_MESHBUFFER_HPP
+#define LVR2_MESHBUFFER_HPP
 
 #include "lvr2/texture/Material.hpp"
 #include "lvr2/texture/Texture.hpp"
+#include "lvr2/io/DataStruct.hpp" // floatArr, etc
 #include "lvr2/types/BaseBuffer.hpp"
 
+#include <vector>
+
 namespace lvr2
 {
 
@@ -217,4 +220,4 @@ class MeshBuffer : public BaseBuffer
 using MeshBufferPtr = std::shared_ptr<MeshBuffer>;
 
 }
-#endif // MESHBUFFER2_HPP
+#endif // LVR2_MESHBUFFER_HPP
diff --git a/include/lvr2/types/Model.hpp b/include/lvr2/types/Model.hpp
index 128542f2a..e61a0894d 100644
--- a/include/lvr2/types/Model.hpp
+++ b/include/lvr2/types/Model.hpp
@@ -32,8 +32,8 @@
  *  @author Thomas Wiemann
  */
 
-#ifndef MODEL_H_
-#define MODEL_H_
+#ifndef LVR2_MODEL_HPP
+#define LVR2_MODEL_HPP
 
 #include "lvr2/types/MeshBuffer.hpp"
 #include "lvr2/types/PointBuffer.hpp"
@@ -85,4 +85,4 @@ using ModelPtr = std::shared_ptr<Model>;
 
 } // namespace lvr2
 
-#endif /* MODEL_H_ */
+#endif // LVR2_MODEL_HPP
diff --git a/include/lvr2/types/PointBuffer.hpp b/include/lvr2/types/PointBuffer.hpp
index 58af56d51..4fc85b68c 100644
--- a/include/lvr2/types/PointBuffer.hpp
+++ b/include/lvr2/types/PointBuffer.hpp
@@ -25,8 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef POINTBUFFER2_HPP
-#define POINTBUFFER2_HPP
+#ifndef LVR2_POINTBUFFER_HPP
+#define LVR2_POINTBUFFER_HPP
 
 #include "lvr2/io/DataStruct.hpp"
 #include "lvr2/types/BaseBuffer.hpp"
@@ -143,4 +143,4 @@ using PointBufferPtr = std::shared_ptr<PointBuffer>;
 
 } // namespace lvr2
 
-#endif // POINTBUFFER2_HPP
+#endif // LVR2_POINTBUFFER_HPP