diff --git a/ArmPkg/Include/Library/ArmLib.h b/ArmPkg/Include/Library/ArmLib.h
index 1e55284317..4550ea6ba0 100644
--- a/ArmPkg/Include/Library/ArmLib.h
+++ b/ArmPkg/Include/Library/ArmLib.h
@@ -314,13 +314,25 @@ EFIAPI
 ArmDisableInterrupts (
   VOID
   );
-  
+
 BOOLEAN
 EFIAPI
 ArmGetInterruptState (
   VOID
   );
 
+UINTN
+EFIAPI
+ArmDisableIrq (
+  VOID
+  );
+
+VOID
+EFIAPI
+ArmEnableIrq (
+  VOID
+  );
+
 VOID
 EFIAPI
 ArmEnableFiq (
diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h
index 66995c7bb4..88848da583 100644
--- a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h
+++ b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.h
@@ -59,30 +59,6 @@ ArmDisableAsynchronousAbort (
   VOID
   );
 
-VOID
-EFIAPI
-ArmEnableIrq (
-  VOID
-  );
-
-UINTN
-EFIAPI
-ArmDisableIrq (
-  VOID
-  );
-
-VOID
-EFIAPI
-ArmEnableFiq (
-  VOID
-  );
-
-UINTN
-EFIAPI
-ArmDisableFiq (
-  VOID
-  );
-
 VOID
 ArmV7PerformPoUDataCacheOperation (
   IN  ARM_V7_CACHE_OPERATION  DataCacheOperation