diff --git a/mission/core/GenericFactory.cpp b/mission/core/GenericFactory.cpp
index 9369c0f..75067f2 100644
--- a/mission/core/GenericFactory.cpp
+++ b/mission/core/GenericFactory.cpp
@@ -1,38 +1,37 @@
 #include "GenericFactory.h"
 
-#include <OBSWConfig.h>
-#include <tmtc/apid.h>
-#include <tmtc/pusIds.h>
-#include <objects/systemObjectList.h>
+#include "OBSWConfig.h"
+#include "tmtc/apid.h"
+#include "tmtc/pusIds.h"
+#include "objects/systemObjectList.h"
 
-#include <test/FsfwExampleTask.h>
-#include <test/FsfwReaderTask.h>
+#include "test/FsfwExampleTask.h"
+#include "test/FsfwReaderTask.h"
 
-#include <mission/assemblies/TestAssembly.h>
+#include "mission/assemblies/TestAssembly.h"
+#include "mission/devices/TestCookie.h"
+#include "mission/devices/TestDeviceHandler.h"
+#include "mission/devices/TestEchoComIF.h"
+#include "mission/utility/TmFunnel.h"
+#include "mission/controller/TestController.h"
 
-#include <mission/devices/TestCookie.h>
-#include <mission/devices/TestDeviceHandler.h>
-#include <mission/devices/TestEchoComIF.h>
-#include <mission/utility/TmFunnel.h>
-#include <mission/controller/TestController.h>
-
-#include <fsfw/devicehandlers/CookieIF.h>
-#include <fsfw/events/EventManager.h>
-#include <fsfw/health/HealthTable.h>
-#include <fsfw/internalError/InternalErrorReporter.h>
-#include <fsfw/pus/CService200ModeCommanding.h>
-#include <fsfw/pus/Service17Test.h>
-#include <fsfw/pus/Service1TelecommandVerification.h>
-#include <fsfw/pus/Service20ParameterManagement.h>
-#include <fsfw/pus/Service2DeviceAccess.h>
-#include <fsfw/pus/Service3Housekeeping.h>
-#include <fsfw/pus/Service5EventReporting.h>
-#include <fsfw/pus/Service8FunctionManagement.h>
-#include <fsfw/pus/Service9TimeManagement.h>
-#include <fsfw/tcdistribution/CCSDSDistributor.h>
-#include <fsfw/tcdistribution/PUSDistributor.h>
-#include <fsfw/timemanager/TimeStamper.h>
-#include <fsfw/tmtcpacket/pus/TmPacketStored.h>
+#include "fsfw/devicehandlers/CookieIF.h"
+#include "fsfw/events/EventManager.h"
+#include "fsfw/health/HealthTable.h"
+#include "fsfw/internalError/InternalErrorReporter.h"
+#include "fsfw/pus/CService200ModeCommanding.h"
+#include "fsfw/pus/Service17Test.h"
+#include "fsfw/pus/Service1TelecommandVerification.h"
+#include "fsfw/pus/Service20ParameterManagement.h"
+#include "fsfw/pus/Service2DeviceAccess.h"
+#include "fsfw/pus/Service3Housekeeping.h"
+#include "fsfw/pus/Service5EventReporting.h"
+#include "fsfw/pus/Service8FunctionManagement.h"
+#include "fsfw/pus/Service9TimeManagement.h"
+#include "fsfw/tcdistribution/CCSDSDistributor.h"
+#include "fsfw/tcdistribution/PUSDistributor.h"
+#include "fsfw/timemanager/TimeStamper.h"
+#include "fsfw/tmtcpacket/pus/TmPacketStored.h"