diff --git a/include/uapi/vidc/media/msm_media_info.h b/driver/vidc/inc/msm_media_info.h
similarity index 100%
rename from include/uapi/vidc/media/msm_media_info.h
rename to driver/vidc/inc/msm_media_info.h
diff --git a/driver/vidc/src/msm_vdec.c b/driver/vidc/src/msm_vdec.c
index af9f82e6f5..4d3dc0ed9a 100644
--- a/driver/vidc/src/msm_vdec.c
+++ b/driver/vidc/src/msm_vdec.c
@@ -4,7 +4,7 @@
  */
 
 #include <media/v4l2_vidc_extensions.h>
-#include <media/msm_media_info.h>
+#include "msm_media_info.h"
 #include <linux/v4l2-common.h>
 
 #include "msm_vdec.h"
diff --git a/driver/vidc/src/msm_venc.c b/driver/vidc/src/msm_venc.c
index cea801d3a8..6968a83faa 100644
--- a/driver/vidc/src/msm_venc.c
+++ b/driver/vidc/src/msm_venc.c
@@ -4,7 +4,7 @@
  */
 
 #include <media/v4l2_vidc_extensions.h>
-#include <media/msm_media_info.h>
+#include "msm_media_info.h"
 
 #include "msm_venc.h"
 #include "msm_vidc_core.h"
diff --git a/driver/vidc/src/msm_vidc_buffer.c b/driver/vidc/src/msm_vidc_buffer.c
index 979a6b1679..e757707d2d 100644
--- a/driver/vidc/src/msm_vidc_buffer.c
+++ b/driver/vidc/src/msm_vidc_buffer.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2020, The Linux Foundation. All rights reserved.
  */
 
-#include <media/msm_media_info.h>
+#include "msm_media_info.h"
 #include "msm_vidc_buffer.h"
 #include "msm_vidc_inst.h"
 #include "msm_vidc_core.h"
diff --git a/driver/vidc/src/msm_vidc_driver.c b/driver/vidc/src/msm_vidc_driver.c
index 762de355ea..df50ff55e5 100644
--- a/driver/vidc/src/msm_vidc_driver.c
+++ b/driver/vidc/src/msm_vidc_driver.c
@@ -6,7 +6,7 @@
 #include <linux/iommu.h>
 #include <linux/workqueue.h>
 #include <media/v4l2_vidc_extensions.h>
-#include <media/msm_media_info.h>
+#include "msm_media_info.h"
 
 #include "msm_vidc_driver.h"
 #include "msm_vidc_platform.h"
@@ -1529,12 +1529,8 @@ int msm_vidc_get_input_internal_buffers(struct msm_vidc_inst *inst,
 	}
 	core = inst->core;
 
-	/*
-	 * TODO: Remove the hack of sending bigger buffer sizes
-	 * once internal buffer calculations are finalised
-	 */
 	buf_size = call_session_op(core, buffer_size,
-		inst, buffer_type) + 100000000;
+		inst, buffer_type);
 
 	buf_count = call_session_op(core, min_count,
 		inst, buffer_type);