10 files changed, 21 insertions, 20 deletions
diff --git a/src/usr/diag/mdia/mdiafwd.H b/src/usr/diag/mdia/mdiafwd.H
index ad4126bb9..5185a966b 100644
--- a/src/usr/diag/mdia/mdiafwd.H
+++ b/src/usr/diag/mdia/mdiafwd.H
@@ -29,9 +29,10 @@
  */
 
 #include <mdia/mdia.H>
-#include <targeting/target.H>
+#include <targeting/common/attributes.H>
 #include <vector>
 #include <map>
+
 /**
  * @brief forwards
  */
diff --git a/src/usr/diag/mdia/mdiamonitor.C b/src/usr/diag/mdia/mdiamonitor.C
index 17ed1a942..9cbef403d 100755
--- a/src/usr/diag/mdia/mdiamonitor.C
+++ b/src/usr/diag/mdia/mdiamonitor.C
@@ -21,7 +21,7 @@
 //
 //  IBM_PROLOG_END
 #include <sys/time.h>
-#include <targeting/util.H>
+#include <targeting/common/util.H>
 #include <vector>
 #include "mdiamonitor.H"
 #include "mdiasm.H"
diff --git a/src/usr/diag/mdia/test/mdiatest.H b/src/usr/diag/mdia/test/mdiatest.H
index 8fa3f5d37..b32401d99 100644
--- a/src/usr/diag/mdia/test/mdiatest.H
+++ b/src/usr/diag/mdia/test/mdiatest.H
@@ -30,7 +30,7 @@
 
 #include <builtins.h>
 #include <cxxtest/TestSuite.H>
-#include <targeting/target.H>
+#include <targeting/common/target.H>
 #include "../mdiafwd.H"
 
 class MdiaTest : public CxxTest::TestSuite
diff --git a/src/usr/diag/mdia/test/mdiatestmba.H b/src/usr/diag/mdia/test/mdiatestmba.H
index c8b5a80ff..c16414257 100644
--- a/src/usr/diag/mdia/test/mdiatestmba.H
+++ b/src/usr/diag/mdia/test/mdiatestmba.H
@@ -30,7 +30,7 @@
 
 #include <builtins.h>
 #include <cxxtest/TestSuite.H>
-#include <targeting/target.H>
+#include <targeting/common/target.H>
 #include "../mdiafwd.H"
 #include "../mdiaglobals.H"
 
diff --git a/src/usr/diag/mdia/test/mdiatestmonitor.H b/src/usr/diag/mdia/test/mdiatestmonitor.H
index db491f22b..504accf92 100644
--- a/src/usr/diag/mdia/test/mdiatestmonitor.H
+++ b/src/usr/diag/mdia/test/mdiatestmonitor.H
@@ -27,7 +27,7 @@
 #include <sys/task.h>
 #include <sys/time.h>
 #include <stdint.h>
-#include <targeting/util.H>
+#include <targeting/common/util.H>
 #include "../mdiafwd.H"
 #include "../mdiamonitor.H"
 #include "../mdiasm.H"
diff --git a/src/usr/diag/mdia/test/mdiatesttrace.H b/src/usr/diag/mdia/test/mdiatesttrace.H
index 7fc6530b7..cea2e1c8a 100644
--- a/src/usr/diag/mdia/test/mdiatesttrace.H
+++ b/src/usr/diag/mdia/test/mdiatesttrace.H
@@ -30,7 +30,7 @@
 
 #include <builtins.h>
 #include <cxxtest/TestSuite.H>
-#include <targeting/target.H>
+#include <targeting/common/attributes.H>
 #include "../mdiatrace.H"
 
 class MdiaTraceTest : public CxxTest::TestSuite
diff --git a/src/usr/diag/mdia/test/mdiatestworkitem.H b/src/usr/diag/mdia/test/mdiatestworkitem.H
index 2fb9a209e..fba00e2fb 100644
--- a/src/usr/diag/mdia/test/mdiatestworkitem.H
+++ b/src/usr/diag/mdia/test/mdiatestworkitem.H
@@ -30,7 +30,7 @@
 
 #include <builtins.h>
 #include <cxxtest/TestSuite.H>
-#include <targeting/target.H>
+#include <targeting/common/attributes.H>
 #include "../mdiaworkitem.H"
 #include "../mdiasm.H"
 
