diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76542842..d6911f61 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,7 +116,15 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 		  -Wno-unused-parameter
 		  -Wno-psabi
         )
+		
+	if(NOT DEFINED WARNING_SHADOW_LOCAL)
+		option(WARNING_SHADOW_LOCAL "Show shadows declarations warning." ON)
 	endif()
+	
+	if(WARNING_SHADOW_LOCAL)
+		list(APPEND WARNING_FLAGS "-Wshadow=local")
+	endif()
+	
 endif()
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
diff --git a/datapoollocal/PoolReadHelper.h b/datapool/PoolReadHelper.h
similarity index 88%
rename from datapoollocal/PoolReadHelper.h
rename to datapool/PoolReadHelper.h
index b863a0f1..5c3153bb 100644
--- a/datapoollocal/PoolReadHelper.h
+++ b/datapool/PoolReadHelper.h
@@ -1,7 +1,7 @@
-#ifndef FSFW_DATAPOOLLOCAL_POOLREADHELPER_H_
-#define FSFW_DATAPOOLLOCAL_POOLREADHELPER_H_
+#ifndef FSFW_DATAPOOL_POOLREADHELPER_H_
+#define FSFW_DATAPOOL_POOLREADHELPER_H_
 
-#include "LocalPoolDataSetBase.h"
+#include "ReadCommitIF.h"
 #include "../serviceinterface/ServiceInterface.h"
 #include <FSFWConfig.h>
 
@@ -48,4 +48,4 @@ private:
 
 
 
-#endif /* FSFW_DATAPOOLLOCAL_POOLREADHELPER_H_ */
+#endif /* FSFW_DATAPOOL_POOLREADHELPER_H_ */