diff --git a/mainboard/emulation/qemu-x86/initram.c b/mainboard/emulation/qemu-x86/initram.c
index 5b6914a398..3921d17ce1 100644
--- a/mainboard/emulation/qemu-x86/initram.c
+++ b/mainboard/emulation/qemu-x86/initram.c
@@ -4,8 +4,8 @@
  * Copyright (C) 2007 Stefan Reinauer <stepan@coresystems.de>
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,19 +17,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <arch/types.h>
-#include <arch/io.h>
-#include <console/loglevel.h>
 #include <console/console.h>
 
-int printk(int msg_level, const char *fmt, ...);
-void die(const char *msg);
-void post_code(u8 value);
-
 int main(void)
 {
 	printk(BIOS_INFO, "RAM init code started.\n");
-
 	printk(BIOS_INFO, "Nothing to do.\n");
 
 	return 0;
diff --git a/mainboard/emulation/qemu-x86/mainboard.c b/mainboard/emulation/qemu-x86/mainboard.c
index 44a49078f6..b4c57da3cd 100644
--- a/mainboard/emulation/qemu-x86/mainboard.c
+++ b/mainboard/emulation/qemu-x86/mainboard.c
@@ -16,14 +16,9 @@
 
 #include <console/console.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
-#include <arch/types.h>
-// #include "dtc.h"
 
-char *mainboard_vendor = "emulation";
-char *mainboard_part_number = "qemu-x86";
+const char *mainboard_vendor = "emulation";
+const char *mainboard_part_number = "qemu-x86";
 
 static void enable_dev(struct device *dev)
 {