diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb
index 171c126..6e5106f 100644
--- a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb
+++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid-fru.bb
@@ -14,7 +14,8 @@
 
 RDEPENDS_${PN} += "libsystemd"
 
-TARGET_CFLAGS += " -fpic -std=gnu++14"
+TARGET_CPPFLAGS += " -fpic -std=gnu++14"
+TARGET_CFLAGS += " -fpic"
 
 SRC_URI += "git://github.com/openbmc/ipmi-fru-parser"
 
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-event.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-event.bb
index 2ab7ce5..3be8e5d 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-event.bb
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-event.bb
@@ -9,7 +9,8 @@
 inherit obmc-phosphor-sdbus-service
 inherit obmc-phosphor-c-daemon
 
-TARGET_CPPFLAGS += "-std=c++11 -fpic"
+TARGET_CXXFLAGS += " -std=c++11 -fpic"
+TARGET_CFLAGS += " -fpic"
 
 SRC_URI += "git://github.com/openbmc/phosphor-event"
 SRC_URI += "file://eventd.conf"