diff --git a/Makefile b/Makefile
index cbe215e1a9b6..ef196427110e 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,8 @@ LINUXINCLUDE    += -include $(srctree)/techpack/video/config/litovidconf.h
 endif
 
 LINUXINCLUDE    += -I$(srctree)/techpack/video/include \
-                   -I$(srctree)/techpack/video/include/uapi
+                   -I$(srctree)/techpack/video/include/uapi \
+                   -I$(srctree)/techpack/video/include/uapi/vidc
 
 USERINCLUDE     += -I$(srctree)/techpack/video/include/uapi
 
diff --git a/include/Kbuild b/include/Kbuild
deleted file mode 100644
index bab1145bc7a7..000000000000
--- a/include/Kbuild
+++ /dev/null
@@ -1,2 +0,0 @@
-# Top-level Makefile calls into asm-$(ARCH)
-# List only non-arch directories below
diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild
deleted file mode 100644
index 469cb04b044f..000000000000
--- a/include/uapi/Kbuild
+++ /dev/null
@@ -1,3 +0,0 @@
-# include all directories below
-
-header-y += media/
diff --git a/include/uapi/media/Kbuild b/include/uapi/media/Kbuild
deleted file mode 100644
index e9b80bb01fd6..000000000000
--- a/include/uapi/media/Kbuild
+++ /dev/null
@@ -1,4 +0,0 @@
-# include header files
-
-header-y += msm_media_info.h
-header-y += msm_vidc_utils.h
diff --git a/include/uapi/media/msm_media_info.h b/include/uapi/vidc/media/msm_media_info.h
similarity index 100%
rename from include/uapi/media/msm_media_info.h
rename to include/uapi/vidc/media/msm_media_info.h
diff --git a/include/uapi/media/msm_vidc_utils.h b/include/uapi/vidc/media/msm_vidc_utils.h
similarity index 100%
rename from include/uapi/media/msm_vidc_utils.h
rename to include/uapi/vidc/media/msm_vidc_utils.h