Index: kernel/genarch/include/genarch/drivers/grlib_irqmp/grlib_irqmp.h
===================================================================
--- kernel/genarch/include/genarch/drivers/grlib_irqmp/grlib_irqmp.h	(revision 6ac3d27eb625f68dbcec00d5d56ddbd6ca72b413)
+++ kernel/genarch/include/genarch/drivers/grlib_irqmp/grlib_irqmp.h	(revision 679dc0c9c223ca3698970cbe869686a2c72637b8)
@@ -39,4 +39,5 @@
 
 #include <typedefs.h>
+#include <arch.h>
 
 #define GRLIB_IRQMP_MASK_OFFSET		0x40
@@ -70,9 +71,9 @@
 } grlib_irqmp_t;
 
-extern void grlib_irqmp_init(grlib_irqmp_t *, grlib_irqmp_regs_t *);
-extern unsigned grlib_irqmp_inum_get(grlib_irqmp_t *);
-extern void grlib_irqmp_clear(grlib_irqc_t *, int);
-extern void grlib_irqmp_irq_mask(grlib_irqc_t *, int);
-extern void grlib_irqmp_irq_unmask(grlib_irqc_t *, int);
+extern void grlib_irqmp_init(grlib_irqmp_t *, bootinfo_t *);
+extern int grlib_irqmp_inum_get(grlib_irqmp_t *);
+extern void grlib_irqmp_clear(grlib_irqmp_t *, int);
+extern void grlib_irqmp_mask(grlib_irqmp_t *, int);
+extern void grlib_irqmp_unmask(grlib_irqmp_t *, int);
 
 #endif
Index: kernel/genarch/include/genarch/drivers/grlib_uart/grlib_uart.h
===================================================================
--- kernel/genarch/include/genarch/drivers/grlib_uart/grlib_uart.h	(revision 6ac3d27eb625f68dbcec00d5d56ddbd6ca72b413)
+++ kernel/genarch/include/genarch/drivers/grlib_uart/grlib_uart.h	(revision 679dc0c9c223ca3698970cbe869686a2c72637b8)
@@ -44,13 +44,4 @@
 #include <typedefs.h>
 
-/** GRLIB UART registers */
-typedef struct {
-	uint32_t data;
-	grlib_uart_status_t status;
-	grlib_uart_control_t control;
-	uint32_t scaler;
-	uint32_t debug;
-} grlib_uart_io_t;
-
 typedef struct {
 	unsigned int rcnt: 6;
@@ -88,5 +79,14 @@
 	unsigned int te: 1;
 	unsigned int re: 1;
-};
+} grlib_uart_control_t;
+
+/** GRLIB UART registers */
+typedef struct {
+	uint32_t data;
+	uint32_t status;
+	uint32_t control;
+	uint32_t scaler;
+	uint32_t debug;
+} grlib_uart_io_t;
 
 typedef struct {