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 50eec10255..42983fa1e0 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
@@ -32,46 +32,6 @@
 
 #define CAM_PKT_NOP_OPCODE 127
 
-enum camera_sensor_cmd_type {
-	CAMERA_SENSOR_CMD_TYPE_INVALID,
-	CAMERA_SENSOR_CMD_TYPE_PROBE,
-	CAMERA_SENSOR_CMD_TYPE_PWR_UP,
-	CAMERA_SENSOR_CMD_TYPE_PWR_DOWN,
-	CAMERA_SENSOR_CMD_TYPE_I2C_INFO,
-	CAMERA_SENSOR_CMD_TYPE_I2C_RNDM_WR,
-	CAMERA_SENSOR_CMD_TYPE_I2C_RNDM_RD,
-	CAMERA_SENSOR_CMD_TYPE_I2C_CONT_WR,
-	CAMERA_SENSOR_CMD_TYPE_I2C_CONT_RD,
-	CAMERA_SENSOR_CMD_TYPE_WAIT,
-	CAMERA_SENSOR_FLASH_CMD_TYPE_INIT_INFO,
-	CAMERA_SENSOR_FLASH_CMD_TYPE_FIRE,
-	CAMERA_SENSOR_FLASH_CMD_TYPE_RER,
-	CAMERA_SENSOR_FLASH_CMD_TYPE_QUERYCURR,
-	CAMERA_SENSOR_FLASH_CMD_TYPE_WIDGET,
-	CAMERA_SENSOR_CMD_TYPE_RD_DATA,
-	CAMERA_SENSOR_FLASH_CMD_TYPE_INIT_FIRE,
-	CAMERA_SENSOR_CMD_TYPE_MAX,
-};
-
-enum camera_sensor_i2c_op_code {
-	CAMERA_SENSOR_I2C_OP_INVALID,
-	CAMERA_SENSOR_I2C_OP_RNDM_WR,
-	CAMERA_SENSOR_I2C_OP_RNDM_WR_VERF,
-	CAMERA_SENSOR_I2C_OP_CONT_WR_BRST,
-	CAMERA_SENSOR_I2C_OP_CONT_WR_BRST_VERF,
-	CAMERA_SENSOR_I2C_OP_CONT_WR_SEQN,
-	CAMERA_SENSOR_I2C_OP_CONT_WR_SEQN_VERF,
-	CAMERA_SENSOR_I2C_OP_MAX,
-};
-
-enum camera_sensor_wait_op_code {
-	CAMERA_SENSOR_WAIT_OP_INVALID,
-	CAMERA_SENSOR_WAIT_OP_COND,
-	CAMERA_SENSOR_WAIT_OP_HW_UCND,
-	CAMERA_SENSOR_WAIT_OP_SW_UCND,
-	CAMERA_SENSOR_WAIT_OP_MAX,
-};
-
 enum camera_flash_opcode {
 	CAMERA_SENSOR_FLASH_OP_INVALID,
 	CAMERA_SENSOR_FLASH_OP_OFF,
@@ -146,38 +106,6 @@ enum msm_camera_power_seq_type {
 	SENSOR_SEQ_TYPE_MAX,
 };
 
-enum cam_sensor_packet_opcodes {
-	CAM_SENSOR_PACKET_OPCODE_SENSOR_STREAMON,
-	CAM_SENSOR_PACKET_OPCODE_SENSOR_UPDATE,
-	CAM_SENSOR_PACKET_OPCODE_SENSOR_INITIAL_CONFIG,
-	CAM_SENSOR_PACKET_OPCODE_SENSOR_PROBE,
-	CAM_SENSOR_PACKET_OPCODE_SENSOR_CONFIG,
-	CAM_SENSOR_PACKET_OPCODE_SENSOR_STREAMOFF,
-	CAM_SENSOR_PACKET_OPCODE_SENSOR_READ,
-	CAM_SENSOR_PACKET_OPCODE_SENSOR_FRAME_SKIP_UPDATE,
-	CAM_SENSOR_PACKET_OPCODE_SENSOR_PROBE_V2,
-	CAM_SENSOR_PACKET_OPCODE_SENSOR_NOP = 127
-};
-
-enum cam_actuator_packet_opcodes {
-	CAM_ACTUATOR_PACKET_OPCODE_INIT,
-	CAM_ACTUATOR_PACKET_AUTO_MOVE_LENS,
-	CAM_ACTUATOR_PACKET_MANUAL_MOVE_LENS,
-	CAM_ACTUATOR_PACKET_OPCODE_READ
-};
-
-enum cam_eeprom_packet_opcodes {
-	CAM_EEPROM_PACKET_OPCODE_INIT,
-	CAM_EEPROM_WRITE
-};
-
-enum cam_ois_packet_opcodes {
-	CAM_OIS_PACKET_OPCODE_INIT,
-	CAM_OIS_PACKET_OPCODE_OIS_CONTROL,
-	CAM_OIS_PACKET_OPCODE_READ,
-	CAM_OIS_PACKET_OPCODE_WRITE_TIME
-};
-
 enum msm_bus_perf_setting {
 	S_INIT,
 	S_PREVIEW,
diff --git a/include/uapi/camera/media/cam_sensor.h b/include/uapi/camera/media/cam_sensor.h
index b29dddea58..8508d440b4 100644
--- a/include/uapi/camera/media/cam_sensor.h
+++ b/include/uapi/camera/media/cam_sensor.h
@@ -15,6 +15,79 @@
 #define MAX_OIS_NAME_SIZE 32
 #define CAM_CSIPHY_SECURE_MODE_ENABLED 1
 #define CAM_SENSOR_NAME_MAX_SIZE 32
+
+enum camera_sensor_cmd_type {
+	CAMERA_SENSOR_CMD_TYPE_INVALID,
+	CAMERA_SENSOR_CMD_TYPE_PROBE,
+	CAMERA_SENSOR_CMD_TYPE_PWR_UP,
+	CAMERA_SENSOR_CMD_TYPE_PWR_DOWN,
+	CAMERA_SENSOR_CMD_TYPE_I2C_INFO,
+	CAMERA_SENSOR_CMD_TYPE_I2C_RNDM_WR,
+	CAMERA_SENSOR_CMD_TYPE_I2C_RNDM_RD,
+	CAMERA_SENSOR_CMD_TYPE_I2C_CONT_WR,
+	CAMERA_SENSOR_CMD_TYPE_I2C_CONT_RD,
+	CAMERA_SENSOR_CMD_TYPE_WAIT,
+	CAMERA_SENSOR_FLASH_CMD_TYPE_INIT_INFO,
+	CAMERA_SENSOR_FLASH_CMD_TYPE_FIRE,
+	CAMERA_SENSOR_FLASH_CMD_TYPE_RER,
+	CAMERA_SENSOR_FLASH_CMD_TYPE_QUERYCURR,
+	CAMERA_SENSOR_FLASH_CMD_TYPE_WIDGET,
+	CAMERA_SENSOR_CMD_TYPE_RD_DATA,
+	CAMERA_SENSOR_FLASH_CMD_TYPE_INIT_FIRE,
+	CAMERA_SENSOR_CMD_TYPE_MAX,
+};
+
+enum cam_actuator_packet_opcodes {
+	CAM_ACTUATOR_PACKET_OPCODE_INIT,
+	CAM_ACTUATOR_PACKET_AUTO_MOVE_LENS,
+	CAM_ACTUATOR_PACKET_MANUAL_MOVE_LENS,
+	CAM_ACTUATOR_PACKET_OPCODE_READ
+};
+
+enum cam_eeprom_packet_opcodes {
+	CAM_EEPROM_PACKET_OPCODE_INIT,
+	CAM_EEPROM_WRITE
+};
+
+enum cam_ois_packet_opcodes {
+	CAM_OIS_PACKET_OPCODE_INIT,
+	CAM_OIS_PACKET_OPCODE_OIS_CONTROL,
+	CAM_OIS_PACKET_OPCODE_READ,
+	CAM_OIS_PACKET_OPCODE_WRITE_TIME
+};
+
+enum camera_sensor_i2c_op_code {
+	CAMERA_SENSOR_I2C_OP_INVALID,
+	CAMERA_SENSOR_I2C_OP_RNDM_WR,
+	CAMERA_SENSOR_I2C_OP_RNDM_WR_VERF,
+	CAMERA_SENSOR_I2C_OP_CONT_WR_BRST,
+	CAMERA_SENSOR_I2C_OP_CONT_WR_BRST_VERF,
+	CAMERA_SENSOR_I2C_OP_CONT_WR_SEQN,
+	CAMERA_SENSOR_I2C_OP_CONT_WR_SEQN_VERF,
+	CAMERA_SENSOR_I2C_OP_MAX,
+};
+
+enum camera_sensor_wait_op_code {
+	CAMERA_SENSOR_WAIT_OP_INVALID,
+	CAMERA_SENSOR_WAIT_OP_COND,
+	CAMERA_SENSOR_WAIT_OP_HW_UCND,
+	CAMERA_SENSOR_WAIT_OP_SW_UCND,
+	CAMERA_SENSOR_WAIT_OP_MAX,
+};
+
+enum cam_sensor_packet_opcodes {
+	CAM_SENSOR_PACKET_OPCODE_SENSOR_STREAMON,
+	CAM_SENSOR_PACKET_OPCODE_SENSOR_UPDATE,
+	CAM_SENSOR_PACKET_OPCODE_SENSOR_INITIAL_CONFIG,
+	CAM_SENSOR_PACKET_OPCODE_SENSOR_PROBE,
+	CAM_SENSOR_PACKET_OPCODE_SENSOR_CONFIG,
+	CAM_SENSOR_PACKET_OPCODE_SENSOR_STREAMOFF,
+	CAM_SENSOR_PACKET_OPCODE_SENSOR_READ,
+	CAM_SENSOR_PACKET_OPCODE_SENSOR_FRAME_SKIP_UPDATE,
+	CAM_SENSOR_PACKET_OPCODE_SENSOR_PROBE_V2,
+	CAM_SENSOR_PACKET_OPCODE_SENSOR_NOP = 127
+};
+
 /**
  * struct cam_sensor_query_cap - capabilities info for sensor
  *