diff --git a/common/lib/acpi.h b/common/lib/acpi.h
index 2d60ea405..8d29a7df5 100644
--- a/common/lib/acpi.h
+++ b/common/lib/acpi.h
@@ -130,6 +130,15 @@ struct madt_x2apic {
     uint32_t acpi_processor_uid;
 } __attribute__((packed));
 
+struct madt_io_apic {
+    uint8_t type;
+    uint8_t length;
+    uint8_t apic_id;
+    uint8_t reserved;
+    uint32_t address;
+    uint32_t gsib;
+} __attribute__((packed));
+
 struct madt_gicc {
     struct madt_header header;
     uint8_t  reserved1[2];
diff --git a/common/sys/lapic.c b/common/sys/lapic.c
index cb348968a..13e2d3fdb 100644
--- a/common/sys/lapic.c
+++ b/common/sys/lapic.c
@@ -9,22 +9,6 @@
 #include <lib/acpi.h>
 #include <mm/pmm.h>
 
-struct madt {
-    struct sdt header;
-    uint32_t local_controller_addr;
-    uint32_t flags;
-    char     madt_entries_begin[];
-} __attribute__((packed));
-
-struct madt_io_apic {
-    uint8_t type;
-    uint8_t length;
-    uint8_t apic_id;
-    uint8_t reserved;
-    uint32_t address;
-    uint32_t gsib;
-} __attribute__((packed));
-
 struct dmar {
     struct sdt header;
     uint8_t host_address_width;