diff --git a/src/fsfw/FSFW.h.in b/src/fsfw/FSFW.h.in
index d4a8f3ba..9e3b5dfa 100644
--- a/src/fsfw/FSFW.h.in
+++ b/src/fsfw/FSFW.h.in
@@ -40,7 +40,11 @@
 
 #ifndef FSFW_USE_PUS_C_TELECOMMANDS
 #define FSFW_USE_PUS_C_TELECOMMANDS         1
-#endif
+#endif /* FSFW_USE_PUS_C_TELECOMMANDS */
+
+#ifndef FSFW_DEBUG_CFDP_DISTRIBUTOR
+#define FSFW_DEBUG_CFDP_DISTRIBUTOR         0
+#endif /* FSFW_DEBUG_CFDP_DISTRIBUTOR */
 
 #ifndef FSFW_TCP_RECV_WIRETAPPING_ENABLED
 #define FSFW_TCP_RECV_WIRETAPPING_ENABLED   0
diff --git a/src/fsfw/cfdp/CFDPHandler.h b/src/fsfw/cfdp/CFDPHandler.h
index 2f11eee3..9cacfe54 100644
--- a/src/fsfw/cfdp/CFDPHandler.h
+++ b/src/fsfw/cfdp/CFDPHandler.h
@@ -50,7 +50,8 @@ public:
     static object_id_t packetSource;
 
     static object_id_t packetDestination;
-        private:
+
+private:
     /**
      * This constant sets the maximum number of packets accepted per call.
      * Remember that one packet must be completely handled in one
diff --git a/src/fsfw/tcdistribution/CFDPDistributor.cpp b/src/fsfw/tcdistribution/CFDPDistributor.cpp
index f28a2998..8c06ddeb 100644
--- a/src/fsfw/tcdistribution/CFDPDistributor.cpp
+++ b/src/fsfw/tcdistribution/CFDPDistributor.cpp
@@ -1,3 +1,4 @@
+#include "fsfw/FSFW.h"
 #include "fsfw/tcdistribution/CCSDSDistributorIF.h"
 #include "fsfw/tcdistribution/CFDPDistributor.h"
 
@@ -5,10 +6,6 @@
 
 #include "fsfw/objectmanager/ObjectManager.h"
 
-#ifndef FSFW_CFDP_DISTRIBUTOR_DEBUGGING
-#define FSFW_CFDP_DISTRIBUTOR_DEBUGGING     1
-#endif
-
 CFDPDistributor::CFDPDistributor(uint16_t setApid, object_id_t setObjectId,
         object_id_t setPacketSource):
         TcDistributor(setObjectId), apid(setApid), checker(setApid),
@@ -18,7 +15,7 @@ CFDPDistributor::CFDPDistributor(uint16_t setApid, object_id_t setObjectId,
 CFDPDistributor::~CFDPDistributor() {}
 
 CFDPDistributor::TcMqMapIter CFDPDistributor::selectDestination() {
-#if FSFW_CFDP_DISTRIBUTOR_DEBUGGING == 1
+#if FSFW_DEBUG_CFDP_DISTRIBUTOR == 1
     store_address_t storeId = this->currentMessage.getStorageId();
 #if FSFW_CPP_OSTREAM_ENABLED == 1
     sif::debug << "CFDPDistributor::handlePacket received: " << storeId.poolIndex << ", " <<