diff --git a/drivers/Makefile b/drivers/Makefile
index 28d4762a55..9e0aee9f69 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -1,13 +1,13 @@
-obj-y += cam_req_mgr/
-obj-y += cam_utils/
-obj-y += cam_core/
-obj-y += cam_sync/
-obj-y += cam_smmu/
-obj-y += cam_cpas/
-obj-y += cam_cdm/
-obj-y += cam_isp/
-obj-y += cam_sensor_module/
-obj-y += cam_icp/
-obj-y += cam_jpeg/
-obj-y += cam_fd/
-obj-y += cam_lrme/
+obj-$(CONFIG_SPECTRA_CAMERA) += cam_req_mgr/
+obj-$(CONFIG_SPECTRA_CAMERA) += cam_utils/
+obj-$(CONFIG_SPECTRA_CAMERA) += cam_core/
+obj-$(CONFIG_SPECTRA_CAMERA) += cam_sync/
+obj-$(CONFIG_SPECTRA_CAMERA) += cam_smmu/
+obj-$(CONFIG_SPECTRA_CAMERA) += cam_cpas/
+obj-$(CONFIG_SPECTRA_CAMERA) += cam_cdm/
+obj-$(CONFIG_SPECTRA_CAMERA) += cam_isp/
+obj-$(CONFIG_SPECTRA_CAMERA) += cam_sensor_module/
+obj-$(CONFIG_SPECTRA_CAMERA) += cam_icp/
+obj-$(CONFIG_SPECTRA_CAMERA) += cam_jpeg/
+obj-$(CONFIG_SPECTRA_CAMERA) += cam_fd/
+obj-$(CONFIG_SPECTRA_CAMERA) += cam_lrme/
diff --git a/drivers/cam_cdm/Makefile b/drivers/cam_cdm/Makefile
index 2b5b712cbb..323a523011 100644
--- a/drivers/cam_cdm/Makefile
+++ b/drivers/cam_cdm/Makefile
@@ -1,12 +1,12 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 
-obj-$(CONFIG_SPECTRA_CAMERA) += cam_cdm_util.o cam_cdm_intf.o cam_cdm_soc.o\
+obj-$(CONFIG_SPECTRA_CAMERA) += cam_cdm_soc.o cam_cdm_util.o cam_cdm_intf.o\
 				cam_cdm_core_common.o cam_cdm_virtual_core.o \
 				cam_cdm_hw_core.o
diff --git a/drivers/cam_cdm/cam_cdm_hw_core.c b/drivers/cam_cdm/cam_cdm_hw_core.c
index 40dba7352f..bf251a8238 100644
--- a/drivers/cam_cdm/cam_cdm_hw_core.c
+++ b/drivers/cam_cdm/cam_cdm_hw_core.c
@@ -10,7 +10,7 @@
 #include <linux/timer.h>
 #include <linux/kernel.h>
 
-#include <cam_req_mgr.h>
+#include <media/cam_req_mgr.h>
 #include "cam_soc_util.h"
 #include "cam_smmu_api.h"
 #include "cam_cdm_intf_api.h"
diff --git a/drivers/cam_core/Makefile b/drivers/cam_core/Makefile
index 986b65f0ec..e117039fc3 100644
--- a/drivers/cam_core/Makefile
+++ b/drivers/cam_core/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu/
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sync
diff --git a/drivers/cam_core/cam_context_utils.c b/drivers/cam_core/cam_context_utils.c
index 6b6b17743d..34dc7b81d4 100644
--- a/drivers/cam_core/cam_context_utils.c
+++ b/drivers/cam_core/cam_context_utils.c
@@ -7,8 +7,8 @@
 #include <linux/videodev2.h>
 #include <linux/slab.h>
 #include <linux/uaccess.h>
-#include <cam_sync.h>
-#include <cam_defs.h>
+#include <media/cam_sync.h>
+#include <media/cam_defs.h>
 
 #include "cam_context.h"
 #include "cam_context_utils.h"
diff --git a/drivers/cam_cpas/Makefile b/drivers/cam_cpas/Makefile
index e0af486932..6fc8f9830c 100644
--- a/drivers/cam_cpas/Makefile
+++ b/drivers/cam_cpas/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
diff --git a/drivers/cam_cpas/cam_cpas_intf.c b/drivers/cam_cpas/cam_cpas_intf.c
index d1b32a0d91..a1d8b40260 100644
--- a/drivers/cam_cpas/cam_cpas_intf.c
+++ b/drivers/cam_cpas/cam_cpas_intf.c
@@ -10,8 +10,8 @@
 #include <media/v4l2-event.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-subdev.h>
-#include <cam_cpas.h>
-#include <cam_req_mgr.h>
+#include <media/cam_cpas.h>
+#include <media/cam_req_mgr.h>
 #include <dt-bindings/msm/msm-camera.h>
 
 #include "cam_subdev.h"
diff --git a/drivers/cam_cpas/camss_top/Makefile b/drivers/cam_cpas/camss_top/Makefile
index 902e74e206..de11b71365 100644
--- a/drivers/cam_cpas/camss_top/Makefile
+++ b/drivers/cam_cpas/camss_top/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
diff --git a/drivers/cam_cpas/cpas_top/Makefile b/drivers/cam_cpas/cpas_top/Makefile
index 2db4c393c6..0306b14ef1 100644
--- a/drivers/cam_cpas/cpas_top/Makefile
+++ b/drivers/cam_cpas/cpas_top/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
diff --git a/drivers/cam_fd/Makefile b/drivers/cam_fd/Makefile
index 20fd941327..92356a35d8 100644
--- a/drivers/cam_fd/Makefile
+++ b/drivers/cam_fd/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
diff --git a/drivers/cam_fd/fd_hw_mgr/Makefile b/drivers/cam_fd/fd_hw_mgr/Makefile
index cc15876c96..8db8097679 100644
--- a/drivers/cam_fd/fd_hw_mgr/Makefile
+++ b/drivers/cam_fd/fd_hw_mgr/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
diff --git a/drivers/cam_fd/fd_hw_mgr/cam_fd_hw_mgr.c b/drivers/cam_fd/fd_hw_mgr/cam_fd_hw_mgr.c
index 0d7e709ad3..fad7caff64 100644
--- a/drivers/cam_fd/fd_hw_mgr/cam_fd_hw_mgr.c
+++ b/drivers/cam_fd/fd_hw_mgr/cam_fd_hw_mgr.c
@@ -5,8 +5,8 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <cam_cpas.h>
-#include <cam_req_mgr.h>
+#include <media/cam_cpas.h>
+#include <media/cam_req_mgr.h>
 
 #include "cam_io_util.h"
 #include "cam_soc_util.h"