diff --git a/src/usr/diag/prdf/iipconst.h b/src/usr/diag/prdf/iipconst.h
index 455af2769..54f8ccd82 100755
--- a/src/usr/diag/prdf/iipconst.h
+++ b/src/usr/diag/prdf/iipconst.h
@@ -37,7 +37,7 @@
 #include <prdf_types.h>
 #endif
 
-#include <target.H>
+#include <targeting/common/target.H>
 
 /*--------------------------------------------------------------------*/
 /*  User Types                                                        */
diff --git a/src/usr/diag/prdf/prdf_main.C b/src/usr/diag/prdf/prdf_main.C
index f1a18483f..abe221dea 100755
--- a/src/usr/diag/prdf/prdf_main.C
+++ b/src/usr/diag/prdf/prdf_main.C
@@ -32,7 +32,7 @@
 #include <prdf_proto.H>
 #include <iipglobl.h>
 #include <iipconst.h>
-#include <targetservice.H>
+#include <targeting/common/targetservice.H>
 
 #undef iipMain_C
 
diff --git a/src/usr/diag/prdf/test/prdfTest.H b/src/usr/diag/prdf/test/prdfTest.H
index 8d8166ff2..9ae5b5a46 100644
--- a/src/usr/diag/prdf/test/prdfTest.H
+++ b/src/usr/diag/prdf/test/prdfTest.H
@@ -43,9 +43,9 @@ class prdfTest: public CxxTest::TestSuite
 
     void testTrace(void)
     {
-        TS_TRACE(ENTER_MRK "testTrace()");
+        TS_TRACE(ENTER_MRK __FUNCTION__);
 
-        PRDF_ENTER( "testTrace()" );
+        PRDF_ENTER( "%s", __FUNCTION__  );
 
         const char * l_testStr = "running testTrace";
         uint64_t l_testHex = 0xDEADBEEF;
@@ -58,21 +58,21 @@ class prdfTest: public CxxTest::TestSuite
 
         PRDF_ERR( "testTrace() Please ignore this error trace 0x%08X", l_testHex );
 
+        PRDF_EXIT( "%s", __FUNCTION__ );
+
         PRDF_DENTER( "testTrace()" );
 
         PRDF_DINF( "testTrace() running testTrace" );
 
         PRDF_DEXIT( "testTrace()" );
 
-        PRDF_EXIT( "testTrace()" );
-
-        TS_TRACE(EXIT_MRK "testTrace()");
+        TS_TRACE(EXIT_MRK __FUNCTION__);
     }
 
     void testPrdInitialize(void)
     {
         using namespace PRDF;
-        TS_TRACE(ENTER_MRK "testPrdInitialize()");
+        TS_TRACE(ENTER_MRK __FUNCTION__);
         PRDF_ENTER( "testPrdInitialize()" );
 
         errlHndl_t l_pErr = NULL;
@@ -91,13 +91,13 @@ class prdfTest: public CxxTest::TestSuite
         }
 
         PRDF_EXIT( "testPrdInitialize()" );
-        TS_TRACE(EXIT_MRK "testPrdInitialize()");
+        TS_TRACE(EXIT_MRK __FUNCTION__);
     }
 
     void testPrdMain(void)
     {
         using namespace PRDF;
-        TS_TRACE(ENTER_MRK "testPrdMain()");
+        TS_TRACE(ENTER_MRK __FUNCTION__);
         PRDF_ENTER( "testPrdMain()" );
 
         errlHndl_t l_pErr = NULL;
@@ -116,19 +116,19 @@ class prdfTest: public CxxTest::TestSuite
         }
 
         PRDF_EXIT( "testPrdMain()" );
-        TS_TRACE(EXIT_MRK "testPrdMain()");
+        TS_TRACE(EXIT_MRK __FUNCTION__);
     }
 
     void testPrdIplCleanup(void)
     {
         using namespace PRDF;
-        TS_TRACE(ENTER_MRK "testPrdIplCleanup()");
+        TS_TRACE(ENTER_MRK __FUNCTION__);
         PRDF_ENTER( "testPrdIplCleanup()" );
 
         PrdIplCleanup();
 
         PRDF_EXIT( "testPrdIplCleanup()" );
-        TS_TRACE(EXIT_MRK "testPrdIplCleanup()");
+        TS_TRACE(EXIT_MRK __FUNCTION__);
     }
 
 };