diff --git a/defaultcfg/fsfwconfig/devices/logicalAddresses.h b/defaultcfg/fsfwconfig/devices/logicalAddresses.h
index 174fa788b..e0827ba33 100644
--- a/defaultcfg/fsfwconfig/devices/logicalAddresses.h
+++ b/defaultcfg/fsfwconfig/devices/logicalAddresses.h
@@ -1,8 +1,8 @@
 #ifndef CONFIG_DEVICES_LOGICALADDRESSES_H_
 #define CONFIG_DEVICES_LOGICALADDRESSES_H_
 
-#include <config/objects/systemObjectList.h>
 #include <fsfw/devicehandlers/CookieIF.h>
+#include "../objects/systemObjectList.h"
 #include <cstdint>
 
 /**
diff --git a/defaultcfg/fsfwconfig/config.mk b/defaultcfg/fsfwconfig/fsfwconfig.mk
similarity index 100%
rename from defaultcfg/fsfwconfig/config.mk
rename to defaultcfg/fsfwconfig/fsfwconfig.mk
diff --git a/defaultcfg/fsfwconfig/ipc/missionMessageTypes.cpp b/defaultcfg/fsfwconfig/ipc/missionMessageTypes.cpp
index e2edbf9c5..b41b87ba1 100644
--- a/defaultcfg/fsfwconfig/ipc/missionMessageTypes.cpp
+++ b/defaultcfg/fsfwconfig/ipc/missionMessageTypes.cpp
@@ -1,4 +1,5 @@
-#include <config/ipc/MissionMessageTypes.h>
+#include "missionMessageTypes.h"
+
 #include <fsfw/ipc/CommandMessageIF.h>
 
 void messagetypes::clearMissionMessage(CommandMessage* message) {
diff --git a/unittest/tests/storagemanager/TestPool.cpp b/unittest/tests/storagemanager/TestPool.cpp
index 3f5341e99..daeb6bb52 100644
--- a/unittest/tests/storagemanager/TestPool.cpp
+++ b/unittest/tests/storagemanager/TestPool.cpp
@@ -1,6 +1,5 @@
 #include "CatchDefinitions.h"
 
-#include <config/objects/Factory.h>
 #include <fsfw/objectmanager/ObjectManager.h>
 #include <fsfw/storagemanager/LocalPool.h>