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 93dffc4bac8d..000000000000
--- a/include/uapi/Kbuild
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note
-
-header-y += media/
diff --git a/include/uapi/media/cam_cpas.h b/include/uapi/camera/media/cam_cpas.h
similarity index 100%
rename from include/uapi/media/cam_cpas.h
rename to include/uapi/camera/media/cam_cpas.h
diff --git a/include/uapi/media/cam_custom.h b/include/uapi/camera/media/cam_custom.h
similarity index 100%
rename from include/uapi/media/cam_custom.h
rename to include/uapi/camera/media/cam_custom.h
diff --git a/include/uapi/media/cam_defs.h b/include/uapi/camera/media/cam_defs.h
similarity index 100%
rename from include/uapi/media/cam_defs.h
rename to include/uapi/camera/media/cam_defs.h
diff --git a/include/uapi/media/cam_fd.h b/include/uapi/camera/media/cam_fd.h
similarity index 100%
rename from include/uapi/media/cam_fd.h
rename to include/uapi/camera/media/cam_fd.h
diff --git a/include/uapi/media/cam_icp.h b/include/uapi/camera/media/cam_icp.h
similarity index 100%
rename from include/uapi/media/cam_icp.h
rename to include/uapi/camera/media/cam_icp.h
diff --git a/include/uapi/media/cam_isp.h b/include/uapi/camera/media/cam_isp.h
similarity index 100%
rename from include/uapi/media/cam_isp.h
rename to include/uapi/camera/media/cam_isp.h
diff --git a/include/uapi/media/cam_isp_ife.h b/include/uapi/camera/media/cam_isp_ife.h
similarity index 100%
rename from include/uapi/media/cam_isp_ife.h
rename to include/uapi/camera/media/cam_isp_ife.h
diff --git a/include/uapi/media/cam_isp_vfe.h b/include/uapi/camera/media/cam_isp_vfe.h
similarity index 100%
rename from include/uapi/media/cam_isp_vfe.h
rename to include/uapi/camera/media/cam_isp_vfe.h
diff --git a/include/uapi/media/cam_jpeg.h b/include/uapi/camera/media/cam_jpeg.h
similarity index 100%
rename from include/uapi/media/cam_jpeg.h
rename to include/uapi/camera/media/cam_jpeg.h
diff --git a/include/uapi/media/cam_lrme.h b/include/uapi/camera/media/cam_lrme.h
similarity index 100%
rename from include/uapi/media/cam_lrme.h
rename to include/uapi/camera/media/cam_lrme.h
diff --git a/include/uapi/media/cam_req_mgr.h b/include/uapi/camera/media/cam_req_mgr.h
similarity index 100%
rename from include/uapi/media/cam_req_mgr.h
rename to include/uapi/camera/media/cam_req_mgr.h
diff --git a/include/uapi/media/cam_sensor.h b/include/uapi/camera/media/cam_sensor.h
similarity index 100%
rename from include/uapi/media/cam_sensor.h
rename to include/uapi/camera/media/cam_sensor.h
diff --git a/include/uapi/media/cam_sync.h b/include/uapi/camera/media/cam_sync.h
similarity index 100%
rename from include/uapi/media/cam_sync.h
rename to include/uapi/camera/media/cam_sync.h
diff --git a/include/uapi/media/Kbuild b/include/uapi/media/Kbuild
deleted file mode 100644
index e7971dac1051..000000000000
--- a/include/uapi/media/Kbuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note
-
-header-y += cam_cpas.h
-header-y += cam_defs.h
-header-y += cam_fd.h
-header-y += cam_icp.h
-header-y += cam_isp.h
-header-y += cam_isp_vfe.h
-header-y += cam_isp_ife.h
-header-y += cam_jpeg.h
-header-y += cam_req_mgr.h
-header-y += cam_sensor.h
-header-y += cam_sync.h
-header-y += cam_lrme.h