diff --git a/ecal/core/include/ecal/ecal_core.h b/ecal/core/include/ecal/ecal_core.h
index 75d0ee2963..9c6b2088c5 100644
--- a/ecal/core/include/ecal/ecal_core.h
+++ b/ecal/core/include/ecal/ecal_core.h
@@ -32,6 +32,7 @@
 
 #include <ecal/ecal_os.h>
 #include <ecal/config/configuration.h>
+#include <ecal/ecal_types.h>
 
 namespace eCAL
 {
diff --git a/ecal/samples/cpp/pubsub/protobuf/proto_dyn_json_rec/src/proto_dyn_json_rec.cpp b/ecal/samples/cpp/pubsub/protobuf/proto_dyn_json_rec/src/proto_dyn_json_rec.cpp
index 1c048937bf..36ea727f2c 100644
--- a/ecal/samples/cpp/pubsub/protobuf/proto_dyn_json_rec/src/proto_dyn_json_rec.cpp
+++ b/ecal/samples/cpp/pubsub/protobuf/proto_dyn_json_rec/src/proto_dyn_json_rec.cpp
@@ -31,7 +31,7 @@ void ProtoMsgCallback(const char* topic_name_, const std::string& msg_, long lon
   std::cout << std::endl;
 }
 
-int main(int argc, char **argv)
+int main()
 {
   // initialize eCAL API
   eCAL::Initialize("proto_dyn");
diff --git a/ecal/samples/cpp/pubsub/protobuf/proto_dyn_snd/src/proto_dyn_snd.cpp b/ecal/samples/cpp/pubsub/protobuf/proto_dyn_snd/src/proto_dyn_snd.cpp
index c8928af6c7..6b9c243319 100644
--- a/ecal/samples/cpp/pubsub/protobuf/proto_dyn_snd/src/proto_dyn_snd.cpp
+++ b/ecal/samples/cpp/pubsub/protobuf/proto_dyn_snd/src/proto_dyn_snd.cpp
@@ -24,7 +24,7 @@
 
 #include "person.pb.h"
 
-int main(int argc, char **argv)
+int main()
 {
   // initialize eCAL API
   eCAL::Initialize("person publisher dynamic");
diff --git a/ecal/samples/cpp/pubsub/string/minimal_rec_cb/src/minimal_rec_cb.cpp b/ecal/samples/cpp/pubsub/string/minimal_rec_cb/src/minimal_rec_cb.cpp
index 2360693742..678281c611 100644
--- a/ecal/samples/cpp/pubsub/string/minimal_rec_cb/src/minimal_rec_cb.cpp
+++ b/ecal/samples/cpp/pubsub/string/minimal_rec_cb/src/minimal_rec_cb.cpp
@@ -25,7 +25,7 @@
 #include <chrono>
 #include <thread>
 
-int main(int argc, char** argv)
+int main()
 {
   std::cout << "-------------------------------" << std::endl;
   std::cout << " HELLO WORLD RECEIVER"           << std::endl;
diff --git a/ecal/samples/cpp/services/ping_client_dyn/src/ping_client_dyn.cpp b/ecal/samples/cpp/services/ping_client_dyn/src/ping_client_dyn.cpp
index aeb983f5b6..cfae92b6f1 100644
--- a/ecal/samples/cpp/services/ping_client_dyn/src/ping_client_dyn.cpp
+++ b/ecal/samples/cpp/services/ping_client_dyn/src/ping_client_dyn.cpp
@@ -29,7 +29,7 @@
 #include "proto_json_conv.h"
 
 // main entry
-int main(int argc, char **argv)
+int main()
 {
   // initialize eCAL API
   eCAL::Initialize("ping client dynamic");
diff --git a/ecal/tests/cpp/config_test/src/config_test.cpp b/ecal/tests/cpp/config_test/src/config_test.cpp
index 7a41f563b0..8416fdf465 100644
--- a/ecal/tests/cpp/config_test/src/config_test.cpp
+++ b/ecal/tests/cpp/config_test/src/config_test.cpp
@@ -60,7 +60,7 @@ TEST(core_cpp_config /*unused*/, user_config_passing /*unused*/)
   // Publisher options
   const bool                pub_use_shm                 = false;
 
-  eCAL::Configuration custom_config(0, nullptr);
+  eCAL::Configuration custom_config;
   try
   {
     custom_config.subscriber.drop_out_of_order_messages       = drop_out_of_order_messages;
@@ -112,7 +112,7 @@ TEST(core_cpp_config /*unused*/, user_config_passing /*unused*/)
 
 TEST(core_cpp_config /*unused*/, user_config_death_test /*unused*/)
 {
-  eCAL::Configuration custom_config(0, nullptr);
+  eCAL::Configuration custom_config;
 
   // Test the IpAddressV4 class with wrong values
   ASSERT_THROW(
@@ -189,8 +189,8 @@ TEST(core_cpp_config /*unused*/, config_custom_datatypes_tests /*unused*/)
   EXPECT_EQ(s1, s2);
 
   // test copy method for config structure
-  eCAL::Configuration config1(0, nullptr);
-  eCAL::Configuration config2(0, nullptr);
+  eCAL::Configuration config1;
+  eCAL::Configuration config2;
   std::string testValue = "234.0.3.2";
   config2.transport_layer.udp.network.group = testValue;
   auto& config2ref = config2;
diff --git a/ecal/tests/cpp/pubsub_test/src/pubsub_test.cpp b/ecal/tests/cpp/pubsub_test/src/pubsub_test.cpp
index dd29c6c154..ee7d74d9ef 100644
--- a/ecal/tests/cpp/pubsub_test/src/pubsub_test.cpp
+++ b/ecal/tests/cpp/pubsub_test/src/pubsub_test.cpp
@@ -207,7 +207,7 @@ TEST(core_cpp_pubsub, SimpleMessage1)
   std::string recv_s;
 
   // initialize eCAL API
-  eCAL::Initialize0, nullptr, "pubsub_test");
+  eCAL::Initialize("pubsub_test");
 
   // create publisher for topic "foo"
   eCAL::CPublisher pub("foo");