diff --git a/storagemanager/LocalPool.tpp b/storagemanager/LocalPool.tpp
index 59d06ab8..32724bd8 100644
--- a/storagemanager/LocalPool.tpp
+++ b/storagemanager/LocalPool.tpp
@@ -1,5 +1,5 @@
-#ifndef LOCALPOOL_TPP
-#define LOCALPOOL_TPP
+#ifndef FRAMEWORK_STORAGEMANAGER_LOCALPOOL_TPP_
+#define FRAMEWORK_STORAGEMANAGER_LOCALPOOL_TPP_
 
 template<uint8_t NUMBER_OF_POOLS>
 inline LocalPool<NUMBER_OF_POOLS>::LocalPool(object_id_t setObjectId,
diff --git a/storagemanager/PoolManager.h b/storagemanager/PoolManager.h
index 87670a82..6e353de2 100644
--- a/storagemanager/PoolManager.h
+++ b/storagemanager/PoolManager.h
@@ -1,5 +1,5 @@
-#ifndef POOLMANAGER_H_
-#define POOLMANAGER_H_
+#ifndef FRAMEWORK_STORAGEMANAGER_POOLMANAGER_H_
+#define FRAMEWORK_STORAGEMANAGER_POOLMANAGER_H_
 
 #include <framework/storagemanager/LocalPool.h>
 #include <framework/ipc/MutexHelper.h>
diff --git a/storagemanager/PoolManager.tpp b/storagemanager/PoolManager.tpp
index 7025d795..854e22da 100644
--- a/storagemanager/PoolManager.tpp
+++ b/storagemanager/PoolManager.tpp
@@ -1,5 +1,5 @@
-#ifndef POOLMANAGER_TPP_
-#define POOLMANAGER_TPP_
+#ifndef FRAMEWORK_STORAGEMANAGER_POOLMANAGER_TPP_
+#define FRAMEWORK_STORAGEMANAGER_POOLMANAGER_TPP_
 
 template<uint8_t NUMBER_OF_POOLS>
 inline PoolManager<NUMBER_OF_POOLS>::PoolManager(object_id_t setObjectId,
diff --git a/storagemanager/StorageAccessor.h b/storagemanager/StorageAccessor.h
index 8949642c..f6964b93 100644
--- a/storagemanager/StorageAccessor.h
+++ b/storagemanager/StorageAccessor.h
@@ -1,22 +1,19 @@
-/**
- * @brief 	Helper classes to facilitate safe access to storages which is also
- * 			conforming to RAII principles
- * @details	These helper can be used together with the
- * 			StorageManager classes to manage access to a storage.
- * 			It can take care of thread-safety while also providing
- * 			mechanisms to automatically clear storage data.
- */
-#ifndef TEST_PROTOTYPES_STORAGEACCESSOR_H_
-#define TEST_PROTOTYPES_STORAGEACCESSOR_H_
+#ifndef FRAMEWORK_STORAGEMANAGER_STORAGEACCESSOR_H_
+#define FRAMEWORK_STORAGEMANAGER_STORAGEACCESSOR_H_
 
 #include <framework/ipc/MutexHelper.h>
 #include <framework/storagemanager/StorageManagerIF.h>
-#include <memory>
 
 /**
- * @brief   Accessor class which can be returned by pool managers
- *          or passed and set by pool managers to have safe access to the pool
- *          resources.
+ * @brief 	Helper classes to facilitate safe access to storages which is also
+ * 			conforming to RAII principles
+ * @details
+ * Accessor class which can be returned by pool manager or passed and set by
+ * pool managers to have safe access to the pool resources.
+ *
+ * These helper can be used together with the StorageManager classes to manage
+ * access to a storage. It can take care of thread-safety while also providing
+ * mechanisms to automatically clear storage data.
  */
 class ConstStorageAccessor {
 	//! StorageManager classes have exclusive access to private variables.