diff --git a/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_ddr4_funcs.mk b/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_ddr4_funcs.mk
index b7202f369a2..f8407246a50 100755
--- a/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_ddr4_funcs.mk
+++ b/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_ddr4_funcs.mk
@@ -27,6 +27,6 @@
 -include 01common.mk
 
 PROCEDURE=p9c_mss_ddr4_funcs
-OBJS+=p9c_mss_funcs.o
+lib${PROCEDURE}_DEPLIBS+=p9c_mss_funcs
 $(eval $(call ADD_MEMORY_INCDIRS,$(PROCEDURE)))
 $(call BUILD_PROCEDURE)
diff --git a/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_ddr_phy_reset.mk b/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_ddr_phy_reset.mk
index c4c835cc1f0..c59a4abd925 100755
--- a/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_ddr_phy_reset.mk
+++ b/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_ddr_phy_reset.mk
@@ -26,8 +26,8 @@
 # Include the macros and things for MSS procedures
 -include 01common.mk
 PROCEDURE=p9c_mss_ddr_phy_reset
-OBJS+=p9c_dimmBadDqBitmapFuncs.o
-OBJS+=p9c_mss_unmask_errors.o
+lib${PROCEDURE}_DEPLIBS+=p9c_dimmBadDqBitmapFuncs
+lib${PROCEDURE}_DEPLIBS+=p9c_mss_unmask_errors
 OBJS+=p9c_mss_termination_control.o
 $(eval $(call ADD_MEMORY_INCDIRS,$(PROCEDURE)))
 $(call BUILD_PROCEDURE)
diff --git a/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_draminit.mk b/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_draminit.mk
index 0329a135054..e0a75d49409 100755
--- a/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_draminit.mk
+++ b/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_draminit.mk
@@ -26,7 +26,7 @@
 
 PROCEDURE=p9c_mss_draminit
 $(eval $(call ADD_MEMORY_INCDIRS,$(PROCEDURE)))
-OBJS+=p9c_mss_ddr4_funcs.o
-OBJS+=p9c_mss_funcs.o
-OBJS+=p9c_mss_unmask_errors.o
+lib${PROCEDURE}_DEPLIBS+=p9c_mss_ddr4_funcs
+lib${PROCEDURE}_DEPLIBS+=p9c_mss_funcs
+lib${PROCEDURE}_DEPLIBS+=p9c_mss_unmask_errors
 $(call BUILD_PROCEDURE)
diff --git a/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_draminit_mc.mk b/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_draminit_mc.mk
index 6327bb38970..68940558f53 100755
--- a/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_draminit_mc.mk
+++ b/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_draminit_mc.mk
@@ -27,6 +27,6 @@
 -include 01common.mk
 
 PROCEDURE=p9c_mss_draminit_mc
-OBJS+=p9c_mss_unmask_errors.o
+lib${PROCEDURE}_DEPLIBS+=p9c_mss_unmask_errors
 $(eval $(call ADD_MEMORY_INCDIRS,$(PROCEDURE)))
 $(call BUILD_PROCEDURE)
diff --git a/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_draminit_training.mk b/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_draminit_training.mk
index e00589054e5..6ed17680389 100755
--- a/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_draminit_training.mk
+++ b/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_draminit_training.mk
@@ -26,11 +26,11 @@
 # Include the macros and things for MSS procedures
 -include 01common.mk
 PROCEDURE=p9c_mss_draminit_training
-OBJS+=p9c_dimmBadDqBitmapFuncs.o
-OBJS+=p9c_mss_funcs.o
+lib${PROCEDURE}_DEPLIBS+=p9c_dimmBadDqBitmapFuncs
+lib${PROCEDURE}_DEPLIBS+=p9c_mss_funcs
 OBJS+=p9c_mss_mrs6_DDR4.o
-OBJS+=p9c_mss_ddr4_funcs.o
+lib${PROCEDURE}_DEPLIBS+=p9c_mss_ddr4_funcs
 OBJS+=p9c_mss_access_delay_reg.o
-OBJS+=p9c_mss_unmask_errors.o
+lib${PROCEDURE}_DEPLIBS+=p9c_mss_unmask_errors
 $(eval $(call ADD_MEMORY_INCDIRS,$(PROCEDURE)))
 $(call BUILD_PROCEDURE)
diff --git a/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_draminit_training_advanced.mk b/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_draminit_training_advanced.mk
index 1e1005250c2..07094c17f41 100755
--- a/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_draminit_training_advanced.mk
+++ b/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_draminit_training_advanced.mk
@@ -30,10 +30,10 @@ $(eval $(call ADD_MEMORY_INCDIRS,$(PROCEDURE)))
 OBJS+=p9c_mss_mcbist.o
 OBJS+=p9c_mss_mcbist_common.o
 OBJS+=p9c_mss_mcbist_address.o
-OBJS+=p9c_dimmBadDqBitmapFuncs.o
+lib${PROCEDURE}_DEPLIBS+=p9c_dimmBadDqBitmapFuncs
 OBJS+=p9c_mss_termination_control.o
 OBJS+=p9c_mss_generic_shmoo.o
-OBJS+=p9c_mss_unmask_errors.o
+lib${PROCEDURE}_DEPLIBS+=p9c_mss_unmask_errors
 OBJS+=p9c_mss_mrs6_DDR4.o
 OBJS+=p9c_mss_access_delay_reg.o
 OBJS+=p9c_mss_funcs.o
diff --git a/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_thermal_init.mk b/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_thermal_init.mk
index 2615cf15d4b..1d9ab67c2b9 100755
--- a/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_thermal_init.mk
+++ b/src/import/chips/centaur/procedures/hwp/memory/p9c_mss_thermal_init.mk
@@ -27,7 +27,7 @@
 -include 01common.mk
 
 PROCEDURE=p9c_mss_thermal_init
-OBJS+=p9c_mss_unmask_errors.o
+lib${PROCEDURE}_DEPLIBS+=p9c_mss_unmask_errors
 $(eval $(call ADD_MEMORY_INCDIRS,$(PROCEDURE)))
 $(call BUILD_PROCEDURE)