diff --git a/datapool/PoolDataSetBase.cpp b/datapool/PoolDataSetBase.cpp
index 176676ce..88470152 100644
--- a/datapool/PoolDataSetBase.cpp
+++ b/datapool/PoolDataSetBase.cpp
@@ -1,7 +1,7 @@
 #include "PoolDataSetBase.h"
 #include "ReadCommitIFAttorney.h"
 
-#include "../serviceinterface/ServiceInterfaceStream.h"
+#include "../serviceinterface/ServiceInterface.h"
 
 #include <cstring>
 
diff --git a/osal/host/Clock.cpp b/osal/host/Clock.cpp
index f0543c79..c097f619 100644
--- a/osal/host/Clock.cpp
+++ b/osal/host/Clock.cpp
@@ -1,4 +1,4 @@
-#include "../../serviceinterface/ServiceInterfaceStream.h"
+#include "../../serviceinterface/ServiceInterface.h"
 #include "../../timemanager/Clock.h"
 
 #include <chrono>
diff --git a/osal/host/QueueMapManager.cpp b/osal/host/QueueMapManager.cpp
index 9fb8b7a3..2a54f813 100644
--- a/osal/host/QueueMapManager.cpp
+++ b/osal/host/QueueMapManager.cpp
@@ -1,5 +1,6 @@
 #include "QueueMapManager.h"
 
+#include "../../serviceinterface/ServiceInterface.h"
 #include "../../ipc/MutexFactory.h"
 #include "../../ipc/MutexHelper.h"
 
diff --git a/unittest/tests/datapoollocal/DataSetTest.cpp b/unittest/tests/datapoollocal/DataSetTest.cpp
index 5c2428ae..370a1e27 100644
--- a/unittest/tests/datapoollocal/DataSetTest.cpp
+++ b/unittest/tests/datapoollocal/DataSetTest.cpp
@@ -14,8 +14,7 @@ TEST_CASE("LocalDataSet" , "[LocDataSetTest]") {
             == retval::CATCH_OK);
     const uint32_t setId = 0;
     SECTION("BasicTest") {
-        StaticLocalDataSet<3> localSet = StaticLocalDataSet<3>(
-                sid_t(objects::TEST_LOCAL_POOL_OWNER_BASE, setId));
+        StaticLocalDataSet<3> localSet(sid_t(objects::TEST_LOCAL_POOL_OWNER_BASE, setId));
     }
 }