diff --git a/include/plat/pc99/plat/machine/interrupt.h b/include/plat/pc99/plat/machine/interrupt.h
index 2db6d146e..18e6ae1b8 100644
--- a/include/plat/pc99/plat/machine/interrupt.h
+++ b/include/plat/pc99/plat/machine/interrupt.h
@@ -45,12 +45,12 @@ receivePendingIRQ(void)
                  : "=m"(ARCH_NODE_STATE(x86KSPendingInterrupt)));
 }
 
-static inline irq_t
+static inline interrupt_t
 servicePendingIRQ(void)
 {
     assert(ARCH_NODE_STATE(x86KScurInterrupt) == int_invalid);
     assert(ARCH_NODE_STATE(x86KSPendingInterrupt) != int_invalid);
-    irq_t ret = ARCH_NODE_STATE(x86KSPendingInterrupt);
+    interrupt_t ret = ARCH_NODE_STATE(x86KSPendingInterrupt);
     ARCH_NODE_STATE(x86KSPendingInterrupt) = int_invalid;
     return ret;
 }
diff --git a/src/arch/x86/32/c_traps.c b/src/arch/x86/32/c_traps.c
index 3f926caf3..bec780a3c 100644
--- a/src/arch/x86/32/c_traps.c
+++ b/src/arch/x86/32/c_traps.c
@@ -117,7 +117,7 @@ void NORETURN VISIBLE restore_user_context(void)
      * we should 'enter' it again */
     if (ARCH_NODE_STATE(x86KSPendingInterrupt) != int_invalid) {
         /* put this in service */
-        irq_t irq = servicePendingIRQ();
+        interrupt_t irq = servicePendingIRQ();
         /* reset our stack and jmp to the IRQ entry point */
         asm volatile(
             /* round our stack back to the top to reset it */
diff --git a/src/arch/x86/64/c_traps.c b/src/arch/x86/64/c_traps.c
index c331fb229..2f33b6143 100644
--- a/src/arch/x86/64/c_traps.c
+++ b/src/arch/x86/64/c_traps.c
@@ -139,7 +139,7 @@ void VISIBLE NORETURN restore_user_context(void)
     /* we've now 'exited' the kernel. If we have a pending interrupt
      * we should 'enter' it again */
     if (ARCH_NODE_STATE(x86KSPendingInterrupt) != int_invalid) {
-        irq_t irq = servicePendingIRQ();
+        interrupt_t irq = servicePendingIRQ();
         /* reset our stack and jmp to the IRQ entry point */
         asm volatile(
             /* round our stack back to the top to reset it */