diff --git a/arch/arm/boards/mini2440/mini2440.c b/arch/arm/boards/mini2440/mini2440.c
index f0d6e65..a673a5d 100644
--- a/arch/arm/boards/mini2440/mini2440.c
+++ b/arch/arm/boards/mini2440/mini2440.c
@@ -30,7 +30,7 @@
 #include <driver.h>
 #include <init.h>
 #include <asm/armlinux.h>
-#include <asm/mach-types.h>
+#include <generated/mach-types.h>
 #include <partition.h>
 #include <nand.h>
 #include <asm/io.h>
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 57c5dbc..8ab40b6 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -5,7 +5,8 @@
 
 TEXT_BASE = $(CONFIG_TEXT_BASE)
 
-CPPFLAGS += -march=i386 -DTEXT_BASE=$(TEXT_BASE) -P
+CPPFLAGS += -march=i386 -m32 -DTEXT_BASE=$(TEXT_BASE) -P
+LDFLAGS += -m elf_i386
 
 ifndef CONFIG_MODULES
 # Add cleanup flags
diff --git a/commands/linux16.c b/commands/linux16.c
index ec859a7..5f412e2 100644
--- a/commands/linux16.c
+++ b/commands/linux16.c
@@ -150,7 +150,7 @@
  * (setup = 'real mode code' and kernel = 'protected mode code') to their
  * default locations, switches back to real mode and runs the setup code.
  */
-static int do_linux16(cmd_tbl_t *cmdtp, int argc, char *argv[])
+static int do_linux16(struct command *cmdtp, int argc, char *argv[])
 {
 	struct linux_kernel_header *lh = NULL;
 	int rc;
diff --git a/drivers/serial/serial_s3c24x0.c b/drivers/serial/serial_s3c24x0.c
index fedddd3..d7eac8f 100644
--- a/drivers/serial/serial_s3c24x0.c
+++ b/drivers/serial/serial_s3c24x0.c
@@ -113,7 +113,7 @@
 {
 	struct device_d *dev = cdev->dev;
 
-	while (!readb(dev->map_base + UTRSTAT) & 0x4)
+	while (!(readb(dev->map_base + UTRSTAT) & 0x4))
 		;
 }
 
diff --git a/scripts/setupmbr/setupmbr.c b/scripts/setupmbr/setupmbr.c
index 3cfec97..dd7f38c 100644
--- a/scripts/setupmbr/setupmbr.c
+++ b/scripts/setupmbr/setupmbr.c
@@ -42,8 +42,8 @@
 #include <assert.h>
 
 /* include the info from this barebox release */
-#include "include/generated/utsrelease.h"
-#include "arch/x86/include/asm/barebox.lds.h"
+#include "../../include/generated/utsrelease.h"
+#include "../../arch/x86/include/asm/barebox.lds.h"
 
 /** define to disable integrity tests and debug messages */
 #define NDEBUG