diff --git a/osal/linux/SemaphoreFactory.cpp b/osal/linux/SemaphoreFactory.cpp
index 805865ca..bcb5d16f 100644
--- a/osal/linux/SemaphoreFactory.cpp
+++ b/osal/linux/SemaphoreFactory.cpp
@@ -1,6 +1,6 @@
 #include "../../tasks/SemaphoreFactory.h"
-#include "../../osal/linux/BinarySemaphore.h"
-#include "../../osal/linux/CountingSemaphore.h"
+#include "BinarySemaphore.h"
+#include "CountingSemaphore.h"
 #include "../../serviceinterface/ServiceInterfaceStream.h"
 
 SemaphoreFactory* SemaphoreFactory::factoryInstance = nullptr;
diff --git a/tasks/SemaphoreFactory.h b/tasks/SemaphoreFactory.h
index b2f34788..2c41a135 100644
--- a/tasks/SemaphoreFactory.h
+++ b/tasks/SemaphoreFactory.h
@@ -1,5 +1,6 @@
-#ifndef FRAMEWORK_TASKS_SEMAPHOREFACTORY_H_
-#define FRAMEWORK_TASKS_SEMAPHOREFACTORY_H_
+#ifndef FSFW_TASKS_SEMAPHOREFACTORY_H_
+#define FSFW_TASKS_SEMAPHOREFACTORY_H_
+
 #include "../tasks/SemaphoreIF.h"
 
 /**
@@ -46,4 +47,4 @@ private:
 	static SemaphoreFactory* factoryInstance;
 };
 
-#endif /* FRAMEWORK_TASKS_SEMAPHOREFACTORY_H_ */
+#endif /* FSFW_TASKS_SEMAPHOREFACTORY_H_ */