4 files changed, 4 insertions, 10 deletions
diff --git a/src/usr/fsi/fsidd.C b/src/usr/fsi/fsidd.C
index 694ccacca..e870411c5 100644
--- a/src/usr/fsi/fsidd.C
+++ b/src/usr/fsi/fsidd.C
@@ -35,14 +35,12 @@
 #include <devicefw/driverif.H>
 #include <trace/interface.H>
 #include <errl/errlentry.H>
-#include <targeting/targetservice.H>
 #include <errl/errlmanager.H>
 #include <initservice/taskargs.H> 
-#include <targeting/predicates/predicatectm.H>
 #include <sys/time.h>
 #include <string.h>
 #include <algorithm>
-#include <targeting/util.H>
+#include <targeting/common/commontargeting.H>
 
 // FSI : General driver traces
 trace_desc_t* g_trac_fsi = NULL;
diff --git a/src/usr/fsi/fsipres.C b/src/usr/fsi/fsipres.C
index c5440cc4e..9954204c0 100644
--- a/src/usr/fsi/fsipres.C
+++ b/src/usr/fsi/fsipres.C
@@ -21,7 +21,7 @@
 //
 //  IBM_PROLOG_END
 #include <devicefw/driverif.H>
-#include <targeting/targetservice.H>
+#include <targeting/common/attributes.H>
 #include <fsi/fsi_reasoncodes.H>
 #include "fsidd.H"
 
diff --git a/src/usr/fsi/test/fsiddtest.H b/src/usr/fsi/test/fsiddtest.H
index 12b6edb68..e98a896a4 100644
--- a/src/usr/fsi/test/fsiddtest.H
+++ b/src/usr/fsi/test/fsiddtest.H
@@ -37,7 +37,7 @@
 #include <fsi/fsiif.H>
 #include <fsi/fsi_reasoncodes.H>
 #include <sys/time.h>
-#include <targeting/util.H>
+#include <targeting/common/attributes.H>
 
 extern trace_desc_t* g_trac_fsi;
 
diff --git a/src/usr/fsi/test/fsiprestest.H b/src/usr/fsi/test/fsiprestest.H
index 7b08a21d0..f2787466f 100644
--- a/src/usr/fsi/test/fsiprestest.H
+++ b/src/usr/fsi/test/fsiprestest.H
@@ -30,12 +30,8 @@
 
 #include <trace/interface.H>
 #include <cxxtest/TestSuite.H>
-#include <targeting/targetservice.H>
 #include <devicefw/userif.H>
-#include <targeting/predicates/predicatectm.H>
-#include <targeting/predicates/predicatepostfixexpr.H>
-#include <targeting/iterators/rangefilter.H>
-#include <targeting/util.H>
+#include <targeting/common/commontargeting.H>
 
 using namespace TARGETING;
 using namespace DeviceFW;