diff --git a/src/arch/x86/include/arch/ioapic.h b/src/arch/x86/include/arch/ioapic.h
index b989e527b8..7ff47bb018 100644
--- a/src/arch/x86/include/arch/ioapic.h
+++ b/src/arch/x86/include/arch/ioapic.h
@@ -39,6 +39,8 @@
 #define SMI		(2 << 8)
 #define INT		(1 << 8)
 
+u32 io_apic_read(u32 ioapic_base, u32 reg);
+void io_apic_write(u32 ioapic_base, u32 reg, u32 value);
 void set_ioapic_id(u32 ioapic_base, u8 ioapic_id);
 void setup_ioapic(u32 ioapic_base, u8 ioapic_id);
 void clear_ioapic(u32 ioapic_base);
diff --git a/src/arch/x86/lib/ioapic.c b/src/arch/x86/lib/ioapic.c
index 389c48c111..4964af6757 100644
--- a/src/arch/x86/lib/ioapic.c
+++ b/src/arch/x86/lib/ioapic.c
@@ -22,13 +22,13 @@
 #include <console/console.h>
 #include <cpu/x86/lapic.h>
 
-static u32 io_apic_read(u32 ioapic_base, u32 reg)
+u32 io_apic_read(u32 ioapic_base, u32 reg)
 {
 	write32(ioapic_base, reg);
 	return read32(ioapic_base + 0x10);
 }
 
-static void io_apic_write(u32 ioapic_base, u32 reg, u32 value)
+void io_apic_write(u32 ioapic_base, u32 reg, u32 value)
 {
 	write32(ioapic_base, reg);
 	write32(ioapic_base + 0x10, value);
diff --git a/src/drivers/generic/ioapic/ioapic.c b/src/drivers/generic/ioapic/ioapic.c
index 9a93c78336..42b2f071f3 100644
--- a/src/drivers/generic/ioapic/ioapic.c
+++ b/src/drivers/generic/ioapic/ioapic.c
@@ -12,18 +12,6 @@
 #include <arch/io.h>
 #include <cpu/x86/lapic.h>
 
-static u32 io_apic_read(u32 ioapic_base, u32 reg)
-{
-	write32(ioapic_base, reg);
-	return read32(ioapic_base + 0x10);
-}
-
-static void io_apic_write(u32 ioapic_base, u32 reg, u32 value)
-{
-	write32(ioapic_base, reg);
-	write32(ioapic_base + 0x10, value);
-}
-
 static void ioapic_init(device_t dev)
 {
 	struct drivers_generic_ioapic_config *config = dev->chip_info;