Change include paths in memory/lib, tests

Change-Id: I34081c5f245798c830f9e6c51b560cab303d65d5
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/23045
Dev-Ready: Brent Wieman <bwieman@us.ibm.com>
Tested-by: Jenkins Server
Tested-by: Hostboot CI
Reviewed-by: ANDRE A. MARIN <aamarin@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Reviewed-by: JACOB L. HARVEY <jlharvey@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/23046
Tested-by: FSP CI Jenkins
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

34 files changed, 119 insertions, 109 deletions

diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/ccs/ccs.C b/src/import/chips/p9/procedures/hwp/memory/lib/ccs/ccs.C
index 625a5050e..8263c2b0e 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/ccs/ccs.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/ccs/ccs.C
@@ -29,8 +29,8 @@
 
 #include <fapi2.H>
 
-#include "../mss.H"
-#include "ccs.H"
+#include <mss.H>
+#include <lib/ccs/ccs.H>
 
 using fapi2::TARGET_TYPE_MCBIST;
 using fapi2::TARGET_TYPE_MCA;
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/ccs/ccs.H b/src/import/chips/p9/procedures/hwp/memory/lib/ccs/ccs.H
index 51e2e7dc5..3e9f0ea26 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/ccs/ccs.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/ccs/ccs.H
@@ -34,10 +34,10 @@
 
 #include <p9_mc_scom_addresses.H>
 
-#include "../utils/poll.H"
-#include "../utils/swizzle.H"
-#include "../port/port.H"
-#include "../shared/mss_const.H"
+#include <lib/utils/poll.H>
+#include <lib/utils/swizzle.H>
+#include <lib/port/port.H>
+#include <lib/shared/mss_const.H>
 
 // I have a dream that the CCS engine code can be shared among controllers. So, I drive the
 // engine from a set of traits. This might be folly. Allow me to dream. BRS
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/kind.H b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/kind.H
index 3f3a4599d..1de8bcf4f 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/kind.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/kind.H
@@ -33,7 +33,7 @@
 #include <fapi2.H>
 
 #include <mss_attribute_accessors.H>
