diff --git a/bl31/bl31.ld.S b/bl31/bl31.ld.S
index 6b7f915..ac99a7d 100644
--- a/bl31/bl31.ld.S
+++ b/bl31/bl31.ld.S
@@ -47,11 +47,7 @@
         __RODATA_START__ = .;
         *(SORT_BY_ALIGNMENT(.rodata*))
 
-	RT_SVC_DESCS
-	FCONF_POPULATOR
-	PMF_SVC_DESCS
-	CPU_OPS
-	GOT
+	RODATA_COMMON
 
         /* Place pubsub sections for events */
         . = ALIGN(8);
@@ -67,11 +63,7 @@
         *(SORT_BY_ALIGNMENT(.text*))
         *(SORT_BY_ALIGNMENT(.rodata*))
 
-	RT_SVC_DESCS
-	FCONF_POPULATOR
-	PMF_SVC_DESCS
-	CPU_OPS
-	GOT
+	RODATA_COMMON
 
         /* Place pubsub sections for events */
         . = ALIGN(8);