3 files changed, 6 insertions, 10 deletions
diff --git a/src/usr/initservice/istepdispatcher/istepdispatcher.C b/src/usr/initservice/istepdispatcher/istepdispatcher.C
index 3f5cd5594..1738343a4 100644
--- a/src/usr/initservice/istepdispatcher/istepdispatcher.C
+++ b/src/usr/initservice/istepdispatcher/istepdispatcher.C
@@ -58,10 +58,8 @@
 #include    <initservice/taskargs.H>        // TASK_ENTRY_MACRO
 
 
-#include    <targeting/attributes.H>        //  ISTEP_MODE attribute
-#include    <targeting/entitypath.H>
-#include    <targeting/target.H>
-#include    <targeting/targetservice.H>
+#include    <targeting/common/attributes.H> //  ISTEP_MODE attribute
+#include    <targeting/common/targetservice.H>
 
 #include    <mbox/mbox_queues.H>            // HB_ISTEP_MSGQ
 #include    <mbox/mboxif.H>                 // register mailbox
@@ -71,7 +69,7 @@
 #include    "splesscommon.H"
 
 #include    <isteps/istepmasterlist.H>
-#include    <targeting/util.H>
+#include    <targeting/common/attributes.H>
 
 //  -----   namespace   ISTEPS_TRACE    ---------------------------------------
 namespace ISTEPS_TRACE
diff --git a/src/usr/initservice/istepdispatcher/splesscommon.H b/src/usr/initservice/istepdispatcher/splesscommon.H
index ecf863f5f..6d5d84953 100644
--- a/src/usr/initservice/istepdispatcher/splesscommon.H
+++ b/src/usr/initservice/istepdispatcher/splesscommon.H
@@ -50,10 +50,8 @@
 
 #include    <sys/mmio.h>                    //  mmio_scratch_read()
 
-#include    <targeting/attributes.H>        //  ISTEP_MODE attribute
-#include    <targeting/entitypath.H>
-#include    <targeting/target.H>
-#include    <targeting/targetservice.H>
+#include    <targeting/common/attributes.H>        //  ISTEP_MODE attribute
+#include    <targeting/common/targetservice.H>
 
 
 // external reference
diff --git a/src/usr/initservice/istepdispatcher/sptask.C b/src/usr/initservice/istepdispatcher/sptask.C
index c8a56221c..946aad7df 100644
--- a/src/usr/initservice/istepdispatcher/sptask.C
+++ b/src/usr/initservice/istepdispatcher/sptask.C
@@ -51,7 +51,7 @@
 #include    <initservice/initsvcudistep.H>  //  InitSvcUserDetailsIstep
 #include    <initservice/taskargs.H>        // TASK_ENTRY_MACRO
 
-#include    <targeting/util.H>              //
+#include    <targeting/common/util.H>       //
 
 #include    "istepdispatcher.H"
 #include    "splesscommon.H"