diff --git a/datapoollocal/HasLocalDpIFManagerAttorney.cpp b/datapoollocal/HasLocalDpIFManagerAttorney.cpp
new file mode 100644
index 00000000..997f4dfa
--- /dev/null
+++ b/datapoollocal/HasLocalDpIFManagerAttorney.cpp
@@ -0,0 +1,18 @@
+#include "HasLocalDpIFManagerAttorney.h"
+#include "LocalPoolObjectBase.h"
+#include "LocalPoolDataSetBase.h"
+#include "HasLocalDataPoolIF.h"
+
+LocalPoolDataSetBase* HasLocalDpIFManagerAttorney::getDataSetHandle(HasLocalDataPoolIF* interface,
+		sid_t sid) {
+	return interface->getDataSetHandle(sid);
+}
+
+LocalPoolObjectBase* HasLocalDpIFManagerAttorney::getPoolObjectHandle(HasLocalDataPoolIF* interface,
+		lp_id_t localPoolId) {
+	return interface->getPoolObjectHandle(localPoolId);
+}
+
+object_id_t HasLocalDpIFManagerAttorney::getObjectId(HasLocalDataPoolIF* interface) {
+	return interface->getObjectId();
+}
diff --git a/datapoollocal/HasLocalDpIFManagerAttorney.h b/datapoollocal/HasLocalDpIFManagerAttorney.h
index 5a62bba0..ca596599 100644
--- a/datapoollocal/HasLocalDpIFManagerAttorney.h
+++ b/datapoollocal/HasLocalDpIFManagerAttorney.h
@@ -1,25 +1,20 @@
 #ifndef FSFW_DATAPOOLLOCAL_HASLOCALDPIFMANAGERATTORNEY_H_
 #define FSFW_DATAPOOLLOCAL_HASLOCALDPIFMANAGERATTORNEY_H_
 
-#include "HasLocalDataPoolIF.h"
+#include "localPoolDefinitions.h"
 
+class HasLocalDataPoolIF;
 class LocalPoolDataSetBase;
 class LocalPoolObjectBase;
 
 class HasLocalDpIFManagerAttorney {
 
-	static LocalPoolDataSetBase* getDataSetHandle(HasLocalDataPoolIF* interface, sid_t sid) {
-		return interface->getDataSetHandle(sid);
-	}
+	static LocalPoolDataSetBase* getDataSetHandle(HasLocalDataPoolIF* interface, sid_t sid);
 
 	static LocalPoolObjectBase* getPoolObjectHandle(HasLocalDataPoolIF* interface,
-			lp_id_t localPoolId) {
-		return interface->getPoolObjectHandle(localPoolId);
-	}
+			lp_id_t localPoolId);
 
-	static object_id_t getObjectId(HasLocalDataPoolIF* interface) {
-		return interface->getObjectId();
-	}
+	static object_id_t getObjectId(HasLocalDataPoolIF* interface);
 
 	friend class LocalDataPoolManager;
 };
diff --git a/datapoollocal/HasLocalDpIFUserAttorney.cpp b/datapoollocal/HasLocalDpIFUserAttorney.cpp
new file mode 100644
index 00000000..002230fe
--- /dev/null
+++ b/datapoollocal/HasLocalDpIFUserAttorney.cpp
@@ -0,0 +1,6 @@
+#include "HasLocalDpIFUserAttorney.h"
+#include "HasLocalDataPoolIF.h"
+
+AccessPoolManagerIF* HasLocalDpIFUserAttorney::getAccessorHandle(HasLocalDataPoolIF *interface) {
+	return interface->getAccessorHandle();
+}
diff --git a/datapoollocal/HasLocalDpIFUserAttorney.h b/datapoollocal/HasLocalDpIFUserAttorney.h
index 51260dbf..67b51a4a 100644
--- a/datapoollocal/HasLocalDpIFUserAttorney.h
+++ b/datapoollocal/HasLocalDpIFUserAttorney.h
@@ -1,16 +1,13 @@
 #ifndef FSFW_DATAPOOLLOCAL_HASLOCALDPIFUSERATTORNEY_H_
 #define FSFW_DATAPOOLLOCAL_HASLOCALDPIFUSERATTORNEY_H_
 
-#include "HasLocalDataPoolIF.h"
-
+class HasLocalDataPoolIF;
 class AccessPoolManagerIF;
 
 class HasLocalDpIFUserAttorney {
 private:
 
-	static AccessPoolManagerIF* getAccessorHandle(HasLocalDataPoolIF* interface) {
-		return interface->getAccessorHandle();
-	}
+	static AccessPoolManagerIF* getAccessorHandle(HasLocalDataPoolIF* interface);
 
 	friend class LocalPoolObjectBase;
 	friend class LocalPoolDataSetBase;