diff --git a/src/fsfw/FSFW.h.in b/src/fsfw/FSFW.h.in
index c644f0b7..9b74d04c 100644
--- a/src/fsfw/FSFW.h.in
+++ b/src/fsfw/FSFW.h.in
@@ -8,5 +8,6 @@
 #cmakedefine FSFW_ADD_TMSTORAGE
 #cmakedefine FSFW_ADD_COORDINATES
 #cmakedefine FSFW_ADD_PUS
+#cmakedefine FSFW_ADD_MONITORING
 
 #endif /* FSFW_FSFW_H_ */
diff --git a/src/fsfw/ipc/CommandMessageCleaner.cpp b/src/fsfw/ipc/CommandMessageCleaner.cpp
index 70b7dd4b..0918d739 100644
--- a/src/fsfw/ipc/CommandMessageCleaner.cpp
+++ b/src/fsfw/ipc/CommandMessageCleaner.cpp
@@ -8,9 +8,11 @@
 #include "fsfw/modes/ModeMessage.h"
 #include "fsfw/monitoring/MonitoringMessage.h"
 #include "fsfw/subsystem/modes/ModeSequenceMessage.h"
-#include "fsfw/tmstorage/TmStoreMessage.h"
 #include "fsfw/housekeeping/HousekeepingMessage.h"
 #include "fsfw/parameters/ParameterMessage.h"
+#ifdef FSFW_ADD_TMSTORAGE
+#include "fsfw/tmstorage/TmStoreMessage.h"
+#endif
 
 void CommandMessageCleaner::clearCommandMessage(CommandMessage* message) {
 	switch(message->getMessageType()){