diff --git a/include/plat/bcm2837/plat/machine.h b/include/plat/bcm2837/plat/machine.h
index 94e709598..eacd49ca9 100644
--- a/include/plat/bcm2837/plat/machine.h
+++ b/include/plat/bcm2837/plat/machine.h
@@ -19,7 +19,6 @@
 #define BASIC_IRQ_OFFSET                32
 #define NORMAL_IRQ_OFFSET               (BASIC_IRQ_OFFSET + 32)
 
-#define MAX_IRQ (32 + 32 + 64 -1)
 enum IRQConstants {
     INTERRUPT_CORE_CNTPSIRQ                  =  0,
     INTERRUPT_CORE_CNTPNSIRQ                 =  1,
@@ -72,7 +71,7 @@ enum IRQConstants {
     INTERRUPT_IRQ_SPI                        = (NORMAL_IRQ_OFFSET + 54),
     INTERRUPT_IRQ_PCM                        = (NORMAL_IRQ_OFFSET + 55),
     INTERRUPT_IRQ_UART                       = (NORMAL_IRQ_OFFSET + 57),
-    maxIRQ = MAX_IRQ
+    maxIRQ = (32 + 32 + 64 - 1)
 } platform_interrupt_t;
 
 #define KERNEL_TIMER_IRQ INTERRUPT_CORE_CNTVIRQ
diff --git a/include/plat/zynqmp/plat/machine.h b/include/plat/zynqmp/plat/machine.h
index 97aaad168..fb8e13a0a 100644
--- a/include/plat/zynqmp/plat/machine.h
+++ b/include/plat/zynqmp/plat/machine.h
@@ -23,7 +23,6 @@
 #include <machine/io.h>
 #include <plat_mode/machine.h>
 
-#define MAX_IRQ (187)
 enum IRQConstants {
 //  INTERRUPT_RESERVED      =   0,
 //  INTERRUPT_RESERVED      =   1,
@@ -222,7 +221,7 @@ enum IRQConstants {
     INTERRUPT_APU_REGERROR      = 185,
     INTERRUPT_CCI               = 186,
     INTERRUPT_SMMU              = 187,
-    maxIRQ = MAX_IRQ
+    maxIRQ = 187
 } platform_interrupt_t;
 
 #define KERNEL_TIMER_IRQ INTERRUPT_CORE_VIRT_TIMER