diff --git a/reactos/hal/halx86/generic/irq.S b/reactos/hal/halx86/generic/irq.S
index 8a96c3aad60..e38b0fc1719 100644
--- a/reactos/hal/halx86/generic/irq.S
+++ b/reactos/hal/halx86/generic/irq.S
@@ -21,14 +21,14 @@ PICInitTable:
     /* Master PIC */
     .short 0x20                         /* Port */
     .byte 0x11                          /* Edge,, cascade, CAI 8, ICW4 */
-    .byte 0x40                          /* Base */
+    .byte PRIMARY_VECTOR_BASE           /* Base */
     .byte 4                             /* IRQ 4 connected to slave */
     .byte 1                             /* Non buffered, not nested, 8086 */
 
     /* Slave PIC */
     .short 0xA0                         /* Port */
     .byte 0x11                          /* Edge, cascade, CAI 8, ICW4 */
-    .byte 0x48                          /* Base */
+    .byte PRIMARY_VECTOR_BASE + 8       /* Base */
     .byte 2                             /* Slave ID: Slave 2 */
     .byte 1                             /* Non buffered, not nested, 8086 */
 
diff --git a/reactos/hal/halx86/include/halirq.h b/reactos/hal/halx86/include/halirq.h
index aa8e8ae5d5d..839dfcf05b4 100644
--- a/reactos/hal/halx86/include/halirq.h
+++ b/reactos/hal/halx86/include/halirq.h
@@ -23,7 +23,7 @@
 
 #else
 
-#define IRQ_BASE		(0x40)
+#define IRQ_BASE		(0x30)
 #define	NR_IRQS			(16)
 
 #define VECTOR2IRQ(vector)	((vector) - IRQ_BASE)
diff --git a/reactos/include/ndk/asm.h b/reactos/include/ndk/asm.h
index 2cdf705b0c5..58161d45ff7 100644
--- a/reactos/include/ndk/asm.h
+++ b/reactos/include/ndk/asm.h
@@ -445,7 +445,7 @@ Author:
 //
 // Generic Definitions
 //
-#define PRIMARY_VECTOR_BASE                     0x40 // FIXME: HACK
+#define PRIMARY_VECTOR_BASE                     0x30 // FIXME: HACK
 #define MAXIMUM_IDTVECTOR                       0xFF
 #endif // !_ASM_H
 
diff --git a/reactos/ntoskrnl/ke/i386/irq.c b/reactos/ntoskrnl/ke/i386/irq.c
index aadf0fcdd43..eb13fb7bc82 100644
--- a/reactos/ntoskrnl/ke/i386/irq.c
+++ b/reactos/ntoskrnl/ke/i386/irq.c
@@ -88,7 +88,7 @@ void irq_handler_13(void);
 void irq_handler_14(void);
 void irq_handler_15(void);
 
-static unsigned int irq_handler[NR_IRQS]=
+unsigned int irq_handler[NR_IRQS]=
 {
    (int)&irq_handler_0,
    (int)&irq_handler_1,