diff --git a/drivers/cam_fd/fd_hw_mgr/cam_fd_hw_mgr.h b/drivers/cam_fd/fd_hw_mgr/cam_fd_hw_mgr.h
index 351cae971a..49bc5bbc1b 100644
--- a/drivers/cam_fd/fd_hw_mgr/cam_fd_hw_mgr.h
+++ b/drivers/cam_fd/fd_hw_mgr/cam_fd_hw_mgr.h
@@ -9,7 +9,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 
-#include <cam_fd.h>
+#include <media/cam_fd.h>
 #include "cam_hw.h"
 #include "cam_hw_intf.h"
 #include "cam_cpas_api.h"
diff --git a/drivers/cam_fd/fd_hw_mgr/fd_hw/Makefile b/drivers/cam_fd/fd_hw_mgr/fd_hw/Makefile
index fd43ca7a45..6a53cc67f7 100644
--- a/drivers/cam_fd/fd_hw_mgr/fd_hw/Makefile
+++ b/drivers/cam_fd/fd_hw_mgr/fd_hw/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
diff --git a/drivers/cam_fd/fd_hw_mgr/fd_hw/cam_fd_hw_core.h b/drivers/cam_fd/fd_hw_mgr/fd_hw/cam_fd_hw_core.h
index 22f9130d9c..1f8815e72f 100644
--- a/drivers/cam_fd/fd_hw_mgr/fd_hw/cam_fd_hw_core.h
+++ b/drivers/cam_fd/fd_hw_mgr/fd_hw/cam_fd_hw_core.h
@@ -9,8 +9,8 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <cam_defs.h>
-#include <cam_fd.h>
+#include <media/cam_defs.h>
+#include <media/cam_fd.h>
 
 #include "cam_common_util.h"
 #include "cam_debug_util.h"
diff --git a/drivers/cam_fd/fd_hw_mgr/fd_hw/cam_fd_hw_intf.h b/drivers/cam_fd/fd_hw_mgr/fd_hw/cam_fd_hw_intf.h
index 040bd161e0..e35e5e520b 100644
--- a/drivers/cam_fd/fd_hw_mgr/fd_hw/cam_fd_hw_intf.h
+++ b/drivers/cam_fd/fd_hw_mgr/fd_hw/cam_fd_hw_intf.h
@@ -9,9 +9,9 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <cam_cpas.h>
-#include <cam_req_mgr.h>
-#include <cam_fd.h>
+#include <media/cam_cpas.h>
+#include <media/cam_req_mgr.h>
+#include <media/cam_fd.h>
 
 #include "cam_io_util.h"
 #include "cam_soc_util.h"
diff --git a/drivers/cam_icp/Makefile b/drivers/cam_icp/Makefile
index b41c6cf1fb..aec65fc06f 100644
--- a/drivers/cam_icp/Makefile
+++ b/drivers/cam_icp/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
diff --git a/drivers/cam_icp/cam_icp_context.c b/drivers/cam_icp/cam_icp_context.c
index 6e043fd95c..ec23a6ee9d 100644
--- a/drivers/cam_icp/cam_icp_context.c
+++ b/drivers/cam_icp/cam_icp_context.c
@@ -7,9 +7,9 @@
 #include <linux/videodev2.h>
 #include <linux/slab.h>
 #include <linux/uaccess.h>
-#include <cam_sync.h>
-#include <cam_defs.h>
-#include <cam_icp.h>
+#include <media/cam_sync.h>
+#include <media/cam_defs.h>
+#include <media/cam_icp.h>
 #include "cam_node.h"
 #include "cam_context.h"
 #include "cam_context_utils.h"
diff --git a/drivers/cam_icp/cam_icp_subdev.c b/drivers/cam_icp/cam_icp_subdev.c
index f6dbaec5f1..bdb2ed5f90 100644
--- a/drivers/cam_icp/cam_icp_subdev.c
+++ b/drivers/cam_icp/cam_icp_subdev.c
@@ -17,9 +17,9 @@
 #include <media/v4l2-event.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-subdev.h>
-#include <cam_req_mgr.h>
-#include <cam_defs.h>
-#include <cam_icp.h>
+#include <media/cam_req_mgr.h>
+#include <media/cam_defs.h>
+#include <media/cam_icp.h>
 #include "cam_req_mgr_dev.h"
 #include "cam_subdev.h"
 #include "cam_node.h"
diff --git a/drivers/cam_icp/hfi.c b/drivers/cam_icp/hfi.c
index 06ad9de00e..783b5c3723 100644
--- a/drivers/cam_icp/hfi.c
+++ b/drivers/cam_icp/hfi.c
@@ -9,7 +9,7 @@
 #include <linux/random.h>
 #include <asm/errno.h>
 #include <linux/timer.h>
-#include <cam_icp.h>
+#include <media/cam_icp.h>
 #include <linux/iopoll.h>
 #include <soc/qcom/socinfo.h>
 
diff --git a/drivers/cam_icp/icp_hw/Makefile b/drivers/cam_icp/icp_hw/Makefile
index e07836a01f..68b36f7066 100644
--- a/drivers/cam_icp/icp_hw/Makefile
+++ b/drivers/cam_icp/icp_hw/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
diff --git a/drivers/cam_icp/icp_hw/a5_hw/Makefile b/drivers/cam_icp/icp_hw/a5_hw/Makefile
index db80567488..9c3aac09a1 100644
--- a/drivers/cam_icp/icp_hw/a5_hw/Makefile
+++ b/drivers/cam_icp/icp_hw/a5_hw/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
diff --git a/drivers/cam_icp/icp_hw/a5_hw/a5_core.c b/drivers/cam_icp/icp_hw/a5_hw/a5_core.c
index f7d94b2ce6..5a2b7868fb 100644
--- a/drivers/cam_icp/icp_hw/a5_hw/a5_core.c
+++ b/drivers/cam_icp/icp_hw/a5_hw/a5_core.c
@@ -13,7 +13,7 @@
 #include <linux/delay.h>
 #include <linux/timer.h>
 #include <linux/elf.h>
