Index: include/libpayload.h
===================================================================
--- include/libpayload.h	(Revision 3236)
+++ include/libpayload.h	(Arbeitskopie)
@@ -49,6 +49,9 @@
 #define BYTE_ORDER	BIG_ENDIAN
 #endif
 
+#define EXIT_SUCCESS 0
+#define EXIT_FAILURE 1
+
 #define RAND_MAX 0x7fffffff
 
 /* Some NVRAM byte definitions */
Index: curses/local.h
===================================================================
--- curses/local.h	(Revision 3236)
+++ curses/local.h	(Arbeitskopie)
@@ -59,8 +59,6 @@
 #undef USE_TERMLIB
 
 #include <libpayload.h>
-#include <arch/types.h>
-#include <arch/io.h>
 #include <curses.h>
 #include <curses.priv.h>
 
@@ -86,9 +84,4 @@
 /* Share the color table for easy lookup */
 extern unsigned char color_pairs[256];
 
-/* speaker.c */
-void speaker_enable(u16 freq);
-void speaker_disable(void);
-void speaker_tone(u16 freq, unsigned int duration);
-
 #endif
Index: i386/sysinfo.c
===================================================================
--- i386/sysinfo.c	(Revision 3236)
+++ i386/sysinfo.c	(Arbeitskopie)
@@ -28,7 +28,6 @@
  */
 
 #include <libpayload.h>
-#include <sysinfo.h>
 
 /**
  * This is a global structure that is used through the library - we set it
Index: i386/coreboot.c
===================================================================
--- i386/coreboot.c	(Revision 3236)
+++ i386/coreboot.c	(Arbeitskopie)
@@ -28,7 +28,6 @@
  */
 
 #include <libpayload.h>
-#include <sysinfo.h>
 #include <coreboot_tables.h>
 
 /*
Index: libc/printf.c
===================================================================
--- libc/printf.c	(Revision 3236)
+++ libc/printf.c	(Arbeitskopie)
@@ -34,7 +34,6 @@
  */
 
 #include <libpayload.h>
-#include <stdarg.h>
 
 /** Structure for specifying output methods for different printf clones. */
 struct printf_spec {
Index: drivers/serial.c
===================================================================
--- drivers/serial.c	(Revision 3236)
+++ drivers/serial.c	(Arbeitskopie)
@@ -28,7 +28,6 @@
  */
 
 #include <libpayload.h>
-#include <sysinfo.h>
 
 #define IOBASE lib_sysinfo.ser_ioport
 
Index: drivers/keyboard.c
===================================================================
--- drivers/keyboard.c	(Revision 3236)
+++ drivers/keyboard.c	(Arbeitskopie)
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  */
 
-#include <arch/io.h>
 #include <libpayload.h>
 
 unsigned char map[2][0x57] = {
Index: drivers/video/geode.c
===================================================================
--- drivers/video/geode.c	(Revision 3236)
+++ drivers/video/geode.c	(Arbeitskopie)
@@ -30,9 +30,7 @@
 #include <libpayload.h>
 #include <pci.h>
 #include <video_console.h>
-#include <arch/io.h>
 #include <arch/msr.h>
-
 #include "font8x16.h"
 
 /* This is the video mode that we're going to use for our VGA screen */