diff --git a/src/fsfw/cfdp/tlv/FilestoreTlvBase.h b/src/fsfw/cfdp/tlv/FilestoreTlvBase.h
index 18eb515a..04012cda 100644
--- a/src/fsfw/cfdp/tlv/FilestoreTlvBase.h
+++ b/src/fsfw/cfdp/tlv/FilestoreTlvBase.h
@@ -1,7 +1,6 @@
 #ifndef FSFW_SRC_FSFW_CFDP_FILESTOREREQUESTBASE_H_
 #define FSFW_SRC_FSFW_CFDP_FILESTOREREQUESTBASE_H_
 
-#include <FSFWConfig.h>
 #include <fsfw/cfdp/definitions.h>
 #include <fsfw/cfdp/tlv/Lv.h>
 #include <fsfw/cfdp/tlv/Tlv.h>
@@ -12,6 +11,8 @@
 #include <cstddef>
 #include <cstdint>
 
+#include "fsfw/FSFW.h"
+
 namespace cfdp {
 
 enum FilestoreActionCode {
diff --git a/src/fsfw/serviceinterface/ServiceInterfacePrinter.h b/src/fsfw/serviceinterface/ServiceInterfacePrinter.h
index 2f3dfed5..65f7250a 100644
--- a/src/fsfw/serviceinterface/ServiceInterfacePrinter.h
+++ b/src/fsfw/serviceinterface/ServiceInterfacePrinter.h
@@ -1,7 +1,7 @@
 #ifndef FSFW_SERVICEINTERFACE_SERVICEINTERFACEPRINTER
 #define FSFW_SERVICEINTERFACE_SERVICEINTERFACEPRINTER
 
-#include <FSFWConfig.h>
+#include "fsfw/FSFW.h"
 
 #if FSFW_DISABLE_PRINTOUT == 0
 #include <cstdio>
diff --git a/src/fsfw/storagemanager/LocalPool.cpp b/src/fsfw/storagemanager/LocalPool.cpp
index 6acedaca..cee1d407 100644
--- a/src/fsfw/storagemanager/LocalPool.cpp
+++ b/src/fsfw/storagemanager/LocalPool.cpp
@@ -1,7 +1,5 @@
 #include "fsfw/storagemanager/LocalPool.h"
 
-#include <FSFWConfig.h>
-
 #include <cstring>
 
 #include "fsfw/FSFW.h"