-#include <cam_icp.h>
+#include <media/cam_icp.h>
 #include "cam_io_util.h"
 #include "cam_a5_hw_intf.h"
 #include "cam_hw.h"
diff --git a/drivers/cam_icp/icp_hw/bps_hw/Makefile b/drivers/cam_icp/icp_hw/bps_hw/Makefile
index 2abf88310c..491e6a1649 100644
--- a/drivers/cam_icp/icp_hw/bps_hw/Makefile
+++ b/drivers/cam_icp/icp_hw/bps_hw/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
diff --git a/drivers/cam_icp/icp_hw/icp_hw_mgr/Makefile b/drivers/cam_icp/icp_hw/icp_hw_mgr/Makefile
index 2d06413e74..b87d5dba81 100644
--- a/drivers/cam_icp/icp_hw/icp_hw_mgr/Makefile
+++ b/drivers/cam_icp/icp_hw/icp_hw_mgr/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/isp/isp_hw/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_icp/icp_hw/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/isp/isp_hw/hw_utils/include
diff --git a/drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c b/drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c
index 57a88f5a30..17c26a654e 100644
--- a/drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c
+++ b/drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c
@@ -16,9 +16,9 @@
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/debugfs.h>
-#include <cam_defs.h>
-#include <cam_icp.h>
-#include <cam_cpas.h>
+#include <media/cam_defs.h>
+#include <media/cam_icp.h>
+#include <media/cam_cpas.h>
 
 #include "cam_sync_api.h"
 #include "cam_packet_util.h"
diff --git a/drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.h b/drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.h
index 3fa1ee0e0f..fb7fff0821 100644
--- a/drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.h
+++ b/drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.h
@@ -8,7 +8,7 @@
 
 #include <linux/types.h>
 #include <linux/completion.h>
-#include <cam_icp.h>
+#include <media/cam_icp.h>
 #include "cam_icp_hw_intf.h"
 #include "cam_hw_mgr_intf.h"
 #include "cam_hw_intf.h"
diff --git a/drivers/cam_icp/icp_hw/icp_hw_mgr/include/cam_a5_hw_intf.h b/drivers/cam_icp/icp_hw/icp_hw_mgr/include/cam_a5_hw_intf.h
index 397592a441..eaa56a4880 100644
--- a/drivers/cam_icp/icp_hw/icp_hw_mgr/include/cam_a5_hw_intf.h
+++ b/drivers/cam_icp/icp_hw/icp_hw_mgr/include/cam_a5_hw_intf.h
@@ -7,8 +7,8 @@
 #define CAM_A5_HW_INTF_H
 
 #include <linux/timer.h>
-#include <cam_defs.h>
-#include <cam_icp.h>
+#include <media/cam_defs.h>
+#include <media/cam_icp.h>
 #include "cam_hw_mgr_intf.h"
 #include "cam_icp_hw_intf.h"
 
diff --git a/drivers/cam_icp/icp_hw/icp_hw_mgr/include/cam_bps_hw_intf.h b/drivers/cam_icp/icp_hw/icp_hw_mgr/include/cam_bps_hw_intf.h
index e02022435d..f2628e4164 100644
--- a/drivers/cam_icp/icp_hw/icp_hw_mgr/include/cam_bps_hw_intf.h
+++ b/drivers/cam_icp/icp_hw/icp_hw_mgr/include/cam_bps_hw_intf.h
@@ -6,8 +6,8 @@
 #ifndef CAM_BPS_HW_INTF_H
 #define CAM_BPS_HW_INTF_H
 
-#include <cam_defs.h>
-#include <cam_icp.h>
+#include <media/cam_defs.h>
+#include <media/cam_icp.h>
 #include "cam_hw_mgr_intf.h"
 #include "cam_icp_hw_intf.h"
 
diff --git a/drivers/cam_icp/icp_hw/icp_hw_mgr/include/cam_ipe_hw_intf.h b/drivers/cam_icp/icp_hw/icp_hw_mgr/include/cam_ipe_hw_intf.h
index 836a564924..ea14ee623f 100644
--- a/drivers/cam_icp/icp_hw/icp_hw_mgr/include/cam_ipe_hw_intf.h
+++ b/drivers/cam_icp/icp_hw/icp_hw_mgr/include/cam_ipe_hw_intf.h
@@ -6,8 +6,8 @@
 #ifndef CAM_IPE_HW_INTF_H
 #define CAM_IPE_HW_INTF_H
 
-#include <cam_defs.h>
-#include <cam_icp.h>
+#include <media/cam_defs.h>
+#include <media/cam_icp.h>
 #include "cam_hw_mgr_intf.h"
 #include "cam_icp_hw_intf.h"
 
diff --git a/drivers/cam_icp/icp_hw/include/cam_icp_hw_mgr_intf.h b/drivers/cam_icp/icp_hw/include/cam_icp_hw_mgr_intf.h
index 25fbe2b8f6..d87c7ef238 100644
--- a/drivers/cam_icp/icp_hw/include/cam_icp_hw_mgr_intf.h
+++ b/drivers/cam_icp/icp_hw/include/cam_icp_hw_mgr_intf.h
@@ -7,8 +7,8 @@
 #define CAM_ICP_HW_MGR_INTF_H
 
 #include <linux/of.h>
-#include <cam_icp.h>
-#include <cam_defs.h>
+#include <media/cam_icp.h>
+#include <media/cam_defs.h>
 #include "cam_cpas_api.h"
 
 #define ICP_CLK_TURBO_HZ         600000000
diff --git a/drivers/cam_icp/icp_hw/ipe_hw/Makefile b/drivers/cam_icp/icp_hw/ipe_hw/Makefile
index 5055e12dff..d57373c332 100644
--- a/drivers/cam_icp/icp_hw/ipe_hw/Makefile
+++ b/drivers/cam_icp/icp_hw/ipe_hw/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
diff --git a/drivers/cam_isp/Makefile b/drivers/cam_isp/Makefile
index 069350122c..86ad96d61c 100644
--- a/drivers/cam_isp/Makefile
+++ b/drivers/cam_isp/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_isp/isp_hw_mgr/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
diff --git a/drivers/cam_isp/cam_isp_context.h b/drivers/cam_isp/cam_isp_context.h
index 1f5bd1048f..5aefa69069 100644
--- a/drivers/cam_isp/cam_isp_context.h
+++ b/drivers/cam_isp/cam_isp_context.h
@@ -8,8 +8,8 @@
 
 
 #include <linux/spinlock.h>
