diff -p -up xf86-video-viaarena/src/include/open/viampg.h.orig xf86-video-viaarena/src/include/open/viampg.h
--- xf86-video-viaarena/src/include/open/viampg.h.orig	2008-01-04 14:23:27.000000000 -0200
+++ xf86-video-viaarena/src/include/open/viampg.h	2008-01-04 14:25:21.000000000 -0200
@@ -25,11 +25,7 @@
 #ifndef _VIAMPG
 #define _VIAMPG
 
-#ifdef XFree86Server
-#include "xf86_ansic.h" /* for Bool */
-#else
 #include "via_types.h"  /* for Bool */
-#endif
 
 typedef struct _VIAMCSURFACE
 {
diff -p -up xf86-video-viaarena/src/include/close/capture.h.orig xf86-video-viaarena/src/include/close/capture.h
--- xf86-video-viaarena/src/include/close/capture.h.orig	2008-01-04 14:23:33.000000000 -0200
+++ xf86-video-viaarena/src/include/close/capture.h	2008-01-04 14:25:29.000000000 -0200
@@ -25,11 +25,7 @@
 #ifndef __LINUX_VIACAP_H
 #define __LINUX_VIACAP_H
 
-#ifdef XFree86Server
-#include "xf86_ansic.h" /* for Bool */
-#else
 #include "open/via_types.h"  /* for Bool */
-#endif
 
 #include "close/VidStruc.h"   /* VIDDATA, video top level structure */
 
diff -p -up xf86-video-viaarena/src/include/close/via.h.orig xf86-video-viaarena/src/include/close/via.h
--- xf86-video-viaarena/src/include/close/via.h.orig	2008-01-04 14:23:41.000000000 -0200
+++ xf86-video-viaarena/src/include/close/via.h	2008-01-04 14:25:38.000000000 -0200
@@ -25,11 +25,7 @@
 #ifndef _VIA_H
 #define _VIA_H
 
-#ifdef XFree86Server
-#include "xf86_ansic.h" /* for Bool */
-#else
 #include "open/via_types.h"  /* for Bool */
-#endif
 
 /* Macros for different codes in V4L & XServer */
 #ifdef XFree86Server
diff -p -up xf86-video-viaarena/src/via_dri.c.orig xf86-video-viaarena/src/via_dri.c
--- xf86-video-viaarena/src/via_dri.c.orig	2008-01-04 14:23:47.000000000 -0200
+++ xf86-video-viaarena/src/via_dri.c	2008-01-04 14:30:24.000000000 -0200
@@ -25,7 +25,6 @@
  
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "xf86Priv.h"
 
 #include "xf86PciInfo.h"
@@ -33,6 +32,8 @@
 
 #include "GL/glxtokens.h"
 
+#include <errno.h>
+
 #include "via_driver.h"
 #include "via_dri.h"
 #include "xf86drm.h"
diff -p -up xf86-video-viaarena/src/via_driver.h.orig xf86-video-viaarena/src/via_driver.h
--- xf86-video-viaarena/src/via_driver.h.orig	2008-01-04 14:23:55.000000000 -0200
+++ xf86-video-viaarena/src/via_driver.h	2008-01-04 14:26:10.000000000 -0200
@@ -38,7 +38,6 @@
 #include "vgaHW.h"
 #include "xf86.h"
 #include "xf86Resources.h"
-#include "xf86_ansic.h"
 #include "xf86Pci.h"
 #include "xf86PciInfo.h"
 #include "xf86_OSproc.h"
diff -p -up xf86-video-viaarena/src/via_i2c.c.orig xf86-video-viaarena/src/via_i2c.c
--- xf86-video-viaarena/src/via_i2c.c.orig	2008-01-04 14:24:00.000000000 -0200
+++ xf86-video-viaarena/src/via_i2c.c	2008-01-04 14:26:14.000000000 -0200
@@ -26,7 +26,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86_ansic.h"
 #include "compiler.h"
 
 #include "xf86Pci.h"
diff -p -up xf86-video-viaarena/src/via_video.c.orig xf86-video-viaarena/src/via_video.c
--- xf86-video-viaarena/src/via_video.c.orig	2008-01-04 14:24:08.000000000 -0200
+++ xf86-video-viaarena/src/via_video.c	2008-01-04 14:32:42.000000000 -0200
@@ -34,7 +34,6 @@
 #include "dixstruct.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
-#include "xf86_ansic.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
@@ -54,6 +53,8 @@
 #include "via_IntegratedTV.h"
 #include "via_utility.h"
 
+#include <fcntl.h>
+
 /*
  * D E F I N E
  */
diff -p -up xf86-video-viaarena/src/xf86drmVIA.c.orig xf86-video-viaarena/src/xf86drmVIA.c
--- xf86-video-viaarena/src/xf86drmVIA.c.orig	2008-01-04 14:24:16.000000000 -0200
+++ xf86-video-viaarena/src/xf86drmVIA.c	2008-01-04 14:26:30.000000000 -0200
@@ -1,7 +1,6 @@
 #ifdef XFree86Server
 # include "xf86.h"
 # include "xf86_OSproc.h"
-# include "xf86_ansic.h"
 # define _DRM_MALLOC xalloc
 # define _DRM_FREE   xfree
 # ifndef XFree86LOADER
diff -p -up xf86-video-viaarena/src/via_driver.c.orig xf86-video-viaarena/src/via_driver.c
--- xf86-video-viaarena/src/via_driver.c.orig	2008-01-04 14:48:28.000000000 -0200
+++ xf86-video-viaarena/src/via_driver.c	2008-01-04 14:48:43.000000000 -0200
@@ -64,6 +64,10 @@
 /* hyunzhang 03/02/2007 sync with vexp/vemp */
 #include <signal.h>
 
+#include <fcntl.h>
+#include <sys/ipc.h>
+#include <sys/shm.h>
+
 CARD8 *MMIOMapBase;
 
 static int exityes = 0;
diff -p -up xf86-video-viaarena/src/via_utility.c.orig xf86-video-viaarena/src/via_utility.c
--- xf86-video-viaarena/src/via_utility.c.orig	2008-01-04 14:51:02.000000000 -0200
+++ xf86-video-viaarena/src/via_utility.c	2008-01-04 14:51:22.000000000 -0200
@@ -38,6 +38,8 @@
 #include "via_hw.h"
 #include "via_tv.h"
 
+#include <fcntl.h>
+
 /* Extern Functions Prototypes Declaration */
 extern void load_vt1622_regs(VIABIOSInfoPtr pBIOSInfo);
 extern void load_vt1623_regs(VIABIOSInfoPtr pBIOSInfo);
diff -p -up xf86-video-viaarena/src/via_Hw3DScaling.c.orig xf86-video-viaarena/src/via_Hw3DScaling.c
--- xf86-video-viaarena/src/via_Hw3DScaling.c.orig	2008-01-04 14:53:49.000000000 -0200
+++ xf86-video-viaarena/src/via_Hw3DScaling.c	2008-01-04 14:54:00.000000000 -0200
@@ -36,6 +36,8 @@
 #include "via_dri.h"
 #include "close/via_drm.h"
 
+#include <errno.h>
+
 unsigned long cur_pointer=0x440;
 unsigned char*   MapBase;