4 files changed, 6 insertions, 7 deletions
diff --git a/src/usr/hwpf/plat/fapiPlatAttributeService.C b/src/usr/hwpf/plat/fapiPlatAttributeService.C
index b7a0e1904..72c4a5b3e 100644
--- a/src/usr/hwpf/plat/fapiPlatAttributeService.C
+++ b/src/usr/hwpf/plat/fapiPlatAttributeService.C
@@ -33,7 +33,7 @@
 //******************************************************************************
 
 #include <hwpf/fapi/fapiTarget.H>
-#include <targeting/targetservice.H>
+#include <targeting/common/targetservice.H>
 #include <errl/errlentry.H>
 #include <hwpf/plat/fapiPlatAttributeService.H>
 #include <hwpf/plat/fapiPlatReasonCodes.H>
diff --git a/src/usr/hwpf/plat/fapiPlatHwAccess.C b/src/usr/hwpf/plat/fapiPlatHwAccess.C
index c2a3d143b..1464ff906 100644
--- a/src/usr/hwpf/plat/fapiPlatHwAccess.C
+++ b/src/usr/hwpf/plat/fapiPlatHwAccess.C
@@ -53,12 +53,11 @@
 #include <fapiPlatTrace.H>
 #include <fapiPlatHwAccess.H>
 #include <errl/errlentry.H>
-#include <targeting/targetservice.H>
 #include <devicefw/userif.H>
 #include <ecmdDataBufferBase.H>
 #include <fapiPlatReasonCodes.H>
-#include <targeting/predicates/predicatectm.H>
-#include <targeting/targetservice.H>
+#include <targeting/common/predicates/predicates.H>
+#include <targeting/common/targetservice.H>
 
 extern "C"
 {
diff --git a/src/usr/hwpf/plat/fapiPlatSystemConfig.C b/src/usr/hwpf/plat/fapiPlatSystemConfig.C
index 4e86de714..f96ab4a8d 100644
--- a/src/usr/hwpf/plat/fapiPlatSystemConfig.C
+++ b/src/usr/hwpf/plat/fapiPlatSystemConfig.C
@@ -32,8 +32,8 @@
 #include <fapiSystemConfig.H>
 #include <fapiPlatReasonCodes.H>
 #include <errl/errlentry.H>
-#include <targeting/targetservice.H>
-#include <targeting/predicates/predicatectm.H>
+#include <targeting/common/targetservice.H>
+#include <targeting/common/predicates/predicates.H>
 
 extern "C"
 {
diff --git a/src/usr/hwpf/plat/fapiPlatTarget.C b/src/usr/hwpf/plat/fapiPlatTarget.C
index bd84316ab..50a5d873b 100644
--- a/src/usr/hwpf/plat/fapiPlatTarget.C
+++ b/src/usr/hwpf/plat/fapiPlatTarget.C
@@ -38,7 +38,7 @@
 
 #include <fapiTarget.H>
 #include <fapiPlatTrace.H>
-#include <targeting/target.H>
+#include <targeting/common/attributes.H>
 #include <string.h>
 
 namespace fapi