8 files changed, 22 insertions, 21 deletions
diff --git a/src/include/usr/hwpf/hwp/dram_initialization/mss_memdiag/mss_maint_cmds.H b/src/include/usr/hwpf/hwp/utility_procedures/mss_maint_cmds.H
index 317c7649f..317c7649f 100644
--- a/src/include/usr/hwpf/hwp/dram_initialization/mss_memdiag/mss_maint_cmds.H
+++ b/src/include/usr/hwpf/hwp/utility_procedures/mss_maint_cmds.H
diff --git a/src/usr/diag/mdia/mdiasm.H b/src/usr/diag/mdia/mdiasm.H
index 5957366a3..6dccaa86c 100644
--- a/src/usr/diag/mdia/mdiasm.H
+++ b/src/usr/diag/mdia/mdiasm.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012                   */
+/* COPYRIGHT International Business Machines Corp. 2012,2013              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -30,7 +30,7 @@
 
 #include <vector>
 #include <util/threadpool.H>
-#include <dram_initialization/mss_memdiag/mss_maint_cmds.H>
+#include <utility_procedures/mss_maint_cmds.H>
 #include "sys/sync.h"
 #include "mdiafwd.H"
 
diff --git a/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.C b/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.C
index 10cd90c2a..87f6606e0 100755
--- a/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.C
+++ b/src/usr/diag/prdf/common/framework/service/prdfPlatServices_common.C
@@ -38,7 +38,6 @@
 #include <prdfErrlUtil.H>
 
 #include <dimmBadDqBitmapFuncs.H> // for dimm[S|G]etBadDqBitmap()
-#include <dram_initialization/mss_memdiag/mss_maint_cmds.H>
 
 using namespace TARGETING;
 
diff --git a/src/usr/diag/prdf/framework/service/prdfPlatServices.C b/src/usr/diag/prdf/framework/service/prdfPlatServices.C
index 52a050b4a..71b1382ac 100644
--- a/src/usr/diag/prdf/framework/service/prdfPlatServices.C
+++ b/src/usr/diag/prdf/framework/service/prdfPlatServices.C
@@ -38,7 +38,6 @@
 
 #include <diag/mdia/mdia.H>
 #include <diag/mdia/mdiamevent.H>
-#include <dram_initialization/mss_memdiag/mss_maint_cmds.H>
 #include <errno.h>
 #include <sys/time.h>
 #include <time.h>
diff --git a/src/usr/diag/prdf/framework/service/prdfPlatServices.H b/src/usr/diag/prdf/framework/service/prdfPlatServices.H
index 28dc2f6e0..8395d8619 100644
--- a/src/usr/diag/prdf/framework/service/prdfPlatServices.H
+++ b/src/usr/diag/prdf/framework/service/prdfPlatServices.H
@@ -33,6 +33,7 @@
  */
 
 #include <diag/mdia/mdia.H>
+#include <utility_procedures/mss_maint_cmds.H>
 
 // This must be included after all other includes. This will take care of cases
 // where a file must be included in the common code, but the include paths are
diff --git a/src/usr/hwpf/hwp/dram_initialization/makefile b/src/usr/hwpf/hwp/dram_initialization/makefile
index cc1c2a5c0..5b8b2a91f 100644
--- a/src/usr/hwpf/hwp/dram_initialization/makefile
+++ b/src/usr/hwpf/hwp/dram_initialization/makefile
@@ -1,25 +1,25 @@
-#  IBM_PROLOG_BEGIN_TAG
-#  This is an automatically generated prolog.
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
 #
-#  $Source: src/usr/hwpf/hwp/dram_initialization/makefile $
+# $Source: src/usr/hwpf/hwp/dram_initialization/makefile $
 #
-#  IBM CONFIDENTIAL
+# IBM CONFIDENTIAL
 #
-#  COPYRIGHT International Business Machines Corp. 2012
+# COPYRIGHT International Business Machines Corp. 2012,2013
 #
-#  p1
+# p1
 #
-#  Object Code Only (OCO) source materials
-#  Licensed Internal Code Source Materials
-#  IBM HostBoot Licensed Internal Code
+# Object Code Only (OCO) source materials
+# Licensed Internal Code Source Materials
+# IBM HostBoot Licensed Internal Code
 #
-#  The source code for this program is not published or other-
-#  wise divested of its trade secrets, irrespective of what has
-#  been deposited with the U.S. Copyright Office.
+# The source code for this program is not published or otherwise
+# divested of its trade secrets, irrespective of what has been
+# deposited with the U.S. Copyright Office.
 #
-#  Origin: 30
+# Origin: 30
 #
-#  IBM_PROLOG_END_TAG
+# IBM_PROLOG_END_TAG
 ROOTPATH = ../../../../..
 
 MODULE = dram_initialization
@@ -57,7 +57,6 @@ OBJS =  dram_initialization.o \
         mss_setup_bars.o   \
         proc_fab_smp.o  \
         proc_setup_bars.o   \
-        mss_maint_cmds.o \
         proc_pcie_config.o \
         proc_mpipl_ex_cleanup.o \
         proc_mpipl_chip_cleanup.o \
diff --git a/src/usr/hwpf/hwp/dram_initialization/mss_memdiag/mss_maint_cmds.C b/src/usr/hwpf/hwp/utility_procedures/mss_maint_cmds.C
index fbab62fb9..fbab62fb9 100644
--- a/src/usr/hwpf/hwp/dram_initialization/mss_memdiag/mss_maint_cmds.C
+++ b/src/usr/hwpf/hwp/utility_procedures/mss_maint_cmds.C
diff --git a/src/usr/hwpf/hwp/utility_procedures/utils.mk b/src/usr/hwpf/hwp/utility_procedures/utils.mk
index 9d074d396..88432057d 100644
--- a/src/usr/hwpf/hwp/utility_procedures/utils.mk
+++ b/src/usr/hwpf/hwp/utility_procedures/utils.mk
@@ -5,7 +5,7 @@
 #
 # IBM CONFIDENTIAL
 #
-# COPYRIGHT International Business Machines Corp. 2012
+# COPYRIGHT International Business Machines Corp. 2012,2013
 #
 # p1
 #
@@ -21,8 +21,11 @@
 #
 # IBM_PROLOG_END_TAG
 EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/utility_procedures
+EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp
+EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp/utility_procedures
+EXTRAINCDIR += ${ROOTPATH}/usr/hwpf/hwp/include
 
 VPATH += utility_procedures
 
-OBJS += mss_unmask_errors.o
+OBJS += mss_unmask_errors.o mss_maint_cmds.o