diff --git a/example/cfdp/Config.h b/example/cfdp/Config.h
index 3abf353..071dd20 100644
--- a/example/cfdp/Config.h
+++ b/example/cfdp/Config.h
@@ -5,6 +5,9 @@
 
 namespace cfdp {
 
+extern PacketInfoListBase* PACKET_LIST_PTR;
+extern LostSegmentsListBase* LOST_SEGMENTS_PTR;
+
 class ExampleUserHandler : public UserBase {
  public:
   explicit ExampleUserHandler(HasFileSystemIF& vfs) : cfdp::UserBase(vfs) {}
diff --git a/example/core/GenericFactory.h b/example/core/GenericFactory.h
index fda8213..d894219 100644
--- a/example/core/GenericFactory.h
+++ b/example/core/GenericFactory.h
@@ -10,13 +10,6 @@
 class TmFunnel;
 class CcsdsDistributor;
 
-#if OBSW_ADD_CFDP_COMPONENTS == 1
-namespace cfdp {
-extern PacketInfoListBase* PACKET_LIST_PTR;
-extern LostSegmentsListBase* LOST_SEGMENTS_PTR;
-}  // namespace cfdp
-#endif
-
 namespace ObjectFactory {
 
 /**