-#include <cam_isp.h>
-#include <cam_defs.h>
+#include <media/cam_isp.h>
+#include <media/cam_defs.h>
 
 #include "cam_context.h"
 #include "cam_isp_hw_mgr_intf.h"
diff --git a/drivers/cam_isp/cam_isp_dev.c b/drivers/cam_isp/cam_isp_dev.c
index b93ae3fd5b..9c3f33181a 100644
--- a/drivers/cam_isp/cam_isp_dev.c
+++ b/drivers/cam_isp/cam_isp_dev.c
@@ -11,7 +11,7 @@
 #include <linux/timer.h>
 #include <linux/kernel.h>
 
-#include <cam_req_mgr.h>
+#include <media/cam_req_mgr.h>
 #include "cam_isp_dev.h"
 #include "cam_hw_mgr_intf.h"
 #include "cam_isp_hw_mgr_intf.h"
diff --git a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/Makefile b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/Makefile
index bdf6d3ee98..d5ab83c81d 100644
--- a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/Makefile
+++ b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/Makefile
@@ -3,7 +3,7 @@
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils/
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cdm/
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core/
-ccflags-y += -I$(srctree)/techpack/camera/drivers/isp_hw_mgr/
+ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_isp/isp_hw_mgr/
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_isp/isp_hw_mgr/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_isp/isp_hw_mgr/hw_utils/irq_controller
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_isp/isp_hw_mgr/hw_utils/include
diff --git a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_rd_ver1.c b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_rd_ver1.c
index ca2d443747..ebf8115723 100644
--- a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_rd_ver1.c
+++ b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_rd_ver1.c
@@ -10,7 +10,7 @@
 #include "cam_debug_util.h"
 #include "cam_cdm_util.h"
 #include "cam_hw_intf.h"
-#include "../../cam_ife_hw_mgr.h"
+#include "cam_ife_hw_mgr.h"
 #include "cam_vfe_hw_intf.h"
 #include "cam_irq_controller.h"
 #include "cam_tasklet_util.h"
diff --git a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver2.c b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver2.c
index 2a452c0d87..990807b51a 100644
--- a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver2.c
+++ b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver2.c
@@ -10,7 +10,7 @@
 #include "cam_debug_util.h"
 #include "cam_cdm_util.h"
 #include "cam_hw_intf.h"
-#include "../../cam_ife_hw_mgr.h"
+#include "cam_ife_hw_mgr.h"
 #include "cam_vfe_hw_intf.h"
 #include "cam_irq_controller.h"
 #include "cam_tasklet_util.h"
diff --git a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver3.c b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver3.c
index f0dea326a8..0ec5ba8c08 100644
--- a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver3.c
+++ b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver3.c
@@ -11,7 +11,7 @@
 #include "cam_debug_util.h"
 #include "cam_cdm_util.h"
 #include "cam_hw_intf.h"
-#include "../../cam_ife_hw_mgr.h"
+#include "cam_ife_hw_mgr.h"
 #include "cam_vfe_hw_intf.h"
 #include "cam_irq_controller.h"
 #include "cam_tasklet_util.h"
diff --git a/drivers/cam_jpeg/Makefile b/drivers/cam_jpeg/Makefile
index 3b9bbdbedb..471f870e4c 100644
--- a/drivers/cam_jpeg/Makefile
+++ b/drivers/cam_jpeg/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sync
diff --git a/drivers/cam_jpeg/cam_jpeg_context.h b/drivers/cam_jpeg/cam_jpeg_context.h
index 739dc6fd45..3a11865a60 100644
--- a/drivers/cam_jpeg/cam_jpeg_context.h
+++ b/drivers/cam_jpeg/cam_jpeg_context.h
@@ -6,7 +6,7 @@
 #ifndef _CAM_JPEG_CONTEXT_H_
 #define _CAM_JPEG_CONTEXT_H_
 
-#include <cam_jpeg.h>
+#include <media/cam_jpeg.h>
 
 #include "cam_context.h"
 #include "cam_jpeg_hw_mgr_intf.h"
diff --git a/drivers/cam_lrme/Makefile b/drivers/cam_lrme/Makefile
index afc585ebf3..72cdba4da0 100644
--- a/drivers/cam_lrme/Makefile
+++ b/drivers/cam_lrme/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sync
diff --git a/drivers/cam_req_mgr/Makefile b/drivers/cam_req_mgr/Makefile
index 375d171331..50599d8792 100644
--- a/drivers/cam_req_mgr/Makefile
+++ b/drivers/cam_req_mgr/Makefile
@@ -1,10 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
-ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu
+ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu/
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
-ccflags-y += -I$(srctree)
+ccflags-y += -I$(src)
 
 obj-$(CONFIG_SPECTRA_CAMERA) += cam_req_mgr_core.o\
 				cam_req_mgr_dev.o \
diff --git a/drivers/cam_req_mgr/cam_mem_mgr_api.h b/drivers/cam_req_mgr/cam_mem_mgr_api.h
index 6141e7cc13..0bbf094ee1 100644
--- a/drivers/cam_req_mgr/cam_mem_mgr_api.h
+++ b/drivers/cam_req_mgr/cam_mem_mgr_api.h
@@ -7,7 +7,7 @@
 #define _CAM_MEM_MGR_API_H_
 
 #include <media/cam_req_mgr.h>
