diff --git a/datapoolglob/GlobalPoolVariable.h b/datapoolglob/GlobalPoolVariable.h
index cfa28e114..eb44c3072 100644
--- a/datapoolglob/GlobalPoolVariable.h
+++ b/datapoolglob/GlobalPoolVariable.h
@@ -32,7 +32,7 @@ class GlobPoolVar: public PoolVariableIF {
 	template<typename U, uint8_t n_var> friend class PoolVarList;
 	static_assert(not std::is_same<T, bool>::value,
 			"Do not use boolean for the PoolEntry type, use uint8_t instead!"
-			"Warum? Darum :-)");
+			"There is no boolean type in CCSDS.");
 public:
 	/**
 	 * @brief	In the constructor, the variable can register itself in a
diff --git a/datapoollocal/LocalPoolVariable.h b/datapoollocal/LocalPoolVariable.h
index 44c16a7ce..39c92f604 100644
--- a/datapoollocal/LocalPoolVariable.h
+++ b/datapoollocal/LocalPoolVariable.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef FRAMEWORK_DATAPOOLLOCAL_LOCALPOOLVARIABLE_H_
+#define FRAMEWORK_DATAPOOLLOCAL_LOCALPOOLVARIABLE_H_
 
 #include <framework/datapool/PoolVariableIF.h>
 #include <framework/datapool/DataSetIF.h>
@@ -100,4 +101,4 @@ using lp_int64_t = LocalPoolVar<int64_t>;
 using lp_float_t = LocalPoolVar<float>;
 using lp_double_t = LocalPoolVar<double>;
 
-
+#endif
diff --git a/datapoollocal/LocalPoolVariable.tpp b/datapoollocal/LocalPoolVariable.tpp
index fdd18bcd7..4bc4c6621 100644
--- a/datapoollocal/LocalPoolVariable.tpp
+++ b/datapoollocal/LocalPoolVariable.tpp
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef FRAMEWORK_DATAPOOLLOCAL_LOCALPOOLVARIABLE_TPP_
+#define FRAMEWORK_DATAPOOLLOCAL_LOCALPOOLVARIABLE_TPP_
 
 #include <framework/housekeeping/HasHkPoolParametersIF.h>
 #include <framework/objectmanager/ObjectManagerIF.h>
@@ -107,3 +108,5 @@ inline ReturnValue_t LocalPoolVar<T>::deSerialize(const uint8_t** buffer,
 		size_t* size, bool bigEndian) {
 	return AutoSerializeAdapter::deSerialize(&value, buffer, size, bigEndian);
 }
+
+#endif
diff --git a/globalfunctions/Type.h b/globalfunctions/Type.h
index f4146f4ea..e46a37e48 100644
--- a/globalfunctions/Type.h
+++ b/globalfunctions/Type.h
@@ -4,6 +4,9 @@
 #include <framework/returnvalues/HasReturnvaluesIF.h>
 #include <framework/serialize/SerializeIF.h>
 
+/**
+ * @brief 	Type definition for CCSDS or ECSS.
+ */
 class Type: public SerializeIF {
 public:
 	enum ActualType_t {
diff --git a/housekeeping/HasHkPoolParametersIF.h b/housekeeping/HasHkPoolParametersIF.h
index 5ec9beef6..ac248cf35 100644
--- a/housekeeping/HasHkPoolParametersIF.h
+++ b/housekeeping/HasHkPoolParametersIF.h
@@ -13,8 +13,7 @@ using LocalDataPoolMap =  std::map<lp_id_t, PoolEntryIF*>;
 using LocalDataPoolMapIter = LocalDataPoolMap::iterator;
 
 /**
- * @brief 	Interface for the local housekeeping managers used by the device
- * 			handler.
+ * @brief
  */
 class HasHkPoolParametersIF {
 public:
@@ -27,6 +26,4 @@ public:
 	virtual HousekeepingManager* getHkManagerHandle() = 0;
 };
 
-
-
 #endif /* FRAMEWORK_DATAPOOL_HASHKPOOLPARAMETERSIF_H_ */