diff --git a/subsystem/CMakeLists.txt b/subsystem/CMakeLists.txt
new file mode 100644
index 00000000..5c98ee70
--- /dev/null
+++ b/subsystem/CMakeLists.txt
@@ -0,0 +1,7 @@
+target_sources(${LIB_FSFW_NAME} 
+	PRIVATE 
+		Subsystem.cpp
+		SubsystemBase.cpp
+)
+
+add_subdirectory(modes)
\ No newline at end of file
diff --git a/subsystem/Subsystem.cpp b/subsystem/Subsystem.cpp
index 9712d7d4..4de6906c 100644
--- a/subsystem/Subsystem.cpp
+++ b/subsystem/Subsystem.cpp
@@ -367,7 +367,7 @@ ReturnValue_t Subsystem::addSequence(ArrayList<ModeListEntry> *sequence,
 	}
 
 	if (inStore) {
-#ifdef USE_MODESTORE
+#if FSFW_USE_MODESTORE == 1
 		result = modeStore->storeArray(sequence,
 				&(modeSequences.find(id)->entries.firstLinkedElement));
 		if (result != RETURN_OK) {
@@ -410,7 +410,7 @@ ReturnValue_t Subsystem::addTable(ArrayList<ModeListEntry> *table, Mode_t id,
 	}
 
 	if (inStore) {
-#ifdef USE_MODESTORE
+#if FSFW_USE_MODESTORE == 1
 		result = modeStore->storeArray(table,
 				&(modeTables.find(id)->firstLinkedElement));
 		if (result != RETURN_OK) {
@@ -440,7 +440,7 @@ ReturnValue_t Subsystem::deleteSequence(Mode_t id) {
 		return ACCESS_DENIED;
 	}
 
-#ifdef USE_MODESTORE
+#if FSFW_USE_MODESTORE == 1
 	modeStore->deleteList(sequenceInfo->entries.firstLinkedElement);
 #endif
 	modeSequences.erase(id);
@@ -463,7 +463,7 @@ ReturnValue_t Subsystem::deleteTable(Mode_t id) {
 		return ACCESS_DENIED;
 	}
 
-#ifdef USE_MODESTORE
+#if FSFW_USE_MODESTORE == 1
 	modeStore->deleteList(pointer->firstLinkedElement);
 #endif
 	modeSequences.erase(id);
@@ -482,10 +482,10 @@ ReturnValue_t Subsystem::initialize() {
 		return RETURN_FAILED;
 	}
 
-#ifdef USE_MODESTORE
+#if FSFW_USE_MODESTORE == 1
 	modeStore = objectManager->get<ModeStoreIF>(objects::MODE_STORE);
 
-	if (modeStore == NULL) {
+	if (modeStore == nullptr) {
 		return RETURN_FAILED;
 	}
 #endif
diff --git a/subsystem/Subsystem.h b/subsystem/Subsystem.h
index 09d7850a..c3a72d54 100644
--- a/subsystem/Subsystem.h
+++ b/subsystem/Subsystem.h
@@ -10,6 +10,8 @@
 #include "../container/SinglyLinkedList.h"
 #include "../serialize/SerialArrayListAdapter.h"
 
+#include <FSFWConfig.h>
+
 /**
  * @brief   TODO: documentation missing
  * @details
@@ -116,7 +118,7 @@ protected:
 
 	StorageManagerIF *IPCStore = nullptr;
 
-#ifdef USE_MODESTORE
+#if FSFW_USE_MODESTORE == 1
 	ModeStoreIF *modeStore = nullptr;
 #endif
 
diff --git a/subsystem/modes/CMakeLists.txt b/subsystem/modes/CMakeLists.txt
new file mode 100644
index 00000000..6ac6a293
--- /dev/null
+++ b/subsystem/modes/CMakeLists.txt
@@ -0,0 +1,5 @@
+target_sources(${LIB_FSFW_NAME} 
+	PRIVATE 
+		ModeSequenceMessage.cpp
+		ModeStore.cpp
+)
diff --git a/subsystem/modes/ModeSequenceMessage.h b/subsystem/modes/ModeSequenceMessage.h
index 9be4586e..7852c984 100644
--- a/subsystem/modes/ModeSequenceMessage.h
+++ b/subsystem/modes/ModeSequenceMessage.h
@@ -2,6 +2,7 @@
 #define FSFW_SUBSYSTEM_MODES_MODESEQUENCEMESSAGE_H_
 
 #include "ModeDefinitions.h"
+
 #include "../../ipc/CommandMessage.h"
 #include "../../storagemanager/StorageManagerIF.h"
 
diff --git a/subsystem/modes/ModeStore.cpp b/subsystem/modes/ModeStore.cpp
index 260e5ab2..e216a167 100644
--- a/subsystem/modes/ModeStore.cpp
+++ b/subsystem/modes/ModeStore.cpp
@@ -1,8 +1,8 @@
-#include "../../subsystem/modes/ModeStore.h"
+#include "ModeStore.h"
 
 // todo: I think some parts are deprecated. If this is used,  the define
 // USE_MODESTORE could be part of the new FSFWConfig.h file.
-#ifdef USE_MODESTORE
+#if FSFW_USE_MODESTORE == 1
 
 ModeStore::ModeStore(object_id_t objectId, uint32_t slots) :
 		SystemObject(objectId), store(slots), emptySlot(store.front()) {
diff --git a/subsystem/modes/ModeStore.h b/subsystem/modes/ModeStore.h
index 3d031cc8..c05086c7 100644
--- a/subsystem/modes/ModeStore.h
+++ b/subsystem/modes/ModeStore.h
@@ -1,7 +1,9 @@
 #ifndef MODESTORE_H_
 #define MODESTORE_H_
 
-#ifdef USE_MODESTORE
+#include <FSFWConfig.h>
+
+#if FSFW_USE_MODESTORE == 1
 
 #include "../../container/ArrayList.h"
 #include "../../container/SinglyLinkedList.h"
diff --git a/subsystem/modes/ModeStoreIF.h b/subsystem/modes/ModeStoreIF.h
index 30cca1f7..9e76deef 100644
--- a/subsystem/modes/ModeStoreIF.h
+++ b/subsystem/modes/ModeStoreIF.h
@@ -1,7 +1,9 @@
 #ifndef MODESTOREIF_H_
 #define MODESTOREIF_H_
 
-#ifdef USE_MODESTORE
+#include <FSFWConfig.h>
+
+#if FSFW_USE_MODESTORE == 1
 
 #include "../../container/ArrayList.h"
 #include "../../container/SinglyLinkedList.h"