diff --git a/osal/linux/MessageQueue.cpp b/osal/linux/MessageQueue.cpp
index 87251724..cfadb793 100644
--- a/osal/linux/MessageQueue.cpp
+++ b/osal/linux/MessageQueue.cpp
@@ -1,5 +1,6 @@
+#include "MessageQueue.h"
 #include "../../serviceinterface/ServiceInterfaceStream.h"
-#include "../../osal/linux/MessageQueue.h"
+#include "../../objectmanager/ObjectManagerIF.h"
 
 #include <fstream>
 
@@ -9,6 +10,7 @@
 #include <errno.h>
 
 
+
 MessageQueue::MessageQueue(uint32_t messageDepth, size_t maxMessageSize):
 		id(MessageQueueIF::NO_QUEUE),lastPartner(MessageQueueIF::NO_QUEUE),
 		defaultDestination(MessageQueueIF::NO_QUEUE),
diff --git a/osal/linux/MessageQueue.h b/osal/linux/MessageQueue.h
index c0b77019..239bbbdb 100644
--- a/osal/linux/MessageQueue.h
+++ b/osal/linux/MessageQueue.h
@@ -1,5 +1,5 @@
-#ifndef MESSAGEQUEUE_H_
-#define MESSAGEQUEUE_H_
+#ifndef FSFW_OSAL_LINUX_MESSAGEQUEUE_H_
+#define FSFW_OSAL_LINUX_MESSAGEQUEUE_H_
 
 #include "../../internalError/InternalErrorReporterIF.h"
 #include "../../ipc/MessageQueueIF.h"
@@ -184,4 +184,4 @@ private:
 	ReturnValue_t handleError(mq_attr* attributes, uint32_t messageDepth);
 };
 
-#endif /* MESSAGEQUEUE_H_ */
+#endif /* FSFW_OSAL_LINUX_MESSAGEQUEUE_H_ */