diff --git a/driver/vidc/inc/msm_vidc_control.h b/driver/vidc/inc/msm_vidc_control.h
index 5e9ed8a30e..87dc22e841 100644
--- a/driver/vidc/inc/msm_vidc_control.h
+++ b/driver/vidc/inc/msm_vidc_control.h
@@ -6,7 +6,7 @@
 #ifndef _MSM_VIDC_CONTROL_H_
 #define _MSM_VIDC_CONTROL_H_
 
-#include <media/msm_vidc_utils.h>
+#include <media/v4l2_vidc_extensions.h>
 #include "msm_vidc_inst.h"
 #include "msm_vidc_internal.h"
 
diff --git a/driver/vidc/src/msm_vdec.c b/driver/vidc/src/msm_vdec.c
index a6d80be430..928c4c39de 100644
--- a/driver/vidc/src/msm_vdec.c
+++ b/driver/vidc/src/msm_vdec.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2020, The Linux Foundation. All rights reserved.
  */
 
-#include <media/msm_vidc_utils.h>
+#include <media/v4l2_vidc_extensions.h>
 #include <media/msm_media_info.h>
 
 #include "msm_vdec.h"
diff --git a/driver/vidc/src/msm_venc.c b/driver/vidc/src/msm_venc.c
index 2d19b5b2ff..6450eb7d82 100644
--- a/driver/vidc/src/msm_venc.c
+++ b/driver/vidc/src/msm_venc.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2020, The Linux Foundation. All rights reserved.
  */
 
-#include <media/msm_vidc_utils.h>
+#include <media/v4l2_vidc_extensions.h>
 #include <media/msm_media_info.h>
 
 #include "msm_venc.h"
diff --git a/driver/vidc/src/msm_vidc_driver.c b/driver/vidc/src/msm_vidc_driver.c
index 8e8f94e0d7..83935d8387 100644
--- a/driver/vidc/src/msm_vidc_driver.c
+++ b/driver/vidc/src/msm_vidc_driver.c
@@ -5,7 +5,7 @@
 
 #include <linux/iommu.h>
 #include <linux/workqueue.h>
-#include <media/msm_vidc_utils.h>
+#include <media/v4l2_vidc_extensions.h>
 #include <media/msm_media_info.h>
 
 #include "msm_vidc_driver.h"
diff --git a/include/uapi/vidc/media/msm_vidc_utils.h b/include/uapi/vidc/media/v4l2_vidc_extensions.h
similarity index 96%
rename from include/uapi/vidc/media/msm_vidc_utils.h
rename to include/uapi/vidc/media/v4l2_vidc_extensions.h
index 9ceef699ef..eea8ab91b0 100644
--- a/include/uapi/vidc/media/msm_vidc_utils.h
+++ b/include/uapi/vidc/media/v4l2_vidc_extensions.h
@@ -3,8 +3,8 @@
  * Copyright (c) 2020, The Linux Foundation. All rights reserved.
  */
 
-#ifndef __MSM_VIDC_UTILS_H__
-#define __MSM_VIDC_UTILS_H__
+#ifndef __V4l2_VIDC_EXTENSIONS_H__
+#define __V4l2_VIDC_EXTENSIONS_H__
 
 #include <linux/types.h>
 #include <linux/v4l2-controls.h>