diff --git a/common/src/dscreen_util.cpp b/common/src/dscreen_util.cpp
index 95ba2b78aa8791f95842c74acf0ecb579c3e10f9..974e92be9de08528ac38dfe4f972dc995c16d85e 100644
--- a/common/src/dscreen_util.cpp
+++ b/common/src/dscreen_util.cpp
@@ -18,6 +18,7 @@
 #include <iomanip>
 #include <random>
 #include <sstream>
+#include <stddef.h>
 #include <sys/time.h>
 
 #include "softbus_bus_center.h"
diff --git a/screenhandler/BUILD.gn b/screenhandler/BUILD.gn
index cd5c1ec49c8f59cd388d9ca2409b79083b66878a..1f32267fc3512bb7905bbc250a56926da714bed2 100644
--- a/screenhandler/BUILD.gn
+++ b/screenhandler/BUILD.gn
@@ -35,7 +35,8 @@ ohos_shared_library("distributed_screen_handler") {
     deps = [
         "//utils/native/base:utils",
         "${mediastandard_path}/interfaces/innerkits/native/media:media_client",
-        "${windowmanager_path}/interfaces/innerkits:wm_interface",
+        "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
+        "//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client",
         "${windowmanager_path}/dm:libdm",
         "${common_path}:distributed_screen_utils",
     ]
diff --git a/services/common/databuffer/include/data_buffer.h b/services/common/databuffer/include/data_buffer.h
index 0c876f9242626b9ca4518613ac9ebdc63b80dcc2..7c465b668789fdbb3a0f22f4c2ced262ca0a777b 100644
--- a/services/common/databuffer/include/data_buffer.h
+++ b/services/common/databuffer/include/data_buffer.h
@@ -17,6 +17,7 @@
 #define OHOS_DATA_BUFFER_H
 
 #include <cstdint>
+#include <stddef.h>
 
 namespace OHOS {
 namespace DistributedHardware {
diff --git a/services/common/test/unittest/databuffer/BUILD.gn b/services/common/test/unittest/databuffer/BUILD.gn
index 3303511bec70b8e1deb12f1b0770fedc2c04042a..83a66676135d67b7a3cd6922528b06b31f9c287c 100644
--- a/services/common/test/unittest/databuffer/BUILD.gn
+++ b/services/common/test/unittest/databuffer/BUILD.gn
@@ -52,7 +52,6 @@ ohos_unittest("DataBufferTest") {
     "${fwk_utils_path}:distributedhardwareutils",
     "${graphicstandard_path}/frameworks/surface:surface",
     "${graphicstandard_path}/rosen/modules/render_service_client:librender_service_client",
-    "${windowmanager_path}/interfaces/innerkits:wm_interface",
     "${windowmanager_path}/wm:libwm",
     "//foundation/distributedhardware/distributedscreen/services/screentransport/screensinktrans:distributed_screen_sinktrans",
   ]
diff --git a/services/common/test/unittest/databuffer/data_buffer_test.h b/services/common/test/unittest/databuffer/data_buffer_test.h
index 4f0a72ba0babfdb90ebeebd81394e7e4ca27828f..b9bf80ffbf682642d4ee094ff3b34184d6859b22 100644
--- a/services/common/test/unittest/databuffer/data_buffer_test.h
+++ b/services/common/test/unittest/databuffer/data_buffer_test.h
@@ -18,6 +18,7 @@
 
 #include <gtest/gtest.h>
 #include <new>
+#include <stddef.h>
 
 #include "data_buffer.h"
 
diff --git a/services/common/test/unittest/utils/BUILD.gn b/services/common/test/unittest/utils/BUILD.gn
index a7fb715264ea9c94175649f1c74a5720ef01ee27..609fd72d2d437020e78ad7b05aa859c1fc0a6224 100644
--- a/services/common/test/unittest/utils/BUILD.gn
+++ b/services/common/test/unittest/utils/BUILD.gn
@@ -54,7 +54,6 @@ ohos_unittest("UtilsTest") {
     "${fwk_utils_path}:distributedhardwareutils",
     "${graphicstandard_path}/frameworks/surface:surface",
     "${graphicstandard_path}/rosen/modules/render_service_client:librender_service_client",
-    "${windowmanager_path}/interfaces/innerkits:wm_interface",
     "${windowmanager_path}/wm:libwm",
     "//foundation/distributedhardware/distributedscreen/services/screenservice/sinkservice:distributed_screen_sink",
   ]
diff --git a/services/screenclient/BUILD.gn b/services/screenclient/BUILD.gn
index 603c6378320ee2db5c1f01f7afcbe49337cbb27c..d81a18c711d3ba5612e26f79a9e6f801b889e773 100644
--- a/services/screenclient/BUILD.gn
+++ b/services/screenclient/BUILD.gn
@@ -38,7 +38,8 @@ ohos_shared_library("distributed_screen_client") {
   deps = [
     "${common_path}:distributed_screen_utils",
     "${graphicstandard_path}/frameworks/surface:surface",
-    "${windowmanager_path}/interfaces/innerkits:wm_interface",
+    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
+    "//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client",
     "${windowmanager_path}/wm:libwm",
     "//foundation/multimodalinput/input:mmi_uinject",
   ]
@@ -51,6 +52,7 @@ ohos_shared_library("distributed_screen_client") {
 
   external_deps = [
     "hiviewdfx_hilog_native:libhilog",
+    "multimodalinput_base:libmmi-client",
   ]
 
   part_name = "distributed_screen"
diff --git a/services/screenclient/test/unittest/BUILD.gn b/services/screenclient/test/unittest/BUILD.gn
index 4becb3d9ac9c6dcdb9481c4963ca3a6d853c00b8..36bde3223e43101bd68eb5931a47d8537c083e14 100644
--- a/services/screenclient/test/unittest/BUILD.gn
+++ b/services/screenclient/test/unittest/BUILD.gn
@@ -52,7 +52,6 @@ ohos_unittest("ScreenClientTest") {
     "${fwk_utils_path}:distributedhardwareutils",
     "${graphicstandard_path}/frameworks/surface:surface",
     "${graphicstandard_path}/rosen/modules/render_service_client:librender_service_client",
-    "${windowmanager_path}/interfaces/innerkits:wm_interface",
     "${windowmanager_path}/wm:libwm",
     "//foundation/distributedhardware/distributedscreen/services/screenclient:distributed_screen_client",
   ]
diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn
index 806fc477888038bd7078b013116640a3bbf7a995..0564cbdaec59d980d6869dd9703c545604bb68d2 100644
--- a/services/screenservice/sinkservice/BUILD.gn
+++ b/services/screenservice/sinkservice/BUILD.gn
@@ -59,7 +59,6 @@ ohos_shared_library("distributed_screen_sink") {
         "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans",
         "${services_path}/screenclient:distributed_screen_client",
         "//foundation/graphic/standard/frameworks/surface:surface",
-        "${windowmanager_path}/interfaces/innerkits:wm_interface",
         "${windowmanager_path}/dm:libdm",
     ]
 
diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn
index 37777849cda7ceafa886e319683daee46fa1b3fe..0fc5f3887b604dd08bb535c4290f7c3d280ab31c 100644
--- a/services/screenservice/sourceservice/BUILD.gn
+++ b/services/screenservice/sourceservice/BUILD.gn
@@ -59,8 +59,8 @@ ohos_shared_library("distributed_screen_source") {
         "//utils/native/base:utils",
         "${common_path}:distributed_screen_utils",
         "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
+        "//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client",
         "//foundation/graphic/standard/frameworks/surface:surface",
-        "${windowmanager_path}/interfaces/innerkits:wm_interface",
         "${windowmanager_path}/dm:libdm",
     ]
 
diff --git a/services/screentransport/screensinkprocessor/decoder/include/image_sink_decoder.h b/services/screentransport/screensinkprocessor/decoder/include/image_sink_decoder.h
index fa17b5a1ab3a5708b89d4f333f410a3c1668a439..4e378cac863cb90f47c6e3733e4ba69638e7435f 100644
--- a/services/screentransport/screensinkprocessor/decoder/include/image_sink_decoder.h
+++ b/services/screentransport/screensinkprocessor/decoder/include/image_sink_decoder.h
@@ -20,6 +20,7 @@
 #include <mutex>
 #include <queue>
 #include <condition_variable>
+#include <stddef.h>
 
 #include "avsharedmemory.h"
 #include "avcodec_common.h"
diff --git a/services/screentransport/screensourceprocessor/encoder/src/image_source_encoder.cpp b/services/screentransport/screensourceprocessor/encoder/src/image_source_encoder.cpp
index 4fb31b4bc36185e42458d6a7fc6de886c929e569..bfd1c630289ff2b2c201814dbaa397709d8e4cc0 100644
--- a/services/screentransport/screensourceprocessor/encoder/src/image_source_encoder.cpp
+++ b/services/screentransport/screensourceprocessor/encoder/src/image_source_encoder.cpp
@@ -16,6 +16,7 @@
 #include "image_source_encoder.h"
 
 #include <securec.h>
+#include <stddef.h>
 
 #include "dscreen_constants.h"
 #include "dscreen_errcode.h"
diff --git a/services/screentransport/test/unittest/screentranstestutils/include/screentrans_test_utils.h b/services/screentransport/test/unittest/screentranstestutils/include/screentrans_test_utils.h
index b38537d3a1c1310386c4807209308c14f151b88f..c62e62696202e1fb127fab3d8a6633e69f8454df 100644
--- a/services/screentransport/test/unittest/screentranstestutils/include/screentrans_test_utils.h
+++ b/services/screentransport/test/unittest/screentranstestutils/include/screentrans_test_utils.h
@@ -16,6 +16,8 @@
 #ifndef OHOS_SCREEN_TRANS_TEST_UTILS_H
 #define OHOS_SCREEN_TRANS_TEST_UTILS_H
 
+#include <stddef.h>
+
 #include "dscreen_errcode.h"
 #include "dscreen_log.h"
 #include "iimage_sink_processor_listener.h"