5 files changed, 5 insertions, 15 deletions
diff --git a/src/usr/hwas/deconfigGard.C b/src/usr/hwas/deconfigGard.C
index 84695f034..7e3c936ed 100644
--- a/src/usr/hwas/deconfigGard.C
+++ b/src/usr/hwas/deconfigGard.C
@@ -27,7 +27,7 @@
  */
 
 #include <string.h>
-#include <targeting/targetservice.H>
+#include <targeting/common/targetservice.H>
 #include <errl/errlmanager.H>
 #include <errl/errludtarget.H>
 #include <hwas/deconfigGard.H>
diff --git a/src/usr/hwas/hwas.C b/src/usr/hwas/hwas.C
index b53f8da45..ac7ac32c4 100644
--- a/src/usr/hwas/hwas.C
+++ b/src/usr/hwas/hwas.C
@@ -36,10 +36,7 @@
 #include    <stdint.h>
 #include    <assert.h>
 
-#include    <targeting/targetservice.H>
-#include    <targeting/iterators/rangefilter.H>
-#include    <targeting/predicates/predicates.H>
-#include    <targeting/util.H>
+#include    <targeting/common/commontargeting.H>
 
 #include    <hwas/hwas.H>
 #include    <hwas/hwasCommon.H>
diff --git a/src/usr/hwas/test/hwas1test.H b/src/usr/hwas/test/hwas1test.H
index 97a1051b7..894db8a1a 100644
--- a/src/usr/hwas/test/hwas1test.H
+++ b/src/usr/hwas/test/hwas1test.H
@@ -46,13 +46,7 @@
 #include <errl/errlmanager.H>
 
 // This component
-#include <targeting/attributes.H>
-#include <targeting/entitypath.H>
-#include <targeting/target.H>
-#include <targeting/targetservice.H>
-#include <targeting/iterators/rangefilter.H>
-#include <targeting/predicates/predicatectm.H>
-#include <targeting/predicates/predicatepostfixexpr.H>
+#include <targeting/common/commontargeting.H>
 
 class HWAS1test: public CxxTest::TestSuite
 {
diff --git a/src/usr/hwas/test/hwasGardTest.H b/src/usr/hwas/test/hwasGardTest.H
index 4a73dc7ec..ad143ff19 100644
--- a/src/usr/hwas/test/hwasGardTest.H
+++ b/src/usr/hwas/test/hwasGardTest.H
@@ -36,7 +36,7 @@
 // CXXTEST
 #include <cxxtest/TestSuite.H>
 #include <errl/errlmanager.H>
-#include <targeting/targetservice.H>
+#include <targeting/common/targetservice.H>
 #include <hwas/deconfigGard.H>
 #include <hwas/hwas_reasoncodes.H>
 
diff --git a/src/usr/hwas/testHWP.C b/src/usr/hwas/testHWP.C
index a95a92a9b..d852295f5 100644
--- a/src/usr/hwas/testHWP.C
+++ b/src/usr/hwas/testHWP.C
@@ -54,10 +54,9 @@
 
 #include <fapiTarget.H>
 #include <fapiPlatHwpInvoker.H>
-#include <targeting/targetservice.H>
+#include <targeting/common/targetservice.H>
 
 using namespace fapi;
-using namespace TARGETING;
 
 /******************************************************************************/
 // Globals/Constants