-#include "../cam_smmu/cam_smmu_api.h"
+#include "cam_smmu_api.h"
 
 /**
  * struct cam_mem_mgr_request_desc
diff --git a/drivers/cam_req_mgr/cam_req_mgr_dev.c b/drivers/cam_req_mgr/cam_req_mgr_dev.c
index b1a05cc14b..718942552b 100644
--- a/drivers/cam_req_mgr/cam_req_mgr_dev.c
+++ b/drivers/cam_req_mgr/cam_req_mgr_dev.c
@@ -10,8 +10,8 @@
 #include <media/v4l2-device.h>
 #include <media/v4l2-event.h>
 #include <media/v4l2-ioctl.h>
-#include <cam_req_mgr.h>
-#include <cam_defs.h>
+#include <media/cam_req_mgr.h>
+#include <media/cam_defs.h>
 #include "cam_req_mgr_dev.h"
 #include "cam_req_mgr_util.h"
 #include "cam_req_mgr_core.h"
diff --git a/drivers/cam_req_mgr/cam_req_mgr_util.c b/drivers/cam_req_mgr/cam_req_mgr_util.c
index 54ab1680b1..f833f667de 100644
--- a/drivers/cam_req_mgr/cam_req_mgr_util.c
+++ b/drivers/cam_req_mgr/cam_req_mgr_util.c
@@ -11,7 +11,7 @@
 #include <linux/mutex.h>
 #include <linux/spinlock.h>
 #include <linux/random.h>
-#include <cam_req_mgr.h>
+#include <media/cam_req_mgr.h>
 #include "cam_req_mgr_util.h"
 #include "cam_debug_util.h"
 
diff --git a/drivers/cam_sensor_module/cam_actuator/Makefile b/drivers/cam_sensor_module/cam_actuator/Makefile
index a51b8fea65..e61c6eeba3 100644
--- a/drivers/cam_sensor_module/cam_actuator/Makefile
+++ b/drivers/cam_sensor_module/cam_actuator/Makefile
@@ -1,12 +1,14 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_cci
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_io
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_utils
+ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 
+
 obj-$(CONFIG_SPECTRA_CAMERA) += cam_actuator_dev.o cam_actuator_core.o cam_actuator_soc.o
diff --git a/drivers/cam_sensor_module/cam_cci/Makefile b/drivers/cam_sensor_module/cam_cci/Makefile
index 82734cb814..a1301bf41d 100644
--- a/drivers/cam_sensor_module/cam_cci/Makefile
+++ b/drivers/cam_sensor_module/cam_cci/Makefile
@@ -1,11 +1,12 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
-ccflags-y += -I$(srctree)/techpack/camera/drivers/camera/cam_req_mgr
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
+ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr/
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_io
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_utils
+ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu
 ccflags-y += -I$(srctree)
 
 obj-$(CONFIG_SPECTRA_CAMERA) += cam_cci_dev.o cam_cci_core.o cam_cci_soc.o
diff --git a/drivers/cam_sensor_module/cam_cci/cam_cci_core.h b/drivers/cam_sensor_module/cam_cci/cam_cci_core.h
index aeaee32502..739fd303b2 100644
--- a/drivers/cam_sensor_module/cam_cci/cam_cci_core.h
+++ b/drivers/cam_sensor_module/cam_cci/cam_cci_core.h
@@ -6,7 +6,7 @@
 #define _CAM_CCI_CORE_H_
 
 #include <linux/irqreturn.h>
-#include <cam_sensor.h>
+#include <media/cam_sensor.h>
 #include "cam_cci_dev.h"
 #include "cam_cci_soc.h"
 
diff --git a/drivers/cam_sensor_module/cam_cci/cam_cci_dev.c b/drivers/cam_sensor_module/cam_cci/cam_cci_dev.c
index 5f155df4dc..e30574da5c 100644
--- a/drivers/cam_sensor_module/cam_cci/cam_cci_dev.c
+++ b/drivers/cam_sensor_module/cam_cci/cam_cci_dev.c
@@ -4,7 +4,7 @@
  */
 
 #include "cam_cci_dev.h"
-#include "../../cam_req_mgr/cam_req_mgr_dev.h"
+#include "cam_req_mgr_dev.h"
 #include "cam_cci_soc.h"
 #include "cam_cci_core.h"
 
diff --git a/drivers/cam_sensor_module/cam_cci/cam_cci_dev.h b/drivers/cam_sensor_module/cam_cci/cam_cci_dev.h
index 4bc1d34af3..439e3058a7 100644
--- a/drivers/cam_sensor_module/cam_cci/cam_cci_dev.h
+++ b/drivers/cam_sensor_module/cam_cci/cam_cci_dev.h
@@ -18,14 +18,14 @@
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/semaphore.h>
-#include <cam_sensor.h>
+#include <media/cam_sensor.h>
 #include <media/v4l2-event.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-subdev.h>
 #include <cam_sensor_cmn_header.h>
 #include <cam_io_util.h>
 #include <cam_sensor_util.h>
-#include "../../cam_req_mgr/cam_subdev.h"
+#include "cam_subdev.h"
 #include <cam_cpas_api.h>
 #include "cam_cci_hwreg.h"
 #include "cam_soc_util.h"
diff --git a/drivers/cam_sensor_module/cam_csiphy/Makefile b/drivers/cam_sensor_module/cam_csiphy/Makefile
index eb23b89c21..d98b845743 100644
--- a/drivers/cam_sensor_module/cam_csiphy/Makefile
+++ b/drivers/cam_sensor_module/cam_csiphy/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_io
diff --git a/drivers/cam_sensor_module/cam_csiphy/cam_csiphy_dev.c b/drivers/cam_sensor_module/cam_csiphy/cam_csiphy_dev.c
index 3325071905..ba98d9adcc 100644
--- a/drivers/cam_sensor_module/cam_csiphy/cam_csiphy_dev.c
+++ b/drivers/cam_sensor_module/cam_csiphy/cam_csiphy_dev.c
@@ -7,7 +7,7 @@
 #include "cam_req_mgr_dev.h"
 #include "cam_csiphy_soc.h"
 #include "cam_csiphy_core.h"
-#include <cam_sensor.h>
+#include <media/cam_sensor.h>
 
 static long cam_csiphy_subdev_ioctl(struct v4l2_subdev *sd,
 	unsigned int cmd, void *arg)
diff --git a/drivers/cam_sensor_module/cam_csiphy/cam_csiphy_dev.h b/drivers/cam_sensor_module/cam_csiphy/cam_csiphy_dev.h
index 2bae9a5152..78c7a848cd 100644
--- a/drivers/cam_sensor_module/cam_csiphy/cam_csiphy_dev.h
+++ b/drivers/cam_sensor_module/cam_csiphy/cam_csiphy_dev.h
@@ -18,7 +18,7 @@
 #include <media/v4l2-event.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-subdev.h>
-#include <cam_defs.h>
+#include <media/cam_defs.h>
 #include <cam_sensor_cmn_header.h>
 #include <cam_req_mgr_interface.h>
 #include <cam_subdev.h>