-#include "../utils/c_str.H"
+#include <lib/utils/c_str.H>
 
 namespace mss
 {
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/mrs_load.C b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/mrs_load.C
index c3d8d9f92..97973c59e 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/mrs_load.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/mrs_load.C
@@ -30,9 +30,9 @@
 
 #include <fapi2.H>
 
-#include "../mss.H"
-#include "mrs_load.H"
-#include "mrs_load_ddr4.H"
+#include <mss.H>
+#include <lib/dimm/mrs_load.H>
+#include <lib/dimm/mrs_load_ddr4.H>
 
 using fapi2::TARGET_TYPE_MCBIST;
 using fapi2::TARGET_TYPE_DIMM;
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/mrs_load.H b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/mrs_load.H
index 2f2f176d3..78121c4c2 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/mrs_load.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/mrs_load.H
@@ -7,7 +7,7 @@
 /*                                                                        */
 /* EKB Project                                                            */
 /*                                                                        */
-/* COPYRIGHT 2015                                                         */
+/* COPYRIGHT 2015,2016                                                    */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -31,10 +31,10 @@
 #define _MSS_MRS_LOAD_H_
 
 #include <fapi2.H>
-#include "../utils/c_str.H"
 #include <p9_mc_scom_addresses.H>
 
-#include "../shared/mss_kind.H"
+#include <lib/utils/c_str.H>
+#include <lib/shared/mss_kind.H>
 
 namespace mss
 {
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/mrs_load_ddr4.C b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/mrs_load_ddr4.C
index fe3d1d769..22156b93e 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/mrs_load_ddr4.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/mrs_load_ddr4.C
@@ -30,8 +30,8 @@
 
 #include <fapi2.H>
 
-#include "../mss.H"
-#include "mrs_load_ddr4.H"
+#include <mss.H>
+#include <lib/dimm/mrs_load_ddr4.H>
 
 using fapi2::TARGET_TYPE_MCBIST;
 using fapi2::TARGET_TYPE_DIMM;
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/mrs_load_ddr4.H b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/mrs_load_ddr4.H
index 2ddf07110..dff040bc9 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/mrs_load_ddr4.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/mrs_load_ddr4.H
@@ -32,7 +32,7 @@
 #define _MSS_MRS_LOAD_DDR4_H_
 
 #include <fapi2.H>
-#include "../mss.H"
+#include <mss.H>
 
 namespace mss
 {
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rank.C b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rank.C
index b2a705eea..ab4926b99 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rank.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rank.C
@@ -28,8 +28,7 @@
 // *HWP Consumed by: FSP:HB
 
 #include <fapi2.H>
-
-#include "../mss.H"
+#include <mss.H>
 
 using fapi2::TARGET_TYPE_MCA;
 using fapi2::TARGET_TYPE_DIMM;
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rcd_load.C b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rcd_load.C
index 7598d4f27..ea7d8714d 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rcd_load.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rcd_load.C
@@ -7,7 +7,7 @@
 /*                                                                        */
 /* EKB Project                                                            */
 /*                                                                        */
-/* COPYRIGHT 2015                                                         */
+/* COPYRIGHT 2015,2016                                                    */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -29,9 +29,9 @@
 
 #include <fapi2.H>
 
-#include "../mss.H"
-#include "rcd_load.H"
-#include "rcd_load_ddr4.H"
+#include <mss.H>
+#include <lib/dimm/rcd_load.H>
+#include <lib/dimm/rcd_load_ddr4.H>
 
 using fapi2::TARGET_TYPE_MCBIST;
 using fapi2::TARGET_TYPE_MCA;
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rcd_load.H b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rcd_load.H
index bc66ccd46..20f15cb06 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rcd_load.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rcd_load.H
@@ -7,7 +7,7 @@
 /*                                                                        */
 /* EKB Project                                                            */
 /*                                                                        */
-/* COPYRIGHT 2015                                                         */
+/* COPYRIGHT 2015,2016                                                    */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -31,10 +31,11 @@
 #define _MSS_RCD_LOAD_H_
 
 #include <fapi2.H>
-#include "../utils/c_str.H"
+
 #include <p9_mc_scom_addresses.H>
 
-#include "../shared/mss_kind.H"
+#include <lib/utils/c_str.H>
+#include <lib/shared/mss_kind.H>
 
 namespace mss
 {
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rcd_load_ddr4.C b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rcd_load_ddr4.C
index cbf370047..a568fed6f 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rcd_load_ddr4.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rcd_load_ddr4.C
@@ -7,7 +7,7 @@
 /*                                                                        */
 /* EKB Project                                                            */
 /*                                                                        */
-/* COPYRIGHT 2015                                                         */
+/* COPYRIGHT 2015,2016                                                    */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -29,8 +29,8 @@
 
 #include <fapi2.H>
 
-#include "../mss.H"
-#include "rcd_load_ddr4.H"
+#include <mss.H>
+#include <lib/dimm/rcd_load_ddr4.H>
 
 using fapi2::TARGET_TYPE_MCBIST;
 using fapi2::TARGET_TYPE_MCA;
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rcd_load_ddr4.H b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rcd_load_ddr4.H
index 640f43d89..862cb7f30 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rcd_load_ddr4.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/dimm/rcd_load_ddr4.H
@@ -7,7 +7,7 @@
 /*                                                                        */
 /* EKB Project                                                            */
 /*                                                                        */
-/* COPYRIGHT 2015                                                         */
+/* COPYRIGHT 2015,2016                                                    */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -31,9 +31,11 @@
 #define _MSS_RCD_LOAD_DDR4_H_
 
 #include <fapi2.H>
-#include "../utils/c_str.H"
+
 #include <p9_mc_scom_addresses.H>
 
+#include <lib/utils/c_str.H>
+
 namespace mss
 {
 ///
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/eff_config/memory_size.C b/src/import/chips/p9/procedures/hwp/memory/lib/eff_config/memory_size.C
index 5bdbb2685..48da0578f 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/eff_config/memory_size.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/eff_config/memory_size.C
@@ -30,8 +30,8 @@
 #include <fapi2.H>
 #include <mss_attribute_accessors.H>
 
-#include "../shared/mss_const.H"
-#include "memory_size.H"
+#include <lib/shared/mss_const.H>
+#include <lib/eff_config/memory_size.H>
 
 namespace mss
 {
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/eff_config/timing.H b/src/import/chips/p9/procedures/hwp/memory/lib/eff_config/timing.H
index 5c921fa5c..5ec266ddd 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/eff_config/timing.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/eff_config/timing.H
@@ -29,10 +29,12 @@
 #ifndef _MSS_TIMING_H_
 #define _MSS_TIMING_H_
 
-#include <mss.H>
-#include <fapi2.H>
 #include <cstdint>
-#include "../utils/find.H"
+
+#include <fapi2.H>
+
+#include <mss.H>
+#include <lib/utils/find.H>
 
 using fapi2::TARGET_TYPE_DIMM;
 
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mc/mc.C b/src/import/chips/p9/procedures/hwp/memory/lib/mc/mc.C
index 6670cd4ce..ae8b9e61e 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/mc/mc.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/mc/mc.C
@@ -30,9 +30,9 @@
 #include <fapi2.H>
 #include <p9_mc_scom_addresses.H>
 
-#include "../utils/dump_regs.H"
-#include "../utils/scom.H"
-#include "mc.H"
+#include <lib/utils/dump_regs.H>
+#include <lib/utils/scom.H>
+#include <lib/mc/mc.H>
 
 using fapi2::TARGET_TYPE_MCA;
 using fapi2::TARGET_TYPE_MCS;
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mc/mc.H b/src/import/chips/p9/procedures/hwp/memory/lib/mc/mc.H
index 1e295dc8f..7416b96dd 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/mc/mc.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/mc/mc.H
@@ -32,10 +32,10 @@
 
 #include <fapi2.H>
 
-#include "p9_mc_scom_addresses.H"
-#include "p9_mc_scom_addresses_fld.H"
-#include "mss_attribute_accessors.H"
-#include "../utils/scom.H"
+#include <p9_mc_scom_addresses.H>
+#include <p9_mc_scom_addresses_fld.H>
+#include <mss_attribute_accessors.H>
+#include <lib/utils/scom.H>
 
 namespace mss
 {
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.C b/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.C
index 2c0beb8bf..6d3ed7568 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/mc/xlate.C
@@ -29,14 +29,14 @@
 
 #include <fapi2.H>
 
-#include "p9_mc_scom_addresses.H"
-#include "p9_mc_scom_addresses_fld.H"
+#include <p9_mc_scom_addresses.H>
+#include <p9_mc_scom_addresses_fld.H>
 
-#include "mss_attribute_accessors.H"
+#include <mss_attribute_accessors.H>
 
-#include "mc.H"
-#include "../utils/scom.H"
-#include "../dimm/kind.H"
+#include <lib/mc/mc.H>
+#include <lib/utils/scom.H>
+#include <lib/dimm/kind.H>
 
 using fapi2::TARGET_TYPE_MCBIST;
 using fapi2::TARGET_TYPE_PROC_CHIP;
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist.C b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist.C
index c9ad1b4ad..ba8a672cc 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist.C
@@ -28,8 +28,8 @@
 // *HWP Consumed by: FSP:HB
 
 #include <fapi2.H>
-#include "mcbist.H"
-#include "../utils/dump_regs.H"
+#include <lib/mcbist/mcbist.H>
+#include <lib/utils/dump_regs.H>
 
 using fapi2::TARGET_TYPE_MCBIST;
 using fapi2::TARGET_TYPE_MCA;
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist.H b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist.H
index f2b46e3c8..f2fefd13d 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/mcbist.H
@@ -35,9 +35,9 @@
 #include <p9_mc_scom_addresses.H>
 #include <p9_mc_scom_addresses_fld.H>
 
-#include "../utils/poll.H"
-#include "../shared/mss_const.H"
-#include "../utils/bit_count.H"
+#include <lib/utils/poll.H>
+#include <lib/shared/mss_const.H>
+#include <lib/utils/bit_count.H>
 
 namespace mss
 {
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mss.H b/src/import/chips/p9/procedures/hwp/memory/lib/mss.H
index 5d2b6038b..61d593167 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/mss.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/mss.H
@@ -31,44 +31,43 @@
 #define _MSS_H_
 
 #include <fapi2.H>
-#include "utils/scom.H"
+#include <lib/utils/scom.H>
 
 #include <p9_mc_scom_addresses.H>
 #include <p9_mc_scom_addresses_fld.H>
 
-#include "shared/mss_const.H"
-#include "shared/mss_kind.H"
+#include <lib/shared/mss_const.H>
+#include <lib/shared/mss_kind.H>
 
-#include "utils/index.H"
-#include "utils/c_str.H"
+#include <lib/utils/index.H>
+#include <lib/utils/c_str.H>
 
-#include "utils/pos.H"
-#include "utils/swizzle.H"
-#include "utils/conversions.H"
-#include "utils/find.H"
-#include "utils/poll.H"
-#include "utils/checker.H"
-#include "utils/dump_regs.H"
+#include <lib/utils/pos.H>
+#include <lib/utils/swizzle.H>
+#include <lib/utils/conversions.H>
+#include <lib/utils/find.H>
+#include <lib/utils/poll.H>
+#include <lib/utils/checker.H>
+#include <lib/utils/dump_regs.H>
 
-#include "ccs/ccs.H"
-#include "mcbist/mcbist.H"
+#include <lib/ccs/ccs.H>
+#include <lib/mcbist/mcbist.H>
 
-#include "port/port.H"
+#include <lib/port/port.H>
 
+#include <lib/dimm/rcd_load.H>
+#include <lib/dimm/mrs_load.H>
+#include <lib/dimm/rank.H>
+#include <lib/dimm/kind.H>
 
-#include "dimm/rcd_load.H"
-#include "dimm/mrs_load.H"
-#include "dimm/rank.H"
-#include "dimm/kind.H"
+#include <lib/phy/ddr_phy.H>
+#include <lib/phy/dp16.H>
+#include <lib/phy/cal_timers.H>
+#include <lib/phy/write_cntrl.H>
+#include <lib/phy/read_cntrl.H>
 
-#include "phy/ddr_phy.H"
-#include "phy/dp16.H"
-#include "phy/cal_timers.H"
-#include "phy/write_cntrl.H"
-#include "phy/read_cntrl.H"
+#include <lib/utils/dump_regs.H>
 
-#include "utils/dump_regs.H"
-
-#include "mc/mc.H"
+#include <lib/mc/mc.H>
 
 #endif
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mss_utils.H b/src/import/chips/p9/procedures/hwp/memory/lib/mss_utils.H
index 83ec3512b..f9ab8133f 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/mss_utils.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/mss_utils.H
@@ -30,7 +30,9 @@
 #ifndef _MSS_P9_ATTR_UTILS_H_
 #define _MSS_P9_ATTR_UTILS_H_
 
-#include "utils/index.H"
-#include "utils/c_str.H"
+//TK: what is this for? BRS
+
+#include <lib/utils/index.H>
+#include <lib/utils/c_str.H>
 
 #endif // _MSS_P9_ATTR_UTILS_H_
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/apb.H b/src/import/chips/p9/procedures/hwp/memory/lib/phy/apb.H
index 1a3461a00..e061d0d16 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/apb.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/apb.H
@@ -31,9 +31,9 @@
 #define _MSS_APB_H_
 
 #include <fapi2.H>
-#include "p9_mc_scom_addresses.H"
-#include "p9_mc_scom_addresses_fld.H"
-#include "../lib/utils/scom.H"
+#include <p9_mc_scom_addresses.H>
+#include <p9_mc_scom_addresses_fld.H>
+#include <lib/utils/scom.H>
 
 namespace mss
 {
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/cal_timers.H b/src/import/chips/p9/procedures/hwp/memory/lib/phy/cal_timers.H
index 56a188d36..794d33ba0 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/cal_timers.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/cal_timers.H
@@ -31,9 +31,9 @@
 #define _MSS_CAL_TIMERS_H_
 
 #include <fapi2.H>
-#include "../shared/mss_const.H"
-#include "../utils/conversions.H"
-#include "../utils/poll.H"
+#include <lib/shared/mss_const.H>
+#include <lib/utils/conversions.H>
+#include <lib/utils/poll.H>
 
 namespace mss
 {
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/phy_cntrl.H b/src/import/chips/p9/procedures/hwp/memory/lib/phy/phy_cntrl.H
index c7f7a2348..e6bfafc7f 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/phy_cntrl.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/phy_cntrl.H
@@ -31,7 +31,7 @@
 #define _MSS_PHY_CNTRL_H_
 
 #include <fapi2.H>
-#include "p9_mc_scom_addresses.H"
+#include <p9_mc_scom_addresses.H>
 
 namespace mss
 {
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/read_cntrl.H b/src/import/chips/p9/procedures/hwp/memory/lib/phy/read_cntrl.H
index 9c9eb82b0..61bb61001 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/read_cntrl.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/read_cntrl.H
@@ -31,7 +31,7 @@
 #define _MSS_READ_CNTRL_H_
 
 #include <fapi2.H>
-#include "p9_mc_scom_addresses.H"
+#include <p9_mc_scom_addresses.H>
 
 namespace mss
 {
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/phy/write_cntrl.H b/src/import/chips/p9/procedures/hwp/memory/lib/phy/write_cntrl.H
index 248a8cbcb..450790550 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/phy/write_cntrl.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/phy/write_cntrl.H
@@ -31,7 +31,7 @@
 #define _MSS_WRITE_CNTRL_H_
 
 #include <fapi2.H>
-#include "p9_mc_scom_addresses.H"
+#include <p9_mc_scom_addresses.H>
 
 namespace mss
 {
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/termination/slew_cal.C b/src/import/chips/p9/procedures/hwp/memory/lib/termination/slew_cal.C
index a873abf2f..396c0ebcd 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/termination/slew_cal.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/termination/slew_cal.C
@@ -29,8 +29,8 @@
 
 #include <fapi2.H>
 
-#include "../mss.H"
-#include "slew_cal.H"
+#include <mss.H>
+#include <lib/termination/slew_cal.H>
 
 using fapi2::TARGET_TYPE_MCBIST;
 using fapi2::TARGET_TYPE_MCA;
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/termination/slew_cal_status.C b/src/import/chips/p9/procedures/hwp/memory/lib/termination/slew_cal_status.C
index 4f62b626d..23402c248 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/termination/slew_cal_status.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/termination/slew_cal_status.C
@@ -7,7 +7,7 @@
 /*                                                                        */
 /* EKB Project                                                            */
 /*                                                                        */
-/* COPYRIGHT 2015                                                         */
+/* COPYRIGHT 2015,2016                                                    */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -29,8 +29,8 @@
 
 #include <fapi2.H>
 
-#include "../mss.H"
-#include "slew_cal.H"
+#include <mss.H>
+#include <lib/termination/slew_cal.H>
 
 using fapi2::TARGET_TYPE_MCBIST;
 using fapi2::TARGET_TYPE_MCA;
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/utils/c_str.C b/src/import/chips/p9/procedures/hwp/memory/lib/utils/c_str.C
index 657481c74..6db3cc45c 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/utils/c_str.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/utils/c_str.C
@@ -7,7 +7,7 @@
 /*                                                                        */
 /* EKB Project                                                            */
 /*                                                                        */
-/* COPYRIGHT 2015                                                         */
+/* COPYRIGHT 2015,2016                                                    */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -27,9 +27,9 @@
 // *HWP Level: 2
 // *HWP Consumed by: HB:FSP
 
-#include <mss_attribute_accessors.H>
 #include <fapi2.H>
-#include "c_str.H"
+#include <mss_attribute_accessors.H>
+#include <lib/utils/c_str.H>
 
 using fapi2::TARGET_TYPE_MCBIST;
 using fapi2::TARGET_TYPE_MCA;
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/utils/checker.H b/src/import/chips/p9/procedures/hwp/memory/lib/utils/checker.H
index f71578e82..6656ef6f1 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/utils/checker.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/utils/checker.H
@@ -31,8 +31,9 @@
 #define _CHECKER_H_
 
 #include <fapi2.H>
-#include "../shared/mss_const.H"
+
 #include <mss_attribute_accessors.H>
+#include <lib/shared/mss_const.H>
 
 namespace mss
 {
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/utils/conversions.H b/src/import/chips/p9/procedures/hwp/memory/lib/utils/conversions.H
index 70c58289d..b273deff0 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/utils/conversions.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/utils/conversions.H
@@ -31,9 +31,10 @@
 #define _MSS_CONVERSIONS_H_
 
 #include <fapi2.H>
-#include <mss_attribute_accessors.H>
-#include "../shared/mss_const.H"
-#include "find.H"
+#include <lib/mss_attribute_accessors.H>
+
+#include <lib/shared/mss_const.H>
+#include <lib/utils/find.H>
 
 // Mutiplication factor to go from clocks to simcycles.
 // Is this just 2400 speed or does this hold for all? BRS
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/utils/fake_spd.C b/src/import/chips/p9/procedures/hwp/memory/lib/utils/fake_spd.C
index ed6c8a3ea..cf4f14e64 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/utils/fake_spd.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/utils/fake_spd.C
@@ -27,7 +27,8 @@
 // *HWP Level: 2
 // *HWP Consumed by: HB:FSP
 
-#include "fake_spd.H"
+#include <lib/utils/fake_spd.H>
+
 #ifndef DOXYGEN
 /// DIMM data was taken from /afs/awd.austin.ibm.com/projects/eclipz/lab/p8/gsiexe/
 /// 78P0AAM_DDR4_8G1RX8_mu/MICRON_SPD_8G_1Rx8_DDR4_2400_RDIMM.hex on 7/31/2015.
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/utils/index.H b/src/import/chips/p9/procedures/hwp/memory/lib/utils/index.H
index 9aeab43ba..e9f2584d4 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/utils/index.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/utils/index.H
@@ -31,8 +31,9 @@
 #define _MSS_INDEX_H_
 
 #include <fapi2.H>
-#include "pos.H"
-#include "../shared/mss_const.H"
+
+#include <lib/utils/pos.H>
+#include <lib/shared/mss_const.H>
 
 namespace mss
 {
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/utils/poll.H b/src/import/chips/p9/procedures/hwp/memory/lib/utils/poll.H
index 785094f4f..992511df3 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/utils/poll.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/utils/poll.H
@@ -31,9 +31,10 @@
 #define _MSS_POLL_H_
 
 #include <fapi2.H>
-#include "../utils/scom.H"
-#include "../shared/mss_const.H"
-#include "conversions.H"
+
+#include <lib/utils/scom.H>
+#include <lib/shared/mss_const.H>
+#include <lib/utils/conversions.H>
 
 namespace mss
 {