diff --git a/unittest/testcfg/devices/logicalAddresses.cpp b/unittest/testcfg/devices/logicalAddresses.cpp
index 157762756..c7ce314d1 100644
--- a/unittest/testcfg/devices/logicalAddresses.cpp
+++ b/unittest/testcfg/devices/logicalAddresses.cpp
@@ -1,10 +1,4 @@
-/**
- * \file logicalAddresses.cpp
- *
- * \date 06.11.2019
- */
-
-#include <fsfw/unittest/config/devices/logicalAddresses.h>
+#include "logicalAddresses.h"
 
 
 
diff --git a/unittest/testcfg/devices/powerSwitcherList.cpp b/unittest/testcfg/devices/powerSwitcherList.cpp
index cb5685229..343f78d04 100644
--- a/unittest/testcfg/devices/powerSwitcherList.cpp
+++ b/unittest/testcfg/devices/powerSwitcherList.cpp
@@ -1,10 +1,4 @@
-/**
- * @file switcherList.cpp
- *
- * @date 28.11.2019
- */
-
-#include <fsfw/unittest/config/devices/powerSwitcherList.h>
+#include "powerSwitcherList.h"
 
 
 
diff --git a/unittest/testcfg/devices/powerSwitcherList.h b/unittest/testcfg/devices/powerSwitcherList.h
index f5b0eb112..86ddea570 100644
--- a/unittest/testcfg/devices/powerSwitcherList.h
+++ b/unittest/testcfg/devices/powerSwitcherList.h
@@ -1,19 +1,9 @@
-/**
- * @file switcherList.h
- *
- * @date 28.11.2019
- */
-
 #ifndef CONFIG_DEVICES_POWERSWITCHERLIST_H_
 #define CONFIG_DEVICES_POWERSWITCHERLIST_H_
 
 namespace switches {
 	/* Switches are uint8_t datatype and go from 0 to 255 */
 	enum switcherList {
-		PCDU,
-		GPS0,
-		GPS1,
-		DUMMY = 129
 	};
 
 }
diff --git a/unittest/testcfg/ipc/MissionMessageTypes.cpp b/unittest/testcfg/ipc/MissionMessageTypes.cpp
index 0ac8debea..d68cb58cc 100644
--- a/unittest/testcfg/ipc/MissionMessageTypes.cpp
+++ b/unittest/testcfg/ipc/MissionMessageTypes.cpp
@@ -1,5 +1,6 @@
+#include "MissionMessageTypes.h"
+
 #include <fsfw/ipc/CommandMessage.h>
-#include <fsfw/unittest/config/ipc/MissionMessageTypes.h>
 
 void messagetypes::clearMissionMessage(CommandMessage* message) {
 	switch(message->getMessageType()) {
diff --git a/unittest/testcfg/objects/Factory.cpp b/unittest/testcfg/objects/Factory.cpp
index 612527c97..e05b7942e 100644
--- a/unittest/testcfg/objects/Factory.cpp
+++ b/unittest/testcfg/objects/Factory.cpp
@@ -1,10 +1,10 @@
+#include "Factory.h"
+
 #include <fsfw/events/EventManager.h>
 #include <fsfw/health/HealthTable.h>
 
 #include <fsfw/internalError/InternalErrorReporter.h>
 #include <fsfw/objectmanager/frameworkObjects.h>
-#include <fsfw/unittest/config/cdatapool/dataPoolInit.h>
-#include <fsfw/unittest/config/objects/Factory.h>
 
 /**
  * @brief Produces system objects.