diff --git a/drivers/cam_sensor_module/cam_eeprom/Makefile b/drivers/cam_sensor_module/cam_eeprom/Makefile
index 850b16787c..7a676c1135 100644
--- a/drivers/cam_sensor_module/cam_eeprom/Makefile
+++ b/drivers/cam_sensor_module/cam_eeprom/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_io
diff --git a/drivers/cam_sensor_module/cam_eeprom/cam_eeprom_core.c b/drivers/cam_sensor_module/cam_eeprom/cam_eeprom_core.c
index c1320d97f6..6600c92d81 100644
--- a/drivers/cam_sensor_module/cam_eeprom/cam_eeprom_core.c
+++ b/drivers/cam_sensor_module/cam_eeprom/cam_eeprom_core.c
@@ -5,7 +5,7 @@
 
 #include <linux/module.h>
 #include <linux/crc32.h>
-#include <cam_sensor.h>
+#include <media/cam_sensor.h>
 
 #include "cam_eeprom_core.h"
 #include "cam_eeprom_soc.h"
diff --git a/drivers/cam_sensor_module/cam_eeprom/cam_eeprom_dev.h b/drivers/cam_sensor_module/cam_eeprom/cam_eeprom_dev.h
index 41817e97ea..66f8aaddc9 100644
--- a/drivers/cam_sensor_module/cam_eeprom/cam_eeprom_dev.h
+++ b/drivers/cam_sensor_module/cam_eeprom/cam_eeprom_dev.h
@@ -20,7 +20,7 @@
 #include <cam_req_mgr_interface.h>
 #include <cam_mem_mgr.h>
 #include <cam_subdev.h>
-#include <cam_sensor.h>
+#include <media/cam_sensor.h>
 #include "cam_soc_util.h"
 #include "cam_context.h"
 
diff --git a/drivers/cam_sensor_module/cam_flash/Makefile b/drivers/cam_sensor_module/cam_flash/Makefile
index dfc2bc2c8c..da9e9e1b19 100644
--- a/drivers/cam_sensor_module/cam_flash/Makefile
+++ b/drivers/cam_sensor_module/cam_flash/Makefile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
@@ -9,6 +9,7 @@ ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_cci
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_res_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_io
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_utils
+ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 
 obj-$(CONFIG_SPECTRA_CAMERA) += cam_flash_dev.o cam_flash_core.o cam_flash_soc.o
diff --git a/drivers/cam_sensor_module/cam_flash/cam_flash_core.h b/drivers/cam_sensor_module/cam_flash/cam_flash_core.h
index 6cafe927cd..c382809dbb 100644
--- a/drivers/cam_sensor_module/cam_flash/cam_flash_core.h
+++ b/drivers/cam_sensor_module/cam_flash/cam_flash_core.h
@@ -6,7 +6,7 @@
 #ifndef _CAM_FLASH_CORE_H_
 #define _CAM_FLASH_CORE_H_
 
-#include <cam_sensor.h>
+#include <media/cam_sensor.h>
 #include "cam_flash_dev.h"
 
 int cam_flash_publish_dev_info(struct cam_req_mgr_device_info *info);
diff --git a/drivers/cam_sensor_module/cam_flash/cam_flash_dev.h b/drivers/cam_sensor_module/cam_flash/cam_flash_dev.h
index 8bd5b9115f..43ed13406e 100644
--- a/drivers/cam_sensor_module/cam_flash/cam_flash_dev.h
+++ b/drivers/cam_sensor_module/cam_flash/cam_flash_dev.h
@@ -17,8 +17,8 @@
 #include <media/v4l2-subdev.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-event.h>
-#include <cam_sensor.h>
-#include <cam_req_mgr.h>
+#include <media/cam_sensor.h>
+#include <media/cam_req_mgr.h>
 #include "cam_req_mgr_util.h"
 #include "cam_req_mgr_interface.h"
 #include "cam_subdev.h"
diff --git a/drivers/cam_sensor_module/cam_ois/Makefile b/drivers/cam_sensor_module/cam_ois/Makefile
index 3452037395..fa7fabc0f0 100644
--- a/drivers/cam_sensor_module/cam_ois/Makefile
+++ b/drivers/cam_sensor_module/cam_ois/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_io
@@ -8,6 +8,7 @@ ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_res_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_cci
+ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core/
 
 obj-$(CONFIG_SPECTRA_CAMERA) += cam_ois_dev.o cam_ois_core.o cam_ois_soc.o
diff --git a/drivers/cam_sensor_module/cam_ois/cam_ois_dev.h b/drivers/cam_sensor_module/cam_ois/cam_ois_dev.h
index 1808a2b2f0..788243ae9d 100644
--- a/drivers/cam_sensor_module/cam_ois/cam_ois_dev.h
+++ b/drivers/cam_sensor_module/cam_ois/cam_ois_dev.h
@@ -10,7 +10,7 @@
 #include <media/v4l2-event.h>
 #include <media/v4l2-subdev.h>
 #include <media/v4l2-ioctl.h>
-#include <cam_sensor.h>
+#include <media/cam_sensor.h>
 #include <cam_sensor_i2c.h>
 #include <cam_sensor_spi.h>
 #include <cam_sensor_io.h>
diff --git a/drivers/cam_sensor_module/cam_res_mgr/Makefile b/drivers/cam_sensor_module/cam_res_mgr/Makefile
index 5bc9889b40..1c8ccb0e3b 100644
--- a/drivers/cam_sensor_module/cam_res_mgr/Makefile
+++ b/drivers/cam_sensor_module/cam_res_mgr/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-#ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+#ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
diff --git a/drivers/cam_sensor_module/cam_sensor/Makefile b/drivers/cam_sensor_module/cam_sensor/Makefile
index 641b1c4903..d3a6fbb6c3 100644
--- a/drivers/cam_sensor_module/cam_sensor/Makefile
+++ b/drivers/cam_sensor_module/cam_sensor/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
diff --git a/drivers/cam_sensor_module/cam_sensor_io/Makefile b/drivers/cam_sensor_module/cam_sensor_io/Makefile
index 34ab4315aa..5b11171fa0 100644
--- a/drivers/cam_sensor_module/cam_sensor_io/Makefile
+++ b/drivers/cam_sensor_module/cam_sensor_io/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_utils
diff --git a/drivers/cam_sensor_module/cam_sensor_io/cam_sensor_i2c.h b/drivers/cam_sensor_module/cam_sensor_io/cam_sensor_i2c.h
index 752b7fdd8a..def8be55bc 100644
--- a/drivers/cam_sensor_module/cam_sensor_io/cam_sensor_i2c.h
+++ b/drivers/cam_sensor_module/cam_sensor_io/cam_sensor_i2c.h
@@ -8,7 +8,7 @@
 
 #include <linux/delay.h>
 #include <media/v4l2-subdev.h>
