diff --git a/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb b/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb
index 4a2353f..2402316 100644
--- a/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb
+++ b/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb
@@ -13,10 +13,3 @@
 
 SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.HostErrorMonitor.service"
 SECURITY_CFLAGS_pn-host-error-monitor  = "${SECURITY_NOPIE_CFLAGS}"
-
-# linux-libc-headers guides this way to include custom uapi headers
-CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi"
-CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include"
-CXXFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi"
-CXXFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include"
-do_configure[depends] += "virtual/kernel:do_shared_workdir"
diff --git a/meta-common/recipes-core/libpeci/libpeci_git.bb b/meta-common/recipes-core/libpeci/libpeci_git.bb
index 71a8a2f..f62dcdc 100644
--- a/meta-common/recipes-core/libpeci/libpeci_git.bb
+++ b/meta-common/recipes-core/libpeci/libpeci_git.bb
@@ -11,10 +11,3 @@
 SRCREV = "a2ceec2aa139277cebb62e1eda449ef60fa4c962"
 
 S = "${WORKDIR}/git"
-
-# linux-libc-headers guides this way to include custom uapi headers
-CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi"
-CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include"
-CXXFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi"
-CXXFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include"
-do_configure[depends] += "virtual/kernel:do_shared_workdir"