diff --git a/ecal/core/CMakeLists.txt b/ecal/core/CMakeLists.txt
index 558419d689..45ecc78bd4 100644
--- a/ecal/core/CMakeLists.txt
+++ b/ecal/core/CMakeLists.txt
@@ -69,6 +69,8 @@ set(ecal_config_src
     src/config/ecal_config_reader.cpp
     src/config/ecal_config_reader.h
     src/config/ecal_config_reader_hlp.h
+    src/pubsub/ecal_publisher_config.cpp
+    src/pubsub/ecal_subscriber_config.cpp
     src/types/ecal_custom_data_types.cpp
     src/types/ecal_registration_options.cpp
 )
@@ -199,7 +201,6 @@ endif()
 if(ECAL_CORE_PUBLISHER)
   set(ecal_pub_src
       src/pubsub/ecal_publisher.cpp
-      src/pubsub/ecal_publisher_config.cpp
       src/pubsub/ecal_pubgate.cpp
       src/pubsub/ecal_pubgate.h
   )
@@ -208,7 +209,6 @@ endif()
 if(ECAL_CORE_SUBSCRIBER)
   set(ecal_sub_src
       src/pubsub/ecal_subscriber.cpp
-      src/pubsub/ecal_subscriber_config.cpp
       src/pubsub/ecal_subgate.cpp
       src/pubsub/ecal_subgate.h
   )
@@ -461,6 +461,7 @@ endif()
 set(ecal_header_cmn
     include/ecal/types/logging.h
     include/ecal/types/monitoring.h
+    include/ecal/config/configuration.h
     include/ecal/config/publisher.h
     include/ecal/config/subscriber.h
     include/ecal/ecal.h
@@ -485,7 +486,6 @@ set(ecal_header_cmn
     include/ecal/ecal_tlayer.h
     include/ecal/ecal_types.h
     include/ecal/ecal_util.h
-    include/ecal/config/configuration.h
 )
 
 set(ecal_header_cimpl
diff --git a/ecal/core/src/config/ecal_cmd_parser.cpp b/ecal/core/src/config/ecal_cmd_parser.cpp
index b2567657b4..82b483c715 100644
--- a/ecal/core/src/config/ecal_cmd_parser.cpp
+++ b/ecal/core/src/config/ecal_cmd_parser.cpp
@@ -1,3 +1,22 @@
+/* ========================= eCAL LICENSE =================================
+ *
+ * Copyright (C) 2016 - 2024 Continental Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ========================= eCAL LICENSE =================================
+*/
+
 #include "config/ecal_cmd_parser.h"
 
 #include "ecal/ecal_defs.h"
diff --git a/ecal/core/src/config/ecal_config_reader.cpp b/ecal/core/src/config/ecal_config_reader.cpp
index 7b4be4de19..4c88f107ae 100644
--- a/ecal/core/src/config/ecal_config_reader.cpp
+++ b/ecal/core/src/config/ecal_config_reader.cpp
@@ -362,7 +362,7 @@ namespace eCAL
     virtual ~CConfigImpl() = default;
 
     void OverwriteKeys(const std::vector<std::string>& /*key_vec_*/) {}
-    void AddFile(std::string& /*file_name_*/) {}
+    bool AddFile(std::string& /*file_name_*/) {return false;}
 
     std::string GetValue(const std::string& /*section_*/, const std::string& /*key_*/, const std::string& default_) { return default_;}
     long GetLongValue(const std::string& /*section_*/, const std::string& /*key_*/, long default_)                  { return default_; }
diff --git a/ecal/tests/cpp/config_test/CMakeLists.txt b/ecal/tests/cpp/config_test/CMakeLists.txt
index 3eb4cde46c..9a8fc3cb83 100644
--- a/ecal/tests/cpp/config_test/CMakeLists.txt
+++ b/ecal/tests/cpp/config_test/CMakeLists.txt
@@ -24,7 +24,8 @@ find_package(tclap REQUIRED)
 
 set(cmd_parser_src
   ${ECAL_CORE_PROJECT_ROOT}/core/src/config/ecal_cmd_parser.cpp
-  ${ECAL_PROJECT_ROOT}/lib/ecal_utils/src/filesystem.cpp   # Ideally we should reference relatively to ECAL_CORE_PROJECT_ROOT
+  ${ECAL_CORE_PROJECT_ROOT}/core/src/util/advanced_tclap_output.cpp
+  ${ECAL_PROJECT_ROOT}/lib/ecal_utils/src/filesystem.cpp
   ${ECAL_PROJECT_ROOT}/lib/ecal_utils/src/str_convert.cpp 
 )
 
@@ -46,7 +47,6 @@ target_link_libraries(${PROJECT_NAME}
     eCAL::core 
     Threads::Threads
     tclap::tclap
-    CustomTclap
 )
 
 target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14)