-#include <cam_sensor.h>
+#include <media/cam_sensor.h>
 #include "cam_cci_dev.h"
 #include "cam_sensor_io.h"
 
diff --git a/drivers/cam_sensor_module/cam_sensor_io/cam_sensor_io.h b/drivers/cam_sensor_module/cam_sensor_io/cam_sensor_io.h
index 3c49212d2d..f70709997e 100644
--- a/drivers/cam_sensor_module/cam_sensor_io/cam_sensor_io.h
+++ b/drivers/cam_sensor_module/cam_sensor_io/cam_sensor_io.h
@@ -6,7 +6,7 @@
 #ifndef _CAM_SENSOR_IO_H_
 #define _CAM_SENSOR_IO_H_
 
-#include <cam_sensor.h>
+#include <media/cam_sensor.h>
 
 #include "cam_sensor_cmn_header.h"
 
diff --git a/drivers/cam_sensor_module/cam_sensor_io/cam_sensor_spi.h b/drivers/cam_sensor_module/cam_sensor_io/cam_sensor_spi.h
index 7a9c44332c..73d7ea9456 100644
--- a/drivers/cam_sensor_module/cam_sensor_io/cam_sensor_spi.h
+++ b/drivers/cam_sensor_module/cam_sensor_io/cam_sensor_spi.h
@@ -8,7 +8,7 @@
 
 #include <linux/spi/spi.h>
 #include <linux/cma.h>
-#include <cam_sensor.h>
+#include <media/cam_sensor.h>
 #include "cam_sensor_i2c.h"
 
 #define MAX_SPI_SIZE 110
diff --git a/drivers/cam_sensor_module/cam_sensor_utils/Makefile b/drivers/cam_sensor_module/cam_sensor_utils/Makefile
index 4813d33a5b..d822b2a733 100644
--- a/drivers/cam_sensor_module/cam_sensor_utils/Makefile
+++ b/drivers/cam_sensor_module/cam_sensor_utils/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_io
diff --git a/drivers/cam_sensor_module/cam_sensor_utils/cam_sensor_cmn_header.h b/drivers/cam_sensor_module/cam_sensor_utils/cam_sensor_cmn_header.h
index a5699342dc..e43e8abe08 100644
--- a/drivers/cam_sensor_module/cam_sensor_utils/cam_sensor_cmn_header.h
+++ b/drivers/cam_sensor_module/cam_sensor_utils/cam_sensor_cmn_header.h
@@ -13,8 +13,8 @@
 #include <linux/timer.h>
 #include <linux/delay.h>
 #include <linux/list.h>
-#include <cam_sensor.h>
-#include <cam_req_mgr.h>
+#include <media/cam_sensor.h>
+#include <media/cam_req_mgr.h>
 
 #define MAX_REGULATOR 5
 #define MAX_POWER_CONFIG 12
diff --git a/drivers/cam_sensor_module/cam_sensor_utils/cam_sensor_util.c b/drivers/cam_sensor_module/cam_sensor_utils/cam_sensor_util.c
index f5ea2dc04a..0d82579e79 100644
--- a/drivers/cam_sensor_module/cam_sensor_utils/cam_sensor_util.c
+++ b/drivers/cam_sensor_module/cam_sensor_utils/cam_sensor_util.c
@@ -5,7 +5,7 @@
 
 #include <linux/kernel.h>
 #include "cam_sensor_util.h"
-#include <cam_mem_mgr.h>
+#include "cam_mem_mgr.h"
 #include "cam_res_mgr_api.h"
 
 #define CAM_SENSOR_PINCTRL_STATE_SLEEP "cam_suspend"
diff --git a/drivers/cam_sensor_module/cam_sensor_utils/cam_sensor_util.h b/drivers/cam_sensor_module/cam_sensor_utils/cam_sensor_util.h
index 69679f8c76..c923efe61d 100644
--- a/drivers/cam_sensor_module/cam_sensor_utils/cam_sensor_util.h
+++ b/drivers/cam_sensor_module/cam_sensor_utils/cam_sensor_util.h
@@ -12,9 +12,9 @@
 #include <linux/of_gpio.h>
 #include <linux/of.h>
 #include "cam_sensor_cmn_header.h"
-#include "../../cam_req_mgr/cam_req_mgr_util.h"
-#include "../../cam_req_mgr/cam_req_mgr_interface.h"
-#include "../../cam_req_mgr/cam_mem_mgr.h"
+#include "cam_req_mgr_util.h"
+#include "cam_req_mgr_interface.h"
+#include <cam_mem_mgr.h>
 #include "cam_soc_util.h"
 #include "cam_debug_util.h"
 #include "cam_sensor_io.h"
diff --git a/drivers/cam_smmu/Makefile b/drivers/cam_smmu/Makefile
index c82e3978d0..b674b48ceb 100644
--- a/drivers/cam_smmu/Makefile
+++ b/drivers/cam_smmu/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
 
diff --git a/drivers/cam_smmu/cam_smmu_api.c b/drivers/cam_smmu/cam_smmu_api.c
index a60e02492a..478a00657f 100644
--- a/drivers/cam_smmu/cam_smmu_api.c
+++ b/drivers/cam_smmu/cam_smmu_api.c
@@ -15,7 +15,7 @@
 #include <linux/genalloc.h>
 #include <soc/qcom/scm.h>
 #include <soc/qcom/secure_buffer.h>
-#include <cam_req_mgr.h>
+#include <media/cam_req_mgr.h>
 #include "cam_smmu_api.h"
 #include "cam_debug_util.h"
 
diff --git a/drivers/cam_sync/Makefile b/drivers/cam_sync/Makefile
index e15ed0ce89..40efdf4dd7 100644
--- a/drivers/cam_sync/Makefile
+++ b/drivers/cam_sync/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
 ccflags-$(CONFIG_MSM_GLOBAL_SYNX) += -I$(srctree)/drivers/media/platform/msm/synx
 ccflags-y += -I$(src)
