diff --git a/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S b/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S
index be4693796f..fef51e7521 100644
--- a/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S
+++ b/ArmPkg/Library/ArmHvcLib/Arm/ArmHvc.S
@@ -12,7 +12,7 @@
 //
 //
 
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroIoLib.h>
 
 .arch_extension virt
 
diff --git a/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S b/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S
index afb2e9bc90..990e12ef75 100644
--- a/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S
+++ b/ArmPkg/Library/ArmSmcLib/Arm/ArmSmc.S
@@ -11,7 +11,7 @@
 //
 //
 
-#include <AsmMacroIoLibV8.h>
+#include <AsmMacroIoLib.h>
 
 .arch_extension sec