Index: arch/ia32/src/cpu/cpu.c
===================================================================
--- arch/ia32/src/cpu/cpu.c	(revision d90ca68dc3c2269e3034c8ad1c8bb2a1c98fdac3)
+++ arch/ia32/src/cpu/cpu.c	(revision e16e036a378fc32c389e8e9d78aabfc0682401f2)
@@ -101,5 +101,4 @@
 {
 	cpu_info_t info;
-	int i;
 
 	CPU->arch.vendor = VendorUnknown;
Index: arch/ia32/src/drivers/ega.c
===================================================================
--- arch/ia32/src/drivers/ega.c	(revision d90ca68dc3c2269e3034c8ad1c8bb2a1c98fdac3)
+++ arch/ia32/src/drivers/ega.c	(revision e16e036a378fc32c389e8e9d78aabfc0682401f2)
@@ -59,5 +59,5 @@
 }
 
-void ega_display_char(char ch)
+static void ega_display_char(char ch)
 {
 	__u8 *vram = (__u8 *) PA2KA(VIDEORAM);
@@ -69,5 +69,5 @@
  * This function takes care of scrolling.
  */
-void ega_check_cursor(void)
+static void ega_check_cursor(void)
 {
 	if (ega_cursor < SCREEN)
Index: arch/ia32/src/ia32.c
===================================================================
--- arch/ia32/src/ia32.c	(revision d90ca68dc3c2269e3034c8ad1c8bb2a1c98fdac3)
+++ arch/ia32/src/ia32.c	(revision e16e036a378fc32c389e8e9d78aabfc0682401f2)
@@ -45,5 +45,5 @@
 #include <arch/interrupt.h>
 #include <arch/asm.h>
-#include <genarch/firmware/acpi/acpi.h>
+#include <genarch/acpi/acpi.h>
 
 #include <arch/bios/bios.h>
Index: arch/ia32/src/smp/smp.c
===================================================================
--- arch/ia32/src/smp/smp.c	(revision d90ca68dc3c2269e3034c8ad1c8bb2a1c98fdac3)
+++ arch/ia32/src/smp/smp.c	(revision e16e036a378fc32c389e8e9d78aabfc0682401f2)
@@ -31,6 +31,6 @@
 #include <arch/smp/mps.h>
 #include <arch/smp/ap.h>
-#include <genarch/firmware/acpi/acpi.h>
-#include <genarch/firmware/acpi/madt.h>
+#include <genarch/acpi/acpi.h>
+#include <genarch/acpi/madt.h>
 #include <config.h>
 #include <synch/waitq.h>