diff --git a/drivers/cam_utils/Makefile b/drivers/cam_utils/Makefile
index fb8c48eeeb..e17c2f50bb 100644
--- a/drivers/cam_utils/Makefile
+++ b/drivers/cam_utils/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/media
+ccflags-y += -I$(srctree)/techpack/camera/include/uapi
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core/
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr/
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu/
diff --git a/drivers/cam_utils/cam_trace.c b/drivers/cam_utils/cam_trace.c
index d4a6c92790..9b45091b4b 100644
--- a/drivers/cam_utils/cam_trace.c
+++ b/drivers/cam_utils/cam_trace.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
  */
 
 /* Instantiate tracepoints */
diff --git a/drivers/cam_utils/cam_trace.h b/drivers/cam_utils/cam_trace.h
index 95bc95da9e..8389975907 100644
--- a/drivers/cam_utils/cam_trace.h
+++ b/drivers/cam_utils/cam_trace.h
@@ -14,7 +14,7 @@
 #define TRACE_INCLUDE_FILE ../../techpack/camera/drivers/cam_utils/cam_trace
 
 #include <linux/tracepoint.h>
-#include <uapi/media/cam_req_mgr.h>
+#include <media/cam_req_mgr.h>
 #include "cam_req_mgr_core.h"
 #include "cam_req_mgr_interface.h"
 #include "cam_context.h"
diff --git a/include/uapi/media/cam_cpas.h b/include/uapi/media/cam_cpas.h
index a3d3ca9d5a..b85ab068f9 100644
--- a/include/uapi/media/cam_cpas.h
+++ b/include/uapi/media/cam_cpas.h
@@ -6,7 +6,7 @@
 #ifndef __UAPI_CAM_CPAS_H__
 #define __UAPI_CAM_CPAS_H__
 
-#include "cam_defs.h"
+#include <media/cam_defs.h>
 
 #define CAM_FAMILY_CAMERA_SS     1
 #define CAM_FAMILY_CPAS_SS       2
diff --git a/include/uapi/media/cam_fd.h b/include/uapi/media/cam_fd.h
index f456683b37..126be4555f 100644
--- a/include/uapi/media/cam_fd.h
+++ b/include/uapi/media/cam_fd.h
@@ -1,12 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
 /*
- * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
  */
 
 #ifndef __UAPI_CAM_FD_H__
 #define __UAPI_CAM_FD_H__
 
-#include "cam_defs.h"
+#include <media/cam_defs.h>
 
 #define CAM_FD_MAX_FACES                       35
 #define CAM_FD_RAW_RESULT_ENTRIES              512
diff --git a/include/uapi/media/cam_icp.h b/include/uapi/media/cam_icp.h
index ac683bffa4..4b5419d2f2 100644
--- a/include/uapi/media/cam_icp.h
+++ b/include/uapi/media/cam_icp.h
@@ -6,8 +6,8 @@
 #ifndef __UAPI_CAM_ICP_H__
 #define __UAPI_CAM_ICP_H__
 
-#include "cam_defs.h"
-#include "cam_cpas.h"
+#include <media/cam_defs.h>
+#include <media/cam_cpas.h>
 
 /* icp, ipe, bps, cdm(ipe/bps) are used in querycap */
 #define CAM_ICP_DEV_TYPE_A5      1
diff --git a/include/uapi/media/cam_isp.h b/include/uapi/media/cam_isp.h
index ee6440a900..956ad9880f 100644
--- a/include/uapi/media/cam_isp.h
+++ b/include/uapi/media/cam_isp.h
@@ -6,10 +6,10 @@
 #ifndef __UAPI_CAM_ISP_H__
 #define __UAPI_CAM_ISP_H__
 
-#include "cam_defs.h"
-#include "cam_isp_vfe.h"
-#include "cam_isp_ife.h"
-#include "cam_cpas.h"
+#include <media/cam_defs.h>
+#include <media/cam_isp_vfe.h>
+#include <media/cam_isp_ife.h>
+#include <media/cam_cpas.h>
 
 /* ISP driver name */
 #define CAM_ISP_DEV_NAME                        "cam-isp"
diff --git a/include/uapi/media/cam_jpeg.h b/include/uapi/media/cam_jpeg.h
index 6513bbae74..fd0ed2a2cf 100644
--- a/include/uapi/media/cam_jpeg.h
+++ b/include/uapi/media/cam_jpeg.h
@@ -1,12 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
 /*
- * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
  */
 
 #ifndef __UAPI_CAM_JPEG_H__
 #define __UAPI_CAM_JPEG_H__
 
-#include "cam_defs.h"
+#include <media/cam_defs.h>
 
 /* enc, dma, cdm(enc/dma) are used in querycap */
 #define CAM_JPEG_DEV_TYPE_ENC      0
diff --git a/include/uapi/media/cam_lrme.h b/include/uapi/media/cam_lrme.h
index 90e3e76e06..e3bd9449f7 100644
--- a/include/uapi/media/cam_lrme.h
+++ b/include/uapi/media/cam_lrme.h
@@ -1,12 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
 /*
- * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
  */
 
 #ifndef __UAPI_CAM_LRME_H__
 #define __UAPI_CAM_LRME_H__
 
-#include "cam_defs.h"
+#include <media/cam_defs.h>
 
 /* LRME Resource Types */
 
diff --git a/include/uapi/media/cam_req_mgr.h b/include/uapi/media/cam_req_mgr.h
index a8c12e2d7c..a1278dda9b 100644
--- a/include/uapi/media/cam_req_mgr.h
+++ b/include/uapi/media/cam_req_mgr.h
@@ -10,7 +10,7 @@
 #include <linux/types.h>
 #include <linux/ioctl.h>
 #include <linux/media.h>
-#include "cam_defs.h"
+#include <media/cam_defs.h>
 
 #define CAM_REQ_MGR_VNODE_NAME "cam-req-mgr-devnode"
 
diff --git a/include/uapi/media/cam_sensor.h b/include/uapi/media/cam_sensor.h
index 5e1918a9a1..514e8bd946 100644
--- a/include/uapi/media/cam_sensor.h
+++ b/include/uapi/media/cam_sensor.h
@@ -8,7 +8,7 @@
 
 #include <linux/types.h>
 #include <linux/ioctl.h>
-#include "cam_defs.h"
+#include <media/cam_defs.h>
 
 #define CAM_SENSOR_PROBE_CMD   (CAM_COMMON_OPCODE_MAX + 1)
 #define CAM_FLASH_MAX_LED_TRIGGERS 3