diff --git a/datapool/PoolDataSetBase.h b/datapool/PoolDataSetBase.h
index 6f3c5fa4..d741dabc 100644
--- a/datapool/PoolDataSetBase.h
+++ b/datapool/PoolDataSetBase.h
@@ -3,6 +3,7 @@
 
 #include "PoolDataSetIF.h"
 #include "PoolVariableIF.h"
+#include "../serialize/SerializeIF.h"
 #include "../ipc/MutexIF.h"
 
 /**
diff --git a/datapoollocal/AccessLocalDataPoolIF.h b/datapoollocal/AccessLocalDataPoolIF.h
index d204a088..5bed34ad 100644
--- a/datapoollocal/AccessLocalDataPoolIF.h
+++ b/datapoollocal/AccessLocalDataPoolIF.h
@@ -4,14 +4,18 @@
 #include <fsfw/datapoollocal/LocalDataPoolManager.h>
 
 
-class AccessLocalDataPoolIF {
-public:
-	virtual ~AccessLocalDataPoolIF() {};
-
-protected:
-	virtual LocalDataPoolManager* getHkManagerHandle() = 0;
-
-};
+//class AccessLocalDataPoolIF {
+//public:
+//	virtual ~AccessLocalDataPoolIF() {};
+//
+//protected:
+//
+//	template <class T> ReturnValue_t fetchPoolEntry(LocalDataPoolManager& manager,
+//			lp_id_t localPoolId, PoolEntry<T> **poolEntry) {
+//		return manager.fetchPoolEntry(localPoolId, poolEntry);
+//	}
+//
+//};
 
 
 #endif /* FSFW_DATAPOOLLOCAL_ACCESSLOCALDATAPOOLIF_H_ */
diff --git a/datapoollocal/HasLocalDataPoolIF.h b/datapoollocal/HasLocalDataPoolIF.h
index 5b296d97..215ac8a5 100644
--- a/datapoollocal/HasLocalDataPoolIF.h
+++ b/datapoollocal/HasLocalDataPoolIF.h
@@ -42,8 +42,8 @@ using LocalDataPoolMapIter = LocalDataPool::iterator;
  */
 class HasLocalDataPoolIF {
 	friend class LocalDataPoolManager;
-	//friend class LocalPoolDataSetBase;
-	//friend class LocalPoolObjectBase;
+	friend class LocalPoolDataSetBase;
+	friend class LocalPoolObjectBase;
 public:
 	virtual~ HasLocalDataPoolIF() {};
 
diff --git a/datapoollocal/LocalDataPoolManager.h b/datapoollocal/LocalDataPoolManager.h
index 7a4e376c..8571aa02 100644
--- a/datapoollocal/LocalDataPoolManager.h
+++ b/datapoollocal/LocalDataPoolManager.h
@@ -17,6 +17,7 @@
 #include "../ipc/MutexHelper.h"
 
 #include <map>
+#include <vector>
 
 namespace Factory {
 void setStaticFrameworkObjectIds();
@@ -53,6 +54,7 @@ class LocalDataPoolManager: public ProvidesDataPoolSubscriptionIF {
 	template<typename T> friend class LocalPoolVariable;
 	template<typename T, uint16_t vecSize> friend class LocalPoolVector;
 	friend class LocalPoolDataSetBase;
+	//friend class AccessLocalDataPoolIF;
 	friend void (Factory::setStaticFrameworkObjectIds)();
 
 
diff --git a/datapoollocal/LocalPoolDataSetBase.cpp b/datapoollocal/LocalPoolDataSetBase.cpp
index 9fc3f924..8a39823e 100644
--- a/datapoollocal/LocalPoolDataSetBase.cpp
+++ b/datapoollocal/LocalPoolDataSetBase.cpp
@@ -8,7 +8,7 @@
 #include <cmath>
 #include <cstring>
 
-LocalPoolDataSetBase::LocalPoolDataSetBase(AccessLocalDataPoolIF *hkOwner,
+LocalPoolDataSetBase::LocalPoolDataSetBase(HasLocalDataPoolIF *hkOwner,
         uint32_t setId, PoolVariableIF** registeredVariablesArray,
         const size_t maxNumberOfVariables, bool periodicHandling):
         PoolDataSetBase(registeredVariablesArray, maxNumberOfVariables) {
diff --git a/datapoollocal/LocalPoolDataSetBase.h b/datapoollocal/LocalPoolDataSetBase.h
index 58b65880..5ad02269 100644
--- a/datapoollocal/LocalPoolDataSetBase.h
+++ b/datapoollocal/LocalPoolDataSetBase.h
@@ -43,8 +43,7 @@ class PeriodicHousekeepingHelper;
  * @ingroup data_pool
  */
 class LocalPoolDataSetBase: public PoolDataSetBase,
-        public MarkChangedIF,
-		public AccessLocalDataPoolIF {
+        public MarkChangedIF {
 	friend class LocalDataPoolManager;
 	friend class PeriodicHousekeepingHelper;
 public:
@@ -54,7 +53,7 @@ public:
 	 * This constructor also initializes the components required for
 	 * periodic handling.
 	 */
-	LocalPoolDataSetBase(AccessLocalDataPoolIF *hkOwner,
+	LocalPoolDataSetBase(HasLocalDataPoolIF *hkOwner,
 			uint32_t setId, PoolVariableIF** registeredVariablesArray,
 	        const size_t maxNumberOfVariables, bool periodicHandling = true);
 
@@ -220,7 +219,7 @@ protected:
 	bool bitGetter(const uint8_t* byte, uint8_t position) const;
 
 	PeriodicHousekeepingHelper* periodicHelper = nullptr;
-	AccessLocalDataPoolIF* hkManager = nullptr;
+	LocalDataPoolManager* hkManager = nullptr;
 
 };