diff --git a/meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb b/meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb
index d92b905..24192d7 100644
--- a/meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb
+++ b/meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb
@@ -13,6 +13,10 @@
     ${PN}-bmc \
 "
 PACKAGES =+ "${STATE_MGR_PACKAGES}"
+PACKAGES_remove = "${PN}"
+RDEPENDS_${PN}-dev = "${STATE_MGR_PACKAGES}"
+RDEPENDS_${PN}-staticdev = "${STATE_MGR_PACKAGES}"
+
 DBUS_PACKAGES = "${STATE_MGR_PACKAGES}"
 
 # Set SYSTEMD_PACKAGES to empty because we do not want ${PN} and DBUS_PACKAGES