diff --git a/ChangeLog b/ChangeLog
index b4c5ab336..9fe191285 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-02-13  Benjamin Herrenschmidt <benh@kernel.crashing.org>
+
+	* cfb/Makefile.am:
+	* cfb16/Makefile.am:
+	* cfb32/Makefile.am:
+	* hw/xfree86/fbdevhw/fbdevhw.c:
+	* hw/xfree86/os-support/linux/int10/linux.c:
+	* hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c:
+	Fix linux build without libc wrappers (From Fredrik
+	Höglund)
+
 2006-02-13  Benjamin Herrenschmidt <benh@kernel.crashing.org>
 
 	* hw/kdrive/src/kdrive.c: (ddxInitGlobals):
diff --git a/cfb/Makefile.am b/cfb/Makefile.am
index 54064c395..89832fa7b 100644
--- a/cfb/Makefile.am
+++ b/cfb/Makefile.am
@@ -11,7 +11,7 @@ libcfb_la_LIBADD = ../mfb/libmfb.la
 
 AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
 
-INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support
+INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support  -I$(top_srcdir)/hw/xfree86/common
 
 EXTRA_DIST = cfbline.c cfbfillarc.c cfbzerarc.c cfbblt.c cfbsolid.c \
              cfbtileodd.c cfbtile32.c cfb8line.c cfbply1rct.c cfbglblt8.c \
diff --git a/cfb16/Makefile.am b/cfb16/Makefile.am
index b062ddd6b..384d8bd74 100644
--- a/cfb16/Makefile.am
+++ b/cfb16/Makefile.am
@@ -4,6 +4,6 @@ include $(top_srcdir)/cfb/Makefile.am.inc
 
 libcfb16_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources)
 
-INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support
+INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/common
 
 AM_CFLAGS = -DPSZ=16 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
diff --git a/cfb32/Makefile.am b/cfb32/Makefile.am
index 0ec8f2a7e..a549d1839 100644
--- a/cfb32/Makefile.am
+++ b/cfb32/Makefile.am
@@ -4,6 +4,6 @@ include $(top_srcdir)/cfb/Makefile.am.inc
 
 libcfb32_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources)
 
-INCLUDES = $(CFB_INCLUDES) $(DIX_CFLAGS) -I$(top_srcdir)/hw/xfree86/os-support
+INCLUDES = $(CFB_INCLUDES) $(DIX_CFLAGS) -I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/common
 
 AM_CFLAGS = -DPSZ=32  $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c
index 25779ed87..7d98d8bc3 100644
--- a/hw/xfree86/fbdevhw/fbdevhw.c
+++ b/hw/xfree86/fbdevhw/fbdevhw.c
@@ -78,14 +78,16 @@ fbdevhwSetup(pointer module, pointer opts, int *errmaj, int *errmin)
 		return (pointer)1;
 	}
 }
-	
-#else /* XFree86LOADER */
+#endif /* XFree86LOADER */
 
 #include <fcntl.h>
 #include <errno.h>
 #include <sys/mman.h>
-
-#endif /* XFree86LOADER */
+#include <sys/ioctl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
 
 /* -------------------------------------------------------------------- */
 /* our private data, and two functions to allocate/free this            */
diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c
index 69df3118e..a91137810 100644
--- a/hw/xfree86/os-support/linux/int10/linux.c
+++ b/hw/xfree86/os-support/linux/int10/linux.c
@@ -27,6 +27,14 @@
 #define ALLOC_ENTRIES(x) ((V_RAM / x) - 1)
 #define SHMERRORPTR (pointer)(-1)
 
+#include <fcntl.h>
+#include <errno.h>
+#include <sys/mman.h>
+#include <sys/ipc.h>
+#include <sys/shm.h>
+#include <unistd.h>
+#include <string.h>
+
 static int counter = 0;
 static unsigned long int10Generation = 0;
 
diff --git a/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c b/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c
index 05d40a37b..48500dbbf 100644
--- a/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c
+++ b/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c
@@ -4,6 +4,9 @@
 #include <xorg-config.h>
 #endif
 
+#include <errno.h>
+#include <string.h>
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Pci.h"