diff --git a/subsystem/modes/ModeStore.h b/subsystem/modes/ModeStore.h
index c05086c7d..a5cb4059c 100644
--- a/subsystem/modes/ModeStore.h
+++ b/subsystem/modes/ModeStore.h
@@ -1,14 +1,15 @@
-#ifndef MODESTORE_H_
-#define MODESTORE_H_
+#ifndef FSFW_SUBSYSTEM_MODES_MODESTORE_H_
+#define FSFW_SUBSYSTEM_MODES_MODESTORE_H_
 
 #include <FSFWConfig.h>
 
 #if FSFW_USE_MODESTORE == 1
 
+#include "ModeStoreIF.h"
+
 #include "../../container/ArrayList.h"
 #include "../../container/SinglyLinkedList.h"
 #include "../../objectmanager/SystemObject.h"
-#include "../../subsystem/modes/ModeStoreIF.h"
 
 class ModeStore: public ModeStoreIF, public SystemObject {
 public:
@@ -43,5 +44,5 @@ private:
 
 #endif
 
-#endif /* MODESTORE_H_ */
+#endif /* FSFW_SUBSYSTEM_MODES_MODESTORE_H_ */