diff --git a/datapool/DataSetIF.h b/datapool/DataSetIF.h
index b51da3a4..a6634a5c 100644
--- a/datapool/DataSetIF.h
+++ b/datapool/DataSetIF.h
@@ -1,5 +1,5 @@
-#ifndef DATASETIF_H_
-#define DATASETIF_H_
+#ifndef FSFW_DATAPOOL_DATASETIF_H_
+#define FSFW_DATAPOOL_DATASETIF_H_
 
 #include "../returnvalues/HasReturnvaluesIF.h"
 #include "../timemanager/Clock.h"
@@ -34,7 +34,6 @@ public:
 	 */
 	virtual ~DataSetIF() {}
 
-
 	/**
 	 * @brief	This operation provides a method to register local data pool
 	 * 			variables to register in a data set by passing itself
@@ -45,4 +44,4 @@ public:
 	virtual uint16_t getFillCount() const = 0;
 };
 
-#endif /* FRAMEWORK_DATAPOOL_DATASETIF_H_ */
+#endif /* FSFW_DATAPOOL_DATASETIF_H_ */
diff --git a/datapool/PoolDataSetIF.h b/datapool/PoolDataSetIF.h
index 78c05d43..aa45fa54 100644
--- a/datapool/PoolDataSetIF.h
+++ b/datapool/PoolDataSetIF.h
@@ -3,6 +3,10 @@
 
 #include "DataSetIF.h"
 
