diff --git a/ArmPkg/Include/Library/ArmLib.h b/ArmPkg/Include/Library/ArmLib.h
index 1726984f5b..9694b9d06d 100644
--- a/ArmPkg/Include/Library/ArmLib.h
+++ b/ArmPkg/Include/Library/ArmLib.h
@@ -279,6 +279,24 @@ ArmCleanInvalidateDataCacheEntryByMVA (
   IN  UINTN   Address
   );
 
+VOID
+EFIAPI
+ArmInvalidateDataCacheEntryBySetWay (
+  IN  UINTN  SetWayFormat
+  );
+
+VOID
+EFIAPI
+ArmCleanDataCacheEntryBySetWay (
+  IN  UINTN  SetWayFormat
+  );
+
+VOID
+EFIAPI
+ArmCleanInvalidateDataCacheEntryBySetWay (
+  IN  UINTN   SetWayFormat
+  );
+
 VOID
 EFIAPI
 ArmEnableDataCache (
@@ -315,6 +333,12 @@ ArmDisableMmu (
   VOID
   );
 
+VOID
+EFIAPI
+ArmEnableCachesAndMmu (
+  VOID
+  );
+
 VOID
 EFIAPI
 ArmDisableCachesAndMmu (
@@ -345,9 +369,15 @@ ArmGetInterruptState (
   VOID
   );
 
+VOID
+EFIAPI
+ArmEnableAsynchronousAbort (
+  VOID
+  );
+
 UINTN
 EFIAPI
-ArmDisableIrq (
+ArmDisableAsynchronousAbort (
   VOID
   );
 
@@ -357,6 +387,12 @@ ArmEnableIrq (
   VOID
   );
 
+UINTN
+EFIAPI
+ArmDisableIrq (
+  VOID
+  );
+
 VOID
 EFIAPI
 ArmEnableFiq (
@@ -456,6 +492,12 @@ ArmSetHighVectors (
   VOID
   );
 
+VOID
+EFIAPI
+ArmDrainWriteBuffer (
+  VOID
+  );
+
 VOID
 EFIAPI
 ArmDataMemoryBarrier (
diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h
index 04e3be0426..c8bb84365b 100644
--- a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h
+++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.h
@@ -18,71 +18,6 @@
 
 typedef VOID (*AARCH64_CACHE_OPERATION)(UINTN);
 
-VOID
-EFIAPI
-ArmDrainWriteBuffer (
-  VOID
-  );
-
-VOID
-EFIAPI
-ArmInvalidateDataCacheEntryBySetWay (
-  IN  UINTN  SetWayFormat
-  );
-
-VOID
-EFIAPI
-ArmCleanDataCacheEntryBySetWay (
-  IN  UINTN  SetWayFormat
-  );
-
-VOID
-EFIAPI
-ArmCleanDataCacheToPoUEntryBySetWay (
-  IN  UINTN  SetWayFormat
-  );
-
-VOID
-EFIAPI
-ArmCleanInvalidateDataCacheEntryBySetWay (
-  IN  UINTN   SetWayFormat
-  );
-
-VOID
-EFIAPI
-ArmEnableAsynchronousAbort (
-  VOID
-  );
-
-UINTN
-EFIAPI
-ArmDisableAsynchronousAbort (
-  VOID
-  );
-
-VOID
-EFIAPI
-ArmEnableIrq (
-  VOID
-  );
-
-UINTN
-EFIAPI
-ArmDisableIrq (
-  VOID
-  );
-
-VOID
-EFIAPI
-ArmEnableFiq (
-  VOID
-  );
-
-UINTN
-EFIAPI
-ArmDisableFiq (
-  VOID
-  );
 
 VOID
 AArch64PerformPoUDataCacheOperation (
diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h
index 88848da583..f183a1cca3 100644
--- a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h
+++ b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h
@@ -17,47 +17,6 @@
 
 typedef VOID (*ARM_V7_CACHE_OPERATION)(UINT32);
 
-VOID
-EFIAPI
-ArmDrainWriteBuffer (
-  VOID
-  );
-
-VOID
-EFIAPI
-ArmInvalidateDataCacheEntryBySetWay (
-  IN  UINT32  SetWayFormat
-  );
-
-VOID
-EFIAPI
-ArmCleanDataCacheEntryBySetWay (
-  IN  UINT32  SetWayFormat
-  );
-
-VOID
-EFIAPI
-ArmCleanDataCacheToPoUEntryBySetWay (
-  IN  UINT32  SetWayFormat
-  );
-
-VOID
-EFIAPI
-ArmCleanInvalidateDataCacheEntryBySetWay (
-  IN  UINT32   SetWayFormat
-  );
-
-VOID
-EFIAPI
-ArmEnableAsynchronousAbort (
-  VOID
-  );
-
-UINTN
-EFIAPI
-ArmDisableAsynchronousAbort (
-  VOID
-  );
 
 VOID
 ArmV7PerformPoUDataCacheOperation (