diff --git a/src/fsfw/cfdp/handler/DestHandler.cpp b/src/fsfw/cfdp/handler/DestHandler.cpp
index 6f4e17d0..fbd1785a 100644
--- a/src/fsfw/cfdp/handler/DestHandler.cpp
+++ b/src/fsfw/cfdp/handler/DestHandler.cpp
@@ -14,7 +14,7 @@
 
 using namespace returnvalue;
 
-cfdp::DestHandler::DestHandler(DestHandlerParams params, FsfwDestParams fsfwParams)
+cfdp::DestHandler::DestHandler(DestHandlerParams params, FsfwParams fsfwParams)
     : tlvVec(params.maxTlvsInOnePdu),
       userTlvVec(params.maxTlvsInOnePdu),
       destParams(std::move(params)),
diff --git a/src/fsfw/cfdp/handler/DestHandler.h b/src/fsfw/cfdp/handler/DestHandler.h
index c4793838..cf55c416 100644
--- a/src/fsfw/cfdp/handler/DestHandler.h
+++ b/src/fsfw/cfdp/handler/DestHandler.h
@@ -47,25 +47,6 @@ struct DestHandlerParams {
   size_t maxFilenameLen = 255;
 };
 
-struct FsfwDestParams {
-  FsfwDestParams(AcceptsTelemetryIF& packetDest, MessageQueueIF* msgQueue,
-                 EventReportingProxyIF* eventReporter, StorageManagerIF& tcStore,
-                 StorageManagerIF& tmStore)
-      : FsfwDestParams(packetDest, msgQueue, eventReporter) {
-    this->tcStore = &tcStore;
-    this->tmStore = &tmStore;
-  }
-
-  FsfwDestParams(AcceptsTelemetryIF& packetDest, MessageQueueIF* msgQueue,
-                 EventReportingProxyIF* eventReporter)
-      : packetDest(packetDest), msgQueue(msgQueue), eventReporter(eventReporter) {}
-  AcceptsTelemetryIF& packetDest;
-  MessageQueueIF* msgQueue;
-  EventReportingProxyIF* eventReporter = nullptr;
-  StorageManagerIF* tcStore = nullptr;
-  StorageManagerIF* tmStore = nullptr;
-};
-
 enum class CallStatus { DONE, CALL_AFTER_DELAY, CALL_AGAIN };
 
 class DestHandler {
@@ -101,7 +82,7 @@ class DestHandler {
    */
   ReturnValue_t PARTIAL_SUCCESS = returnvalue::makeCode(0, 2);
   ReturnValue_t FAILURE = returnvalue::makeCode(0, 3);
-  explicit DestHandler(DestHandlerParams handlerParams, FsfwDestParams fsfwParams);
+  explicit DestHandler(DestHandlerParams handlerParams, FsfwParams fsfwParams);
 
   /**
    *
@@ -166,7 +147,7 @@ class DestHandler {
   std::vector<cfdp::Tlv> tlvVec;
   std::vector<cfdp::Tlv> userTlvVec;
   DestHandlerParams destParams;
-  FsfwDestParams fsfwParams;
+  cfdp::FsfwParams fsfwParams;
   TransactionParams transactionParams;
   FsmResult fsmRes;
 
diff --git a/src/fsfw/cfdp/handler/SourceHandler.cpp b/src/fsfw/cfdp/handler/SourceHandler.cpp
index 2b64de7a..69610634 100644
--- a/src/fsfw/cfdp/handler/SourceHandler.cpp
+++ b/src/fsfw/cfdp/handler/SourceHandler.cpp
@@ -8,7 +8,7 @@
 
 using namespace returnvalue;
 
-cfdp::SourceHandler::SourceHandler(SourceHandlerParams params, FsfwSourceParams fsfwParams)
+cfdp::SourceHandler::SourceHandler(SourceHandlerParams params, FsfwParams fsfwParams)
     : transactionParams(params.maxFilePathSize),
       sourceParams(std::move(params)),
       fsfwParams(fsfwParams) {}
diff --git a/src/fsfw/cfdp/handler/SourceHandler.h b/src/fsfw/cfdp/handler/SourceHandler.h
index 211b436b..0bc3d741 100644
--- a/src/fsfw/cfdp/handler/SourceHandler.h
+++ b/src/fsfw/cfdp/handler/SourceHandler.h
@@ -22,30 +22,9 @@ struct SourceHandlerParams {
   size_t maxFilePathSize = 256;
 };
 
-// TODO: This class in identical to the ones used by the destination handler. Consider unifying
-//       them.
-struct FsfwSourceParams {
-  FsfwSourceParams(AcceptsTelemetryIF& packetDest, MessageQueueIF* msgQueue,
-                   EventReportingProxyIF* eventReporter, StorageManagerIF& tcStore,
-                   StorageManagerIF& tmStore)
-      : FsfwSourceParams(packetDest, msgQueue, eventReporter) {
-    this->tcStore = &tcStore;
-    this->tmStore = &tmStore;
-  }
-
-  FsfwSourceParams(AcceptsTelemetryIF& packetDest, MessageQueueIF* msgQueue,
-                   EventReportingProxyIF* eventReporter)
-      : packetDest(packetDest), msgQueue(msgQueue), eventReporter(eventReporter) {}
-  AcceptsTelemetryIF& packetDest;
-  MessageQueueIF* msgQueue;
-  EventReportingProxyIF* eventReporter = nullptr;
-  StorageManagerIF* tcStore = nullptr;
-  StorageManagerIF* tmStore = nullptr;
-};
-
 class SourceHandler {
  public:
-  SourceHandler(SourceHandlerParams params, FsfwSourceParams fsfwParams);
+  SourceHandler(SourceHandlerParams params, FsfwParams fsfwParams);
 
   /**
    * Pass a put request to the source handler, which might initiate a CFDP transaction and start
@@ -80,7 +59,7 @@ class SourceHandler {
   cfdp::CfdpState state = cfdp::CfdpState::IDLE;
   TransactionStep step = TransactionStep::IDLE;
   SourceHandlerParams sourceParams;
-  FsfwSourceParams fsfwParams;
+  cfdp::FsfwParams fsfwParams;
 
   void fsmNacked();
   ReturnValue_t checksumGeneration();
diff --git a/src/fsfw/cfdp/handler/defs.h b/src/fsfw/cfdp/handler/defs.h
index f4d96814..8098ed99 100644
--- a/src/fsfw/cfdp/handler/defs.h
+++ b/src/fsfw/cfdp/handler/defs.h
@@ -3,7 +3,9 @@
 
 #include <etl/list.h>
 
+#include "fsfw/storagemanager/StorageManagerIF.h"
 #include "fsfw/storagemanager/storeAddress.h"
+#include "fsfw/tmtcservices/AcceptsTelemetryIF.h"
 
 namespace cfdp {
 
@@ -22,6 +24,25 @@ struct PacketInfo {
   PacketInfo() = default;
 };
 
+struct FsfwParams {
+  FsfwParams(AcceptsTelemetryIF& packetDest, MessageQueueIF* msgQueue,
+             EventReportingProxyIF* eventReporter, StorageManagerIF& tcStore,
+             StorageManagerIF& tmStore)
+      : FsfwParams(packetDest, msgQueue, eventReporter) {
+    this->tcStore = &tcStore;
+    this->tmStore = &tmStore;
+  }
+
+  FsfwParams(AcceptsTelemetryIF& packetDest, MessageQueueIF* msgQueue,
+             EventReportingProxyIF* eventReporter)
+      : packetDest(packetDest), msgQueue(msgQueue), eventReporter(eventReporter) {}
+  AcceptsTelemetryIF& packetDest;
+  MessageQueueIF* msgQueue;
+  EventReportingProxyIF* eventReporter = nullptr;
+  StorageManagerIF* tcStore = nullptr;
+  StorageManagerIF* tmStore = nullptr;
+};
+
 template <size_t SIZE>
 using PacketInfoList = etl::list<PacketInfo, SIZE>;
 using PacketInfoListBase = etl::ilist<PacketInfo>;
diff --git a/unittests/cfdp/handler/testDestHandler.cpp b/unittests/cfdp/handler/testDestHandler.cpp
index 4d082418..d0aea3d5 100644
--- a/unittests/cfdp/handler/testDestHandler.cpp
+++ b/unittests/cfdp/handler/testDestHandler.cpp
@@ -38,7 +38,7 @@ TEST_CASE("CFDP Dest Handler", "[cfdp]") {
   LocalPool::LocalPoolConfig storeCfg = {{10, 32}, {10, 64}, {10, 128}, {10, 1024}};
   StorageManagerMock tcStore(2, storeCfg);
   StorageManagerMock tmStore(3, storeCfg);
-  FsfwDestParams fp(tmReceiver, &mqMock, &eventReporterMock);
+  FsfwParams fp(tmReceiver, &mqMock, &eventReporterMock);
   RemoteEntityCfg cfg(remoteId);
   remoteCfgTableMock.addRemoteConfig(cfg);
   fp.tcStore = &tcStore;