diff --git a/driver/vidc/inc/msm_vidc_debug.h b/driver/vidc/inc/msm_vidc_debug.h
index 5b3dcf5978..d20116d252 100644
--- a/driver/vidc/inc/msm_vidc_debug.h
+++ b/driver/vidc/inc/msm_vidc_debug.h
@@ -6,6 +6,7 @@
 #ifndef __MSM_VIDC_DEBUG__
 #define __MSM_VIDC_DEBUG__
 
+#include <linux/errno.h>
 #include <linux/debugfs.h>
 #include <linux/delay.h>
 #include <linux/types.h>
diff --git a/driver/vidc/src/msm_vidc.c b/driver/vidc/src/msm_vidc.c
index fec47342b9..90d9c09680 100644
--- a/driver/vidc/src/msm_vidc.c
+++ b/driver/vidc/src/msm_vidc.c
@@ -5,7 +5,6 @@
 
 #include <linux/types.h>
 #include <linux/hash.h>
-#include "msm_vidc.h"
 #include "msm_vidc_core.h"
 #include "msm_vidc_inst.h"
 #include "msm_vdec.h"
@@ -19,6 +18,7 @@
 #include "msm_vidc_power.h"
 #include "msm_vidc_memory.h"
 #include "venus_hfi_response.h"
+#include "msm_vidc.h"
 
 #define MSM_VIDC_DRV_NAME "msm_vidc_driver"
 /* kernel/msm-4.19 */
diff --git a/driver/vidc/src/msm_vidc_dt.c b/driver/vidc/src/msm_vidc_dt.c
index 282b90d2de..fe615a44d8 100644
--- a/driver/vidc/src/msm_vidc_dt.c
+++ b/driver/vidc/src/msm_vidc_dt.c
@@ -8,10 +8,10 @@
 #include <linux/of.h>
 #include <linux/sort.h>
 
+#include "msm_vidc_debug.h"
 #include "msm_vidc_dt.h"
 #include "msm_vidc_internal.h"
 #include "msm_vidc_core.h"
-#include "msm_vidc_debug.h"
 #include "msm_vidc_driver.h"
 
 static size_t get_u32_array_num_elements(struct device_node *np,