5 files changed, 12 insertions, 15 deletions
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 82869862c..6249fcc39 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
@@ -27,18 +27,17 @@
 /// @file memory_size.C
 /// @brief Return the effective memory size behind a target
 ///
-// *HWP HWP Owner: Brian Silver <bsilver@us.ibm.com>
-// *HWP HWP Backup: Andre Marin <aamarin@us.ibm.com>
+// *HWP HWP Owner: Andre Marin <aamarin@us.ibm.com>
+// *HWP HWP Backup: Jacob Harvey <jlharvey@us.ibm.com>
 // *HWP Team: Memory
 // *HWP Level: 3
 // *HWP Consumed by: HB:FSP
 
 #include <fapi2.H>
-#include <lib/mss_attribute_accessors.H>
 
+#include <lib/mss_attribute_accessors.H>
 #include <lib/shared/mss_const.H>
-#include <lib/eff_config/memory_size.H>
-
+#include <generic/memory/lib/utils/memory_size.H>
 #include <generic/memory/lib/utils/find.H>
 
 namespace mss
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 63ef799a8..b687da464 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
@@ -27,8 +27,8 @@
 /// @file mcbist.H
 /// @brief Run and manage the MCBIST engine
 ///
-// *HWP HWP Owner: Brian Silver <bsilver@us.ibm.com>
-// *HWP HWP Backup: Andre Marin <aamarin@us.ibm.com>
+// *HWP HWP Owner: Andre Marin <aamarin@us.ibm.com>
+// *HWP HWP Backup: Stephen Glancy <sglancy@us.ibm.com>
 // *HWP Team: Memory
 // *HWP Level: 2
 // *HWP Consumed by: HB:FSP
@@ -42,7 +42,7 @@
 #include <p9_mc_scom_addresses_fld.H>
 
 #include <lib/utils/poll.H>
-#include <lib/eff_config/memory_size.H>
+#include <generic/memory/lib/utils/memory_size.H>
 #include <lib/shared/mss_const.H>
 #include <lib/utils/bit_count.H>
 #include <lib/utils/num.H>
diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_mss_eff_grouping.C b/src/import/chips/p9/procedures/hwp/nest/p9_mss_eff_grouping.C
index 07948632c..60f26f3c8 100644
--- a/src/import/chips/p9/procedures/hwp/nest/p9_mss_eff_grouping.C
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_mss_eff_grouping.C
@@ -46,7 +46,7 @@
 #include <p9_mss_eff_grouping.H>
 #include <p9_fbc_utils.H>
 #include <map>
-#include <lib/eff_config/memory_size.H>
+#include <generic/memory/lib/utils/memory_size.H>
 
 ///----------------------------------------------------------------------------
 /// Constant definitions
diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_mss_setup_bars.C b/src/import/chips/p9/procedures/hwp/nest/p9_mss_setup_bars.C
index a4d87327b..07bf41df8 100644
--- a/src/import/chips/p9/procedures/hwp/nest/p9_mss_setup_bars.C
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_mss_setup_bars.C
@@ -43,7 +43,7 @@
 #include <p9_mc_scom_addresses.H>
 #include <p9_mc_scom_addresses_fld.H>
 #include <map>
-#include <lib/eff_config/memory_size.H>
+#include <generic/memory/lib/utils/memory_size.H>
 
 ///----------------------------------------------------------------------------
 /// Constant definitions
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/eff_config/memory_size.H b/src/import/generic/memory/lib/utils/memory_size.H
index 9a6cbc4ab..427d152e2 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/eff_config/memory_size.H
+++ b/src/import/generic/memory/lib/utils/memory_size.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/import/chips/p9/procedures/hwp/memory/lib/eff_config/memory_size.H $ */
+/* $Source: src/import/generic/memory/lib/utils/memory_size.H $           */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
@@ -27,8 +27,8 @@
 /// @file memory_size.H
 /// @brief Return the effective memory size behind a target
 ///
-// *HWP HWP Owner: Brian Silver <bsilver@us.ibm.com>
-// *HWP HWP Backup: Andre Marin <aamarin@us.ibm.com>
+// *HWP HWP Owner: Andre Marin <aamarin@us.ibm.com>
+// *HWP HWP Backup: Jacob Harvey <jlharvey@us.ibm.com>
 // *HWP Team: Memory
 // *HWP Level: 3
 // *HWP Consumed by: HB:FSP
@@ -38,8 +38,6 @@
 
 #include <fapi2.H>
 
-#include <lib/mss_attribute_accessors.H>
-
 namespace mss
 {
 ///