diff --git a/ipc/QueueFactory.h b/ipc/QueueFactory.h
index 4f4d72c7..0310e534 100644
--- a/ipc/QueueFactory.h
+++ b/ipc/QueueFactory.h
@@ -1,7 +1,9 @@
-#ifndef FRAMEWORK_IPC_QUEUEFACTORY_H_
-#define FRAMEWORK_IPC_QUEUEFACTORY_H_
+#ifndef FSFW_IPC_QUEUEFACTORY_H_
+#define FSFW_IPC_QUEUEFACTORY_H_
+
 
 #include "MessageQueueIF.h"
+#include "../ipc/MessageQueueMessage.h"
 #include <stdint.h>
 /**
  * Creates message queues.
@@ -30,4 +32,4 @@ private:
 	static QueueFactory* factoryInstance;
 };
 
-#endif /* FRAMEWORK_IPC_QUEUEFACTORY_H_ */
+#endif /* FSFW_IPC_QUEUEFACTORY_H_ */
diff --git a/osal/linux/QueueFactory.cpp b/osal/linux/QueueFactory.cpp
index 0860950c..44def48a 100644
--- a/osal/linux/QueueFactory.cpp
+++ b/osal/linux/QueueFactory.cpp
@@ -15,7 +15,7 @@ QueueFactory* QueueFactory::factoryInstance = nullptr;
 
 
 ReturnValue_t MessageQueueSenderIF::sendMessage(MessageQueueId_t sendTo,
-			MessageQueueMessage* message, MessageQueueId_t sentFrom,
+			MessageQueueMessageIF* message, MessageQueueId_t sentFrom,
 			bool ignoreFault) {
 	return MessageQueue::sendMessageFromMessageQueue(sendTo,message,
 			sentFrom,ignoreFault);