diff --git a/ecal/core/src/service/ecal_clientgate.h b/ecal/core/src/service/ecal_clientgate.h
index fdc6b84f5a..3e7077eb66 100644
--- a/ecal/core/src/service/ecal_clientgate.h
+++ b/ecal/core/src/service/ecal_clientgate.h
@@ -25,23 +25,17 @@
 
 #include "ecal_def.h"
 #include "serialization/ecal_struct_sample_registration.h"
-#include "util/ecal_expmap.h"
 
 #include <ecal/ecal_callback.h>
 
 #include <atomic>
+#include <functional>
 #include <map>
-#include <set>
 #include <shared_mutex>
 #include <string>
-#include <vector>
 
 namespace eCAL
 {
-  // deprecated >>>
-  class CServiceClientImpl;
-  // deprecated <<<
-
   class CServiceClientImpl;
 
   class CClientGate
diff --git a/ecal/core/src/service/ecal_servicegate.h b/ecal/core/src/service/ecal_servicegate.h
index 020c6f47f1..cfebcfffde 100644
--- a/ecal/core/src/service/ecal_servicegate.h
+++ b/ecal/core/src/service/ecal_servicegate.h
@@ -27,8 +27,10 @@
 #include "serialization/ecal_struct_sample_registration.h"
 
 #include <atomic>
+#include <functional>
+#include <map>
 #include <shared_mutex>
-#include <set>
+#include <string>
 
 namespace eCAL
 {