diff --git a/osal/host/QueueMapManager.cpp b/osal/host/QueueMapManager.cpp
index 6007e9f31..1b2094e91 100644
--- a/osal/host/QueueMapManager.cpp
+++ b/osal/host/QueueMapManager.cpp
@@ -1,6 +1,7 @@
+#include "QueueMapManager.h"
+
 #include "../../ipc/MutexFactory.h"
 #include "../../ipc/MutexHelper.h"
-#include "../../osal/host/QueueMapManager.h"
 
 QueueMapManager* QueueMapManager::mqManagerInstance = nullptr;
 
diff --git a/osal/host/QueueMapManager.h b/osal/host/QueueMapManager.h
index 823fd4c2b..d7d5c9154 100644
--- a/osal/host/QueueMapManager.h
+++ b/osal/host/QueueMapManager.h
@@ -1,5 +1,5 @@
-#ifndef FRAMEWORK_OSAL_HOST_QUEUEMAP_H_
-#define FRAMEWORK_OSAL_HOST_QUEUEMAP_H_
+#ifndef FSFW_OSAL_HOST_QUEUEMAPMANAGER_H_
+#define FSFW_OSAL_HOST_QUEUEMAPMANAGER_H_
 
 #include "../../ipc/MessageQueueSenderIF.h"
 #include "../../osal/host/MessageQueue.h"
@@ -44,4 +44,4 @@ private:
 
 
 
-#endif /* FRAMEWORK_OSAL_HOST_QUEUEMAP_H_ */
+#endif /* FSFW_OSAL_HOST_QUEUEMAPMANAGER_H_ */