+/**
+ * @brief   Extendes the DataSetIF by adding abstract functions to lock
+ *          and unlock a data pool and read/commit semantics.
+ */
 class PoolDataSetIF: public DataSetIF {
 public:
     virtual~ PoolDataSetIF() {};
diff --git a/datapool/PoolVarList.h b/datapool/PoolVarList.h
index 1c8a7be4..0b2b0f06 100644
--- a/datapool/PoolVarList.h
+++ b/datapool/PoolVarList.h
@@ -1,5 +1,5 @@
-#ifndef POOLVARLIST_H_
-#define POOLVARLIST_H_
+#ifndef FSFW_DATAPOOL_POOLVARLIST_H_
+#define FSFW_DATAPOOL_POOLVARLIST_H_
 
 #include "../datapool/PoolVariableIF.h"
 #include "../datapoolglob/GlobalPoolVariable.h"
@@ -8,7 +8,8 @@ class PoolVarList {
 private:
 	GlobPoolVar<T> variables[n_var];
 public:
-	PoolVarList( const uint32_t set_id[n_var], DataSetIF* dataSet, PoolVariableIF::ReadWriteMode_t setReadWriteMode ) {
+	PoolVarList( const uint32_t set_id[n_var], DataSetIF* dataSet,
+	        PoolVariableIF::ReadWriteMode_t setReadWriteMode ) {
 		//I really should have a look at the new init list c++ syntax.
 		if (dataSet == NULL) {
 			return;
@@ -25,4 +26,4 @@ public:
 
 
 
-#endif /* POOLVARLIST_H_ */
+#endif /* FSFW_DATAPOOL_POOLVARLIST_H_ */
diff --git a/datapool/PoolVariableIF.h b/datapool/PoolVariableIF.h
index 2aa269dd..cd15f744 100644
--- a/datapool/PoolVariableIF.h
+++ b/datapool/PoolVariableIF.h
@@ -1,5 +1,5 @@
-#ifndef FRAMEWORK_DATAPOOL_POOLVARIABLEIF_H_
-#define FRAMEWORK_DATAPOOL_POOLVARIABLEIF_H_
+#ifndef FSFW_DATAPOOL_POOLVARIABLEIF_H_
+#define FSFW_DATAPOOL_POOLVARIABLEIF_H_
 
 #include "../returnvalues/HasReturnvaluesIF.h"
 #include "../serialize/SerializeIF.h"
@@ -96,4 +96,4 @@ protected:
 
 using pool_rwm_t = PoolVariableIF::ReadWriteMode_t;
 
-#endif /* POOLVARIABLEIF_H_ */
+#endif /* FSFW_DATAPOOL_POOLVARIABLEIF_H_ */
diff --git a/datapool/ControllerSet.cpp b/datapoolglob/ControllerSet.cpp
similarity index 79%
rename from datapool/ControllerSet.cpp
rename to datapoolglob/ControllerSet.cpp
index 4055158b..54fc6e8c 100644
--- a/datapool/ControllerSet.cpp
+++ b/datapoolglob/ControllerSet.cpp
@@ -1,4 +1,4 @@
-#include "../datapool/ControllerSet.h"
+#include <fsfw/datapoolglob/ControllerSet.h>
 
 ControllerSet::ControllerSet() {
 
diff --git a/datapool/ControllerSet.h b/datapoolglob/ControllerSet.h
similarity index 59%
rename from datapool/ControllerSet.h
rename to datapoolglob/ControllerSet.h
index 43e1cbf2..5da11397 100644
--- a/datapool/ControllerSet.h
+++ b/datapoolglob/ControllerSet.h
@@ -1,5 +1,5 @@
-#ifndef CONTROLLERSET_H_
-#define CONTROLLERSET_H_
+#ifndef FSFW_DATAPOOLGLOB_CONTROLLERSET_H_
+#define FSFW_DATAPOOLGLOB_CONTROLLERSET_H_
 
 #include "../datapoolglob/GlobalDataSet.h"
 
@@ -12,4 +12,4 @@ public:
 	void setInvalid();
 };
 
-#endif /* CONTROLLERSET_H_ */
+#endif /*  FSFW_DATAPOOLGLOB_CONTROLLERSET_H_ */
diff --git a/datapoollocal/LocalDataPoolManager.cpp b/datapoollocal/LocalDataPoolManager.cpp
index 87a0a3cb..c84b2c69 100644
--- a/datapoollocal/LocalDataPoolManager.cpp
+++ b/datapoollocal/LocalDataPoolManager.cpp
@@ -1,5 +1,5 @@
-#include "../datapoollocal/LocalDataPoolManager.h"
-#include "../datapoollocal/LocalDataSet.h"
+#include "LocalDataPoolManager.h"
+#include "LocalPoolDataSetBase.h"
 #include "../housekeeping/AcceptsHkPacketsIF.h"
 #include "../ipc/MutexFactory.h"
 #include "../ipc/MutexHelper.h"
@@ -185,7 +185,7 @@ ReturnValue_t LocalDataPoolManager::generateHousekeepingPacket(sid_t sid,
 				" Set ID not found or dataset not assigned!" << std::endl;
 		return HasReturnvaluesIF::RETURN_FAILED;
 	}
-	sif::info << "hk gen called" << std::endl;
+
 	store_address_t storeId;
 	HousekeepingPacketDownlink hkPacket(sid, collectionInterval,
 	        dataSetToSerialize->getFillCount(), dataSetToSerialize);
diff --git a/datapoollocal/LocalDataPoolManager.h b/datapoollocal/LocalDataPoolManager.h
index c851978c..c6567c80 100644
--- a/datapoollocal/LocalDataPoolManager.h
+++ b/datapoollocal/LocalDataPoolManager.h
@@ -1,14 +1,14 @@
 #ifndef FRAMEWORK_DATAPOOLLOCAL_LOCALDATAPOOLMANAGER_H_
 #define FRAMEWORK_DATAPOOLLOCAL_LOCALDATAPOOLMANAGER_H_
 
+#include "HasLocalDataPoolIF.h"
+
 #include "../housekeeping/HousekeepingPacketDownlink.h"
+#include "../housekeeping/HousekeepingMessage.h"
 #include "../datapool/DataSetIF.h"
+#include "../datapool/PoolEntry.h"
 #include "../objectmanager/SystemObjectIF.h"
 #include "../ipc/MutexIF.h"
-
-#include "../housekeeping/HousekeepingMessage.h"
-#include "../datapool/PoolEntry.h"
-#include "../datapoollocal/HasLocalDataPoolIF.h"
 #include "../ipc/CommandMessage.h"
 #include "../ipc/MessageQueueIF.h"
 #include "../ipc/MutexHelper.h"
diff --git a/housekeeping/HousekeepingPacketDownlink.h b/housekeeping/HousekeepingPacketDownlink.h
index bee0bac1..ee531bae 100644
--- a/housekeeping/HousekeepingPacketDownlink.h
+++ b/housekeeping/HousekeepingPacketDownlink.h
@@ -1,7 +1,8 @@
-#ifndef FRAMEWORK_HOUSEKEEPING_HOUSEKEEPINGPACKETDOWNLINK_H_
-#define FRAMEWORK_HOUSEKEEPING_HOUSEKEEPINGPACKETDOWNLINK_H_
+#ifndef FSFW_HOUSEKEEPING_HOUSEKEEPINGPACKETDOWNLINK_H_
+#define FSFW_HOUSEKEEPING_HOUSEKEEPINGPACKETDOWNLINK_H_
 
 #include "../datapoollocal/LocalPoolDataSetBase.h"
+
 #include "../housekeeping/HousekeepingMessage.h"
 #include "../serialize/SerialLinkedListAdapter.h"
 #include "../storagemanager/StorageManagerIF.h"