diff --git a/camera_hdf/hdi_impl/BUILD.gn b/camera_hdf/hdi_impl/BUILD.gn
index 9e152f18adde15e7b4479cb30afec3c64b96ce17..fbb5c864716833438adc7f34cb13de4c81138358 100644
--- a/camera_hdf/hdi_impl/BUILD.gn
+++ b/camera_hdf/hdi_impl/BUILD.gn
@@ -36,8 +36,6 @@ ohos_shared_library("distributed_camera_hdf") {
     "${fwk_common_path}/utils/include/",
     "${fwk_utils_path}/include",
     "${fwk_utils_path}/include/log",
-    "${camera_hdf_path}/camera/interfaces/include",
-    "${camera_hdf_path}/gralloc/src/adapter",
     "${display_hdf_path}/interfaces/include",
     "${hdf_framework_path}/include/utils",
     "${hdf_framework_path}/include/core",
@@ -51,7 +49,7 @@ ohos_shared_library("distributed_camera_hdf") {
     #producer
     "//foundation/graphic/standard/frameworks/surface/include",
     "//foundation/graphic/standard/interfaces/kits/surface",
-    "//foundation/graphic/standard/utils/include",
+    "//foundation/graphic/standard/utils/buffer_handle/export",
     "//foundation/communication/ipc/ipc/native/src/core/include",
     "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
     "//foundation/multimedia/camera_standard/frameworks/native/metadata/include",
@@ -79,6 +77,23 @@ ohos_shared_library("distributed_camera_hdf") {
     "src/utils/dcamera.cpp"
   ]
 
+  cflags = [
+    "-fPIC",
+    "-Wall",
+  ]
+
+  if (device_name == "baltimore") {
+    cflags += [ "-DBALTIMORE_CAMERA" ]
+    include_dirs += [
+      "${camera_hdf_path_baltimore}/camera/interfaces/include",
+    ]
+  } else {
+    include_dirs += [
+      "${camera_hdf_path}/camera/interfaces/include",
+      "${camera_hdf_path}/camera/interfaces/hdi_ipc",
+    ]
+  }
+
   deps = [
     "//utils/native/base:utils",
     "${common_path}:distributed_camera_utils",
@@ -89,7 +104,6 @@ ohos_shared_library("distributed_camera_hdf") {
     "//drivers/peripheral/display/hal:hdi_display_gralloc",
     "//foundation/multimedia/camera_standard/frameworks/native/metadata:metadata",
     "//third_party/jsoncpp:jsoncpp",
-    "${camera_hdf_path}/gralloc/src/adapter:libgralloc_adapter",
   ]
 
   defines = [
@@ -102,6 +116,7 @@ ohos_shared_library("distributed_camera_hdf") {
     "hiviewdfx_hilog_native:libhilog",
   ]
 
+  cflags_cc = cflags
   subsystem_name = "distributedhardware"
 
   part_name = "distributed_camera"
diff --git a/camera_hdf/hdi_impl/include/dcamera_device/dmetadata_processor.h b/camera_hdf/hdi_impl/include/dcamera_device/dmetadata_processor.h
index e51023984680f9c82d4fe4c9016945ad926f4e4c..c434ae6aab3a0e7e801865bbe61d9dd6477dd927 100644
--- a/camera_hdf/hdi_impl/include/dcamera_device/dmetadata_processor.h
+++ b/camera_hdf/hdi_impl/include/dcamera_device/dmetadata_processor.h
@@ -21,8 +21,13 @@
 #include <vector>
 #include "constants.h"
 #include "dcamera.h"
-#include <drivers/peripheral/adapter/camera/interfaces/include/types.h>
+
 #include <foundation/distributedhardware/distributedcamera/camera_hdf/interfaces/include/types.h>
+#ifdef BALTIMORE_CAMERA
+#include <drivers/peripheral/adapter/camera/interfaces/include/types.h>
+#else
+#include <drivers/peripheral/camera/interfaces/include/types.h>
+#endif
 
 namespace OHOS {
 namespace DistributedHardware {
diff --git a/camera_hdf/hdi_impl/include/dcamera_host/dcamera_host.h b/camera_hdf/hdi_impl/include/dcamera_host/dcamera_host.h
index 603ad354d0cb2042b9133c617e49ddb4ac9ce722..b99477274f78eee9cbf92b65315b1d92cac73006 100644
--- a/camera_hdf/hdi_impl/include/dcamera_host/dcamera_host.h
+++ b/camera_hdf/hdi_impl/include/dcamera_host/dcamera_host.h
@@ -21,8 +21,13 @@
 #include "icamera_device.h"
 #include "icamera_host_callback.h"
 #include "icamera_device_callback.h"
-#include <drivers/peripheral/adapter/camera/interfaces/include/types.h>
+
 #include <foundation/distributedhardware/distributedcamera/camera_hdf/interfaces/include/types.h>
+#ifdef BALTIMORE_CAMERA
+#include <drivers/peripheral/adapter/camera/interfaces/include/types.h>
+#else
+#include <drivers/peripheral/camera/interfaces/include/types.h>
+#endif
 
 namespace OHOS {
 namespace DistributedHardware {
diff --git a/camera_hdf/hdi_impl/include/dstream_operator/dcamera_steam.h b/camera_hdf/hdi_impl/include/dstream_operator/dcamera_steam.h
index 703ae26459ece2371dede93ccbcdcdc80b935946..ac1d1f209d7316302530a7e09c35c7b8427fa996 100644
--- a/camera_hdf/hdi_impl/include/dstream_operator/dcamera_steam.h
+++ b/camera_hdf/hdi_impl/include/dstream_operator/dcamera_steam.h
@@ -19,8 +19,13 @@
 #include "surface.h"
 #include "dimage_buffer.h"
 #include "dbuffer_manager.h"
-#include <drivers/peripheral/adapter/camera/interfaces/include/types.h>
+
 #include <foundation/distributedhardware/distributedcamera/camera_hdf/interfaces/include/types.h>
+#ifdef BALTIMORE_CAMERA
+#include <drivers/peripheral/adapter/camera/interfaces/include/types.h>
+#else
+#include <drivers/peripheral/camera/interfaces/include/types.h>
+#endif
 
 namespace OHOS {
 namespace DistributedHardware {
diff --git a/camera_hdf/hdi_impl/include/utils/dcamera.h b/camera_hdf/hdi_impl/include/utils/dcamera.h
index 768db55138810b59743b6b9fef40b5a149b4ac93..de4f61a16cd05d4a68f6f7a9affe5ded4b90fb1b 100644
--- a/camera_hdf/hdi_impl/include/utils/dcamera.h
+++ b/camera_hdf/hdi_impl/include/utils/dcamera.h
@@ -16,8 +16,12 @@
 #ifndef DISTRIBUTED_CAMERA_H
 #define DISTRIBUTED_CAMERA_H
 
-#include <drivers/peripheral/adapter/camera/interfaces/include/types.h>
 #include <foundation/distributedhardware/distributedcamera/camera_hdf/interfaces/include/types.h>
+#ifdef BALTIMORE_CAMERA
+#include <drivers/peripheral/adapter/camera/interfaces/include/types.h>
+#else
+#include <drivers/peripheral/camera/interfaces/include/types.h>
+#endif
 
 namespace OHOS {
 namespace DistributedHardware {
diff --git a/camera_hdf/hdi_impl/src/dcamera_device/dmetadata_processor.cpp b/camera_hdf/hdi_impl/src/dcamera_device/dmetadata_processor.cpp
index c8602c366c9fdb1a91d78ad1d73e6d957a25fd65..44fa7a12ce74549f2558bf4387bf029a44dce093 100644
--- a/camera_hdf/hdi_impl/src/dcamera_device/dmetadata_processor.cpp
+++ b/camera_hdf/hdi_impl/src/dcamera_device/dmetadata_processor.cpp
@@ -458,7 +458,7 @@ void DMetadataProcessor::ResizeMetadataHeader(common_metadata_header_t *header,
 
 uint32_t DMetadataProcessor::GetDataSize(uint32_t type)
 {
-    int32_t size = 0;
+    uint32_t size = 0;
     if (type == META_TYPE_BYTE) {
         size = sizeof(uint8_t);
     } else if (type == META_TYPE_INT32) {
diff --git a/camera_hdf/hdi_impl/src/dstream_operator/dcamera_steam.cpp b/camera_hdf/hdi_impl/src/dstream_operator/dcamera_steam.cpp
index 06ac97e9347597467fc9ec90e9019b6047828eb9..ee3cb82a32b01e541f9e9fec395f43f45f933f75 100644
--- a/camera_hdf/hdi_impl/src/dstream_operator/dcamera_steam.cpp
+++ b/camera_hdf/hdi_impl/src/dstream_operator/dcamera_steam.cpp
@@ -197,8 +197,7 @@ DCamRetCode DCameraStream::GetNextRequest()
     }
 
     std::shared_ptr<DImageBuffer> imageBuffer = std::make_shared<DImageBuffer>();
-    auto surface = OHOS::SurfaceBufferImpl::FromBase(surfaceBuffer);
-    RetCode ret = DBufferManager::SurfaceBufferToDImageBuffer(surface, imageBuffer);
+    RetCode ret = DBufferManager::SurfaceBufferToDImageBuffer(surfaceBuffer, imageBuffer);
     if (ret != RC_OK) {
         DHLOGE("Convert surface buffer to image buffer failed, streamId = %d.", dcStreamInfo_->streamId_);
         return DCamRetCode::EXCEED_MAX_NUMBER;
diff --git a/camera_hdf/hdi_impl/test/BUILD.gn b/camera_hdf/hdi_impl/test/BUILD.gn
index 04c5bca3e4b182bdd1c74fb96e80a3fecb8149fc..e00a47e70bf14291d59d14b34e8869372e09cee2 100644
--- a/camera_hdf/hdi_impl/test/BUILD.gn
+++ b/camera_hdf/hdi_impl/test/BUILD.gn
@@ -21,8 +21,7 @@ ohos_executable("dcamera_hdi_sample") {
     "dcamera_hdi_sample.cpp",
     "common.cpp"
   ]
-  cflags = [ "-Wall" ]
-  cflags_cc = cflags
+
   include_dirs = [
     "${distributedcamera_hdf_path}/interfaces/include",
     "${distributedcamera_hdf_path}/interfaces/hdi_ipc/client/device",
@@ -43,7 +42,6 @@ ohos_executable("dcamera_hdi_sample") {
     "${common_path}/include/constants",
     "${fwk_utils_path}/include",
     "${fwk_utils_path}/include/log",
-    "${camera_hdf_path}/camera/interfaces/include",
     "${hdf_framework_path}/include/utils",
     "${hdf_uhdf_path}/include/hdi",
     "${hdf_uhdf_path}/osal/include",
@@ -61,6 +59,23 @@ ohos_executable("dcamera_hdi_sample") {
     "${fwk_common_path}/utils/include",
   ]
 
+  cflags = [
+    "-fPIC",
+    "-Wall",
+  ]
+
+  if (device_name == "baltimore") {
+    cflags += [ "-DBALTIMORE_CAMERA" ]
+    include_dirs += [
+      "${camera_hdf_path_baltimore}/camera/interfaces/include",
+    ]
+  } else {
+    include_dirs += [
+      "${camera_hdf_path}/camera/interfaces/include",
+      "${camera_hdf_path}/camera/interfaces/hdi_ipc",
+    ]
+  }
+
   deps = [
     "${fwk_utils_path}:distributedhardwareutils",
     "${distributedcamera_hdf_path}/interfaces/hdi_ipc/client:distributed_camera_hdf_client",
@@ -78,6 +93,7 @@ ohos_executable("dcamera_hdi_sample") {
     "samgr_standard:samgr_proxy",
   ]
 
+  cflags_cc = cflags
   part_name = "distributed_camera"
   subsystem_name = "distributedhardware"
 }
\ No newline at end of file
diff --git a/camera_hdf/interfaces/hdi_ipc/client/BUILD.gn b/camera_hdf/interfaces/hdi_ipc/client/BUILD.gn
index 7353b562c7eff529eb24307be1680476e2e8dc46..571dd1e627217e1c477d5c9ec58b0c2fb6f7461f 100644
--- a/camera_hdf/interfaces/hdi_ipc/client/BUILD.gn
+++ b/camera_hdf/interfaces/hdi_ipc/client/BUILD.gn
@@ -25,7 +25,6 @@ ohos_shared_library("distributed_camera_hdf_client") {
     "${fwk_common_path}/utils/include/",
     "${fwk_utils_path}/include",
     "${fwk_utils_path}/include/log",
-    "${camera_hdf_path}/camera/interfaces/include",
     "${hdf_framework_path}/include/utils",
     "${hdf_uhdf_path}/include/hdi",
     "${hdf_uhdf_path}/osal/include",
@@ -40,6 +39,23 @@ ohos_shared_library("distributed_camera_hdf_client") {
     "//foundation/multimedia/camera_standard/frameworks/native/metadata/include",
   ]
 
+  cflags = [
+    "-fPIC",
+    "-Wall",
+  ]
+
+  if (device_name == "baltimore") {
+    cflags += [ "-DBALTIMORE_CAMERA" ]
+    include_dirs += [
+      "${camera_hdf_path_baltimore}/camera/interfaces/include",
+    ]
+  } else {
+    include_dirs += [
+      "${camera_hdf_path}/camera/interfaces/include",
+      "${camera_hdf_path}/camera/interfaces/hdi_ipc",
+    ]
+  }
+
   sources = [
     "device/dcamera_device_callback_stub.cpp",
     "device/dcamera_device_callback.cpp",
@@ -76,6 +92,7 @@ ohos_shared_library("distributed_camera_hdf_client") {
     "hiviewdfx_hilog_native:libhilog",
   ]
 
+  cflags_cc = cflags
   subsystem_name = "distributedhardware"
   part_name = "distributed_camera"
 }
diff --git a/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_callback_stub.cpp b/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_callback_stub.cpp
index 6e86fd0dfe2a98f78a4720e31cf52f1677260dd7..a72665e478dcec5d990e885b1bb0ef99d731b4ec 100644
--- a/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_callback_stub.cpp
+++ b/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_callback_stub.cpp
@@ -21,6 +21,10 @@
 
 #include <hdf_base.h>
 
+#ifndef BALTIMORE_CAMERA
+#include "cmd_common.h"
+#endif
+
 namespace OHOS {
 namespace DistributedHardware {
 int32_t DCameraDeviceCallbackStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply,
diff --git a/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_proxy.cpp b/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_proxy.cpp
index badfd01fc323670c6b0a4f1e943ef3d534a63852..5f4dc2ed6d6289544e0a58d3f22fa8f3cab42d14 100644
--- a/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_proxy.cpp
+++ b/camera_hdf/interfaces/hdi_ipc/client/device/dcamera_device_proxy.cpp
@@ -22,6 +22,10 @@
 #include "istream_operator_callback.h"
 #include "metadata_utils.h"
 
+#ifndef BALTIMORE_CAMERA
+#include "cmd_common.h"
+#endif
+
 namespace OHOS {
 namespace DistributedHardware {
 CamRetCode DCameraDeviceProxy::GetStreamOperator(
diff --git a/camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_callback_stub.cpp b/camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_callback_stub.cpp
index 36e27e2cec78c908ef61d0b5f87b2533a53db7e1..957b7d0cee390b524058f6679df0645dd1909462 100644
--- a/camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_callback_stub.cpp
+++ b/camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_callback_stub.cpp
@@ -19,6 +19,10 @@
 
 #include <hdf_base.h>
 
+#ifndef BALTIMORE_CAMERA
+#include "cmd_common.h"
+#endif
+
 namespace OHOS {
 namespace DistributedHardware {
 int32_t DCameraHostCallbackStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply,
diff --git a/camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_proxy.cpp b/camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_proxy.cpp
index 9565f39e53d0eda59ca95e1daf79df10b6de8dbc..8074be6f47b009dcd5b2499d301dcc5a397d6d2a 100644
--- a/camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_proxy.cpp
+++ b/camera_hdf/interfaces/hdi_ipc/client/host/dcamera_host_proxy.cpp
@@ -15,6 +15,7 @@
 
 #include "dcamera_host_proxy.h"
 #include <hdf_base.h>
+#include <hdf_log.h>
 #include <message_parcel.h>
 #include "distributed_hardware_log.h"
 #include "icamera_device.h"
@@ -23,6 +24,10 @@
 #include "ipc_data_utils.h"
 #include "metadata_utils.h"
 
+#ifndef BALTIMORE_CAMERA
+#include "cmd_common.h"
+#endif
+
 OHOS::sptr<OHOS::Camera::ICameraHost> OHOS::Camera::ICameraHost::Get(const char *serviceName)
 {
     using namespace OHOS::HDI::ServiceManager::V1_0;
diff --git a/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_callback_stub.cpp b/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_callback_stub.cpp
index 3c22c28b9260a903b321ab757d29e78c29ac4933..ebc6b256caf742cf11faf40ec8df2a523d23387a 100644
--- a/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_callback_stub.cpp
+++ b/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_callback_stub.cpp
@@ -19,6 +19,10 @@
 #include "distributed_hardware_log.h"
 #include "dstream_operator_callback.h"
 
+#ifndef BALTIMORE_CAMERA
+#include "cmd_common.h"
+#endif
+
 namespace OHOS {
 namespace DistributedHardware {
 int32_t DStreamOperatorCallbackStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply,
diff --git a/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_proxy.cpp b/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_proxy.cpp
index e5937f82ac881db082cbdecea3663344b18b2438..c30915d235cada788dfca394266683ad757b7b7b 100644
--- a/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_proxy.cpp
+++ b/camera_hdf/interfaces/hdi_ipc/client/operator/dstream_operator_proxy.cpp
@@ -15,6 +15,7 @@
 
 #include "dstream_operator_proxy.h"
 #include <hdf_base.h>
+#include <hdf_log.h>
 #include <message_parcel.h>
 #include "distributed_hardware_log.h"
 #include "ioffline_stream_operator.h"
@@ -22,6 +23,10 @@
 #include "istream_operator_callback.h"
 #include "metadata_utils.h"
 
+#ifndef BALTIMORE_CAMERA
+#include "cmd_common.h"
+#endif
+
 namespace OHOS {
 namespace DistributedHardware {
 CamRetCode DStreamOperatorProxy::IsStreamsSupported(OperationMode mode,
diff --git a/camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn b/camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn
index 77652f8a0aae979808aab370abeb36d930a342d1..1db284c892d499fb93288e9b53679f76fd8f7e9a 100644
--- a/camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn
+++ b/camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn
@@ -28,7 +28,6 @@ ohos_shared_library("distributed_camera_host_config") {
     "${common_path}/include/constants",
     "//utils/native/base/include",
     "//utils/system/safwk/native/include",
-    "${camera_hdf_path}/camera/interfaces/include",
     "${hdf_framework_path}/include/utils",
     "${hdf_framework_path}/include/core",
     "${hdf_framework_path}/include/osal",
@@ -46,6 +45,23 @@ ohos_shared_library("distributed_camera_host_config") {
     "//foundation/multimedia/camera_standard/frameworks/native/metadata/include",
   ]
 
+  cflags = [
+    "-fPIC",
+    "-Wall",
+  ]
+
+  if (device_name == "baltimore") {
+    cflags += [ "-DBALTIMORE_CAMERA" ]
+    include_dirs += [
+      "${camera_hdf_path_baltimore}/camera/interfaces/include",
+    ]
+  } else {
+    include_dirs += [
+      "${camera_hdf_path}/camera/interfaces/include",
+      "${camera_hdf_path}/camera/interfaces/hdi_ipc",
+    ]
+  }
+
   sources = [
     "dcamera_host_config.cpp"
   ]
@@ -67,6 +83,8 @@ ohos_shared_library("distributed_camera_host_config") {
     "hiviewdfx_hilog_native:libhilog",
   ]
   install_images = [ chipset_base_dir ]
+
+  cflags_cc = cflags
   subsystem_name = "distributedhardware"
 
   part_name = "distributed_camera"
diff --git a/camera_hdf/interfaces/hdi_ipc/config/provider/BUILD.gn b/camera_hdf/interfaces/hdi_ipc/config/provider/BUILD.gn
index 8c2f45ee5ff54f7727e255facd999cc9217d1b16..d514dc709a9156edde0040ff0defdfa52b27227d 100644
--- a/camera_hdf/interfaces/hdi_ipc/config/provider/BUILD.gn
+++ b/camera_hdf/interfaces/hdi_ipc/config/provider/BUILD.gn
@@ -23,7 +23,6 @@ ohos_shared_library("distributed_camera_provider_config") {
     "${distributedcamera_hdf_path}/hdi_impl/include/utils",
     "//utils/native/base/include",
     "//utils/system/safwk/native/include",
-    "${camera_hdf_path}/camera/interfaces/include",
     "${hdf_framework_path}/include/utils",
     "${hdf_framework_path}/include/core",
     "${hdf_framework_path}/include/osal",
@@ -41,6 +40,23 @@ ohos_shared_library("distributed_camera_provider_config") {
     "//foundation/multimedia/camera_standard/frameworks/native/metadata/include",
   ]
 
+  cflags = [
+    "-fPIC",
+    "-Wall",
+  ]
+
+  if (device_name == "baltimore") {
+    cflags += [ "-DBALTIMORE_CAMERA" ]
+    include_dirs += [
+      "${camera_hdf_path_baltimore}/camera/interfaces/include",
+    ]
+  } else {
+    include_dirs += [
+      "${camera_hdf_path}/camera/interfaces/include",
+      "${camera_hdf_path}/camera/interfaces/hdi_ipc",
+    ]
+  }
+
   sources = [
     "dcamera_provider_config.cpp"
   ]
@@ -62,6 +78,7 @@ ohos_shared_library("distributed_camera_provider_config") {
     "hiviewdfx_hilog_native:libhilog",
   ]
   install_images = [ chipset_base_dir ]
+  cflags_cc = cflags
   subsystem_name = "distributedhardware"
 
   part_name = "distributed_camera"
diff --git a/camera_hdf/interfaces/hdi_ipc/ipc_data_utils.h b/camera_hdf/interfaces/hdi_ipc/ipc_data_utils.h
index b57c44e680477465c248996ca1121f5c29f8e6bf..e657d632f1c88f503a4fb9b92ac01187b7ec3998 100644
--- a/camera_hdf/interfaces/hdi_ipc/ipc_data_utils.h
+++ b/camera_hdf/interfaces/hdi_ipc/ipc_data_utils.h
@@ -23,8 +23,13 @@
 #include <iostream>
 #include <iservmgr_hdi.h>
 #include "camera_metadata_info.h"
-#include <drivers/peripheral/adapter/camera/interfaces/include/types.h>
+
 #include <foundation/distributedhardware/distributedcamera/camera_hdf/interfaces/include/types.h>
+#ifdef BALTIMORE_CAMERA
+#include <drivers/peripheral/adapter/camera/interfaces/include/types.h>
+#else
+#include <drivers/peripheral/camera/interfaces/include/types.h>
+#endif
 
 namespace OHOS {
 namespace DistributedHardware {
diff --git a/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_callback_proxy.cpp b/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_callback_proxy.cpp
index c1d7c6586d6889f2abc5b26dbcc57eceb506745e..44b7e8349be06930499af0a7eeaf1001ddde1c08 100644
--- a/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_callback_proxy.cpp
+++ b/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_callback_proxy.cpp
@@ -20,6 +20,10 @@
 #include "ipc_data_utils.h"
 #include "metadata_utils.h"
 
+#ifndef BALTIMORE_CAMERA
+#include "cmd_common.h"
+#endif
+
 namespace OHOS {
 namespace DistributedHardware {
 void DCameraDeviceCallbackProxy::OnError(ErrorType type, int32_t errorMsg)
diff --git a/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_stub.cpp b/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_stub.cpp
index 81be1631ebac2fd3e96b7be6912da1937349b2ba..f2691921e683edfae4685c41ca3def1abc0ea188 100644
--- a/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_stub.cpp
+++ b/camera_hdf/interfaces/hdi_ipc/server/device/dcamera_device_stub.cpp
@@ -22,6 +22,10 @@
 #include "istream_operator_callback.h"
 #include "metadata_utils.h"
 
+#ifndef BALTIMORE_CAMERA
+#include "cmd_common.h"
+#endif
+
 namespace OHOS {
 namespace DistributedHardware {
 int32_t DCameraDeviceStub::OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel& reply,
diff --git a/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_callback_proxy.cpp b/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_callback_proxy.cpp
index eed9b4f4bcfa191c06a5e354ed070f46dfe93036..2fdae24c369cc284c52d6c48a457533987ca4648 100644
--- a/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_callback_proxy.cpp
+++ b/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_callback_proxy.cpp
@@ -18,6 +18,10 @@
 #include <message_parcel.h>
 #include "distributed_hardware_log.h"
 
+#ifndef BALTIMORE_CAMERA
+#include "cmd_common.h"
+#endif
+
 namespace OHOS {
 namespace DistributedHardware {
 void DCameraHostCallbackProxy::OnCameraStatus(const std::string &cameraId, CameraStatus status)
diff --git a/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_stub.cpp b/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_stub.cpp
index 5c11b7125142ea6021537921e05eae49da30355a..32eadba3e4796f43239ab21703533a68b9babb2f 100644
--- a/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_stub.cpp
+++ b/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_stub.cpp
@@ -23,6 +23,10 @@
 #include "ipc_data_utils.h"
 #include "metadata_utils.h"
 
+#ifndef BALTIMORE_CAMERA
+#include "cmd_common.h"
+#endif
+
 namespace OHOS {
 namespace DistributedHardware {
 DCameraHostStub::DCameraHostStub()
diff --git a/camera_hdf/interfaces/hdi_ipc/server/operator/doffline_stream_operator_stub.cpp b/camera_hdf/interfaces/hdi_ipc/server/operator/doffline_stream_operator_stub.cpp
index d378f32b4bd89f873f70be2e3824736904570ab9..d5be009c2cd335ee589cb0e21325853c30b0fa89 100644
--- a/camera_hdf/interfaces/hdi_ipc/server/operator/doffline_stream_operator_stub.cpp
+++ b/camera_hdf/interfaces/hdi_ipc/server/operator/doffline_stream_operator_stub.cpp
@@ -17,6 +17,10 @@
 #include <hdf_base.h>
 #include "distributed_hardware_log.h"
 
+#ifndef BALTIMORE_CAMERA
+#include "cmd_common.h"
+#endif
+
 namespace OHOS {
 namespace DistributedHardware {
 int32_t DOfflineStreamOperatorStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply,
diff --git a/camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_callback_proxy.cpp b/camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_callback_proxy.cpp
index 9e206856f551acc04ea7af3803105e781404b577..b971960ad9a0fcf4cf4693620861dba169d5e20a 100644
--- a/camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_callback_proxy.cpp
+++ b/camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_callback_proxy.cpp
@@ -18,6 +18,10 @@
 #include <message_parcel.h>
 #include "distributed_hardware_log.h"
 
+#ifndef BALTIMORE_CAMERA
+#include "cmd_common.h"
+#endif
+
 namespace OHOS {
 namespace DistributedHardware {
 void DStreamOperatorCallbackProxy::OnCaptureStarted(int32_t captureId, const std::vector<int32_t> &streamId)
diff --git a/camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_stub.cpp b/camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_stub.cpp
index b8dc46ad819a98eac292f94e9e835c3412135968..8a3132b9bd21c246f964766c03487fbed8a19d9a 100644
--- a/camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_stub.cpp
+++ b/camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_stub.cpp
@@ -21,6 +21,10 @@
 #include "istream_operator_callback.h"
 #include "metadata_utils.h"
 
+#ifndef BALTIMORE_CAMERA
+#include "cmd_common.h"
+#endif
+
 namespace OHOS {
 namespace DistributedHardware {
 int32_t DStreamOperatorStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply,
diff --git a/camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_stub.cpp b/camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_stub.cpp
index cb1245a9a162ee92061191549dad639e4789fcd3..b4c0096128c0f58cf4c26b4740607094dadc9971 100644
--- a/camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_stub.cpp
+++ b/camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_stub.cpp
@@ -14,6 +14,8 @@
  */
 
 #include "dcamera_provider_stub.h"
+
+#include <buffer_handle_parcel.h>
 #include <hdf_base.h>
 #include <hdf_log.h>
 #include <hdf_sbuf_ipc.h>
diff --git a/distributedcamera.gni b/distributedcamera.gni
index 8207be526f332bd3979d7fe5bf67a9282b71e7c4..feba3fe82795d9420e9f2de156c82d51debd6503 100644
--- a/distributedcamera.gni
+++ b/distributedcamera.gni
@@ -17,7 +17,9 @@ distributedhardwarefwk_path = "//foundation/distributedhardware/distributedhardw
 
 hdf_framework_path = "//drivers/framework"
 
-camera_hdf_path = "//drivers/peripheral/adapter"
+camera_hdf_path_baltimore = "//drivers/peripheral/adapter"
+
+camera_hdf_path = "//drivers/peripheral"
 
 display_hdf_path = "//drivers/peripheral/display"
 
diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerainterface/icamera_source_data_process.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerainterface/icamera_source_data_process.h
index 5c19df20c7a2f07bb216d58204024ad3c4b36b44..d8b9693d57482d38e0fc3b9fd88656a0e6121aa8 100644
--- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerainterface/icamera_source_data_process.h
+++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerainterface/icamera_source_data_process.h
@@ -47,7 +47,7 @@ public:
 
     bool operator < (const DCameraStreamConfig& others) const
     {
-        return (this->width_ < others.width_) || ((this->width_ == others.width_) && (this->height_ < this->height_));
+        return (this->width_ < others.width_) || ((this->width_ == others.width_) && (this->height_ < others.height_));
     }
 };
 
diff --git a/services/data_process/include/utils/image_common_type.h b/services/data_process/include/utils/image_common_type.h
index 9f692ea8e4693c40cc217191696db15495f7a5e5..0b33c4c6678407c2a6e1724e57254fff91c244c4 100644
--- a/services/data_process/include/utils/image_common_type.h
+++ b/services/data_process/include/utils/image_common_type.h
@@ -17,6 +17,7 @@
 #define OHOS_IMAGE_COMMON_TYPE_H
 
 #include <cstdlib>
+#include <cstdint>
 
 namespace OHOS {
 namespace DistributedHardware {