Package: directfb
Version: cvs-2006-10-04
Author: Guillem Jover <guillem@hadrons.org>
Status: applied
Description:
 Do not use kernel types from userland, otherwise we get types collisions
 on some architectures.


Index: gfxdrivers/ati128/ati128.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/ati128/ati128.c,v
retrieving revision 1.35
diff -u -r1.35 ati128.c
--- gfxdrivers/ati128/ati128.c	4 Oct 2006 10:12:43 -0000	1.35
+++ gfxdrivers/ati128/ati128.c	7 Oct 2006 19:54:33 -0000
@@ -85,8 +85,8 @@
 
 
 /* macro for S12.0 and S14.0 format */
-#define S12(val) (((__u16)((__s16)(val)))&0x3fff)
-#define S14(val) (((__u16)((__s16)(val)))&0x3fff)
+#define S12(val) (((u16)((s16)(val)))&0x3fff)
+#define S14(val) (((u16)((s16)(val)))&0x3fff)
 
 /** CARD FUNCTIONS **/
 static bool ati128FillRectangle( void *drv, void *dev, DFBRectangle *rect );
@@ -241,7 +241,7 @@
 {
      ATI128DriverData *adrv = (ATI128DriverData*) drv;
      ATI128DeviceData *adev = (ATI128DeviceData*) dev;
-     volatile __u8    *mmio = adrv->mmio_base;
+     volatile u8      *mmio = adrv->mmio_base;
 
      ati128_waitfifo( adrv, adev, 5 );
      /* set the destination datatype */
@@ -262,11 +262,11 @@
 {
      ATI128DriverData *adrv = (ATI128DriverData*) drv;
      ATI128DeviceData *adev = (ATI128DeviceData*) dev;
-     volatile __u8    *mmio = adrv->mmio_base;
+     volatile u8      *mmio = adrv->mmio_base;
 
-     __u32 fts = adev->ATI_fake_texture_src + (adev->fake_texture_number & 7)*4;
+     u32 fts = adev->ATI_fake_texture_src + (adev->fake_texture_number & 7)*4;
      ati128_waitidle( adrv, adev );
-     *((__u32*)  dfb_gfxcard_memory_virtual(NULL,fts)  ) = adev->fake_texture_color;
+     *((u32*)  dfb_gfxcard_memory_virtual(NULL,fts)  ) = adev->fake_texture_color;
      ati128_waitidle( adrv, adev );
 
      ati128_out32( mmio, SCALE_3D_DATATYPE, DST_32BPP );
@@ -303,7 +303,7 @@
 {
      ATI128DriverData *adrv = (ATI128DriverData*) drv;
      ATI128DeviceData *adev = (ATI128DeviceData*) dev;
-     volatile __u8    *mmio = adrv->mmio_base;
+     volatile u8      *mmio = adrv->mmio_base;
 
      ati128_waitfifo( adrv, adev, 3 );
      /* set the destination datatype */
@@ -333,12 +333,12 @@
 {
      ATI128DriverData *adrv = (ATI128DriverData*) drv;
      ATI128DeviceData *adev = (ATI128DeviceData*) dev;
-     volatile __u8    *mmio = adrv->mmio_base;
+     volatile u8      *mmio = adrv->mmio_base;
 
-     __u32 fts = adev->ATI_fake_texture_src + (adev->fake_texture_number & 7)*4;
+     u32 fts = adev->ATI_fake_texture_src + (adev->fake_texture_number & 7)*4;
 
      ati128_waitidle( adrv, adev );
-     *((__u32*)  dfb_gfxcard_memory_virtual(NULL,fts)  ) = adev->fake_texture_color;
+     *((u32*)  dfb_gfxcard_memory_virtual(NULL,fts)  ) = adev->fake_texture_color;
      ati128_waitidle( adrv, adev );
 
      ati128_out32( mmio, SCALE_3D_DATATYPE, DST_32BPP );
@@ -388,7 +388,7 @@
 {
      ATI128DriverData *adrv = (ATI128DriverData*) drv;
      ATI128DeviceData *adev = (ATI128DeviceData*) dev;
-     volatile __u8    *mmio = adrv->mmio_base;
+     volatile u8      *mmio = adrv->mmio_base;
 
      int dx, dy;
      int small, large;
@@ -455,12 +455,12 @@
 {
      ATI128DriverData *adrv = (ATI128DriverData*) drv;
      ATI128DeviceData *adev = (ATI128DeviceData*) dev;
-     volatile __u8    *mmio = adrv->mmio_base;
+     volatile u8      *mmio = adrv->mmio_base;
 
-     __u32 src = 0;
+     u32 src = 0;
 
-     __u32 scalex = (__u32)(((double)sr->w/(double)dr->w) * 65536);
-     __u32 scaley = (__u32)(((double)sr->h/(double)dr->h) * 65536);
+     u32 scalex = (u32)(((double)sr->w/(double)dr->w) * 65536);
+     u32 scaley = (u32)(((double)sr->h/(double)dr->h) * 65536);
 
      ati128_waitfifo( adrv, adev, 9 );
 
@@ -595,9 +595,9 @@
 {
      ATI128DriverData *adrv = (ATI128DriverData*) drv;
      ATI128DeviceData *adev = (ATI128DeviceData*) dev;
-     volatile __u8    *mmio = adrv->mmio_base;
+     volatile u8      *mmio = adrv->mmio_base;
 
-     __u32 dir_cmd = 0;
+     u32 dir_cmd = 0;
 
      if ((adev->source->format != adev->destination->format) ||
          (adev->blittingflags & DSBLIT_BLEND_ALPHACHANNEL))
@@ -696,7 +696,7 @@
 {
      ATI128DriverData *adrv = (ATI128DriverData*) driver_data;
 
-     adrv->mmio_base = (volatile __u8*) dfb_gfxcard_map_mmio( device, 0, -1 );
+     adrv->mmio_base = (volatile u8*) dfb_gfxcard_map_mmio( device, 0, -1 );
      if (!adrv->mmio_base)
           return DFB_IO;
 
@@ -726,7 +726,7 @@
 {
      ATI128DriverData *adrv = (ATI128DriverData*) driver_data;
      ATI128DeviceData *adev = (ATI128DeviceData*) device_data;
-     volatile __u8    *mmio = adrv->mmio_base;
+     volatile u8      *mmio = adrv->mmio_base;
 
      /* fill device info */
      snprintf( device_info->name,
@@ -781,7 +781,7 @@
 {
      ATI128DeviceData *adev = (ATI128DeviceData*) device_data;
      ATI128DriverData *adrv = (ATI128DriverData*) driver_data;
-     volatile __u8    *mmio = adrv->mmio_base;
+     volatile u8      *mmio = adrv->mmio_base;
 
      D_DEBUG( "DirectFB/ATI128: FIFO Performance Monitoring:\n" );
      D_DEBUG( "DirectFB/ATI128:  %9d ati128_waitfifo calls\n",
Index: gfxdrivers/ati128/ati128.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/ati128/ati128.h,v
retrieving revision 1.11
diff -u -r1.11 ati128.h
--- gfxdrivers/ati128/ati128.h	5 Dec 2003 04:01:06 -0000	1.11
+++ gfxdrivers/ati128/ati128.h	7 Oct 2006 19:54:33 -0000
@@ -33,7 +33,7 @@
 #include <core/layers.h>
 
 typedef struct {
-     volatile __u8 *mmio_base;
+     volatile u8 *mmio_base;
 } ATI128DriverData;
 
 typedef struct {
@@ -42,13 +42,13 @@
      DFBSurfaceBlittingFlags blittingflags;
 
      /* store some ATI register values in native format */
-     __u32 ATI_dst_bpp;
-     __u32 ATI_color_compare;
-     __u32 ATI_blend_function;
+     u32 ATI_dst_bpp;
+     u32 ATI_color_compare;
+     u32 ATI_blend_function;
 
      /* used for the fake texture hack */
-     __u32 ATI_fake_texture_src;
-     __u32 fake_texture_color;
+     u32 ATI_fake_texture_src;
+     u32 fake_texture_color;
      unsigned int fake_texture_number;
 
      /* state validation */
Index: gfxdrivers/ati128/ati128_overlay.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/ati128/ati128_overlay.c,v
retrieving revision 1.21
diff -u -r1.21 ati128_overlay.c
--- gfxdrivers/ati128/ati128_overlay.c	20 Nov 2004 21:18:07 -0000	1.21
+++ gfxdrivers/ati128/ati128_overlay.c	7 Oct 2006 19:54:33 -0000
@@ -42,26 +42,26 @@
 
      /* overlay registers */
      struct {
-          __u32 H_INC;
-          __u32 STEP_BY;
-          __u32 Y_X_START;
-          __u32 Y_X_END;
-          __u32 V_INC;
-          __u32 P1_BLANK_LINES_AT_TOP;
-          __u32 P23_BLANK_LINES_AT_TOP;
-          __u32 VID_BUF_PITCH0_VALUE;
-          __u32 VID_BUF_PITCH1_VALUE;
-          __u32 P1_X_START_END;
-          __u32 P2_X_START_END;
-          __u32 P3_X_START_END;
-          __u32 VID_BUF0_BASE_ADRS;
-          __u32 VID_BUF1_BASE_ADRS;
-          __u32 VID_BUF2_BASE_ADRS;
-          __u32 P1_V_ACCUM_INIT;
-          __u32 P23_V_ACCUM_INIT;
-          __u32 P1_H_ACCUM_INIT;
-          __u32 P23_H_ACCUM_INIT;
-          __u32 SCALE_CNTL;
+          u32 H_INC;
+          u32 STEP_BY;
+          u32 Y_X_START;
+          u32 Y_X_END;
+          u32 V_INC;
+          u32 P1_BLANK_LINES_AT_TOP;
+          u32 P23_BLANK_LINES_AT_TOP;
+          u32 VID_BUF_PITCH0_VALUE;
+          u32 VID_BUF_PITCH1_VALUE;
+          u32 P1_X_START_END;
+          u32 P2_X_START_END;
+          u32 P3_X_START_END;
+          u32 VID_BUF0_BASE_ADRS;
+          u32 VID_BUF1_BASE_ADRS;
+          u32 VID_BUF2_BASE_ADRS;
+          u32 P1_V_ACCUM_INIT;
+          u32 P23_V_ACCUM_INIT;
+          u32 P1_H_ACCUM_INIT;
+          u32 P23_H_ACCUM_INIT;
+          u32 SCALE_CNTL;
      } regs;
 } ATIOverlayLayerData;
 
@@ -88,7 +88,7 @@
               DFBColorAdjustment         *adjustment )
 {
      ATI128DriverData *adrv = (ATI128DriverData*) driver_data;
-     volatile __u8    *mmio = adrv->mmio_base;
+     volatile u8      *mmio = adrv->mmio_base;
 
      /* set capabilities and type */
      description->caps = DLCAPS_SCREEN_LOCATION | DLCAPS_SURFACE;
@@ -258,7 +258,7 @@
 
 static void ov0_set_regs( ATI128DriverData *adrv, ATIOverlayLayerData *aov0 )
 {
-     volatile __u8 *mmio = adrv->mmio_base;
+     volatile u8 *mmio = adrv->mmio_base;
 
      ati128_out32( mmio, OV0_REG_LOAD_CNTL, 1 );
      while (!(ati128_in32( mmio, OV0_REG_LOAD_CNTL ) & (1 << 3)));
@@ -338,7 +338,7 @@
      DFBRegion      dstBox;
      int            dst_w;
      int            dst_h;
-     __u32          offset_u = 0, offset_v = 0;
+     u32            offset_u = 0, offset_v = 0;
 
      SurfaceBuffer *front_buffer = surface->front_buffer;
 
Index: gfxdrivers/ati128/ati128_state.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/ati128/ati128_state.c,v
retrieving revision 1.12
diff -u -r1.12 ati128_state.c
--- gfxdrivers/ati128/ati128_state.c	30 Mar 2004 19:13:39 -0000	1.12
+++ gfxdrivers/ati128/ati128_state.c	7 Oct 2006 19:54:33 -0000
@@ -45,7 +45,7 @@
 #include "ati128_state.h"
 
 
-static __u32 ati128SourceBlend[] = {
+static u32 ati128SourceBlend[] = {
      SCALE_3D_CNTL_ALPHA_BLEND_SRC_ZERO,        /* DSBF_ZERO         */
      SCALE_3D_CNTL_ALPHA_BLEND_SRC_ONE,         /* DSBF_ONE          */
      SCALE_3D_CNTL_ALPHA_BLEND_SRC_SRCCOLOR,    /* DSBF_SRCCOLOR     */
@@ -59,7 +59,7 @@
      SCALE_3D_CNTL_ALPHA_BLEND_SRC_SAT          /* DSBF_SRCALPHASAT  */
 };
 
-static __u32 ati128DestBlend[] = {
+static u32 ati128DestBlend[] = {
      SCALE_3D_CNTL_ALPHA_BLEND_DST_ZERO,        /* DSBF_ZERO         */
      SCALE_3D_CNTL_ALPHA_BLEND_DST_ONE,         /* DSBF_ONE          */
      SCALE_3D_CNTL_ALPHA_BLEND_DST_SRCCOLOR,    /* DSBF_SRCCOLOR     */
@@ -212,7 +212,7 @@
                        ATI128DeviceData *adev,
                        CardState        *state )
 {
-     __u32 fill_color = 0;
+     u32 fill_color = 0;
 
      if (adev->v_color)
           return;
Index: gfxdrivers/ati128/mmio.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/ati128/mmio.h,v
retrieving revision 1.10
diff -u -r1.10 mmio.h
--- gfxdrivers/ati128/mmio.h	5 Dec 2003 04:01:06 -0000	1.10
+++ gfxdrivers/ati128/mmio.h	7 Oct 2006 19:54:33 -0000
@@ -34,28 +34,28 @@
 #include "ati128.h"
 
 static inline void
-ati128_out32(volatile __u8 *mmioaddr, __u32 reg, __u32 value)
+ati128_out32(volatile u8 *mmioaddr, u32 reg, u32 value)
 {
 #ifdef __powerpc__
        asm volatile("stwbrx %0,%1,%2;eieio" : : "r"(value), "b"(reg),
                        "r"(mmioaddr) : "memory");
 
 #else
-     *((volatile __u32*)(mmioaddr+reg)) = value;
+     *((volatile u32*)(mmioaddr+reg)) = value;
 #endif
 }
 
-static inline __u32
-ati128_in32(volatile __u8 *mmioaddr, __u32 reg)
+static inline u32
+ati128_in32(volatile u8 *mmioaddr, u32 reg)
 {
 #ifdef __powerpc__
-     __u32 value;
+     u32 value;
 
      asm volatile("lwbrx %0,%1,%2;eieio" : "=r"(value) : "b"(reg), "r"(mmioaddr));
 
      return value;
 #else
-     return *((volatile __u32*)(mmioaddr+reg));
+     return *((volatile u32*)(mmioaddr+reg));
 #endif
 }
 
Index: gfxdrivers/cle266/hwdoc.txt
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/cle266/hwdoc.txt,v
retrieving revision 1.1
diff -u -r1.1 hwdoc.txt
--- gfxdrivers/cle266/hwdoc.txt	25 Sep 2003 04:30:58 -0000	1.1
+++ gfxdrivers/cle266/hwdoc.txt	7 Oct 2006 19:54:34 -0000
@@ -27,7 +27,7 @@
  */
  
  /* GL -> UC ROP mapping
-const __u32 UC_ROP[16] = 
+const u32 UC_ROP[16] =
 {
 	HC_HROP_BLACK,    // GL_CLEAR           0
 	HC_HROP_DPa,      // GL_AND             s & d
Index: gfxdrivers/cle266/mmio.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/cle266/mmio.h,v
retrieving revision 1.2
diff -u -r1.2 mmio.h
--- gfxdrivers/cle266/mmio.h	10 Oct 2003 15:26:52 -0000	1.2
+++ gfxdrivers/cle266/mmio.h	7 Oct 2006 19:54:34 -0000
@@ -25,13 +25,13 @@
 
 #else // !KERNEL
 
-#define VIA_OUT(hwregs, reg, val)   *(volatile __u32 *)((hwregs) + (reg)) = (val)
-#define VIA_IN(hwregs, reg)         *(volatile __u32 *)((hwregs) + (reg))
-#define VGA_OUT8(hwregs, reg, val)  *(volatile __u8 *)((hwregs) + (reg) + 0x8000) = (val)
-#define VGA_IN8(hwregs, reg)        *(volatile __u8 *)((hwregs) + (reg) + 0x8000)
+#define VIA_OUT(hwregs, reg, val)   *(volatile u32 *)((hwregs) + (reg)) = (val)
+#define VIA_IN(hwregs, reg)         *(volatile u32 *)((hwregs) + (reg))
+#define VGA_OUT8(hwregs, reg, val)  *(volatile u8 *)((hwregs) + (reg) + 0x8000) = (val)
+#define VGA_IN8(hwregs, reg)        *(volatile u8 *)((hwregs) + (reg) + 0x8000)
 
-#define RS16(val)               ((__u16)((__s16)(val)))
-#define RS12(val)               (((__u16)((__s16)(val))) & 0xfff)
+#define RS16(val)               ((u16)((s16)(val)))
+#define RS12(val)               (((u16)((s16)(val))) & 0xfff)
 
 #endif // KERNEL
 
Index: gfxdrivers/cle266/uc_fifo.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/cle266/uc_fifo.c,v
retrieving revision 1.10
diff -u -r1.10 uc_fifo.c
--- gfxdrivers/cle266/uc_fifo.c	29 Oct 2005 00:40:57 -0000	1.10
+++ gfxdrivers/cle266/uc_fifo.c	7 Oct 2006 19:54:34 -0000
@@ -67,15 +67,15 @@
 
 void uc_fifo_flush_sys(struct uc_fifo* fifo, volatile void *regs)
 {
-    __u32* p;
-    __u32* q;
+    u32* p;
+    u32* q;
 
-    volatile __u32* hwregs     = regs;
-    volatile __u32* reg_tset   = regs + VIA_REG_TRANSET;
-    volatile __u32* reg_tspace = regs + VIA_REG_TRANSPACE;
+    volatile u32* hwregs     = regs;
+    volatile u32* reg_tset   = regs + VIA_REG_TRANSET;
+    volatile u32* reg_tspace = regs + VIA_REG_TRANSPACE;
 
     int check2Dcmd;
-    __u32 addr;
+    u32 addr;
 
     p = fifo->buf;
     q = fifo->head;
@@ -164,7 +164,7 @@
 
     // Note: malloc won't work for DMA buffers...
 
-    fifo->buf = SHMALLOC(pool, sizeof(__u32) * size);
+    fifo->buf = SHMALLOC(pool, sizeof(u32) * size);
     if (!(fifo->buf)) {
         SHFREE(pool, fifo);
         return NULL;
Index: gfxdrivers/cle266/uc_fifo.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/cle266/uc_fifo.h,v
retrieving revision 1.10
diff -u -r1.10 uc_fifo.h
--- gfxdrivers/cle266/uc_fifo.h	29 Oct 2005 00:40:57 -0000	1.10
+++ gfxdrivers/cle266/uc_fifo.h	7 Oct 2006 19:54:34 -0000
@@ -39,8 +39,8 @@
 
 struct uc_fifo
 {
-    __u32* buf;
-    __u32* head;
+    u32* buf;
+    u32* head;
 
     unsigned int size;
     unsigned int prep;
@@ -142,7 +142,7 @@
 
 #define UC_FIFO_ADD_FLOAT(fifo, val)        \
     do {                                    \
-        union {float f; __u32 i;} v;        \
+        union {float f; u32 i;} v;          \
         v.f = (float) (val);                \
         UC_FIFO_ADD(fifo, v.i);             \
     } while(0)
Index: gfxdrivers/cle266/uc_hwset.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/cle266/uc_hwset.c,v
retrieving revision 1.19
diff -u -r1.19 uc_hwset.c
--- gfxdrivers/cle266/uc_hwset.c	30 Mar 2004 18:35:10 -0000	1.19
+++ gfxdrivers/cle266/uc_hwset.c	7 Oct 2006 19:54:34 -0000
@@ -331,7 +331,7 @@
                  CardState    *state )
 {
      struct uc_fifo *fifo  = ucdrv->fifo;
-     __u32           color = 0;
+     u32             color = 0;
 
      if (UC_IS_VALID( uc_color2d ))
           return;
Index: gfxdrivers/cle266/uc_overlay.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/cle266/uc_overlay.c,v
retrieving revision 1.17
diff -u -r1.17 uc_overlay.c
--- gfxdrivers/cle266/uc_overlay.c	20 Nov 2004 21:18:07 -0000	1.17
+++ gfxdrivers/cle266/uc_overlay.c	7 Oct 2006 19:54:34 -0000
@@ -138,7 +138,7 @@
 {
     UcDriverData*  ucdrv = (UcDriverData*) driver_data;
     UcOverlayData* ucovl = (UcOverlayData*) layer_data;
-    volatile __u8* vio = ucdrv->hwregs;
+    volatile u8*   vio   = ucdrv->hwregs;
 
     ucovl->v1.isenabled = false;
 
Index: gfxdrivers/cle266/uc_overlay.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/cle266/uc_overlay.h,v
retrieving revision 1.8
diff -u -r1.8 uc_overlay.h
--- gfxdrivers/cle266/uc_overlay.h	2 Apr 2006 12:18:18 -0000	1.8
+++ gfxdrivers/cle266/uc_overlay.h	7 Oct 2006 19:54:34 -0000
@@ -23,7 +23,7 @@
     DFBDisplayLayerConfig cfg;      // Layer configuration
     int ox, oy;                     // Top-left visible corner (the offset)
                                     // in the source surface
-    __u8 opacity;                   // Layer opacity
+    u8 opacity;                     // Layer opacity
     int level;                      // Position in the DirectFB layer stack
                                     // < 0 = underlay mode, > 0 = overlay mode
     DFBColorAdjustment adj;         // Color adjustment (brightness etc)
@@ -33,11 +33,11 @@
 
     // TODO: initialize the variables!!!
 
-    __u8                hwrev;       // CLE266 revision
+    u8                  hwrev;       // CLE266 revision
     int                 scrwidth;    // Current screen width
 
     bool                extfifo_on;  // True when we're using the extended fifo.
-    __u8                mclk_save[3];
+    u8                  mclk_save[3];
 
     struct uc_ovl_vinfo v1;          // Video overlay V1
 
@@ -51,27 +51,27 @@
 
 // Video engine - mapping functions (uc_ovl_hwmap.c)
 
-bool uc_ovl_map_vzoom(int sh, int dh, __u32* zoom, __u32* mini);
-bool uc_ovl_map_hzoom(int sw, int dw,  __u32* zoom, __u32* mini,
-                      __u32* falign, __u32* dcount);
-__u32 uc_ovl_map_qwpitch(int falign, DFBSurfacePixelFormat format, int sw);
-__u32 uc_ovl_map_format(DFBSurfacePixelFormat format);
+bool uc_ovl_map_vzoom(int sh, int dh, u32* zoom, u32* mini);
+bool uc_ovl_map_hzoom(int sw, int dw,  u32* zoom, u32* mini,
+                      u32* falign, u32* dcount);
+u32 uc_ovl_map_qwpitch(int falign, DFBSurfacePixelFormat format, int sw);
+u32 uc_ovl_map_format(DFBSurfacePixelFormat format);
 void uc_ovl_map_window(int scrw, int scrh, DFBRectangle* win, int sw, int sh,
-                       __u32* win_start, __u32* win_end, int* ox, int* oy);
-void uc_ovl_map_buffer(DFBSurfacePixelFormat format, __u32 buf,
+                       u32* win_start, u32* win_end, int* ox, int* oy);
+void uc_ovl_map_buffer(DFBSurfacePixelFormat format, u32 buf,
                        int x, int y, int w, int h, int pitch, int field,
-                       __u32* y_start, __u32* u_start, __u32* v_start);
-__u32 uc_ovl_map_alpha(int opacity);
+                       u32* y_start, u32* u_start, u32* v_start);
+u32 uc_ovl_map_alpha(int opacity);
 void uc_ovl_map_v1_control(DFBSurfacePixelFormat format, int sw,
                            int hwrev, bool extfifo_on,
-                           __u32* control, __u32* fifo);
-__u32 uc_ovl_map_fifo(__u8 depth, __u8 pre_thr, __u8 thr);
-void uc_ovl_map_adjustment(DFBColorAdjustment* adj, __u32* a1, __u32* a2);
+                           u32* control, u32* fifo);
+u32 uc_ovl_map_fifo(u8 depth, u8 pre_thr, u8 thr);
+void uc_ovl_map_adjustment(DFBColorAdjustment* adj, u32* a1, u32* a2);
 
 // Video engine - setting functions (uc_ovl_hwset.c)
 
 void uc_ovl_setup_fifo(UcOverlayData* ucovl, int scrwidth);
-void uc_ovl_vcmd_wait(volatile __u8* vio);
+void uc_ovl_vcmd_wait(volatile u8* vio);
 DFBResult uc_ovl_update(UcDriverData* ucdrv,
                         UcOverlayData* ucovl, int action,
                         CoreSurface* surface);
Index: gfxdrivers/cle266/uc_ovl_hwmap.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/cle266/uc_ovl_hwmap.c,v
retrieving revision 1.7
diff -u -r1.7 uc_ovl_hwmap.c
--- gfxdrivers/cle266/uc_ovl_hwmap.c	2 Apr 2006 12:18:18 -0000	1.7
+++ gfxdrivers/cle266/uc_ovl_hwmap.c	7 Oct 2006 19:54:34 -0000
@@ -30,9 +30,9 @@
  *       See ddover.c, DDOVER_HQVCalcZoomHeight()
  */
 
-bool uc_ovl_map_vzoom(int sh, int dh, __u32* zoom, __u32* mini)
+bool uc_ovl_map_vzoom(int sh, int dh, u32* zoom, u32* mini)
 {
-    __u32 sh1, tmp, d;
+    u32 sh1, tmp, d;
     bool zoom_ok = true;
 
     if (sh == dh) { // No zoom
@@ -92,10 +92,10 @@
  * @note Derived from VIA's V4L driver.
  *       See ddover.c, DDOVER_HQVCalcZoomWidth() and DDOver_GetDisplayCount()
  */
-bool uc_ovl_map_hzoom(int sw, int dw,  __u32* zoom, __u32* mini,
-                      __u32* falign, __u32* dcount)
+bool uc_ovl_map_hzoom(int sw, int dw,  u32* zoom, u32* mini,
+                      u32* falign, u32* dcount)
 {
-    __u32 tmp, sw1, d;
+    u32 tmp, sw1, d;
     int md; // Minify-divider
     bool zoom_ok = true;
 
@@ -158,7 +158,7 @@
  * @note Derived from VIA's V4L driver. See ddover.c, DDOver_GetFetch()
  * @note Only call after uc_ovl_map_hzoom()
  */
-__u32 uc_ovl_map_qwpitch(int falign, DFBSurfacePixelFormat format, int sw)
+u32 uc_ovl_map_qwpitch(int falign, DFBSurfacePixelFormat format, int sw)
 {
     int fetch = 0;
 
@@ -199,7 +199,7 @@
  *
  * @note Derived from VIA's V4L driver. See ddover.c, DDOver_GetV1Format()
  */
-__u32 uc_ovl_map_format(DFBSurfacePixelFormat format)
+u32 uc_ovl_map_format(DFBSurfacePixelFormat format)
 {
     switch (format) {
     case DSPF_YV12:
@@ -238,7 +238,7 @@
  * @parm oy         will hold new topmost coordinate in source surface
  */
 void uc_ovl_map_window(int scrw, int scrh, DFBRectangle* win, int sw, int sh,
-                       __u32* win_start, __u32* win_end, int* ox, int* oy)
+                       u32* win_start, u32* win_end, int* ox, int* oy)
 {
     int x1, y1, x2, y2;
     int x,y,dw,dh;      // These help making the code readable...
@@ -337,14 +337,14 @@
  * @note Derived from VIA's V4L driver. See ddover.c,
  *       DDOver_GetSrcStartAddress() and DDOVer_GetYCbCrStartAddress()
  */
-void uc_ovl_map_buffer(DFBSurfacePixelFormat format, __u32 buf,
+void uc_ovl_map_buffer(DFBSurfacePixelFormat format, u32 buf,
                        int ox, int oy, int sw, int sh, int sp, int field,
-                       __u32* y_start, __u32* u_start, __u32* v_start)
+                       u32* y_start, u32* u_start, u32* v_start)
 {
     int swap_cb_cr = 0;
 
-    __u32 tmp;
-    __u32 y_offset, uv_offset = 0;
+    u32 tmp;
+    u32 y_offset, uv_offset = 0;
 
     switch (format) {
 
@@ -417,9 +417,9 @@
  * @note: Derived from ddmpeg.c, VIAAlphaWin()
  */
 
-__u32 uc_ovl_map_alpha(int opacity)
+u32 uc_ovl_map_alpha(int opacity)
 {
-    __u32 ctrl = 0x00080000;    // Not sure what this number is, supposedly
+    u32 ctrl = 0x00080000;      // Not sure what this number is, supposedly
                                 // it is the "expire number divided by 4".
 
     if (opacity > 255) opacity = 255;
@@ -446,7 +446,7 @@
  */
 void uc_ovl_map_v1_control(DFBSurfacePixelFormat format, int sw,
                            int hwrev, bool extfifo_on,
-                           __u32* control, __u32* fifo)
+                           u32* control, u32* fifo)
 {
     *control = V1_BOB_ENABLE | V1_ENABLE | uc_ovl_map_format(format);
 
@@ -504,11 +504,11 @@
  * @param mask  Bitmask
  * @param shift Position in hardware register.
  */
-static int fmt(float x, int ndec, int sbit, __u32 mask, int shift)
+static int fmt(float x, int ndec, int sbit, u32 mask, int shift)
 {
     int y = (x * (1 << ndec));
     if (sbit && (y < 0)) y = -y | (1 << sbit);
-    return (((__u32) y) & mask) << shift;
+    return (((u32) y) & mask) << shift;
 }
 
 /**
@@ -518,7 +518,7 @@
  * @param a1    Will hold value for V1_ColorSpaceReg_1
  * @param a2    Will hold value for V1_ColorSpaceReg_2
  */
-void uc_ovl_map_adjustment(DFBColorAdjustment* adj, __u32* a1, __u32* a2)
+void uc_ovl_map_adjustment(DFBColorAdjustment* adj, u32* a1, u32* a2)
 {
     float con, sat, bri, hue;
     float c, s;
Index: gfxdrivers/cle266/uc_ovl_hwset.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/cle266/uc_ovl_hwset.c,v
retrieving revision 1.16
diff -u -r1.16 uc_ovl_hwset.c
--- gfxdrivers/cle266/uc_ovl_hwset.c	30 Mar 2004 19:13:40 -0000	1.16
+++ gfxdrivers/cle266/uc_ovl_hwset.c	7 Oct 2006 19:54:34 -0000
@@ -25,7 +25,7 @@
 
 void uc_ovl_setup_fifo(UcOverlayData* ucovl, int scrwidth)
 {
-     __u8* mclk_save = ucovl->mclk_save;
+     u8* mclk_save = ucovl->mclk_save;
 
      if (!iopl(3)) {
           if (scrwidth <= 1024) { // Disable
@@ -62,7 +62,7 @@
      ucovl->scrwidth = scrwidth;
 }
 
-void uc_ovl_vcmd_wait(volatile __u8* vio)
+void uc_ovl_vcmd_wait(volatile u8* vio)
 {
      while ((VIDEO_IN(vio, V_COMPOSE_MODE)
              & (V1_COMMAND_FIRE | V3_COMMAND_FIRE)));
@@ -92,13 +92,13 @@
      bool write_buffers = false;
      bool write_settings = false;
 
-     volatile __u8* vio = ucdrv->hwregs;
+     volatile u8* vio = ucdrv->hwregs;
 
-     __u32 win_start, win_end;   // Overlay register settings
-     __u32 zoom, mini;
-     __u32 dcount, falign, qwpitch;
-     __u32 y_start, u_start, v_start;
-     __u32 v_ctrl, fifo_ctrl;
+     u32 win_start, win_end;     // Overlay register settings
+     u32 zoom, mini;
+     u32 dcount, falign, qwpitch;
+     u32 y_start, u_start, v_start;
+     u32 v_ctrl, fifo_ctrl;
 
      int offset = surface->front_buffer->video.offset;
 
@@ -241,7 +241,7 @@
     UcOverlayData* ucovl = (UcOverlayData*) layer_data;
     UcDriverData*  ucdrv = (UcDriverData*) driver_data;
     DFBColorAdjustment* ucadj;
-    __u32 a1, a2;
+    u32 a1, a2;
 
     ucadj = &ucovl->v1.adj;
 
Index: gfxdrivers/cle266/uc_probe.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/cle266/uc_probe.c,v
retrieving revision 1.2
diff -u -r1.2 uc_probe.c
--- gfxdrivers/cle266/uc_probe.c	30 Mar 2004 18:35:10 -0000	1.2
+++ gfxdrivers/cle266/uc_probe.c	7 Oct 2006 19:54:34 -0000
@@ -82,7 +82,7 @@
  * @returns DFB_OK or DFB_FAILURE
  */
 
-DFBResult uc_probe_vga_device(__u16 vendor, __u16 device, char* name,
+DFBResult uc_probe_vga_device(u16 vendor, u16 device, char* name,
                         struct uc_vga_device* devinfo)
 {
     char fbuf[256];
@@ -198,7 +198,7 @@
 
         r = uc_mmap_vga_device(&devinfo, name);
         if (r == DFB_OK) {
-            printf("IO area mmapped to 0x%x.\n", (__u32) devinfo.iomap);
+            printf("IO area mmapped to 0x%x.\n", (u32) devinfo.iomap);
         }
     }
 
Index: gfxdrivers/cle266/uc_probe.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/cle266/uc_probe.h,v
retrieving revision 1.1
diff -u -r1.1 uc_probe.h
--- gfxdrivers/cle266/uc_probe.h	29 Oct 2003 12:44:42 -0000	1.1
+++ gfxdrivers/cle266/uc_probe.h	7 Oct 2006 19:54:34 -0000
@@ -12,21 +12,21 @@
 
 struct uc_vga_device 
 {
-    __u32 busid;    /* bus<8>:dev<5>:sub<3> */
-    __u32 devid;    /* mfr<16>:device<16> */
-    __u32 irq;      /* IRQ number */
+    u32 busid;      /* bus<8>:dev<5>:sub<3> */
+    u32 devid;      /* mfr<16>:device<16> */
+    u32 irq;        /* IRQ number */
 
-    __u32 fbmem;    /* Framebuffer base address */
-    __u32 fbsize;   /* Framebuffer size in bytes */
+    u32 fbmem;      /* Framebuffer base address */
+    u32 fbsize;     /* Framebuffer size in bytes */
     void* fbmap;    /* Mmapped frambuffer address */
 
-    __u32 iomem;    /* IO area base address */
-    __u32 iosize;   /* IO area size in bytes */
+    u32 iomem;      /* IO area base address */
+    u32 iosize;     /* IO area size in bytes */
     void* iomap;    /* Mmapped IO area address */
 };
 
 int uc_parse_vga_device(char* s, struct uc_vga_device* devinfo);
-DFBResult uc_probe_vga_device(__u16 vendor, __u16 device, char* name,
+DFBResult uc_probe_vga_device(u16 vendor, u16 device, char* name,
                         struct uc_vga_device* devinfo);
 DFBResult uc_mmap_vga_device(struct uc_vga_device* devinfo, char* name);
 void uc_munmap_vga_device(struct uc_vga_device* devinfo);
Index: gfxdrivers/cle266/uc_state.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/cle266/uc_state.c,v
retrieving revision 1.25
diff -u -r1.25 uc_state.c
--- gfxdrivers/cle266/uc_state.c	30 Mar 2004 18:35:10 -0000	1.25
+++ gfxdrivers/cle266/uc_state.c	7 Oct 2006 19:54:34 -0000
@@ -135,8 +135,8 @@
      UcDeviceData   *ucdev = (UcDeviceData*) dev;
      struct uc_fifo *fifo  = ucdrv->fifo;
 
-     __u32 rop3d     = HC_HROP_P;
-     __u32 regEnable = HC_HenCW_MASK | HC_HenAW_MASK;
+     u32 rop3d     = HC_HROP_P;
+     u32 regEnable = HC_HenCW_MASK | HC_HenAW_MASK;
 
      StateModificationFlags modified = state->modified;
 
Index: gfxdrivers/cle266/uc_state.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/cle266/uc_state.h,v
retrieving revision 1.1
diff -u -r1.1 uc_state.h
--- gfxdrivers/cle266/uc_state.h	25 Sep 2003 04:30:58 -0000	1.1
+++ gfxdrivers/cle266/uc_state.h	7 Oct 2006 19:54:34 -0000
@@ -26,27 +26,27 @@
 {
     // These control clipping...
 
-    __u32 regHClipTB;
-    __u32 regHClipLR;
-    __u32 regHFPClipTL;
-    __u32 regHFPClipBL;
-    __u32 regHFPClipLL;
-    __u32 regHFPClipRL;
-    __u32 regHFPClipTBH;
-    __u32 regHFPClipLRH;
+    u32 regHClipTB;
+    u32 regHClipLR;
+    u32 regHFPClipTL;
+    u32 regHFPClipBL;
+    u32 regHFPClipLL;
+    u32 regHFPClipRL;
+    u32 regHFPClipTBH;
+    u32 regHFPClipLRH;
 
     // Other functions
 
-    __u32 regHLP;           // Line stipple pattern
-    __u32 regHLPRF;         // Line stipple factor
-    __u32 regHSolidCL;      // --- Don't know. Unused in DRI.
-    __u32 regHPixGC;        // Don't know. Is kept cleared in DRI.
-    //__u32 regHSPXYOS;     // Polygon stipple x and y offsets. Unused here.
-    __u32 regHVertexCNT;    // --- Don't know. Unused in DRI.
-
-    __u8 ps_xos;            // Polygon stipple x-offset. => regHSPXYOS
-    __u8 ps_yos;            // Polygon stipple y-offset. => regHSPXYOS
-    __u32 ps_pat[32];       // Polygon stipple pattern buffer.
+    u32 regHLP;             // Line stipple pattern
+    u32 regHLPRF;           // Line stipple factor
+    u32 regHSolidCL;        // --- Don't know. Unused in DRI.
+    u32 regHPixGC;          // Don't know. Is kept cleared in DRI.
+    //u32 regHSPXYOS;       // Polygon stipple x and y offsets. Unused here.
+    u32 regHVertexCNT;      // --- Don't know. Unused in DRI.
+
+    u8 ps_xos;              // Polygon stipple x-offset. => regHSPXYOS
+    u8 ps_yos;              // Polygon stipple y-offset. => regHSPXYOS
+    u32 ps_pat[32];         // Polygon stipple pattern buffer.
                             // These are not registers...
 };
 
@@ -55,12 +55,12 @@
 
 struct uc_hw_stencil
 {
-    //__u32 regHSBBasL;     // These aren't in regs3d.h, but they should exist...
-    //__u32 regHSBBasH;
-    //__u32 regHSBFM;
+    //u32 regHSBBasL;       // These aren't in regs3d.h, but they should exist...
+    //u32 regHSBBasH;
+    //u32 regHSBFM;
 
-    __u32 regHSTREF;        // Stencil reference value and plane mask
-    __u32 regHSTMD;         // Stencil test function and fail operation and
+    u32 regHSTREF;          // Stencil reference value and plane mask
+    u32 regHSTMD;           // Stencil test function and fail operation and
                             // zpass/zfail operations.
 };
 */
Index: gfxdrivers/cle266/unichrome.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/cle266/unichrome.c,v
retrieving revision 1.29
diff -u -r1.29 unichrome.c
--- gfxdrivers/cle266/unichrome.c	1 May 2006 19:09:28 -0000	1.29
+++ gfxdrivers/cle266/unichrome.c	7 Oct 2006 19:54:34 -0000
@@ -122,7 +122,7 @@
 static void uc_dump_vq(UcDeviceData *ucdev)
 {
      int i;
-     __u8* vq;
+     u8* vq;
 
      if (!ucdev->vq_start) return;
      vq = dfb_system_video_memory_virtual(ucdev->vq_start);
@@ -165,7 +165,7 @@
 DFBResult uc_init_2d_engine(GraphicsDevice *device, UcDeviceData *ucdev, UcDriverData *ucdrv, bool enable)
 {
      DFBResult result = DFB_OK;
-     volatile __u8* hwregs = ucdrv->hwregs;
+     volatile u8* hwregs = ucdrv->hwregs;
 
      // Init 2D engine registers to reset 2D engine
 
@@ -246,9 +246,9 @@
      return result;
 }
 
-void uc_init_3d_engine(volatile __u8* hwregs, int hwrev, bool init_all)
+void uc_init_3d_engine(volatile u8* hwregs, int hwrev, bool init_all)
 {
-     __u32 i;
+     u32 i;
 
      if (init_all) {
 
Index: gfxdrivers/cle266/unichrome.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/cle266/unichrome.h,v
retrieving revision 1.22
diff -u -r1.22 unichrome.h
--- gfxdrivers/cle266/unichrome.h	29 Oct 2005 00:40:57 -0000	1.22
+++ gfxdrivers/cle266/unichrome.h	7 Oct 2006 19:54:34 -0000
@@ -29,52 +29,52 @@
 struct uc_hw_texture {
      DFBSurfaceBlittingFlags bltflags;
 
-     __u32 l2w;      //width, rounded up to nearest 2^m, eg 600 => 1024
-     __u32 l2h;      //height, rounded up, e.g 480 => 512
-     __u32 we;       //width exponent, i.e m in the number 2^m
-     __u32 he;       //height exponent
+     u32 l2w;        //width, rounded up to nearest 2^m, eg 600 => 1024
+     u32 l2h;        //height, rounded up, e.g 480 => 512
+     u32 we;         //width exponent, i.e m in the number 2^m
+     u32 he;         //height exponent
 
-     __u32 format;   // HW pixel format
+     u32 format;     // HW pixel format
 
      // 3d engine texture environment, texture unit 0
 
      // Used for the DSBLIT_BLEND_ALPHACHANNEL, DSBLIT_BLEND_COLORALPHA
      // and DSBLIT_COLORIZE blitting flags.
 
-     __u32 regHTXnTB;
-     __u32 regHTXnMPMD;
+     u32 regHTXnTB;
+     u32 regHTXnMPMD;
 
-     __u32 regHTXnTBLCsat_0;
-     __u32 regHTXnTBLCop_0;
-     __u32 regHTXnTBLMPfog_0;
-     __u32 regHTXnTBLAsat_0;
-     __u32 regHTXnTBLRCb_0;
-     __u32 regHTXnTBLRAa_0;
-     __u32 regHTXnTBLRFog_0;
+     u32 regHTXnTBLCsat_0;
+     u32 regHTXnTBLCop_0;
+     u32 regHTXnTBLMPfog_0;
+     u32 regHTXnTBLAsat_0;
+     u32 regHTXnTBLRCb_0;
+     u32 regHTXnTBLRAa_0;
+     u32 regHTXnTBLRFog_0;
 };
 
 
 /** Hardware source-destination blending registers. */
 struct uc_hw_alpha {
 /*
-    __u32 regHABBasL;       // Alpha buffer, low 24 bits.
-    __u32 regHABBasH;       // Alpha buffer, high 8 bits.
-    __u32 regHABFM;         // Alpha pixel format, memory type and pitch.
-    __u32 regHATMD;         // Alpha test function and reference value.
+    u32 regHABBasL;         // Alpha buffer, low 24 bits.
+    u32 regHABBasH;         // Alpha buffer, high 8 bits.
+    u32 regHABFM;           // Alpha pixel format, memory type and pitch.
+    u32 regHATMD;           // Alpha test function and reference value.
 
     // Blending function
 */
-     __u32 regHABLCsat;
-     __u32 regHABLCop;
-     __u32 regHABLAsat;
-     __u32 regHABLAop;
-     __u32 regHABLRCa;
-     __u32 regHABLRFCa;
-     __u32 regHABLRCbias;
-     __u32 regHABLRCb;
-     __u32 regHABLRFCb;
-     __u32 regHABLRAa;
-     __u32 regHABLRAb;
+     u32 regHABLCsat;
+     u32 regHABLCop;
+     u32 regHABLAsat;
+     u32 regHABLAop;
+     u32 regHABLRCa;
+     u32 regHABLRFCa;
+     u32 regHABLRCbias;
+     u32 regHABLRCb;
+     u32 regHABLRFCb;
+     u32 regHABLRAa;
+     u32 regHABLRAb;
 };
 
 typedef enum {
@@ -96,11 +96,11 @@
      UcStateBits valid;
 
      /* Current state settings */
-     __u32                   pitch;      // combined src/dst pitch (2D)
-     __u32                   color;      // 2D fill color
-     __u32                   color3d;    // color for 3D operations
-     __u32                   draw_rop2d; // logical drawing ROP (2D)
-     __u32                   draw_rop3d; // logical drawing ROP (3D)
+     u32                     pitch;      // combined src/dst pitch (2D)
+     u32                     color;      // 2D fill color
+     u32                     color3d;    // color for 3D operations
+     u32                     draw_rop2d; // logical drawing ROP (2D)
+     u32                     draw_rop3d; // logical drawing ROP (3D)
 
      DFBSurfaceBlittingFlags bflags;     // blitting flags
      DFBRegion               clip;       // clipping region
@@ -121,9 +121,9 @@
      unsigned int cmd_waitcycles;
      unsigned int idle_waitcycles;
 
-     __u32           vq_start;   // VQ related
-     __u32           vq_size;
-     __u32           vq_end;
+     u32             vq_start;   // VQ related
+     u32             vq_size;
+     u32             vq_end;
 
 } UcDeviceData;
 
Index: gfxdrivers/cyber5k/cyber5k.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/cyber5k/cyber5k.c,v
retrieving revision 1.17
diff -u -r1.17 cyber5k.c
--- gfxdrivers/cyber5k/cyber5k.c	26 Aug 2006 09:34:19 -0000	1.17
+++ gfxdrivers/cyber5k/cyber5k.c	7 Oct 2006 19:54:35 -0000
@@ -64,7 +64,7 @@
 
 
 /* HACK */
-volatile __u8 *cyber_mmio = NULL;
+volatile u8 *cyber_mmio = NULL;
 
 
 /* FIXME: support for destination color keying */
@@ -208,7 +208,7 @@
 cyber5k_validate_color( CyberDriverData *cdrv,
                         CyberDeviceData *cdev, CardState *state )
 {
-     __u32 fill_color = 0;
+     u32 fill_color = 0;
 
      if (cdev->v_color)
           return;
@@ -327,7 +327,7 @@
 {
      CyberDriverData *cdrv = (CyberDriverData*) drv;
      CyberDeviceData *cdev = (CyberDeviceData*) dev;
-     volatile __u8   *mmio = cdrv->mmio_base;
+     volatile u8     *mmio = cdrv->mmio_base;
 
      cyber_waitidle( cdrv, cdev );
 
@@ -345,7 +345,7 @@
 {
      CyberDriverData *cdrv = (CyberDriverData*) drv;
      CyberDeviceData *cdev = (CyberDeviceData*) dev;
-     volatile __u8   *mmio = cdrv->mmio_base;
+     volatile u8     *mmio = cdrv->mmio_base;
 
      cyber_waitidle( cdrv, cdev );
 
@@ -364,10 +364,10 @@
 {
      CyberDriverData *cdrv = (CyberDriverData*) drv;
      CyberDeviceData *cdev = (CyberDeviceData*) dev;
-     volatile __u8   *mmio = cdrv->mmio_base;
+     volatile u8     *mmio = cdrv->mmio_base;
 
-     __u32 dst = cdev->dst_pixeloffset +
-                 rect->y * cdev->dst_pixelpitch + rect->x;
+     u32 dst = cdev->dst_pixeloffset +
+               rect->y * cdev->dst_pixelpitch + rect->x;
 
      cyber_waitidle( cdrv, cdev );
      cyber_out32( mmio, DSTPTR, dst );
@@ -396,10 +396,10 @@
 {
      CyberDriverData *cdrv = (CyberDriverData*) drv;
      CyberDeviceData *cdev = (CyberDeviceData*) dev;
-     volatile __u8   *mmio = cdrv->mmio_base;
+     volatile u8     *mmio = cdrv->mmio_base;
 
-     __u32 dst = cdev->dst_pixeloffset +
-                (rect->y * cdev->dst_pixelpitch + rect->x) * 3;
+     u32 dst = cdev->dst_pixeloffset +
+               (rect->y * cdev->dst_pixelpitch + rect->x) * 3;
 
      cyber_waitidle( cdrv, cdev );
      cyber_out8( mmio, DSTXROT, rect->x & 7 );
@@ -430,9 +430,9 @@
 {
      CyberDriverData *cdrv = (CyberDriverData*) drv;
      CyberDeviceData *cdev = (CyberDeviceData*) dev;
-     volatile __u8   *mmio = cdrv->mmio_base;
+     volatile u8     *mmio = cdrv->mmio_base;
 
-     __u32 cmd = COP_LINE_DRAW | PAT_FIXFGD;
+     u32 cmd = COP_LINE_DRAW | PAT_FIXFGD;
 
      int dx;
      int dy;
@@ -474,9 +474,9 @@
 {
      CyberDriverData *cdrv = (CyberDriverData*) drv;
      CyberDeviceData *cdev = (CyberDeviceData*) dev;
-     volatile __u8   *mmio = cdrv->mmio_base;
+     volatile u8     *mmio = cdrv->mmio_base;
 
-     __u32 cmd = cdev->blitting_cmd;
+     u32 cmd = cdev->blitting_cmd;
 
      cyber_waitidle( cdrv, cdev );
 
@@ -509,11 +509,11 @@
 {
      CyberDriverData *cdrv = (CyberDriverData*) drv;
      CyberDeviceData *cdev = (CyberDeviceData*) dev;
-     volatile __u8   *mmio = cdrv->mmio_base;
+     volatile u8     *mmio = cdrv->mmio_base;
 
-     __u32 cmd = cdev->blitting_cmd;
-     __u32 src = 0;
-     __u32 dst = 0;
+     u32 cmd = cdev->blitting_cmd;
+     u32 src = 0;
+     u32 dst = 0;
 
      cyber_waitidle( cdrv, cdev );
 
@@ -725,7 +725,7 @@
      CyberDriverData *cdrv = (CyberDriverData*) driver_data;
 
      /* gain access to memory mapped registers */
-     cdrv->mmio_base = (volatile __u8*) dfb_gfxcard_map_mmio( device, 0, -1 );
+     cdrv->mmio_base = (volatile u8*) dfb_gfxcard_map_mmio( device, 0, -1 );
      if (!cdrv->mmio_base)
           return DFB_IO;
 
@@ -766,7 +766,7 @@
                     void               *device_data )
 {
      CyberDriverData *cdrv = (CyberDriverData*) driver_data;
-     volatile __u8   *mmio = cdrv->mmio_base;
+     volatile u8     *mmio = cdrv->mmio_base;
 
      /* fill device info */
      snprintf( device_info->name,
Index: gfxdrivers/cyber5k/cyber5k.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/cyber5k/cyber5k.h,v
retrieving revision 1.4
diff -u -r1.4 cyber5k.h
--- gfxdrivers/cyber5k/cyber5k.h	1 May 2006 18:51:52 -0000	1.4
+++ gfxdrivers/cyber5k/cyber5k.h	7 Oct 2006 19:54:35 -0000
@@ -32,11 +32,11 @@
 #include <core/layers.h>
 
 /* HACK */
-extern volatile __u8 *cyber_mmio;
+extern volatile u8 *cyber_mmio;
 
 
 typedef struct {
-     volatile __u8 *mmio_base;
+     volatile u8 *mmio_base;
 } CyberDriverData;
 
 typedef struct {
@@ -48,12 +48,12 @@
      int v_blitting_cmd;
 
      /* stored values */
-     __u32 dst_pixeloffset;
-     __u32 dst_pixelpitch;
-     __u32 src_pixeloffset;
-     __u32 src_pixelpitch;
+     u32 dst_pixeloffset;
+     u32 dst_pixelpitch;
+     u32 src_pixeloffset;
+     u32 src_pixelpitch;
 
-     __u32 blitting_cmd;
+     u32 blitting_cmd;
 } CyberDeviceData;
 
 
Index: gfxdrivers/cyber5k/mmio.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/cyber5k/mmio.h,v
retrieving revision 1.5
diff -u -r1.5 mmio.h
--- gfxdrivers/cyber5k/mmio.h	1 May 2006 18:51:52 -0000	1.5
+++ gfxdrivers/cyber5k/mmio.h	7 Oct 2006 19:54:35 -0000
@@ -33,39 +33,39 @@
 #include "regs.h"
 
 static inline void
-cyber_out8(volatile __u8 *mmioaddr, __u32 reg, __u8 value)
+cyber_out8(volatile u8 *mmioaddr, u32 reg, u8 value)
 {
-     *((volatile __u8*)(mmioaddr+reg)) = value;
+     *((volatile u8*)(mmioaddr+reg)) = value;
 }
 
 static inline void
-cyber_out16(volatile __u8 *mmioaddr, __u32 reg, __u16 value)
+cyber_out16(volatile u8 *mmioaddr, u32 reg, u16 value)
 {
-     *((volatile __u16*)(mmioaddr+reg)) = value;
+     *((volatile u16*)(mmioaddr+reg)) = value;
 }
 
 static inline void
-cyber_out32(volatile __u8 *mmioaddr, __u32 reg, __u32 value)
+cyber_out32(volatile u8 *mmioaddr, u32 reg, u32 value)
 {
-     *((volatile __u32*)(mmioaddr+reg)) = value;
+     *((volatile u32*)(mmioaddr+reg)) = value;
 }
 
-static inline __u8
-cyber_in8(volatile __u8 *mmioaddr, __u32 reg)
+static inline u8
+cyber_in8(volatile u8 *mmioaddr, u32 reg)
 {
-     return *((volatile __u8*)(mmioaddr+reg));
+     return *((volatile u8*)(mmioaddr+reg));
 }
 
-static inline __u16
-cyber_in16(volatile __u8 *mmioaddr, __u32 reg)
+static inline u16
+cyber_in16(volatile u8 *mmioaddr, u32 reg)
 {
-     return *((volatile __u16*)(mmioaddr+reg));
+     return *((volatile u16*)(mmioaddr+reg));
 }
 
-static inline __u32
-cyber_in32(volatile __u8 *mmioaddr, __u32 reg)
+static inline u32
+cyber_in32(volatile u8 *mmioaddr, u32 reg)
 {
-     return *((volatile __u32*)(mmioaddr+reg));
+     return *((volatile u32*)(mmioaddr+reg));
 }
 
 /* Wait for idle accelerator */
Index: gfxdrivers/i810/i810.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/i810/i810.c,v
retrieving revision 1.15
diff -u -r1.15 i810.c
--- gfxdrivers/i810/i810.c	26 Aug 2006 09:34:19 -0000	1.15
+++ gfxdrivers/i810/i810.c	7 Oct 2006 19:54:35 -0000
@@ -822,7 +822,7 @@
 
 
      if (!idev->initialized) {
-          __u32 base;
+          u32 base;
 
           /* We'll attempt to bind at fb_base + fb_len + 1 MB,
           to be safe */
@@ -908,7 +908,7 @@
 
      idrv->idev = device_data;
 
-     idrv->mmio_base = (volatile __u8*) dfb_gfxcard_map_mmio( device, 0, -1 );
+     idrv->mmio_base = (volatile u8*) dfb_gfxcard_map_mmio( device, 0, -1 );
      if (!idrv->mmio_base)
           return DFB_IO;
 
Index: gfxdrivers/i810/i810.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/i810/i810.h,v
retrieving revision 1.3
diff -u -r1.3 i810.h
--- gfxdrivers/i810/i810.h	1 May 2006 18:51:52 -0000	1.3
+++ gfxdrivers/i810/i810.h	7 Oct 2006 19:54:35 -0000
@@ -45,10 +45,6 @@
 #include <core/gfxcard.h>
 #include <core/layers.h>
 
-typedef unsigned int u32;
-typedef unsigned short u16;
-typedef unsigned char u8;
-
 
 #define LP_RING     0x2030
 #define HP_RING     0x2040
@@ -683,36 +679,36 @@
 #endif
 
 struct i810_ovl_regs {
-	__u32 obuf_0y;
-	__u32 obuf_1y;
-	__u32 obuf_0u;
-	__u32 obuf_0v;
-	__u32 obuf_1u;
-	__u32 obuf_1v;
-	__u32 ov0stride;
-	__u32 yrgb_vph;
-	__u32 uv_vph;
-	__u32 horz_ph;
-	__u32 init_ph;
-	__u32 dwinpos;
-	__u32 dwinsz;
-	__u32 swid;
-	__u32 swidqw;
-	__u32 sheight;
-	__u32 yrgbscale;
-	__u32 uvscale;
-	__u32 ov0clrc0;
-	__u32 ov0clrc1;
-	__u32 dclrkv;
-	__u32 dclrkm;
-	__u32 sclrkvh;
-	__u32 sclrkvl;
-	__u32 sclrkm;
-	__u32 ov0conf;
-	__u32 ov0cmd;
-	__u32 reserved;
-	__u32 awinpos;
-	__u32 awinsz;
+	u32 obuf_0y;
+	u32 obuf_1y;
+	u32 obuf_0u;
+	u32 obuf_0v;
+	u32 obuf_1u;
+	u32 obuf_1v;
+	u32 ov0stride;
+	u32 yrgb_vph;
+	u32 uv_vph;
+	u32 horz_ph;
+	u32 init_ph;
+	u32 dwinpos;
+	u32 dwinsz;
+	u32 swid;
+	u32 swidqw;
+	u32 sheight;
+	u32 yrgbscale;
+	u32 uvscale;
+	u32 ov0clrc0;
+	u32 ov0clrc1;
+	u32 dclrkv;
+	u32 dclrkm;
+	u32 sclrkvh;
+	u32 sclrkvl;
+	u32 sclrkm;
+	u32 ov0conf;
+	u32 ov0cmd;
+	u32 reserved;
+	u32 awinpos;
+	u32 awinsz;
 };
 
 typedef struct {
@@ -751,11 +747,11 @@
     agp_bind              lring_bind;
     agp_bind              ovl_bind;
 
-    __u32                 pattern;
-    __u32                 lring1;
-    __u32                 lring2;
-    __u32                 lring3;
-    __u32                 lring4;
+    u32                   pattern;
+    u32                   lring1;
+    u32                   lring2;
+    u32                   lring3;
+    u32                   lring4;
 
     u32 i810fb_version;
     u32 cur_tail;
@@ -789,11 +785,11 @@
     u32 flags;
 	int agpgart;
 	agp_info info;
-	volatile __u8 *aper_base;
-	volatile __u8 *lring_base;
-	volatile __u8 *ovl_base;
-	volatile __u8 *mmio_base;
-	volatile __u8 *pattern_base;
+	volatile u8 *aper_base;
+	volatile u8 *lring_base;
+	volatile u8 *ovl_base;
+	volatile u8 *mmio_base;
+	volatile u8 *pattern_base;
 } I810DriverData;
 
 extern DisplayLayerFuncs i810OverlayFuncs;
Index: gfxdrivers/i830/i830.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/i830/i830.c,v
retrieving revision 1.10
diff -u -r1.10 i830.c
--- gfxdrivers/i830/i830.c	26 Aug 2006 09:34:19 -0000	1.10
+++ gfxdrivers/i830/i830.c	7 Oct 2006 19:54:35 -0000
@@ -74,9 +74,9 @@
 /**************************************************************************************************/
 
 static void
-i830_lring_enable( I830DriverData *idrv, __u32 mode )
+i830_lring_enable( I830DriverData *idrv, u32 mode )
 {
-     __u32 tmp;
+     u32 tmp;
 
      D_DEBUG_AT( I830_Ring, "%s lp ring...\n", mode ? "Enabling" : "Disabling" );
 
@@ -91,8 +91,8 @@
 i830_wait_for_blit_idle( I830DriverData *idrv,
                          I830DeviceData *idev )
 {
-     __u32 count = 0;
-     __u32 head , tail;
+     u32 count = 0;
+     u32 head , tail;
 
      if (idev != NULL)
           idev->idle_calls++;
@@ -117,7 +117,7 @@
 i830_init_ringbuffer( I830DriverData *idrv,
                       I830DeviceData *idev )
 {
-     __u32 ring_enabled;
+     u32 ring_enabled;
 
      D_DEBUG_AT( I830_Ring, "Previous lp ring config: 0x%08x, 0x%08x, 0x%08x, 0x%08x\n",
                  i830_readl(idrv->mmio_base, LP_RING),
@@ -394,7 +394,7 @@
 
 
      if (!idev->initialized) {
-          __u32 base;
+          u32 base;
 
           /* We'll attempt to bind at fb_base + fb_len + 1 MB,
           to be safe */
@@ -479,7 +479,7 @@
 
      idrv->idev = device_data;
 
-     idrv->mmio_base = (volatile __u8*) dfb_gfxcard_map_mmio( device, 0, -1 );
+     idrv->mmio_base = (volatile u8*) dfb_gfxcard_map_mmio( device, 0, -1 );
      if (!idrv->mmio_base)
           return DFB_IO;
 
Index: gfxdrivers/i830/i830.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/i830/i830.h,v
retrieving revision 1.5
diff -u -r1.5 i830.h
--- gfxdrivers/i830/i830.h	3 May 2006 07:37:05 -0000	1.5
+++ gfxdrivers/i830/i830.h	7 Oct 2006 19:54:35 -0000
@@ -187,58 +187,58 @@
 #define MAX_CUTOFF_FREQ         3.0
 
 typedef volatile struct {
-     __u32 OBUF_0Y;
-     __u32 OBUF_1Y;
-     __u32 OBUF_0U;
-     __u32 OBUF_0V;
-     __u32 OBUF_1U;
-     __u32 OBUF_1V;
-     __u32 OSTRIDE;
-     __u32 YRGB_VPH;
-     __u32 UV_VPH;
-     __u32 HORZ_PH;
-     __u32 INIT_PHS;
-     __u32 DWINPOS;
-     __u32 DWINSZ;
-     __u32 SWIDTH;
-     __u32 SWIDTHSW;
-     __u32 SHEIGHT;
-     __u32 YRGBSCALE;
-     __u32 UVSCALE;
-     __u32 OCLRC0;
-     __u32 OCLRC1;
-     __u32 DCLRKV;
-     __u32 DCLRKM;
-     __u32 SCLRKVH;
-     __u32 SCLRKVL;
-     __u32 SCLRKEN;
-     __u32 OCONFIG;
-     __u32 OCMD;
-     __u32 RESERVED1;           /* 0x6C */
-     __u32 AWINPOS;
-     __u32 AWINSZ;
-     __u32 RESERVED2;           /* 0x78 */
-     __u32 RESERVED3;           /* 0x7C */
-     __u32 RESERVED4;           /* 0x80 */
-     __u32 RESERVED5;           /* 0x84 */
-     __u32 RESERVED6;           /* 0x88 */
-     __u32 RESERVED7;           /* 0x8C */
-     __u32 RESERVED8;           /* 0x90 */
-     __u32 RESERVED9;           /* 0x94 */
-     __u32 RESERVEDA;           /* 0x98 */
-     __u32 RESERVEDB;           /* 0x9C */
-     __u32 FASTHSCALE;               /* 0xA0 */
-     __u32 UVSCALEV;            /* 0xA4 */
-
-     __u32 RESERVEDC[(0x200 - 0xA8) / 4];         /* 0xA8 - 0x1FC */
-     __u16 Y_VCOEFS[N_VERT_Y_TAPS * N_PHASES];         /* 0x200 */
-     __u16 RESERVEDD[0x100 / 2 - N_VERT_Y_TAPS * N_PHASES];
-     __u16 Y_HCOEFS[N_HORIZ_Y_TAPS * N_PHASES];             /* 0x300 */
-     __u16 RESERVEDE[0x200 / 2 - N_HORIZ_Y_TAPS * N_PHASES];
-     __u16 UV_VCOEFS[N_VERT_UV_TAPS * N_PHASES];            /* 0x500 */
-     __u16 RESERVEDF[0x100 / 2 - N_VERT_UV_TAPS * N_PHASES];
-     __u16 UV_HCOEFS[N_HORIZ_UV_TAPS * N_PHASES];      /* 0x600 */
-     __u16 RESERVEDG[0x100 / 2 - N_HORIZ_UV_TAPS * N_PHASES];
+     u32 OBUF_0Y;
+     u32 OBUF_1Y;
+     u32 OBUF_0U;
+     u32 OBUF_0V;
+     u32 OBUF_1U;
+     u32 OBUF_1V;
+     u32 OSTRIDE;
+     u32 YRGB_VPH;
+     u32 UV_VPH;
+     u32 HORZ_PH;
+     u32 INIT_PHS;
+     u32 DWINPOS;
+     u32 DWINSZ;
+     u32 SWIDTH;
+     u32 SWIDTHSW;
+     u32 SHEIGHT;
+     u32 YRGBSCALE;
+     u32 UVSCALE;
+     u32 OCLRC0;
+     u32 OCLRC1;
+     u32 DCLRKV;
+     u32 DCLRKM;
+     u32 SCLRKVH;
+     u32 SCLRKVL;
+     u32 SCLRKEN;
+     u32 OCONFIG;
+     u32 OCMD;
+     u32 RESERVED1;           /* 0x6C */
+     u32 AWINPOS;
+     u32 AWINSZ;
+     u32 RESERVED2;           /* 0x78 */
+     u32 RESERVED3;           /* 0x7C */
+     u32 RESERVED4;           /* 0x80 */
+     u32 RESERVED5;           /* 0x84 */
+     u32 RESERVED6;           /* 0x88 */
+     u32 RESERVED7;           /* 0x8C */
+     u32 RESERVED8;           /* 0x90 */
+     u32 RESERVED9;           /* 0x94 */
+     u32 RESERVEDA;           /* 0x98 */
+     u32 RESERVEDB;           /* 0x9C */
+     u32 FASTHSCALE;               /* 0xA0 */
+     u32 UVSCALEV;            /* 0xA4 */
+
+     u32 RESERVEDC[(0x200 - 0xA8) / 4];         /* 0xA8 - 0x1FC */
+     u16 Y_VCOEFS[N_VERT_Y_TAPS * N_PHASES];         /* 0x200 */
+     u16 RESERVEDD[0x100 / 2 - N_VERT_Y_TAPS * N_PHASES];
+     u16 Y_HCOEFS[N_HORIZ_Y_TAPS * N_PHASES];             /* 0x300 */
+     u16 RESERVEDE[0x200 / 2 - N_HORIZ_Y_TAPS * N_PHASES];
+     u16 UV_VCOEFS[N_VERT_UV_TAPS * N_PHASES];            /* 0x500 */
+     u16 RESERVEDF[0x100 / 2 - N_VERT_UV_TAPS * N_PHASES];
+     u16 UV_HCOEFS[N_HORIZ_UV_TAPS * N_PHASES];      /* 0x600 */
+     u16 RESERVEDG[0x100 / 2 - N_HORIZ_UV_TAPS * N_PHASES];
 } I830OverlayRegs;
 
 typedef struct {
@@ -276,21 +276,21 @@
      agp_bind              lring_bind;
      agp_bind              ovl_bind;
 
-     __u32                 pattern;
-     __u32                 lring1;
-     __u32                 lring2;
-     __u32                 lring3;
-     __u32                 lring4;
+     u32                   pattern;
+     u32                   lring1;
+     u32                   lring2;
+     u32                   lring3;
+     u32                   lring4;
 
      /* benchmarking */
-     __u32                 waitfifo_sum;
-     __u32                 waitfifo_calls;
-     __u32                 idle_calls;
-     __u32                 fifo_waitcycles;
-     __u32                 idle_waitcycles;
-     __u32                 fifo_cache_hits;
-     __u32                 fifo_timeoutsum;
-     __u32                 idle_timeoutsum;
+     u32                   waitfifo_sum;
+     u32                   waitfifo_calls;
+     u32                   idle_calls;
+     u32                   fifo_waitcycles;
+     u32                   idle_waitcycles;
+     u32                   fifo_cache_hits;
+     u32                   fifo_timeoutsum;
+     u32                   idle_timeoutsum;
 } I830DeviceData;
 
 typedef struct {
@@ -298,14 +298,14 @@
 
      I830OverlayRegs    *oregs;
 
-     __u32               flags;
+     u32                 flags;
      int                 agpgart;
      agp_info            info;
-     volatile __u8      *aper_base;
-     volatile __u8      *lring_base;
-     volatile __u8      *ovl_base;
-     volatile __u8      *mmio_base;
-     volatile __u8      *pattern_base;
+     volatile u8        *aper_base;
+     volatile u8        *lring_base;
+     volatile u8        *ovl_base;
+     volatile u8        *mmio_base;
+     volatile u8        *pattern_base;
 } I830DriverData;
 
 extern DisplayLayerFuncs i830OverlayFuncs;
@@ -317,22 +317,22 @@
 
 
 #define i830_readb(mmio_base, where)                     \
-        *((volatile __u8 *) (mmio_base + where))           \
+        *((volatile u8 *) (mmio_base + where))           \
 
 #define i830_readw(mmio_base, where)                     \
-       *((volatile __u16 *) (mmio_base + where))           \
+       *((volatile u16 *) (mmio_base + where))           \
 
 #define i830_readl(mmio_base, where)                     \
-       *((volatile __u32 *) (mmio_base + where))           \
+       *((volatile u32 *) (mmio_base + where))           \
 
 #define i830_writeb(mmio_base, where, val)                              \
-        *((volatile __u8 *) (mmio_base + where)) = (volatile __u8) val      \
+        *((volatile u8 *) (mmio_base + where)) = (volatile u8) val      \
 
 #define i830_writew(mmio_base, where, val)                              \
-        *((volatile __u16 *) (mmio_base + where)) = (volatile __u16) val    \
+        *((volatile u16 *) (mmio_base + where)) = (volatile u16) val    \
 
 #define i830_writel(mmio_base, where, val)                              \
-        *((volatile __u32 *) (mmio_base + where)) = (volatile __u32) val    \
+        *((volatile u32 *) (mmio_base + where)) = (volatile u32) val    \
 
 
 
@@ -376,11 +376,11 @@
 
 static inline void
 i830_out_ring( I830RingBlock *block,
-               __u32          value )
+               u32            value )
 {
      D_DEBUG_AT( I830_Ring, "out_ring( 0x%08x, 0x%08x )\n", block->outring, value );
 
-     *(volatile __u32*)(block->virt + block->outring) = value;
+     *(volatile u32*)(block->virt + block->outring) = value;
 
      block->outring = (block->outring + 4) & block->tail_mask;
 }
Index: gfxdrivers/i830/i830_overlay.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/i830/i830_overlay.c,v
retrieving revision 1.6
diff -u -r1.6 i830_overlay.c
--- gfxdrivers/i830/i830_overlay.c	30 Sep 2006 16:15:34 -0000	1.6
+++ gfxdrivers/i830/i830_overlay.c	7 Oct 2006 19:54:35 -0000
@@ -319,7 +319,7 @@
 {
      I830DriverData *idrv = driver_data;
      I830DeviceData *idev = idrv->idev;
-     __u16 b, c, s;
+     u16 b, c, s;
 
      if (adj->flags & DCAF_BRIGHTNESS)
 	 b = ((adj->brightness >> 8) - 128) & 0xFF;
@@ -376,9 +376,9 @@
 
 
 typedef struct {
-     __u8 sign;
-     __u16 mantissa;
-     __u8 exponent;
+     u8 sign;
+     u16 mantissa;
+     u8 exponent;
 } coeffRec, *coeffPtr;
 
 static bool
@@ -632,7 +632,7 @@
           int yscaleIntUV, yscaleFractUV;
           /* UV is half the size of Y -- YUV420 */
           int uvratio = 2;
-          __u32 newval;
+          u32 newval;
           coeffRec xcoeffY[N_HORIZ_Y_TAPS * N_PHASES];
           coeffRec xcoeffUV[N_HORIZ_UV_TAPS * N_PHASES];
           int i, j, pos;
Index: gfxdrivers/mach64/mach64.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/mach64/mach64.c,v
retrieving revision 1.42
diff -u -r1.42 mach64.c
--- gfxdrivers/mach64/mach64.c	26 Aug 2006 09:34:19 -0000	1.42
+++ gfxdrivers/mach64/mach64.c	7 Oct 2006 19:54:36 -0000
@@ -121,7 +121,7 @@
 {
      Mach64DriverData *mdrv = (Mach64DriverData*) drv;
      Mach64DeviceData *mdev = (Mach64DeviceData*) dev;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
 
      mach64_waitidle( mdrv, mdev );
 
@@ -169,7 +169,7 @@
 {
      Mach64DriverData *mdrv = (Mach64DriverData*) drv;
      Mach64DeviceData *mdev = (Mach64DeviceData*) dev;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
 
      if (mdev->chip >= CHIP_3D_RAGE_PRO) {
           mach64_waitfifo( mdrv, mdev, 1 );
@@ -397,7 +397,7 @@
 {
      Mach64DriverData *mdrv = (Mach64DriverData*) drv;
      Mach64DeviceData *mdev = (Mach64DeviceData*) dev;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
 
      if (state->modified == SMF_ALL) {
           mdev->valid = 0;
@@ -483,7 +483,7 @@
 {
      Mach64DriverData *mdrv = (Mach64DriverData*) drv;
      Mach64DeviceData *mdev = (Mach64DeviceData*) dev;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
 
      bool use_scaler_3d;
 
@@ -654,7 +654,7 @@
 {
      Mach64DriverData *mdrv = (Mach64DriverData*) drv;
      Mach64DeviceData *mdev = (Mach64DeviceData*) dev;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
 
      mach64_waitfifo( mdrv, mdev, 3 );
 
@@ -669,7 +669,7 @@
 {
      Mach64DriverData *mdrv = (Mach64DriverData*) drv;
      Mach64DeviceData *mdev = (Mach64DeviceData*) dev;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
 
      int x2 = rect->x + rect->w - 1;
      int y2 = rect->y + rect->h - 1;
@@ -695,9 +695,9 @@
                               int x2, int y2,
                               bool draw_3d )
 {
-     volatile __u8 *mmio = mdrv->mmio_base;
+     volatile u8 *mmio = mdrv->mmio_base;
 
-     __u32 dst_cntl = 0;
+     u32 dst_cntl = 0;
      int   dx, dy;
 
      dx = x2 - x1;
@@ -784,9 +784,9 @@
                                    int X2l, int X2r,
                                    int Y, int dY )
 {
-     volatile __u8 *mmio = mdrv->mmio_base;
+     volatile u8 *mmio = mdrv->mmio_base;
 
-     __u32 dst_cntl;
+     u32 dst_cntl;
      int   dXl, dXr;
 
      X1r++; X2r++;
@@ -870,9 +870,9 @@
                             DFBRectangle *srect,
                             DFBRectangle *drect )
 {
-     volatile __u8 *mmio = mdrv->mmio_base;
+     volatile u8 *mmio = mdrv->mmio_base;
 
-     __u32 dst_cntl = 0;
+     u32 dst_cntl = 0;
 
      if (srect->x <= drect->x) {
           srect->x += srect->w - 1;
@@ -902,10 +902,10 @@
                                   DFBRectangle     *drect,
                                   bool              filter )
 {
-     volatile __u8 *mmio   = mdrv->mmio_base;
+     volatile u8 *mmio     = mdrv->mmio_base;
      CoreSurface   *source = mdev->source;
 
-     __u32 scale_3d_cntl = SCALE_3D_FCN_SCALE | mdev->blit_blend;
+     u32 scale_3d_cntl = SCALE_3D_FCN_SCALE | mdev->blit_blend;
      int   hacc, vacc;
 
      if (!filter)
@@ -968,10 +968,10 @@
                                DFBRectangle     *drect,
                                bool              filter )
 {
-     volatile __u8 *mmio   = mdrv->mmio_base;
+     volatile u8 *mmio     = mdrv->mmio_base;
      CoreSurface   *source = mdev->source;
 
-     __u32 scale_3d_cntl = SCALE_3D_FCN_SCALE | mdev->blit_blend;
+     u32 scale_3d_cntl = SCALE_3D_FCN_SCALE | mdev->blit_blend;
      int   hacc, vacc;
 
      if (!filter)
@@ -991,7 +991,7 @@
      if (drect->y < mdev->clip.y1) {
           int sy, dy;
           dy = mdev->clip.y1 - drect->y;
-          sy = (__u64) srect->h * dy / drect->h;
+          sy = (u64) srect->h * dy / drect->h;
           srect->y += sy;
           srect->h -= sy;
           drect->y += dy;
@@ -1042,9 +1042,9 @@
                                 DFBRectangle     *drect,
                                 bool              filter )
 {
-     volatile __u8 *mmio = mdrv->mmio_base;
+     volatile u8 *mmio = mdrv->mmio_base;
 
-     __u32 scale_3d_cntl = SCALE_3D_FCN_TEXTURE | MIP_MAP_DISABLE | mdev->blit_blend;
+     u32 scale_3d_cntl = SCALE_3D_FCN_TEXTURE | MIP_MAP_DISABLE | mdev->blit_blend;
 
      if (mdev->blit_deinterlace) {
           srect->y /= 2;
@@ -1103,9 +1103,9 @@
                              DFBRectangle     *drect,
                              bool              filter )
 {
-     volatile __u8 *mmio = mdrv->mmio_base;
+     volatile u8 *mmio = mdrv->mmio_base;
 
-     __u32 scale_3d_cntl = SCALE_3D_FCN_TEXTURE | MIP_MAP_DISABLE | mdev->blit_blend;
+     u32 scale_3d_cntl = SCALE_3D_FCN_TEXTURE | MIP_MAP_DISABLE | mdev->blit_blend;
 
      if (mdev->blit_deinterlace) {
           srect->y /= 2;
@@ -1278,8 +1278,8 @@
 mach64_chip_type_vt( Mach64DriverData   *mdrv,
                      GraphicsDeviceInfo *device_info )
 {
-     __u32 config_chip_id = mach64_in32( mdrv->mmio_base, CONFIG_CHIP_ID );
-     __u32 cfg_chip_type = config_chip_id & CFG_CHIP_TYPE;
+     u32 config_chip_id = mach64_in32( mdrv->mmio_base, CONFIG_CHIP_ID );
+     u32 cfg_chip_type = config_chip_id & CFG_CHIP_TYPE;
 
      switch (cfg_chip_type) {
      case MACH64_CFG_CHIP_TYPE( 'V', 'T' ):
@@ -1320,8 +1320,8 @@
 mach64_chip_type_gt( Mach64DriverData   *mdrv,
                      GraphicsDeviceInfo *device_info )
 {
-     __u32 config_chip_id = mach64_in32( mdrv->mmio_base, CONFIG_CHIP_ID );
-     __u32 cfg_chip_type = config_chip_id & CFG_CHIP_TYPE;
+     u32 config_chip_id = mach64_in32( mdrv->mmio_base, CONFIG_CHIP_ID );
+     u32 cfg_chip_type = config_chip_id & CFG_CHIP_TYPE;
 
      switch (cfg_chip_type) {
      case MACH64_CFG_CHIP_TYPE( 'G', 'T' ):
@@ -1454,7 +1454,7 @@
 {
      Mach64DriverData *mdrv = (Mach64DriverData*) driver_data;
 
-     mdrv->mmio_base = (volatile __u8*) dfb_gfxcard_map_mmio( device, 0, -1 );
+     mdrv->mmio_base = (volatile u8*) dfb_gfxcard_map_mmio( device, 0, -1 );
      if (!mdrv->mmio_base)
           return DFB_IO;
 
@@ -1498,7 +1498,7 @@
 {
      Mach64DriverData *mdrv = (Mach64DriverData*) driver_data;
      Mach64DeviceData *mdev = (Mach64DeviceData*) device_data;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
 
      /* fill device info */
      device_info->caps.flags = CCF_CLIPPING;
@@ -1575,7 +1575,7 @@
 {
      Mach64DriverData *mdrv = (Mach64DriverData*) driver_data;
      Mach64DeviceData *mdev = (Mach64DeviceData*) device_data;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
 
      D_DEBUG( "DirectFB/Mach64: FIFO Performance Monitoring:\n" );
      D_DEBUG( "DirectFB/Mach64:  %9d mach64_waitfifo calls\n",
Index: gfxdrivers/mach64/mach64.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/mach64/mach64.h,v
retrieving revision 1.15
diff -u -r1.15 mach64.h
--- gfxdrivers/mach64/mach64.h	1 Dec 2005 10:41:37 -0000	1.15
+++ gfxdrivers/mach64/mach64.h	7 Oct 2006 19:54:36 -0000
@@ -82,13 +82,13 @@
 
      Mach64StateBits valid;
 
-     __u32 hw_debug;
-     __u32 hw_debug_orig;
+     u32 hw_debug;
+     u32 hw_debug_orig;
 
-     __u32 pix_width;
+     u32 pix_width;
 
-     __u32 draw_blend;
-     __u32 blit_blend;
+     u32 draw_blend;
+     u32 blit_blend;
 
      int tex_offset;
      int tex_pitch;
@@ -110,7 +110,7 @@
 
 typedef struct {
      int accelerator;
-     volatile __u8 *mmio_base;
+     volatile u8 *mmio_base;
      Mach64DeviceData *device_data;
 } Mach64DriverData;
 
Index: gfxdrivers/mach64/mach64_overlay.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/mach64/mach64_overlay.c,v
retrieving revision 1.19
diff -u -r1.19 mach64_overlay.c
--- gfxdrivers/mach64/mach64_overlay.c	1 Dec 2005 09:24:18 -0000	1.19
+++ gfxdrivers/mach64/mach64_overlay.c	7 Oct 2006 19:54:36 -0000
@@ -48,25 +48,25 @@
 
      /* overlay registers */
      struct {
-          __u32 overlay_Y_X_START;
-          __u32 overlay_Y_X_END;
-          __u32 overlay_GRAPHICS_KEY_CLR;
-          __u32 overlay_GRAPHICS_KEY_MSK;
-          __u32 overlay_VIDEO_KEY_CLR;
-          __u32 overlay_VIDEO_KEY_MSK;
-          __u32 overlay_KEY_CNTL;
-          __u32 overlay_SCALE_INC;
-          __u32 overlay_SCALE_CNTL;
-          __u32 scaler_HEIGHT_WIDTH;
-          __u32 scaler_BUF_PITCH;
-          __u32 scaler_BUF0_OFFSET;
-          __u32 scaler_BUF1_OFFSET;
-          __u32 scaler_BUF0_OFFSET_U;
-          __u32 scaler_BUF0_OFFSET_V;
-          __u32 scaler_BUF1_OFFSET_U;
-          __u32 scaler_BUF1_OFFSET_V;
-          __u32 video_FORMAT;
-          __u32 capture_CONFIG;
+          u32 overlay_Y_X_START;
+          u32 overlay_Y_X_END;
+          u32 overlay_GRAPHICS_KEY_CLR;
+          u32 overlay_GRAPHICS_KEY_MSK;
+          u32 overlay_VIDEO_KEY_CLR;
+          u32 overlay_VIDEO_KEY_MSK;
+          u32 overlay_KEY_CNTL;
+          u32 overlay_SCALE_INC;
+          u32 overlay_SCALE_CNTL;
+          u32 scaler_HEIGHT_WIDTH;
+          u32 scaler_BUF_PITCH;
+          u32 scaler_BUF0_OFFSET;
+          u32 scaler_BUF1_OFFSET;
+          u32 scaler_BUF0_OFFSET_U;
+          u32 scaler_BUF0_OFFSET_V;
+          u32 scaler_BUF1_OFFSET_U;
+          u32 scaler_BUF1_OFFSET_V;
+          u32 video_FORMAT;
+          u32 capture_CONFIG;
      } regs;
 } Mach64OverlayLayerData;
 
@@ -292,7 +292,7 @@
 {
      Mach64DriverData *mdrv = (Mach64DriverData*) driver_data;
      Mach64DeviceData *mdev = mdrv->device_data;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
 
      mach64_waitfifo( mdrv, mdev, 2 );
 
@@ -335,7 +335,7 @@
 {
      Mach64DriverData *mdrv = (Mach64DriverData*) driver_data;
      Mach64DeviceData *mdev = mdrv->device_data;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
 
      if (mdev->chip < CHIP_3D_RAGE_PRO)
           return DFB_UNSUPPORTED;
@@ -384,7 +384,7 @@
 static void ov_reset( Mach64DriverData *mdrv )
 {
      Mach64DeviceData *mdev = mdrv->device_data;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
 
      if (mdev->chip >= CHIP_3D_RAGE_PRO) {
           mach64_waitfifo( mdrv, mdev, 6 );
@@ -414,7 +414,7 @@
                          Mach64OverlayLayerData *mov )
 {
      Mach64DeviceData *mdev = mdrv->device_data;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
 
      mach64_waitfifo( mdrv, mdev, (mdev->chip >= CHIP_264VT3) ? 6 : 7 );
 
@@ -436,7 +436,7 @@
                            Mach64OverlayLayerData *mov )
 {
      Mach64DeviceData *mdev = mdrv->device_data;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
 
      mach64_waitfifo( mdrv, mdev, (mdev->chip >= CHIP_3D_RAGE_PRO) ? 6 : 2 );
 
@@ -460,7 +460,7 @@
                              Mach64OverlayLayerData *mov )
 {
      Mach64DeviceData *mdev = mdrv->device_data;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
 
      mach64_waitfifo( mdrv, mdev, 5 );
 
@@ -475,7 +475,7 @@
                             Mach64OverlayLayerData *mov )
 {
      Mach64DeviceData *mdev = mdrv->device_data;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
 
      mach64_waitfifo( mdrv, mdev, 1 );
 
@@ -486,7 +486,7 @@
                           Mach64OverlayLayerData *mov )
 {
      Mach64DeviceData *mdev = mdrv->device_data;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
 
      mach64_waitfifo( mdrv, mdev, 1 );
 
@@ -499,7 +499,7 @@
                           CoreSurface            *surface )
 {
      Mach64DeviceData *mdev   = mdrv->device_data;
-     volatile __u8    *mmio   = mdrv->mmio_base;
+     volatile u8      *mmio   = mdrv->mmio_base;
      SurfaceBuffer    *buffer = surface->front_buffer;
      VideoMode        *mode   = dfb_system_current_mode();
      int               yres   = mode->yres;
@@ -509,8 +509,8 @@
 
      DFBRegion dst;
      int h_inc, v_inc;
-     __u32 lcd_gen_ctrl, vert_stretching;
-     __u8 ecp_div;
+     u32 lcd_gen_ctrl, vert_stretching;
+     u8 ecp_div;
 
      if (mode->doubled) {
           dest.y *= 2;
@@ -588,7 +588,7 @@
      int            pitch  = buffer->video.pitch;
      DFBRectangle   source = config->source;
 
-     __u32 offset, offset_u, offset_v;
+     u32 offset, offset_u, offset_v;
      int cropleft, croptop;
 
      if (config->options & DLOP_DEINTERLACING) {
@@ -646,7 +646,7 @@
      mov->regs.scaler_BUF1_OFFSET_V = offset_v + buffer->video.pitch/2;
 }
 
-static __u32 ovColorKey[] = {
+static u32 ovColorKey[] = {
      VIDEO_KEY_FN_TRUE      | GRAPHICS_KEY_FN_TRUE  | OVERLAY_CMP_MIX_OR, /* 0 */
      VIDEO_KEY_FN_NOT_EQUAL | GRAPHICS_KEY_FN_FALSE | OVERLAY_CMP_MIX_OR, /* DLOP_SRC_COLORKEY */
      VIDEO_KEY_FN_FALSE     | GRAPHICS_KEY_FN_EQUAL | OVERLAY_CMP_MIX_OR, /* DLOP_DST_COLORKEY */
Index: gfxdrivers/mach64/mach64_state.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/mach64/mach64_state.c,v
retrieving revision 1.20
diff -u -r1.20 mach64_state.c
--- gfxdrivers/mach64/mach64_state.c	1 Dec 2005 10:41:37 -0000	1.20
+++ gfxdrivers/mach64/mach64_state.c	7 Oct 2006 19:54:36 -0000
@@ -50,7 +50,7 @@
                              Mach64DeviceData *mdev,
                              CardState        *state )
 {
-     volatile __u8 *mmio        = mdrv->mmio_base;
+     volatile u8 *mmio          = mdrv->mmio_base;
      CoreSurface   *destination = state->destination;
      SurfaceBuffer *buffer      = destination->back_buffer;
      int            pitch       = buffer->video.pitch / DFB_BYTES_PER_PIXEL( destination->format );
@@ -83,7 +83,7 @@
                                Mach64DeviceData *mdev,
                                CardState        *state )
 {
-     volatile __u8 *mmio        = mdrv->mmio_base;
+     volatile u8 *mmio          = mdrv->mmio_base;
      CoreSurface   *destination = state->destination;
      SurfaceBuffer *buffer      = destination->back_buffer;
      int            pitch       = buffer->video.pitch / DFB_BYTES_PER_PIXEL( destination->format );
@@ -126,7 +126,7 @@
                         Mach64DeviceData *mdev,
                         CardState        *state )
 {
-     volatile __u8 *mmio   = mdrv->mmio_base;
+     volatile u8 *mmio     = mdrv->mmio_base;
      CoreSurface   *source = state->source;
      SurfaceBuffer *buffer = source->front_buffer;
      int            pitch  = buffer->video.pitch / DFB_BYTES_PER_PIXEL( source->format );
@@ -164,7 +164,7 @@
                           Mach64DeviceData *mdev,
                           CardState        *state )
 {
-     volatile __u8 *mmio   = mdrv->mmio_base;
+     volatile u8 *mmio     = mdrv->mmio_base;
      CoreSurface   *source = state->source;
      SurfaceBuffer *buffer = source->front_buffer;
      int            pitch  = buffer->video.pitch / DFB_BYTES_PER_PIXEL( source->format );
@@ -205,7 +205,7 @@
                                 Mach64DeviceData *mdev,
                                 CardState        *state )
 {
-     volatile __u8 *mmio   = mdrv->mmio_base;
+     volatile u8 *mmio     = mdrv->mmio_base;
      CoreSurface   *source = state->source;
      SurfaceBuffer *buffer = source->front_buffer;
      int            offset = buffer->video.offset;
@@ -282,7 +282,7 @@
                       Mach64DeviceData *mdev,
                       CardState        *state )
 {
-     volatile __u8 *mmio = mdrv->mmio_base;
+     volatile u8 *mmio = mdrv->mmio_base;
 
      mach64_waitfifo( mdrv, mdev, 2 );
      mach64_out32( mmio, SC_LEFT_RIGHT, (S13( state->clip.x2 ) << 16) | S13( state->clip.x1 ) );
@@ -293,9 +293,9 @@
                        Mach64DeviceData *mdev,
                        CardState        *state )
 {
-     volatile __u8 *mmio  = mdrv->mmio_base;
+     volatile u8 *mmio    = mdrv->mmio_base;
      DFBColor       color = state->color;
-     __u32          clr;
+     u32            clr;
 
      if (MACH64_IS_VALID( m_color ))
           return;
@@ -355,7 +355,7 @@
                           Mach64DeviceData *mdev,
                           CardState        *state )
 {
-     volatile __u8 *mmio  = mdrv->mmio_base;
+     volatile u8 *mmio    = mdrv->mmio_base;
      DFBColor       color = state->color;
 
      if (MACH64_IS_VALID( m_color_3d ))
@@ -385,7 +385,7 @@
                            Mach64DeviceData *mdev,
                            CardState        *state )
 {
-     volatile __u8 *mmio  = mdrv->mmio_base;
+     volatile u8 *mmio    = mdrv->mmio_base;
      DFBColor       color = state->color;
 
      if (MACH64_IS_VALID( m_color_tex ))
@@ -419,7 +419,7 @@
                               Mach64DeviceData *mdev,
                               CardState        *state )
 {
-     volatile __u8 *mmio = mdrv->mmio_base;
+     volatile u8 *mmio = mdrv->mmio_base;
 
      if (MACH64_IS_VALID( m_srckey ))
           return;
@@ -438,8 +438,8 @@
                                     Mach64DeviceData *mdev,
                                     CardState        *state )
 {
-     volatile __u8 *mmio = mdrv->mmio_base;
-     __u32          clr, msk;
+     volatile u8 *mmio = mdrv->mmio_base;
+     u32          clr, msk;
 
      if (MACH64_IS_VALID( m_srckey_scale ))
           return;
@@ -497,7 +497,7 @@
                               Mach64DeviceData *mdev,
                               CardState        *state )
 {
-     volatile __u8 *mmio = mdrv->mmio_base;
+     volatile u8 *mmio = mdrv->mmio_base;
 
      if (MACH64_IS_VALID( m_dstkey ))
           return;
@@ -515,7 +515,7 @@
 void mach64_disable_colorkey( Mach64DriverData *mdrv,
                               Mach64DeviceData *mdev )
 {
-     volatile __u8 *mmio = mdrv->mmio_base;
+     volatile u8 *mmio = mdrv->mmio_base;
 
      if (MACH64_IS_VALID( m_disable_key ))
           return;
@@ -527,7 +527,7 @@
      MACH64_INVALIDATE( m_srckey | m_srckey_scale | m_dstkey );
 }
 
-static __u32 mach64SourceBlend[] = {
+static u32 mach64SourceBlend[] = {
      ALPHA_BLND_SRC_ZERO,
      ALPHA_BLND_SRC_ONE,
      0,
@@ -541,7 +541,7 @@
      ALPHA_BLND_SAT
 };
 
-static __u32 mach64DestBlend[] = {
+static u32 mach64DestBlend[] = {
      ALPHA_BLND_DST_ZERO,
      ALPHA_BLND_DST_ONE,
      ALPHA_BLND_DST_SRCCOLOR,
@@ -559,7 +559,7 @@
                             Mach64DeviceData *mdev,
                             CardState        *state )
 {
-     volatile __u8 *mmio = mdrv->mmio_base;
+     volatile u8 *mmio = mdrv->mmio_base;
 
      if (MACH64_IS_VALID( m_draw_blend ))
           return;
@@ -582,7 +582,7 @@
                             Mach64DeviceData *mdev,
                             CardState        *state )
 {
-     volatile __u8 *mmio = mdrv->mmio_base;
+     volatile u8 *mmio = mdrv->mmio_base;
 
      if (MACH64_IS_VALID( m_blit_blend ))
           return;
Index: gfxdrivers/mach64/mmio.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/mach64/mmio.h,v
retrieving revision 1.7
diff -u -r1.7 mmio.h
--- gfxdrivers/mach64/mmio.h	7 Mar 2005 21:45:46 -0000	1.7
+++ gfxdrivers/mach64/mmio.h	7 Oct 2006 19:54:36 -0000
@@ -34,19 +34,19 @@
 #include "mach64.h"
 
 static inline void
-mach64_out8( volatile __u8 *mmioaddr, __u32 reg, __u8 value )
+mach64_out8( volatile u8 *mmioaddr, u32 reg, u8 value )
 {
-     *((volatile __u8*)(mmioaddr+reg)) = value;
+     *((volatile u8*)(mmioaddr+reg)) = value;
 }
 
-static inline __u8
-mach64_in8( volatile __u8 *mmioaddr, __u32 reg )
+static inline u8
+mach64_in8( volatile u8 *mmioaddr, u32 reg )
 {
-     return *((volatile __u8*)(mmioaddr+reg));
+     return *((volatile u8*)(mmioaddr+reg));
 }
 
 static inline void
-mach64_out32( volatile __u8 *mmioaddr, __u32 reg, __u32 value )
+mach64_out32( volatile u8 *mmioaddr, u32 reg, u32 value )
 {
 #ifdef __powerpc__
      if (reg >= 0x400)
@@ -57,17 +57,17 @@
                               "r"(mmioaddr) : "memory");
 #else
      if (reg >= 0x400)
-          *((volatile __u32*)(mmioaddr+reg-0x800)) = value;
+          *((volatile u32*)(mmioaddr+reg-0x800)) = value;
      else
-          *((volatile __u32*)(mmioaddr+reg)) = value;
+          *((volatile u32*)(mmioaddr+reg)) = value;
 #endif
 }
 
-static inline __u32
-mach64_in32( volatile __u8 *mmioaddr, __u32 reg )
+static inline u32
+mach64_in32( volatile u8 *mmioaddr, u32 reg )
 {
 #ifdef __powerpc__
-     __u32 value;
+     u32 value;
 
      if (reg >= 0x400)
           asm volatile("lwbrx %0,%1,%2;eieio" : "=r"(value) : "b"(reg-0x800), "r"(mmioaddr));
@@ -77,13 +77,13 @@
      return value;
 #else
      if (reg >= 0x400)
-          return *((volatile __u32*)(mmioaddr+reg-0x800));
+          return *((volatile u32*)(mmioaddr+reg-0x800));
      else
-          return *((volatile __u32*)(mmioaddr+reg));
+          return *((volatile u32*)(mmioaddr+reg));
 #endif
 }
 
-static const __u32 lt_lcd_regs[] = {
+static const u32 lt_lcd_regs[] = {
      CONFIG_PANEL_LT,
      LCD_GEN_CTRL_LT,
      DSTN_CONTROL_LT,
@@ -98,7 +98,7 @@
 #if 0
 static inline void
 mach64_in_lcd( Mach64DeviceData *mdev,
-               volatile __u8    *mmioaddr, __u8 reg, __u32 value )
+               volatile u8      *mmioaddr, u8 reg, u32 value )
 {
      if (mdev->chip == CHIP_3D_RAGE_LT) {
           mach64_out32( mmioaddr, lt_lcd_regs[reg], value );
@@ -109,9 +109,9 @@
 }
 #endif
 
-static inline __u32
+static inline u32
 mach64_in_lcd( Mach64DeviceData *mdev,
-               volatile __u8    *mmioaddr, __u8 reg )
+               volatile u8      *mmioaddr, u8 reg )
 {
      if (mdev->chip == CHIP_3D_RAGE_LT) {
           return mach64_in32( mmioaddr, lt_lcd_regs[reg] );
@@ -125,15 +125,15 @@
 
 #if 0
 static inline void
-mach64_out_pll( volatile __u8 *mmioaddr, __u8 reg, __u8 value )
+mach64_out_pll( volatile u8 *mmioaddr, u8 reg, u8 value )
 {
      mach64_out8( mmioaddr, CLOCK_CNTL1, (reg << 2) | PLL_WR_EN );
      mach64_out8( mmioaddr, CLOCK_CNTL2, value );
 }
 #endif
 
-static inline __u8
-mach64_in_pll( volatile __u8 *mmioaddr, __u8 reg )
+static inline u8
+mach64_in_pll( volatile u8 *mmioaddr, u8 reg )
 {
      mach64_out8( mmioaddr, CLOCK_CNTL1, reg << 2 );
      return mach64_in8( mmioaddr, CLOCK_CNTL2 );
@@ -167,7 +167,7 @@
                                     Mach64DeviceData *mdev,
                                     unsigned int requested_fifo_space )
 {
-     __u32 fifo_stat;
+     u32 fifo_stat;
      int timeout = 1000000;
 
      mdev->waitfifo_sum += requested_fifo_space;
Index: gfxdrivers/matrox/matrox.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/matrox/matrox.c,v
retrieving revision 1.102
diff -u -r1.102 matrox.c
--- gfxdrivers/matrox/matrox.c	13 Sep 2006 21:35:43 -0000	1.102
+++ gfxdrivers/matrox/matrox.c	7 Oct 2006 19:54:36 -0000
@@ -214,7 +214,7 @@
 {
      MatroxDriverData *mdrv = (MatroxDriverData*) drv;
      MatroxDeviceData *mdev = (MatroxDeviceData*) dev;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
 
      mga_waitidle( mdrv, mdev );
 
@@ -926,7 +926,7 @@
                        MatroxDeviceData *mdev,
                        DFBRectangle *rect )
 {
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
 
      mga_waitfifo( mdrv, mdev, 3 );
 
@@ -957,7 +957,7 @@
 {
      MatroxDriverData *mdrv = (MatroxDriverData*) drv;
      MatroxDeviceData *mdev = (MatroxDeviceData*) dev;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
 
      matrox_fill_rectangle( mdrv, mdev, rect );
 
@@ -996,7 +996,7 @@
 {
      MatroxDriverData *mdrv = (MatroxDriverData*) drv;
      MatroxDeviceData *mdev = (MatroxDeviceData*) dev;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
 
      matrox_fill_rectangle( mdrv, mdev, rect );
 
@@ -1054,7 +1054,7 @@
 {
      MatroxDriverData *mdrv = (MatroxDriverData*) drv;
      MatroxDeviceData *mdev = (MatroxDeviceData*) dev;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
 
      mga_waitfifo( mdrv, mdev, 6 );
 
@@ -1092,7 +1092,7 @@
 {
      MatroxDriverData *mdrv = (MatroxDriverData*) drv;
      MatroxDeviceData *mdev = (MatroxDeviceData*) dev;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
 
      mga_waitfifo( mdrv, mdev, 3 );
 
@@ -1122,7 +1122,7 @@
                        int Xl, int Xr, int X2l,
                        int X2r, int Y, int dY )
 {
-     volatile __u8 *mmio = mdrv->mmio_base;
+     volatile u8 *mmio = mdrv->mmio_base;
 
      int dxl = X2l - Xl;
      int dxr = ++X2r - ++Xr;
@@ -1130,7 +1130,7 @@
      int dXl = ABS(dxl);
      int dXr = ABS(dxr);
 
-     __u32 sgn = 0;
+     u32 sgn = 0;
 
      mga_waitfifo( mdrv, mdev, 6 );
 
@@ -1158,7 +1158,7 @@
 {
      MatroxDriverData *mdrv = (MatroxDriverData*) drv;
      MatroxDeviceData *mdev = (MatroxDeviceData*) dev;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
 
      mga_waitfifo( mdrv, mdev, 1 );
 
@@ -1217,12 +1217,12 @@
                     int w,  int h,
                     int pitch, int offset )
 {
-     volatile __u8 *mmio = mdrv->mmio_base;
+     volatile u8 *mmio = mdrv->mmio_base;
 
-     __u32 dwgctl = BLTMOD_BFCOL | BOP_COPY | SHFTZERO | ATYPE_RSTR | OP_BITBLT;
-     __u32 start, end;
-     __u32 sgn = 0;
-     __s32 pixelpitch = pitch;
+     u32 dwgctl = BLTMOD_BFCOL | BOP_COPY | SHFTZERO | ATYPE_RSTR | OP_BITBLT;
+     u32 start, end;
+     u32 sgn = 0;
+     s32 pixelpitch = pitch;
 
      if (sx < dx)
           sgn |= BLIT_LEFT;
@@ -1284,7 +1284,7 @@
 {
      MatroxDriverData *mdrv = (MatroxDriverData*) drv;
      MatroxDeviceData *mdev = (MatroxDeviceData*) dev;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
      int               src_field, dst_field;
 
      src_field = rect->y & 1;
@@ -1329,12 +1329,12 @@
                 int w,  int h,
                 int pitch )
 {
-     volatile __u8 *mmio = mdrv->mmio_base;
+     volatile u8 *mmio = mdrv->mmio_base;
 
-     __u32 dwgctl = BLTMOD_BFCOL | BOP_COPY | SHFTZERO | ATYPE_RSTR | OP_BITBLT;
-     __u32 start, end;
-     __u32 sgn = 0;
-     __s32 pixelpitch = pitch;
+     u32 dwgctl = BLTMOD_BFCOL | BOP_COPY | SHFTZERO | ATYPE_RSTR | OP_BITBLT;
+     u32 start, end;
+     u32 sgn = 0;
+     s32 pixelpitch = pitch;
 
      if (sx < dx)
           sgn |= BLIT_LEFT;
@@ -1393,7 +1393,7 @@
 {
      MatroxDriverData *mdrv = (MatroxDriverData*) drv;
      MatroxDeviceData *mdev = (MatroxDeviceData*) dev;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
 
      matroxDoBlit2D( mdrv, mdev,
                      rect->x, rect->y,
@@ -1439,7 +1439,7 @@
 {
      MatroxDriverData *mdrv = (MatroxDriverData*) drv;
      MatroxDeviceData *mdev = (MatroxDeviceData*) dev;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
 
      matroxDoBlit2D( mdrv, mdev,
                      rect->x, rect->y,
@@ -1518,7 +1518,7 @@
 {
      MatroxDriverData *mdrv = (MatroxDriverData*) drv;
      MatroxDeviceData *mdev = (MatroxDeviceData*) dev;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
      int               src_field, dst_field;
 
      src_field = rect->y & 1;
@@ -1560,7 +1560,7 @@
 {
      MatroxDriverData *mdrv = (MatroxDriverData*) drv;
      MatroxDeviceData *mdev = (MatroxDeviceData*) dev;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
      int               src_field, dst_field;
 
      src_field = rect->y & 1;
@@ -1640,7 +1640,7 @@
 {
      MatroxDriverData *mdrv = (MatroxDriverData*) drv;
      MatroxDeviceData *mdev = (MatroxDeviceData*) dev;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
      int               src_field, dst_field;
 
      src_field = rect->y & 1;
@@ -1747,7 +1747,7 @@
 {
      MatroxDriverData *mdrv = (MatroxDriverData*) drv;
      MatroxDeviceData *mdev = (MatroxDeviceData*) dev;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
      int               src_field, dst_field;
 
      src_field = rect->y & 1;
@@ -1798,9 +1798,9 @@
                  int w2, int h2,
                  bool filter )
 {
-     volatile __u8 *mmio = mdrv->mmio_base;
+     volatile u8 *mmio = mdrv->mmio_base;
 
-     __s32 startx, starty, incx, incy;
+     s32 startx, starty, incx, incy;
 
      if (mdev->blit_deinterlace) {
           sy /= 2;
@@ -1856,8 +1856,8 @@
                   DFBRectangle *drect,
                   bool filter )
 {
-     volatile __u8 *mmio = mdrv->mmio_base;
-     __u32          texctl;
+     volatile u8 *mmio = mdrv->mmio_base;
+     u32          texctl;
 
      matroxDoBlitTMU( mdrv, mdev,
                       srect->x, srect->y,
@@ -1882,12 +1882,12 @@
      /* CbCr plane */
      mga_waitfifo( mdrv, mdev, 10 );
      mga_out32( mmio, texctl, TEXCTL );
-     mga_out32( mmio, ( (((__u32)(mdev->w/2 - 1) & 0x7ff) << 18) |
-                        (((__u32)(3 - mdev->w2) & 0x3f) <<  9) |
-                        (((__u32)(mdev->w2 + 3) & 0x3f)      )  ), TEXWIDTH );
-     mga_out32( mmio, ( (((__u32)(mdev->h/2 - 1) & 0x7ff) << 18) |
-                        (((__u32)(3 - mdev->h2) & 0x3f) <<  9) |
-                        (((__u32)(mdev->h2 + 3) & 0x3f)      )  ), TEXHEIGHT );
+     mga_out32( mmio, ( (((u32)(mdev->w/2 - 1) & 0x7ff) << 18) |
+                        (((u32)(3 - mdev->w2) & 0x3f) <<  9) |
+                        (((u32)(mdev->w2 + 3) & 0x3f)      )  ), TEXWIDTH );
+     mga_out32( mmio, ( (((u32)(mdev->h/2 - 1) & 0x7ff) << 18) |
+                        (((u32)(3 - mdev->h2) & 0x3f) <<  9) |
+                        (((u32)(mdev->h2 + 3) & 0x3f)      )  ), TEXHEIGHT );
      mga_out32( mmio, mdev->src_offset[0][1], TEXORG );
 
      mga_out32( mmio, mdev->dst_pitch/2, PITCH );
@@ -1910,12 +1910,12 @@
      /* Restore registers */
      mga_waitfifo( mdrv, mdev, 7 );
      mga_out32( mmio, mdev->texctl, TEXCTL );
-     mga_out32( mmio, ( (((__u32)(mdev->w - 1) & 0x7ff) << 18) |
-                        (((__u32)(4 - mdev->w2) & 0x3f) <<  9) |
-                        (((__u32)(mdev->w2 + 4) & 0x3f)      )  ), TEXWIDTH );
-     mga_out32( mmio, ( (((__u32)(mdev->h - 1) & 0x7ff) << 18) |
-                        (((__u32)(4 - mdev->h2) & 0x3f) <<  9) |
-                        (((__u32)(mdev->h2 + 4) & 0x3f)      )  ), TEXHEIGHT );
+     mga_out32( mmio, ( (((u32)(mdev->w - 1) & 0x7ff) << 18) |
+                        (((u32)(4 - mdev->w2) & 0x3f) <<  9) |
+                        (((u32)(mdev->w2 + 4) & 0x3f)      )  ), TEXWIDTH );
+     mga_out32( mmio, ( (((u32)(mdev->h - 1) & 0x7ff) << 18) |
+                        (((u32)(4 - mdev->h2) & 0x3f) <<  9) |
+                        (((u32)(mdev->h2 + 4) & 0x3f)      )  ), TEXHEIGHT );
      mga_out32( mmio, mdev->src_offset[0][0], TEXORG );
 
      mga_out32( mmio, mdev->dst_pitch, PITCH );
@@ -1932,8 +1932,8 @@
                   DFBRectangle *drect,
                   bool filter )
 {
-     volatile __u8 *mmio = mdrv->mmio_base;
-     __u32          texctl;
+     volatile u8 *mmio = mdrv->mmio_base;
+     u32          texctl;
 
      matroxDoBlitTMU( mdrv, mdev,
                       srect->x, srect->y,
@@ -1958,12 +1958,12 @@
      /* Cb plane */
      mga_waitfifo( mdrv, mdev, 9 );
      mga_out32( mmio, texctl, TEXCTL );
-     mga_out32( mmio, ( (((__u32)(mdev->w/2 - 1) & 0x7ff) << 18) |
-                        (((__u32)(3 - mdev->w2) & 0x3f) <<  9) |
-                        (((__u32)(mdev->w2 + 3) & 0x3f)      )  ), TEXWIDTH );
-     mga_out32( mmio, ( (((__u32)(mdev->h/2 - 1) & 0x7ff) << 18) |
-                        (((__u32)(3 - mdev->h2) & 0x3f) <<  9) |
-                        (((__u32)(mdev->h2 + 3) & 0x3f)      )  ), TEXHEIGHT );
+     mga_out32( mmio, ( (((u32)(mdev->w/2 - 1) & 0x7ff) << 18) |
+                        (((u32)(3 - mdev->w2) & 0x3f) <<  9) |
+                        (((u32)(mdev->w2 + 3) & 0x3f)      )  ), TEXWIDTH );
+     mga_out32( mmio, ( (((u32)(mdev->h/2 - 1) & 0x7ff) << 18) |
+                        (((u32)(3 - mdev->h2) & 0x3f) <<  9) |
+                        (((u32)(mdev->h2 + 3) & 0x3f)      )  ), TEXHEIGHT );
      mga_out32( mmio, mdev->src_offset[0][1], TEXORG );
 
      mga_out32( mmio, mdev->dst_pitch/2, PITCH );
@@ -1998,12 +1998,12 @@
      /* Restore registers */
      mga_waitfifo( mdrv, mdev, 6 );
      mga_out32( mmio, mdev->texctl, TEXCTL );
-     mga_out32( mmio, ( (((__u32)(mdev->w - 1) & 0x7ff) << 18) |
-                        (((__u32)(4 - mdev->w2) & 0x3f) <<  9) |
-                        (((__u32)(mdev->w2 + 4) & 0x3f)      )  ), TEXWIDTH );
-     mga_out32( mmio, ( (((__u32)(mdev->h - 1) & 0x7ff) << 18) |
-                        (((__u32)(4 - mdev->h2) & 0x3f) <<  9) |
-                        (((__u32)(mdev->h2 + 4) & 0x3f)      )  ), TEXHEIGHT );
+     mga_out32( mmio, ( (((u32)(mdev->w - 1) & 0x7ff) << 18) |
+                        (((u32)(4 - mdev->w2) & 0x3f) <<  9) |
+                        (((u32)(mdev->w2 + 4) & 0x3f)      )  ), TEXWIDTH );
+     mga_out32( mmio, ( (((u32)(mdev->h - 1) & 0x7ff) << 18) |
+                        (((u32)(4 - mdev->h2) & 0x3f) <<  9) |
+                        (((u32)(mdev->h2 + 4) & 0x3f)      )  ), TEXHEIGHT );
      mga_out32( mmio, mdev->src_offset[0][0], TEXORG );
 
      mga_out32( mmio, mdev->dst_pitch, PITCH );
@@ -2133,8 +2133,8 @@
                  DFBRectangle *drect,
                  bool filter )
 {
-     volatile __u8 *mmio = mdrv->mmio_base;
-     int            src_field, dst_field;
+     volatile u8 *mmio = mdrv->mmio_base;
+     int          src_field, dst_field;
 
      src_field = srect->y & 1;
      dst_field = drect->y & 1;
@@ -2217,9 +2217,9 @@
 {
      MatroxDriverData *mdrv = (MatroxDriverData*) drv;
      MatroxDeviceData *mdev = (MatroxDeviceData*) dev;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
      int               src_field, dst_field;
-     __u32             texctl;
+     u32               texctl;
 
      src_field = srect->y & 1;
      dst_field = drect->y & 1;
@@ -2264,12 +2264,12 @@
 
      mga_waitfifo( mdrv, mdev, 10 );
      mga_out32( mmio, texctl, TEXCTL );
-     mga_out32( mmio, ( (((__u32)(mdev->w/2 - 1) & 0x7ff) << 18) |
-                        (((__u32)(3 - mdev->w2) & 0x3f) <<  9) |
-                        (((__u32)(mdev->w2 + 3) & 0x3f)      )  ), TEXWIDTH );
-     mga_out32( mmio, ( (((__u32)(mdev->h/2 - 1) & 0x7ff) << 18) |
-                        (((__u32)(3 - mdev->h2) & 0x3f) <<  9) |
-                        (((__u32)(mdev->h2 + 3) & 0x3f)      )  ), TEXHEIGHT );
+     mga_out32( mmio, ( (((u32)(mdev->w/2 - 1) & 0x7ff) << 18) |
+                        (((u32)(3 - mdev->w2) & 0x3f) <<  9) |
+                        (((u32)(mdev->w2 + 3) & 0x3f)      )  ), TEXWIDTH );
+     mga_out32( mmio, ( (((u32)(mdev->h/2 - 1) & 0x7ff) << 18) |
+                        (((u32)(3 - mdev->h2) & 0x3f) <<  9) |
+                        (((u32)(mdev->h2 + 3) & 0x3f)      )  ), TEXHEIGHT );
      mga_out32( mmio, mdev->dst_pitch/2, PITCH );
      mga_out32( mmio, PW16 | NODITHER, MACCESS );
      mga_out32( mmio, (mdev->dst_pitch/2 * mdev->clip.y1/2) & 0xFFFFFF, YTOP );
@@ -2304,12 +2304,12 @@
      /* Restore registers */
      mga_waitfifo( mdrv, mdev, 7 );
      mga_out32( mmio, mdev->texctl, TEXCTL );
-     mga_out32( mmio, ( (((__u32)(mdev->w - 1) & 0x7ff) << 18) |
-                        (((__u32)(4 - mdev->w2) & 0x3f) <<  9) |
-                        (((__u32)(mdev->w2 + 4) & 0x3f)      )  ), TEXWIDTH );
-     mga_out32( mmio, ( (((__u32)(mdev->h - 1) & 0x7ff) << 18) |
-                        (((__u32)(4 - mdev->h2) & 0x3f) <<  9) |
-                        (((__u32)(mdev->h2 + 4) & 0x3f)      )  ), TEXHEIGHT );
+     mga_out32( mmio, ( (((u32)(mdev->w - 1) & 0x7ff) << 18) |
+                        (((u32)(4 - mdev->w2) & 0x3f) <<  9) |
+                        (((u32)(mdev->w2 + 4) & 0x3f)      )  ), TEXWIDTH );
+     mga_out32( mmio, ( (((u32)(mdev->h - 1) & 0x7ff) << 18) |
+                        (((u32)(4 - mdev->h2) & 0x3f) <<  9) |
+                        (((u32)(mdev->h2 + 4) & 0x3f)      )  ), TEXHEIGHT );
      mga_out32( mmio, mdev->dst_pitch, PITCH );
      mga_out32( mmio, PW8 | BYPASS332 | NODITHER, MACCESS );
 
@@ -2327,9 +2327,9 @@
 {
      MatroxDriverData *mdrv = (MatroxDriverData*) drv;
      MatroxDeviceData *mdev = (MatroxDeviceData*) dev;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
      int               src_field, dst_field;
-     __u32             texctl;
+     u32               texctl;
 
      src_field = srect->y & 1;
      dst_field = drect->y & 1;
@@ -2374,12 +2374,12 @@
 
      mga_waitfifo( mdrv, mdev, 9 );
      mga_out32( mmio, texctl, TEXCTL );
-     mga_out32( mmio, ( (((__u32)(mdev->w/2 - 1) & 0x7ff) << 18) |
-                        (((__u32)(3 - mdev->w2) & 0x3f) <<  9) |
-                        (((__u32)(mdev->w2 + 3) & 0x3f)      )  ), TEXWIDTH );
-     mga_out32( mmio, ( (((__u32)(mdev->h/2 - 1) & 0x7ff) << 18) |
-                        (((__u32)(3 - mdev->h2) & 0x3f) <<  9) |
-                        (((__u32)(mdev->h2 + 3) & 0x3f)      )  ), TEXHEIGHT );
+     mga_out32( mmio, ( (((u32)(mdev->w/2 - 1) & 0x7ff) << 18) |
+                        (((u32)(3 - mdev->w2) & 0x3f) <<  9) |
+                        (((u32)(mdev->w2 + 3) & 0x3f)      )  ), TEXWIDTH );
+     mga_out32( mmio, ( (((u32)(mdev->h/2 - 1) & 0x7ff) << 18) |
+                        (((u32)(3 - mdev->h2) & 0x3f) <<  9) |
+                        (((u32)(mdev->h2 + 3) & 0x3f)      )  ), TEXHEIGHT );
      mga_out32( mmio, mdev->dst_pitch/2, PITCH );
      mga_out32( mmio, (mdev->dst_pitch/2 * mdev->clip.y1/2) & 0xFFFFFF, YTOP );
      mga_out32( mmio, (mdev->dst_pitch/2 * mdev->clip.y2/2) & 0xFFFFFF, YBOT );
@@ -2437,12 +2437,12 @@
      /* Restore registers */
      mga_waitfifo( mdrv, mdev, 6 );
      mga_out32( mmio, mdev->texctl, TEXCTL );
-     mga_out32( mmio, ( (((__u32)(mdev->w - 1) & 0x7ff) << 18) |
-                        (((__u32)(4 - mdev->w2) & 0x3f) <<  9) |
-                        (((__u32)(mdev->w2 + 4) & 0x3f)      )  ), TEXWIDTH );
-     mga_out32( mmio, ( (((__u32)(mdev->h - 1) & 0x7ff) << 18) |
-                        (((__u32)(4 - mdev->h2) & 0x3f) <<  9) |
-                        (((__u32)(mdev->h2 + 4) & 0x3f)      )  ), TEXHEIGHT );
+     mga_out32( mmio, ( (((u32)(mdev->w - 1) & 0x7ff) << 18) |
+                        (((u32)(4 - mdev->w2) & 0x3f) <<  9) |
+                        (((u32)(mdev->w2 + 4) & 0x3f)      )  ), TEXWIDTH );
+     mga_out32( mmio, ( (((u32)(mdev->h - 1) & 0x7ff) << 18) |
+                        (((u32)(4 - mdev->h2) & 0x3f) <<  9) |
+                        (((u32)(mdev->h2 + 4) & 0x3f)      )  ), TEXHEIGHT );
      mga_out32( mmio, mdev->dst_pitch, PITCH );
 
      mga_out32( mmio, mdev->src_offset[0][0], TEXORG );
@@ -2455,14 +2455,14 @@
 
 /******************************************************************************/
 
-static __u32 pci_config_in32( unsigned int bus,
-                              unsigned int slot,
-                              unsigned int func,
-                              __u8 reg )
+static u32 pci_config_in32( unsigned int bus,
+                            unsigned int slot,
+                            unsigned int func,
+                            u8 reg )
 {
      char  filename[512];
      int   fd;
-     __u32 val;
+     u32 val;
 
      snprintf( filename, 512,
                "/proc/bus/pci/%02x/%02x.%x",
@@ -2626,7 +2626,7 @@
 {
      MatroxDriverData *mdrv = driver_data;
 
-     mdrv->mmio_base = (volatile __u8*) dfb_gfxcard_map_mmio( device, 0, -1 );
+     mdrv->mmio_base = (volatile u8*) dfb_gfxcard_map_mmio( device, 0, -1 );
      if (!mdrv->mmio_base)
           return DFB_IO;
 
@@ -2703,7 +2703,7 @@
 {
      MatroxDriverData *mdrv = (MatroxDriverData*) driver_data;
      MatroxDeviceData *mdev = (MatroxDeviceData*) device_data;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
      unsigned int      bus, slot, func;
      bool              g450, g550, sgram = false;
      DFBResult         ret;
@@ -2831,7 +2831,7 @@
 
      /* soft reset to fix eventually corrupted TMU read offset on G200 */
      if (mdrv->accelerator == FB_ACCEL_MATROX_MGAG200) {
-          __u32 ien = mga_in32( mmio, IEN );
+          u32 ien = mga_in32( mmio, IEN );
           mga_out32( mmio, 1, RST );
           usleep(10);
           mga_out32( mmio, 0, RST );
Index: gfxdrivers/matrox/matrox.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/matrox/matrox.h,v
retrieving revision 1.42
diff -u -r1.42 matrox.h
--- gfxdrivers/matrox/matrox.h	13 Sep 2006 21:35:43 -0000	1.42
+++ gfxdrivers/matrox/matrox.h	7 Oct 2006 19:54:36 -0000
@@ -85,7 +85,7 @@
      unsigned int fifo_cache_hits;
 
      /* ATYPE_BLK or ATYPE_RSTR, depending on SGRAM setting */
-     __u32 atype_blk_rstr;
+     u32 atype_blk_rstr;
 
      /* State handling */
      MatroxStateBits valid;
@@ -96,7 +96,7 @@
      int src_pitch;
      int src_offset[2][3];
      int w, h, w2, h2;
-     __u32 color[3];
+     u32 color[3];
 
      bool draw_blend;
      bool blit_src_colorkey;
@@ -107,9 +107,9 @@
 
      bool depth_buffer;
 
-     __u32 texctl;
+     u32 texctl;
 
-     __u32 idle_status;
+     u32 idle_status;
 
      DFBRegion clip;
 
@@ -126,7 +126,7 @@
 typedef struct {
      int            accelerator;
      int            maven_fd;
-     volatile __u8 *mmio_base;
+     volatile u8   *mmio_base;
 
      CoreScreen    *primary;
      CoreScreen    *secondary;
Index: gfxdrivers/matrox/matrox_3d.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/matrox/matrox_3d.c,v
retrieving revision 1.7
diff -u -r1.7 matrox_3d.c
--- gfxdrivers/matrox/matrox_3d.c	27 Jun 2006 21:16:26 -0000	1.7
+++ gfxdrivers/matrox/matrox_3d.c	7 Oct 2006 19:54:36 -0000
@@ -47,9 +47,9 @@
 #define CEIL(x) my_ceil(x)
 #define FLOOR(x) my_floor(x)
 #else
-#define RINT(x) ((__s32)(x))
-#define CEIL(x) ((__s32)ceil(x))
-#define FLOOR(x) ((__s32)floor(x))
+#define RINT(x) ((s32)(x))
+#define CEIL(x) ((s32)ceil(x))
+#define FLOOR(x) ((s32)floor(x))
 #endif
 
 
@@ -99,9 +99,9 @@
 
 #define F2COL(x) (RINT(x) & 0x00ffffff)
 
-#define mgaF1800(x) (((__s32) (x)) & 0x0003ffff)
-#define mgaF2400(x) (((__s32) (x)) & 0x00ffffff)
-#define mgaF2200(x) (((__s32) (x)) & 0x003fffff)
+#define mgaF1800(x) (((s32) (x)) & 0x0003ffff)
+#define mgaF2400(x) (((s32) (x)) & 0x00ffffff)
+#define mgaF2200(x) (((s32) (x)) & 0x003fffff)
 
 #define OUTREG(r,d)  do { mga_out32( mmio, d, r ); } while (0)
 
@@ -216,7 +216,7 @@
      int         Shape; /* 1 = Top half, 2 = bottom half, 3 = top+bottom */
 //     float       bf = mga_bf_sign;
 
-     volatile __u8 *mmio = mdrv->mmio_base;
+     volatile u8 *mmio = mdrv->mmio_base;
 
 /* find the order of the 3 vertices along the Y axis */
      {
@@ -476,7 +476,7 @@
           }
 
           {
-               __u32 sgn = 0;
+               u32 sgn = 0;
 
                mga_waitfifo( mdrv, mdev, 9 );
 
@@ -491,8 +491,8 @@
                }
 
                mga_out32( mmio, sgn,                            SGN );
-               mga_out32( mmio, ((__u32)(eLeft->sx) & 0xFFFF) | ((__u32)(eRight->sx) << 16), FXBNDRY );
-               mga_out32( mmio, lines     | ((__u32)(eLeft->sy)  << 16), YDSTLEN | EXECUTE );
+               mga_out32( mmio, ((u32)(eLeft->sx) & 0xFFFF) | ((u32)(eRight->sx) << 16), FXBNDRY );
+               mga_out32( mmio, lines     | ((u32)(eLeft->sy)  << 16), YDSTLEN | EXECUTE );
 
                if (Shape != 3) { /* has only one half? */
                     return;
@@ -535,8 +535,8 @@
      int               i;
      MatroxDriverData *mdrv = (MatroxDriverData*) drv;
      MatroxDeviceData *mdev = (MatroxDeviceData*) dev;
-     volatile __u8    *mmio = mdrv->mmio_base;
-     __u32             dwgctl;
+     volatile u8      *mmio = mdrv->mmio_base;
+     u32               dwgctl;
 
      float wScale;
 
Index: gfxdrivers/matrox/matrox_bes.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/matrox/matrox_bes.c,v
retrieving revision 1.67
diff -u -r1.67 matrox_bes.c
--- gfxdrivers/matrox/matrox_bes.c	22 Jun 2006 00:04:23 -0000	1.67
+++ gfxdrivers/matrox/matrox_bes.c	7 Oct 2006 19:54:37 -0000
@@ -52,36 +52,36 @@
      /* Stored registers */
      struct {
           /* BES */
-          __u32 besGLOBCTL;
-          __u32 besA1ORG;
-          __u32 besA2ORG;
-          __u32 besA1CORG;
-          __u32 besA2CORG;
-          __u32 besA1C3ORG;
-          __u32 besA2C3ORG;
-          __u32 besCTL;
+          u32 besGLOBCTL;
+          u32 besA1ORG;
+          u32 besA2ORG;
+          u32 besA1CORG;
+          u32 besA2CORG;
+          u32 besA1C3ORG;
+          u32 besA2C3ORG;
+          u32 besCTL;
 
-          __u32 besCTL_field;
+          u32 besCTL_field;
 
-          __u32 besHCOORD;
-          __u32 besVCOORD;
+          u32 besHCOORD;
+          u32 besVCOORD;
 
-          __u32 besHSRCST;
-          __u32 besHSRCEND;
-          __u32 besHSRCLST;
+          u32 besHSRCST;
+          u32 besHSRCEND;
+          u32 besHSRCLST;
 
-          __u32 besPITCH;
+          u32 besPITCH;
 
-          __u32 besV1WGHT;
-          __u32 besV2WGHT;
+          u32 besV1WGHT;
+          u32 besV2WGHT;
 
-          __u32 besV1SRCLST;
-          __u32 besV2SRCLST;
+          u32 besV1SRCLST;
+          u32 besV2SRCLST;
 
-          __u32 besVISCAL;
-          __u32 besHISCAL;
+          u32 besVISCAL;
+          u32 besHISCAL;
 
-          __u8  xKEYOPMODE;
+          u8    xKEYOPMODE;
      } regs;
 } MatroxBesLayerData;
 
@@ -111,7 +111,7 @@
               DFBColorAdjustment         *adjustment )
 {
      MatroxDriverData   *mdrv = (MatroxDriverData*) driver_data;
-     volatile __u8      *mmio = mdrv->mmio_base;
+     volatile u8        *mmio = mdrv->mmio_base;
 
      /* set capabilities and type */
      description->caps = DLCAPS_SCREEN_LOCATION | DLCAPS_SURFACE |
@@ -256,7 +256,7 @@
 {
      MatroxDriverData   *mdrv = (MatroxDriverData*) driver_data;
      MatroxBesLayerData *mbes = (MatroxBesLayerData*) layer_data;
-     volatile __u8      *mmio = mdrv->mmio_base;
+     volatile u8        *mmio = mdrv->mmio_base;
 
      /* remember configuration */
      mbes->config = *config;
@@ -341,13 +341,13 @@
                        DFBColorAdjustment *adj )
 {
      MatroxDriverData *mdrv = (MatroxDriverData*) driver_data;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
 
      if (mdrv->accelerator == FB_ACCEL_MATROX_MGAG200)
           return DFB_UNSUPPORTED;
 
      mga_out32( mmio, (adj->contrast >> 8) |
-                      ((__u8)(((int)adj->brightness >> 8) - 128)) << 16,
+                      ((u8)(((int)adj->brightness >> 8) - 128)) << 16,
                 BESLUMACTL );
 
      return DFB_OK;
@@ -391,7 +391,7 @@
                           bool onsync )
 {
      int            line = 0;
-     volatile __u8 *mmio = mdrv->mmio_base;
+     volatile u8   *mmio = mdrv->mmio_base;
      VideoMode     *mode = dfb_system_current_mode();
 
      if (!mode) {
@@ -503,15 +503,15 @@
 
      /* scale crop values to source dimensions */
      if (cropleft)
-          cropleft = ((__u64) (source.w << 16) * cropleft / dest.w) & ~0x3;
+          cropleft = ((u64) (source.w << 16) * cropleft / dest.w) & ~0x3;
      if (croptop)
-          croptop = ((__u64) (source.h << 16) * croptop / dest.h) & ~0x3;
+          croptop = ((u64) (source.h << 16) * croptop / dest.h) & ~0x3;
      if (cropright)
-          cropright = ((__u64) (source.w << 16) * cropright / dest.w) & ~0x3;
+          cropright = ((u64) (source.w << 16) * cropright / dest.w) & ~0x3;
      if (cropbot)
-          cropbot = ((__u64) (source.h << 16) * cropbot / dest.h) & ~0x3;
+          cropbot = ((u64) (source.h << 16) * cropbot / dest.h) & ~0x3;
      if (croptop_uv)
-          croptop_uv = ((__u64) ((source.h/2) << 16) * croptop_uv / dest.h) & ~0x3;
+          croptop_uv = ((u64) ((source.h/2) << 16) * croptop_uv / dest.h) & ~0x3;
 
      /* should horizontal zoom be used? */
      if (mdev->g450_matrox)
Index: gfxdrivers/matrox/matrox_crtc2.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/matrox/matrox_crtc2.c,v
retrieving revision 1.36
diff -u -r1.36 matrox_crtc2.c
--- gfxdrivers/matrox/matrox_crtc2.c	22 Jun 2006 00:04:23 -0000	1.36
+++ gfxdrivers/matrox/matrox_crtc2.c	7 Oct 2006 19:54:37 -0000
@@ -52,20 +52,20 @@
      /* Stored registers */
      struct {
           /* CRTC2 */
-          __u32 c2CTL;
-          __u32 c2DATACTL;
-          __u32 c2MISC;
-          __u32 c2OFFSET;
-
-          __u32 c2HPARAM;
-          __u32 c2VPARAM;
-
-          __u32 c2STARTADD0;
-          __u32 c2STARTADD1;
-          __u32 c2PL2STARTADD0;
-          __u32 c2PL2STARTADD1;
-          __u32 c2PL3STARTADD0;
-          __u32 c2PL3STARTADD1;
+          u32 c2CTL;
+          u32 c2DATACTL;
+          u32 c2MISC;
+          u32 c2OFFSET;
+
+          u32 c2HPARAM;
+          u32 c2VPARAM;
+
+          u32 c2STARTADD0;
+          u32 c2STARTADD1;
+          u32 c2PL2STARTADD0;
+          u32 c2PL2STARTADD1;
+          u32 c2PL3STARTADD0;
+          u32 c2PL3STARTADD1;
      } regs;
 
      MatroxMavenData mav;
@@ -306,7 +306,7 @@
 {
      MatroxDriverData     *mdrv    = (MatroxDriverData*) driver_data;
      MatroxCrtc2LayerData *mcrtc2  = (MatroxCrtc2LayerData*) layer_data;
-     volatile __u8        *mmio    = mdrv->mmio_base;
+     volatile u8          *mmio    = mdrv->mmio_base;
 
      crtc2_calc_buffer( mdrv, mcrtc2, surface, false );
 
@@ -398,7 +398,7 @@
 static void crtc2_set_regs( MatroxDriverData     *mdrv,
                             MatroxCrtc2LayerData *mcrtc2 )
 {
-     volatile __u8 *mmio = mdrv->mmio_base;
+     volatile u8 *mmio = mdrv->mmio_base;
 
      mga_out32( mmio, mcrtc2->regs.c2CTL,     C2CTL );
      mga_out32( mmio, mcrtc2->regs.c2DATACTL, C2DATACTL );
@@ -568,7 +568,7 @@
 static void crtc2_set_buffer( MatroxDriverData     *mdrv,
                               MatroxCrtc2LayerData *mcrtc2 )
 {
-     volatile __u8 *mmio = mdrv->mmio_base;
+     volatile u8 *mmio = mdrv->mmio_base;
 
      mga_out32( mmio, mcrtc2->regs.c2STARTADD0, C2STARTADD0 );
      mga_out32( mmio, mcrtc2->regs.c2STARTADD1, C2STARTADD1 );
@@ -583,7 +583,7 @@
             MatroxCrtc2LayerData *mcrtc2,
             int                   on )
 {
-     volatile __u8 *mmio = mdrv->mmio_base;
+     volatile u8 *mmio = mdrv->mmio_base;
 
      if (on)
           mcrtc2->regs.c2CTL |= C2EN;
@@ -606,8 +606,8 @@
 static void crtc2_set_mafc( MatroxDriverData     *mdrv,
                             int                   on )
 {
-     volatile __u8 *mmio = mdrv->mmio_base;
-     __u8           val;
+     volatile u8   *mmio = mdrv->mmio_base;
+     u8             val;
 
      val = mga_in_dac( mmio, XMISCCTRL );
      if (on) {
@@ -639,8 +639,8 @@
      maven_close( mav, mdrv );
 
      if (mdev->g450_matrox) {
-          volatile __u8 *mmio = mdrv->mmio_base;
-          __u8           val;
+          volatile u8   *mmio = mdrv->mmio_base;
+          u8             val;
 
           /* Set Rset to 0.7 V */
           val = mga_in_dac( mmio, XGENIOCTRL );
@@ -669,15 +669,15 @@
 {
      MatroxDeviceData *mdev = mdrv->device_data;
      MatroxMavenData  *mav  = &mcrtc2->mav;
-     volatile __u8    *mmio = mdrv->mmio_base;
+     volatile u8      *mmio = mdrv->mmio_base;
      DFBResult         res;
 
      if ((res = maven_open( mav, mdrv )) != DFB_OK)
           return res;
 
      if (mdev->g450_matrox) {
-          volatile __u8 *mmio = mdrv->mmio_base;
-          __u8           val;
+          volatile u8   *mmio = mdrv->mmio_base;
+          u8             val;
 
           /* Set Rset to 1.0 V */
           val = mga_in_dac( mmio, XGENIOCTRL );
Index: gfxdrivers/matrox/matrox_maven.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/matrox/matrox_maven.c,v
retrieving revision 1.23
diff -u -r1.23 matrox_maven.c
--- gfxdrivers/matrox/matrox_maven.c	27 Jun 2006 21:16:26 -0000	1.23
+++ gfxdrivers/matrox/matrox_maven.c	7 Oct 2006 19:54:37 -0000
@@ -55,13 +55,13 @@
 static void
 maven_write_byte( MatroxMavenData  *mav,
                   MatroxDriverData *mdrv,
-                  __u8              reg,
-                  __u8              val )
+                  u8                reg,
+                  u8                val )
 {
      MatroxDeviceData *mdev = mdrv->device_data;
 
      if (mdev->g450_matrox) {
-          volatile __u8 *mmio = mdrv->mmio_base;
+          volatile u8 *mmio = mdrv->mmio_base;
 
           mga_out_dac( mmio, 0x87, reg );
           mga_out_dac( mmio, 0x88, val );
@@ -72,13 +72,13 @@
 static void
 maven_write_word( MatroxMavenData  *mav,
                   MatroxDriverData *mdrv,
-                  __u8              reg,
-                  __u16             val )
+                  u8                reg,
+                  u16               val )
 {
      MatroxDeviceData *mdev = mdrv->device_data;
 
      if (mdev->g450_matrox) {
-          volatile __u8 *mmio = mdrv->mmio_base;
+          volatile u8 *mmio = mdrv->mmio_base;
 
           mga_out_dac( mmio, 0x87, reg );
           mga_out_dac( mmio, 0x88, val );
@@ -91,10 +91,10 @@
 #if 0
 /* i2c_smbus_read_byte_data() doesn't work with maven. */
 static int
-i2c_read_byte( int fd, __u8 addr, __u8 reg )
+i2c_read_byte( int fd, u8 addr, u8 reg )
 {
      int ret;
-     __u8 val;
+     u8 val;
      struct i2c_msg msgs[] = {
           { addr, I2C_M_REV_DIR_ADDR, sizeof(reg), &reg },
           { addr, I2C_M_RD | I2C_M_NOSTART, sizeof(val), &val }
@@ -287,7 +287,7 @@
 void
 maven_set_hue( MatroxMavenData  *mav,
                MatroxDriverData *mdrv,
-               __u8              hue )
+               u8                hue )
 {
      maven_write_byte( mav, mdrv, 0x25, hue );
 }
@@ -295,7 +295,7 @@
 void
 maven_set_saturation( MatroxMavenData  *mav,
                       MatroxDriverData *mdrv,
-                      __u8              saturation )
+                      u8                saturation )
 {
      maven_write_byte( mav, mdrv, 0x20, saturation );
      maven_write_byte( mav, mdrv, 0x22, saturation );
@@ -304,8 +304,8 @@
 void
 maven_set_bwlevel( MatroxMavenData  *mav,
                    MatroxDriverData *mdrv,
-                   __u8              brightness,
-                   __u8              contrast )
+                   u8                brightness,
+                   u8                contrast )
 {
      MatroxDeviceData *mdev = mdrv->device_data;
      int b, c, bl, wl, wlmax, blmin, range;
@@ -491,7 +491,7 @@
 
      /* Maven registers */
      {
-          static const __u8 ntscregs[2][0x40] = {
+          static const u8 ntscregs[2][0x40] = {
           /* G400 */
           {
                0x21, 0xF0, 0x7C, 0x1F, /* 00-03 */
@@ -603,7 +603,7 @@
                0x00
           }
           };
-          static const __u8 palregs[2][0x40] = {
+          static const u8 palregs[2][0x40] = {
           /* G400 */
           {
                0x2A, 0x09, 0x8A, 0xCB, /* 00-03 */
Index: gfxdrivers/matrox/matrox_maven.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/matrox/matrox_maven.h,v
retrieving revision 1.5
diff -u -r1.5 matrox_maven.h
--- gfxdrivers/matrox/matrox_maven.h	16 Jan 2005 20:50:51 -0000	1.5
+++ gfxdrivers/matrox/matrox_maven.h	7 Oct 2006 19:54:37 -0000
@@ -26,8 +26,8 @@
 
 typedef struct {
      char dev[256];
-     __u8 regs[256];
-     __u8 address;
+     u8 regs[256];
+     u8 address;
 } MatroxMavenData;
 
 DFBResult maven_init( MatroxMavenData  *mav,
@@ -52,13 +52,13 @@
 
 void maven_set_hue( MatroxMavenData  *mav,
                     MatroxDriverData *mdrv,
-                    __u8              hue );
+                    u8                hue );
 void maven_set_saturation( MatroxMavenData  *mav,
                            MatroxDriverData *mdrv,
-                           __u8              saturation );
+                           u8                saturation );
 void maven_set_bwlevel( MatroxMavenData  *mav,
                         MatroxDriverData *mdrv,
-                        __u8              brightness,
-                        __u8              contrast );
+                        u8                brightness,
+                        u8                contrast );
 
 #endif
Index: gfxdrivers/matrox/matrox_spic.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/matrox/matrox_spic.c,v
retrieving revision 1.21
diff -u -r1.21 matrox_spic.c
--- gfxdrivers/matrox/matrox_spic.c	22 Jun 2006 00:04:23 -0000	1.21
+++ gfxdrivers/matrox/matrox_spic.c	7 Oct 2006 19:54:37 -0000
@@ -49,11 +49,11 @@
      /* Stored registers */
      struct {
           /* CRTC2 sub picture */
-          __u32 c2DATACTL;
+          u32 c2DATACTL;
 
-          __u32 c2SPICSTARTADD0;
-          __u32 c2SPICSTARTADD1;
-          __u32 c2SUBPICLUT;
+          u32 c2SPICSTARTADD0;
+          u32 c2SPICSTARTADD1;
+          u32 c2SUBPICLUT;
      } regs;
 } MatroxSpicLayerData;
 
@@ -179,13 +179,13 @@
      MatroxDriverData    *mdrv  = (MatroxDriverData*) driver_data;
      MatroxSpicLayerData *mspic = (MatroxSpicLayerData*) layer_data;
      MatroxDeviceData    *mdev  = mdrv->device_data;
-     volatile __u8       *mmio  = mdrv->mmio_base;
+     volatile u8         *mmio  = mdrv->mmio_base;
 
      /* remember configuration */
      mspic->config = *config;
 
      if (updated & CLRCF_PALETTE) {
-          __u8 y, cb, cr;
+          u8 y, cb, cr;
           int  i;
 
           for (i = 0; i < 16; i++) {
@@ -238,7 +238,7 @@
 {
      MatroxDriverData    *mdrv  = (MatroxDriverData*) driver_data;
      MatroxSpicLayerData *mspic = (MatroxSpicLayerData*) layer_data;
-     volatile __u8       *mmio  = mdrv->mmio_base;
+     volatile u8         *mmio  = mdrv->mmio_base;
 
      mspic->regs.c2DATACTL = mga_in32( mmio, C2DATACTL );
 
@@ -302,7 +302,7 @@
 static void spic_set_buffer( MatroxDriverData    *mdrv,
                              MatroxSpicLayerData *mspic )
 {
-     volatile __u8 *mmio = mdrv->mmio_base;
+     volatile u8 *mmio = mdrv->mmio_base;
 
      mga_out32( mmio, mspic->regs.c2SPICSTARTADD0, C2SPICSTARTADD0 );
      mga_out32( mmio, mspic->regs.c2SPICSTARTADD1, C2SPICSTARTADD1 );
Index: gfxdrivers/matrox/matrox_state.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/matrox/matrox_state.c,v
retrieving revision 1.63
diff -u -r1.63 matrox_state.c
--- gfxdrivers/matrox/matrox_state.c	13 Sep 2006 21:35:43 -0000	1.63
+++ gfxdrivers/matrox/matrox_state.c	7 Oct 2006 19:54:37 -0000
@@ -134,7 +134,7 @@
                                   MatroxDeviceData *mdev,
                                   CardState        *state )
 {
-     volatile __u8 *mmio            = mdrv->mmio_base;
+     volatile u8   *mmio            = mdrv->mmio_base;
      CoreSurface   *destination     = state->destination;
      SurfaceBuffer *buffer          = destination->back_buffer;
      SurfaceBuffer *depth_buffer    = destination->depth_buffer;
@@ -208,7 +208,7 @@
                       MatroxDeviceData *mdev,
                       DFBRegion        *clip )
 {
-     volatile __u8 *mmio = mdrv->mmio_base;
+     volatile u8 *mmio = mdrv->mmio_base;
 
      mga_waitfifo( mdrv, mdev, 3 );
 
@@ -231,7 +231,7 @@
                                 CardState        *state )
 {
      DFBColor       color = state->color;
-     volatile __u8 *mmio  = mdrv->mmio_base;
+     volatile u8   *mmio  = mdrv->mmio_base;
 
      if (MGA_IS_VALID( m_drawColor ))
           return;
@@ -259,7 +259,7 @@
                                 CardState        *state )
 {
      DFBColor       color = state->color;
-     volatile __u8 *mmio  = mdrv->mmio_base;
+     volatile u8   *mmio  = mdrv->mmio_base;
 
      if (MGA_IS_VALID( m_blitColor ))
           return;
@@ -295,10 +295,10 @@
                             CardState        *state )
 {
      DFBColor       color = state->color;
-     volatile __u8 *mmio  = mdrv->mmio_base;
+     volatile u8   *mmio  = mdrv->mmio_base;
 
-     __u32 fcol;
-     __u8  cb, cr;
+     u32 fcol;
+     u8  cb, cr;
 
      if (MGA_IS_VALID( m_color ))
           return;
@@ -427,7 +427,7 @@
      MGA_INVALIDATE( m_srckey );
 }
 
-static __u32 matroxSourceBlend[] = {
+static u32 matroxSourceBlend[] = {
      SRC_ZERO,                /* DSBF_ZERO         */
      SRC_ONE,                 /* DSBF_ONE          */
      0,                       /* DSBF_SRCCOLOR     */
@@ -441,7 +441,7 @@
      SRC_SRC_ALPHA_SATURATE   /* DSBF_SRCALPHASAT  */
 };
 
-static __u32 matroxDestBlend[] = {
+static u32 matroxDestBlend[] = {
      DST_ZERO,                /* DSBF_ZERO         */
      DST_ONE,                 /* DSBF_ONE          */
      DST_SRC_COLOR,           /* DSBF_SRCCOLOR     */
@@ -459,9 +459,9 @@
                                 MatroxDeviceData *mdev,
                                 CardState        *state )
 {
-     volatile __u8 *mmio = mdrv->mmio_base;
+     volatile u8 *mmio = mdrv->mmio_base;
 
-     __u32 alphactrl;
+     u32 alphactrl;
 
      if (MGA_IS_VALID( m_drawBlend ))
           return;
@@ -477,7 +477,7 @@
      MGA_INVALIDATE( m_blitBlend );
 }
 
-static __u32 matroxAlphaSelect[] = {
+static u32 matroxAlphaSelect[] = {
      0,
      0,
      DIFFUSEDALPHA,
@@ -488,9 +488,9 @@
                                 MatroxDeviceData *mdev,
                                 CardState        *state )
 {
-     volatile __u8 *mmio = mdrv->mmio_base;
+     volatile u8 *mmio = mdrv->mmio_base;
 
-     __u32 alphactrl;
+     u32 alphactrl;
 
      if (MGA_IS_VALID( m_blitBlend ))
           return;
@@ -541,8 +541,8 @@
                              MatroxDeviceData *mdev,
                              CorePalette      *palette )
 {
-     volatile __u8  *mmio = mdrv->mmio_base;
-     volatile __u16 *dst  = dfb_gfxcard_memory_virtual( NULL, mdev->tlut_offset );
+     volatile u8  *mmio = mdrv->mmio_base;
+     volatile u16 *dst  = dfb_gfxcard_memory_virtual( NULL, mdev->tlut_offset );
      int             i;
 
      for (i = 0; i < palette->num_entries; i++)
@@ -578,11 +578,11 @@
                              MatroxDeviceData *mdev,
                              CardState        *state )
 {
-     volatile __u8 *mmio            = mdrv->mmio_base;
+     volatile u8   *mmio            = mdrv->mmio_base;
      CoreSurface   *surface         = state->source;
      SurfaceBuffer *buffer          = surface->front_buffer;
      int            bytes_per_pixel = DFB_BYTES_PER_PIXEL(surface->format);
-     __u32          texctl = 0, texctl2 = 0;
+     u32            texctl = 0, texctl2 = 0;
 
      if (MGA_IS_VALID( m_Source ))
           return;
@@ -685,13 +685,13 @@
      mga_out32( mmio, texctl,  TEXCTL );
      mga_out32( mmio, texctl2, TEXCTL2 );
 
-     mga_out32( mmio, ( (((__u32)(mdev->w - 1) & 0x7ff) << 18) |
-                        (((__u32)(4 - mdev->w2) & 0x3f) <<  9) |
-                        (((__u32)(mdev->w2 + 4) & 0x3f)      )  ), TEXWIDTH );
-
-     mga_out32( mmio, ( (((__u32)(mdev->h - 1) & 0x7ff) << 18) |
-                        (((__u32)(4 - mdev->h2) & 0x3f) <<  9) |
-                        (((__u32)(mdev->h2 + 4) & 0x3f)      )  ), TEXHEIGHT );
+     mga_out32( mmio, ( (((u32)(mdev->w - 1) & 0x7ff) << 18) |
+                        (((u32)(4 - mdev->w2) & 0x3f) <<  9) |
+                        (((u32)(mdev->w2 + 4) & 0x3f)      )  ), TEXWIDTH );
+
+     mga_out32( mmio, ( (((u32)(mdev->h - 1) & 0x7ff) << 18) |
+                        (((u32)(4 - mdev->h2) & 0x3f) <<  9) |
+                        (((u32)(mdev->h2 + 4) & 0x3f)      )  ), TEXHEIGHT );
 
      mga_out32( mmio, mdev->src_offset[0][0], TEXORG );
 
@@ -702,7 +702,7 @@
                              MatroxDeviceData *mdev,
                              CardState        *state )
 {
-     volatile __u8 *mmio            = mdrv->mmio_base;
+     volatile u8   *mmio            = mdrv->mmio_base;
      CoreSurface   *surface         = state->source;
      SurfaceBuffer *buffer          = surface->front_buffer;
      int            bytes_per_pixel = DFB_BYTES_PER_PIXEL(surface->format);
@@ -734,10 +734,10 @@
                              MatroxDeviceData *mdev,
                              CardState        *state )
 {
-     volatile __u8 *mmio    = mdrv->mmio_base;
+     volatile u8   *mmio    = mdrv->mmio_base;
      CoreSurface   *surface = state->source;
-     __u32          key;
-     __u32          mask;
+     u32            key;
+     u32            mask;
 
      if (MGA_IS_VALID( m_SrcKey ))
           return;
@@ -762,10 +762,10 @@
                              MatroxDeviceData *mdev,
                              CardState        *state )
 {
-     volatile __u8 *mmio    = mdrv->mmio_base;
+     volatile u8   *mmio    = mdrv->mmio_base;
      CoreSurface   *surface = state->source;
-     __u32          key;
-     __u32          mask;
+     u32            key;
+     u32            mask;
 
      if (MGA_IS_VALID( m_srckey ))
           return;
Index: gfxdrivers/matrox/mmio.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/matrox/mmio.h,v
retrieving revision 1.16
diff -u -r1.16 mmio.h
--- gfxdrivers/matrox/mmio.h	1 Dec 2005 10:52:50 -0000	1.16
+++ gfxdrivers/matrox/mmio.h	7 Oct 2006 19:54:37 -0000
@@ -33,38 +33,38 @@
 #include "matrox.h"
 
 static inline void
-mga_out8(volatile __u8 *mmioaddr, __u8 value, __u32 reg)
+mga_out8(volatile u8 *mmioaddr, u8 value, u32 reg)
 {
-     *((volatile __u8*)(mmioaddr+reg)) = value;
+     *((volatile u8*)(mmioaddr+reg)) = value;
 }
 
 static inline void
-mga_out32(volatile __u8 *mmioaddr, __u32 value, __u32 reg)
+mga_out32(volatile u8 *mmioaddr, u32 value, u32 reg)
 {
 #ifdef __powerpc__
      asm volatile("stwbrx %0,%1,%2;eieio" : : "r"(value), "b"(reg), "r"(mmioaddr) : "memory");
 #else
-     *((volatile __u32*)(mmioaddr+reg)) = value;
+     *((volatile u32*)(mmioaddr+reg)) = value;
 #endif
 }
 
-static inline __u8
-mga_in8(volatile __u8 *mmioaddr, __u32 reg)
+static inline u8
+mga_in8(volatile u8 *mmioaddr, u32 reg)
 {
-     return *((volatile __u8*)(mmioaddr+reg));
+     return *((volatile u8*)(mmioaddr+reg));
 }
 
-static inline __u32
-mga_in32(volatile __u8 *mmioaddr, __u32 reg)
+static inline u32
+mga_in32(volatile u8 *mmioaddr, u32 reg)
 {
 #ifdef __powerpc__
-     __u32 value;
+     u32 value;
 
      asm volatile("lwbrx %0,%1,%2;eieio" : "=r"(value) : "b"(reg), "r"(mmioaddr));
 
      return value;
 #else
-     return *((volatile __u32*)(mmioaddr+reg));
+     return *((volatile u32*)(mmioaddr+reg));
 #endif
 }
 
@@ -100,14 +100,14 @@
 }
 
 static inline void
-mga_out_dac( volatile __u8 *mmioaddr, __u8 reg, __u8 val )
+mga_out_dac( volatile u8 *mmioaddr, u8 reg, u8 val )
 {
      mga_out8( mmioaddr, reg, DAC_INDEX );
      mga_out8( mmioaddr, val, DAC_DATA );
 }
 
-static inline __u8
-mga_in_dac( volatile __u8 *mmioaddr, __u8 reg )
+static inline u8
+mga_in_dac( volatile u8 *mmioaddr, u8 reg )
 {
      mga_out8( mmioaddr, reg, DAC_INDEX );
      return mga_in8( mmioaddr, DAC_DATA );
Index: gfxdrivers/matrox/regs.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/matrox/regs.h,v
retrieving revision 1.26
diff -u -r1.26 regs.h
--- gfxdrivers/matrox/regs.h	26 Oct 2005 05:38:39 -0000	1.26
+++ gfxdrivers/matrox/regs.h	7 Oct 2006 19:54:37 -0000
@@ -28,12 +28,12 @@
 #ifndef __MATROX__REGS_H__
 #define __MATROX__REGS_H__
 
-#define U8_TO_F0915(x)          (((__u32) ((x+1) << 15)) & 0x00FFFFFF)
+#define U8_TO_F0915(x)          (((u32) ((x+1) << 15)) & 0x00FFFFFF)
 
-#define RS16(val)               ( (__u16)((__s16)(val)))
-#define RS18(val)               (((__u32)((__s32)(val)))&0x003ffff)
-#define RS24(val)               (((__u32)((__s32)(val)))&0x0ffffff)
-#define RS27(val)               (((__u32)((__s32)(val)))&0x7ffffff)
+#define RS16(val)               ( (u16)((s16)(val)))
+#define RS18(val)               (((u32)((s32)(val)))&0x003ffff)
+#define RS24(val)               (((u32)((s32)(val)))&0x0ffffff)
+#define RS27(val)               (((u32)((s32)(val)))&0x7ffffff)
 
 #define DWGSYNC          0x2C4C
 #define SYNC_DMA_BUSY    0x8325340              /* just a random number */
Index: gfxdrivers/neomagic/neo2200.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/neomagic/neo2200.c,v
retrieving revision 1.19
diff -u -r1.19 neo2200.c
--- gfxdrivers/neomagic/neo2200.c	26 Aug 2006 09:34:19 -0000	1.19
+++ gfxdrivers/neomagic/neo2200.c	7 Oct 2006 19:54:37 -0000
@@ -53,27 +53,27 @@
 #include "neomagic.h"
 
 typedef volatile struct {
-  __u32 bltStat;
-  __u32 bltCntl;
-  __u32 xpColor;
-  __u32 fgColor;
-  __u32 bgColor;
-  __u32 pitch;
-  __u32 clipLT;
-  __u32 clipRB;
-  __u32 srcBitOffset;
-  __u32 srcStart;
-  __u32 reserved0;
-  __u32 dstStart;
-  __u32 xyExt;
-
-  __u32 reserved1[19];
-
-  __u32 pageCntl;
-  __u32 pageBase;
-  __u32 postBase;
-  __u32 postPtr;
-  __u32 dataPtr;
+  u32 bltStat;
+  u32 bltCntl;
+  u32 xpColor;
+  u32 fgColor;
+  u32 bgColor;
+  u32 pitch;
+  u32 clipLT;
+  u32 clipRB;
+  u32 srcBitOffset;
+  u32 srcStart;
+  u32 reserved0;
+  u32 dstStart;
+  u32 xyExt;
+
+  u32 reserved1[19];
+
+  u32 pageCntl;
+  u32 pageBase;
+  u32 postBase;
+  u32 postPtr;
+  u32 dataPtr;
 } Neo2200;
 
 typedef struct {
@@ -87,7 +87,7 @@
      int srcPitch;
      int srcPixelWidth;
 
-     __u32 bltCntl;
+     u32 bltCntl;
 
      bool src_dst_equal;
 
@@ -403,9 +403,9 @@
      Neo2200DeviceData *ndev    = (Neo2200DeviceData*) dev;
      Neo2200           *neo2200 = ndrv->neo2200;
 
-     __u32 dst = ndev->dstOrg +
-                (rect->y * ndev->dstPitch) +
-                (rect->x * ndev->dstPixelWidth);
+     u32 dst = ndev->dstOrg +
+              (rect->y * ndev->dstPitch) +
+              (rect->x * ndev->dstPixelWidth);
 
      neo2200_waitfifo( ndrv, ndev, 3 );
 
@@ -445,8 +445,8 @@
      Neo2200DeviceData *ndev    = (Neo2200DeviceData*) dev;
      Neo2200           *neo2200 = ndrv->neo2200;
 
-     __u32 src_start, dst_start;
-     __u32 bltCntl = ndev->bltCntl;
+     u32 src_start, dst_start;
+     u32 bltCntl = ndev->bltCntl;
 
 //     fprintf(stderr, "blit: %d, %d (%dx%d) -> %d, %d\n",
 //             rect->x, rect->y, rect->w, rect->h, dx, dy);
Index: gfxdrivers/neomagic/neo_overlay.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/neomagic/neo_overlay.c,v
retrieving revision 1.17
diff -u -r1.17 neo_overlay.c
--- gfxdrivers/neomagic/neo_overlay.c	12 Apr 2005 14:05:16 -0000	1.17
+++ gfxdrivers/neomagic/neo_overlay.c	7 Oct 2006 19:54:37 -0000
@@ -39,15 +39,15 @@
 
      /* overlay registers */
      struct {
-          __u32 OFFSET;
-          __u16 PITCH;
-          __u16 X1;
-          __u16 X2;
-          __u16 Y1;
-          __u16 Y2;
-          __u16 HSCALE;
-          __u16 VSCALE;
-          __u8  CONTROL;
+          u32 OFFSET;
+          u16 PITCH;
+          u16 X1;
+          u16 X2;
+          u16 Y1;
+          u16 Y2;
+          u16 HSCALE;
+          u16 VSCALE;
+          u8  CONTROL;
      } regs;
 } NeoOverlayLayerData;
 
Index: gfxdrivers/neomagic/neomagic.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/neomagic/neomagic.c,v
retrieving revision 1.21
diff -u -r1.21 neomagic.c
--- gfxdrivers/neomagic/neomagic.c	29 Oct 2005 00:40:57 -0000	1.21
+++ gfxdrivers/neomagic/neomagic.c	7 Oct 2006 19:54:37 -0000
@@ -121,7 +121,7 @@
 {
      NeoDriverData *ndrv = (NeoDriverData*) driver_data;
 
-     ndrv->mmio_base = (volatile __u8*) dfb_gfxcard_map_mmio( device, 0, -1 );
+     ndrv->mmio_base = (volatile u8*) dfb_gfxcard_map_mmio( device, 0, -1 );
      if (!ndrv->mmio_base)
           return DFB_IO;
 
Index: gfxdrivers/neomagic/neomagic.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/neomagic/neomagic.h,v
retrieving revision 1.8
diff -u -r1.8 neomagic.h
--- gfxdrivers/neomagic/neomagic.h	5 Dec 2003 04:01:06 -0000	1.8
+++ gfxdrivers/neomagic/neomagic.h	7 Oct 2006 19:54:37 -0000
@@ -43,7 +43,7 @@
 } NeoDeviceData;
 
 typedef struct {
-     volatile __u8 *mmio_base;
+     volatile u8 *mmio_base;
 } NeoDriverData;
 
 extern DisplayLayerFuncs neoOverlayFuncs;
@@ -121,13 +121,13 @@
 #define NEO_MODE1_BLT_ON_ADDR   0x2000
 
 
-static inline void OUTGR (__u8 index, __u8 data)
+static inline void OUTGR (u8 index, u8 data)
 {
      outb (index, 0x3ce);
      outb (data, 0x3cf);
 }
 
-static inline void OUTSR (__u8 index, __u8 data)
+static inline void OUTSR (u8 index, u8 data)
 {
      outb (index, 0x3c4);
      outb (data, 0x3c5);
Index: gfxdrivers/nvidia/nvidia.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/nvidia/nvidia.c,v
retrieving revision 1.97
diff -u -r1.97 nvidia.c
--- gfxdrivers/nvidia/nvidia.c	26 Aug 2006 09:34:19 -0000	1.97
+++ gfxdrivers/nvidia/nvidia.c	7 Oct 2006 19:54:38 -0000
@@ -163,7 +163,7 @@
 {
      NVidiaDriverData *nvdrv = (NVidiaDriverData*) driver_data;
      NVidiaDeviceData *nvdev = (NVidiaDeviceData*) device_data;
-     volatile __u8    *mmio  = nvdrv->mmio_base;
+     volatile u8      *mmio  = nvdrv->mmio_base;
      int               i;
 
      nv_waitidle( nvdrv, nvdev );
@@ -475,8 +475,8 @@
                return;
 
           if (accel == DFXL_TEXTRIANGLES) {
-               __u32 size = (1 << direct_log2( source->width  )) *
-                            (1 << direct_log2( source->height ));
+               u32 size = (1 << direct_log2( source->width  )) *
+                          (1 << direct_log2( source->height ));
                
                if (size > nvdev->max_texture_size)
                     return;
@@ -594,8 +594,8 @@
                return;
 
           if (accel == DFXL_TEXTRIANGLES) {
-               __u32 size = (1 << direct_log2( source->width  )) *
-                            (1 << direct_log2( source->height ));
+               u32 size = (1 << direct_log2( source->width  )) *
+                          (1 << direct_log2( source->height ));
                
                if (size > nvdev->max_texture_size)
                     return;
@@ -709,8 +709,8 @@
                return;
 
           if (accel == DFXL_TEXTRIANGLES) {
-               __u32 size = (1 << direct_log2( source->width  )) *
-                            (1 << direct_log2( source->height ));
+               u32 size = (1 << direct_log2( source->width  )) *
+                          (1 << direct_log2( source->height ));
                
                if (size > nvdev->max_texture_size)
                     return;
@@ -1390,7 +1390,7 @@
 }
 
 static void
-nv_find_architecture( NVidiaDriverData *nvdrv, __u32 *ret_chip, __u32 *ret_arch )
+nv_find_architecture( NVidiaDriverData *nvdrv, u32 *ret_chip, u32 *ret_arch )
 {
      unsigned int vendor_id;
      unsigned int device_id;
@@ -1452,7 +1452,7 @@
 {
      NVidiaDriverData *nvdrv = (NVidiaDriverData*) driver_data;
      NVidiaDeviceData *nvdev = (NVidiaDeviceData*) device_data;
-     __u32             arch  = 0;
+     u32               arch  = 0;
     
      nvdrv->device      = device;
      nvdrv->device_data = device_data;
Index: gfxdrivers/nvidia/nvidia.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/nvidia/nvidia.h,v
retrieving revision 1.43
diff -u -r1.43 nvidia.h
--- gfxdrivers/nvidia/nvidia.h	7 Feb 2006 09:33:35 -0000	1.43
+++ gfxdrivers/nvidia/nvidia.h	7 Oct 2006 19:54:38 -0000
@@ -105,73 +105,73 @@
 typedef struct {
      StateModificationFlags  set;
      
-     __u32                   fb_offset;
-     __u32                   fb_size;
-     __u32                   agp_offset;
+     u32                     fb_offset;
+     u32                     fb_size;
+     u32                     agp_offset;
      
      DFBSurfacePixelFormat   dst_format;
-     __u32                   dst_offset;
-     __u32                   dst_pitch;
+     u32                     dst_offset;
+     u32                     dst_pitch;
      bool                    dst_422;
 
      DFBSurfacePixelFormat   src_format;
-     __u32                   src_offset;
-     __u8                   *src_address;
-     __u32                   src_pitch;
-     __u32                   src_width;
-     __u32                   src_height;
+     u32                     src_offset;
+     u8                     *src_address;
+     u32                     src_pitch;
+     u32                     src_width;
+     u32                     src_height;
      bool                    src_system;
      bool                    src_interlaced;
 
      DFBRectangle            clip;
 
-     __u32                   color2d;
-     __u32                   color3d;
+     u32                     color2d;
+     u32                     color3d;
      
      DFBSurfaceDrawingFlags  drawingflags;
      DFBSurfaceBlittingFlags blittingflags;
      
      /* NVRectangle/NVTriangle/NVLine registers */
-     __u32                   drawing_operation; // SetOperation
+     u32                     drawing_operation; // SetOperation
      
      /* NVScaledImage registers */
-     __u32                   scaler_operation;  // SetOperation
-     __u32                   scaler_format;     // SetColorFormat
-     __u32                   scaler_filter;     // SetImageInFormat
+     u32                     scaler_operation;  // SetOperation
+     u32                     scaler_format;     // SetColorFormat
+     u32                     scaler_filter;     // SetImageInFormat
      
      /* NVImageBlt/NVStretchedImage registers */
-     __u32                   system_operation;  // SetOperation
-     __u32                   system_format;     // SetColorFormat
+     u32                     system_operation;  // SetOperation
+     u32                     system_format;     // SetColorFormat
 
      /* Remember value of NVBeta1 & NVBeta4 */
      bool                    beta1_set;
-     __u32                   beta1_val;
+     u32                     beta1_val;
      bool                    beta4_set;
-     __u32                   beta4_val;
+     u32                     beta4_val;
 
      /* 3D stuff */
      bool                    enabled_3d;       // 3d engine enabled
-     __u32                   buf_offset[2];    // reserved buffers
+     u32                     buf_offset[2];    // reserved buffers
      SurfaceBuffer          *src_texture;      // current source for TextureTriangles
-     __u32                   max_texture_size;
+     u32                     max_texture_size;
      
      struct {
           bool               modified;
-          __u32              colorkey;
-          __u32              offset;
-          __u32              format;
-          __u32              filter;
-          __u32              blend;
-          __u32              control;
-          __u32              fog;
+          u32                colorkey;
+          u32                offset;
+          u32                format;
+          u32                filter;
+          u32                blend;
+          u32                control;
+          u32                fog;
      } state3d[2]; // 0 => drawing | 1 => blitting
 
      /* Remember subchannels configuration */
-     __u32                   subchannel_object[8];
+     u32                     subchannel_object[8];
      
      /* Chipsets informations */
-     __u32                   chip;
-     __u32                   arch;
+     u32                     chip;
+     u32                     arch;
      
      /* AGP control */
      bool                    use_agp;
@@ -188,7 +188,7 @@
      unsigned int            dma_free;
      unsigned int            dma_put;
      unsigned int            dma_get;
-     volatile __u32         *cmd_ptr;               
+     volatile u32           *cmd_ptr;
 
      /* FIFO control */
      unsigned int            fifo_free;
Index: gfxdrivers/nvidia/nvidia_2d.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/nvidia/nvidia_2d.c,v
retrieving revision 1.19
diff -u -r1.19 nvidia_2d.c
--- gfxdrivers/nvidia/nvidia_2d.c	28 Jan 2006 11:36:56 -0000	1.19
+++ gfxdrivers/nvidia/nvidia_2d.c	7 Oct 2006 19:54:38 -0000
@@ -50,10 +50,10 @@
 
 
 static void
-nv_copy32( volatile __u32 *dst, __u8 *src, int n )
+nv_copy32( volatile u32 *dst, u8 *src, int n )
 {
-     __u32 *D = (__u32*) dst;
-     __u32 *S = (__u32*) src;
+     u32 *D = (u32*) dst;
+     u32 *S = (u32*) src;
      
 #ifdef ARCH_X86
      __asm__ __volatile__(
@@ -69,10 +69,10 @@
 }
 
 static void
-nv_copy16( volatile __u32 *dst, __u8 *src, int n )
+nv_copy16( volatile u32 *dst, u8 *src, int n )
 {
-     __u32 *D = (__u32*) dst;
-     __u16 *S = (__u16*) src;
+     u32 *D = (u32*) dst;
+     u16 *S = (u16*) src;
 
 #ifdef ARCH_X86
      __asm__ __volatile__(
@@ -82,7 +82,7 @@
           : "memory" );
 #else
      for (; n > 1; n -= 2) {
-          *D++ = *((__u32*)S);
+          *D++ = *((u32*)S);
           S += 2;
      }
 #endif
@@ -92,7 +92,7 @@
 }
 
 static inline bool
-nv_clip_source( DFBRectangle *rect, __u32 width, __u32 height )
+nv_clip_source( DFBRectangle *rect, u32 width, u32 height )
 {
      if (rect->x >= width || rect->y >= height)
           return false;
@@ -213,9 +213,9 @@
      
      if (nvdev->blittingflags || nvdev->src_format != nvdev->dst_format) {
           DFBRectangle  *clip       = &nvdev->clip;
-          __u32          src_width  = (nvdev->src_width  + 1) & ~1;
-          __u32          src_height = (nvdev->src_height + 1) & ~1;
-          __u32          filter     = 0;
+          u32            src_width  = (nvdev->src_width  + 1) & ~1;
+          u32            src_height = (nvdev->src_height + 1) & ~1;
+          u32            filter     = 0;
 
           if (nvdev->dst_422)
                src_width >>= 1; 
@@ -255,9 +255,9 @@
 {
      NVidiaDriverData *nvdrv = (NVidiaDriverData*) drv;
      NVidiaDeviceData *nvdev = (NVidiaDeviceData*) dev;
-     __u8             *src   = nvdev->src_address;
-     __u32             src_w;
-     __u32             src_h;
+     u8               *src   = nvdev->src_address;
+     u32               src_w;
+     u32               src_h;
      int               w, h, n;
      
      if (nvdev->blittingflags & DSBLIT_DEINTERLACE) {
@@ -287,7 +287,7 @@
           case DSPF_RGB16:
                src += rect->y * nvdev->src_pitch + rect->x * 2;
                for (h = rect->h; h--;) {
-                    __u8 *s = src;
+                    u8 *s = src;
                     
                     for (w = rect->w; w >= n*2; w -= n*2) {
                          nv_begin( SUBC_IMAGEBLT, IBLIT_PIXEL0, n );
@@ -306,7 +306,7 @@
           default:
                src += rect->y * nvdev->src_pitch + rect->x * 4;
                for (h = rect->h; h--;) {
-                    __u8 *s = src;
+                    u8 *s = src;
                     
                     for (w = rect->w; w >= n; w -= n) {
                          nv_begin( SUBC_IMAGEBLT, IBLIT_PIXEL0, n );
@@ -331,8 +331,8 @@
      NVidiaDriverData *nvdrv      = (NVidiaDriverData*) drv;
      NVidiaDeviceData *nvdev      = (NVidiaDeviceData*) dev;
      DFBRectangle     *cr         = &nvdev->clip;
-     __u32             src_width  = (nvdev->src_width  + 1) & ~1;
-     __u32             src_height = (nvdev->src_height + 1) & ~1;
+     u32               src_width  = (nvdev->src_width  + 1) & ~1;
+     u32               src_height = (nvdev->src_height + 1) & ~1;
      
      if (nvdev->dst_422) {
           sr->x /= 2;
@@ -373,9 +373,9 @@
      NVidiaDriverData *nvdrv  = (NVidiaDriverData*) drv;
      NVidiaDeviceData *nvdev  = (NVidiaDeviceData*) dev;
      DFBRectangle     *cr     = &nvdev->clip; 
-     __u8             *src    = nvdev->src_address;
-     __u32             src_w;
-     __u32             src_h;
+     u8               *src    = nvdev->src_address;
+     u32               src_w;
+     u32               src_h;
      int               w, h, n;
 
      if (!nv_clip_source( sr, nvdev->src_width, nvdev->src_height ))
@@ -408,7 +408,7 @@
           case DSPF_RGB16:
                src += sr->y * nvdev->src_pitch + sr->x * 2;
                for (h = sr->h; h--;) {
-                    __u8 *s = src;
+                    u8 *s = src;
                     
                     for (w = sr->w; w >= n*2; w -= n*2) {
                          nv_begin( SUBC_STRETCHEDIMAGE, ISTRETCH_PIXEL0, n );
@@ -427,7 +427,7 @@
           default:
                src += sr->y * nvdev->src_pitch + sr->x * 4;
                for (h = sr->h; h--;) {
-                    __u8 *s= src;
+                    u8 *s= src;
                     
                     for (w = sr->w; w >= n; w -= n) {
                          nv_begin( SUBC_STRETCHEDIMAGE, ISTRETCH_PIXEL0, n );
Index: gfxdrivers/nvidia/nvidia_3d.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/nvidia/nvidia_3d.c,v
retrieving revision 1.15
diff -u -r1.15 nvidia_3d.c
--- gfxdrivers/nvidia/nvidia_3d.c	28 Jan 2006 11:36:56 -0000	1.15
+++ gfxdrivers/nvidia/nvidia_3d.c	7 Oct 2006 19:54:38 -0000
@@ -43,11 +43,11 @@
 #include "nvidia_3d.h"
 
 
-static __inline__ __u32
+static __inline__ u32
 f2d( float f ) {
      union {
           float f;
-          __u32 d;
+          u32 d;
      } t;
      t.f = f;
      return t.d;
@@ -307,9 +307,9 @@
 #define UMASK 0xAAAAAAAA
 
 static inline void
-a8_to_tex( __u32 *dst, __u8 *src, int pitch, int width, int height )
+a8_to_tex( u32 *dst, u8 *src, int pitch, int width, int height )
 {
-     __u32 u, v;
+     u32 u, v;
      int   i;
 
      for (v = 0; height--; v = (v + VINC) & VMASK) {
@@ -335,18 +335,18 @@
 }
 
 static inline void
-rgb16_to_tex( __u32 *dst, __u8 *src, int pitch, int width, int height )
+rgb16_to_tex( u32 *dst, u8 *src, int pitch, int width, int height )
 {
-     __u32 u, v;
+     u32 u, v;
      int   i;
 
      for (v = 0; height--; v = (v + VINC) & VMASK) {
           for (i = 0, u = 0; i < width/2; i++, u = (u + UINC) & UMASK)
-               dst[(u|v)/4] = ((__u32*) src)[i];
+               dst[(u|v)/4] = ((u32*) src)[i];
           
           if (width & 1) {
                u = (u + UINC) & UMASK;
-               dst[(u|v)/4] = ((__u16*) src)[width-1];
+               dst[(u|v)/4] = ((u16*) src)[width-1];
           }             
                
           src += pitch;
@@ -354,17 +354,17 @@
 }
 
 static inline void
-rgb32_to_tex( __u32 *dst, __u8 *src, int pitch, int width, int height )
+rgb32_to_tex( u32 *dst, u8 *src, int pitch, int width, int height )
 {
-     __u32 u, v;
+     u32 u, v;
      int   i;
 
      for (v = 0; height--; v = (v + VINC) & VMASK) {
           for (i = 0, u = 0; i < width; i += 2, u = (u + UINC) & UMASK) {
-               register __u32 pix0, pix1;
-               pix0 = ((__u32*) src)[i];
+               register u32 pix0, pix1;
+               pix0 = ((u32*) src)[i];
                pix0 = RGB32_TO_RGB16( pix0 );
-               pix1 = ((__u32*) src)[i+1];
+               pix1 = ((u32*) src)[i+1];
                pix1 = RGB32_TO_RGB16( pix1 );
 #ifdef WORDS_BIGENDIAN
                dst[(u|v)/4] = (pix0 << 16) | pix1;
@@ -375,7 +375,7 @@
           
           if (width & 1) {
                u = (u + UINC) & UMASK;
-               dst[(u|v)/4] = RGB32_TO_RGB16( ((__u32*) src)[width-1] );
+               dst[(u|v)/4] = RGB32_TO_RGB16( ((u32*) src)[width-1] );
           }             
                
           src += pitch;
@@ -383,17 +383,17 @@
 }
 
 static inline void
-argb_to_tex( __u32 *dst, __u8 *src, int pitch, int width, int height )
+argb_to_tex( u32 *dst, u8 *src, int pitch, int width, int height )
 {
-     __u32 u, v;
+     u32 u, v;
      int   i;
 
      for (v = 0; height--; v = (v + VINC) & VMASK) {
           for (i = 0, u = 0; i < width; i += 2, u = (u + UINC) & UMASK) {
-               register __u32 pix0, pix1;
-               pix0 = ((__u32*) src)[i];
+               register u32 pix0, pix1;
+               pix0 = ((u32*) src)[i];
                pix0 = ARGB_TO_ARGB4444( pix0 );
-               pix1 = ((__u32*) src)[i+1];
+               pix1 = ((u32*) src)[i+1];
                pix1 = ARGB_TO_ARGB4444( pix1 );
 #ifdef WORDS_BIGENDIAN
                dst[(u|v)/4] = (pix0 << 16) | pix1;
@@ -404,7 +404,7 @@
 
           if (width & 1) {
                u = (u + UINC) & UMASK;
-               dst[(u|v)/4] = ARGB_TO_ARGB4444( ((__u32*) src)[width-1] );
+               dst[(u|v)/4] = ARGB_TO_ARGB4444( ((u32*) src)[width-1] );
           }
 
           src += pitch;
@@ -416,16 +416,16 @@
 {
      SurfaceBuffer *buffer       = nvdev->src_texture;
      CoreSurface   *surface      = buffer->surface;
-     __u32         *tex_origin;
-     __u8          *src_buffer;
-     __u32          src_pitch;
-     __u32          field_offset = 0;
+     u32           *tex_origin;
+     u8            *src_buffer;
+     u32            src_pitch;
+     u32            field_offset = 0;
 
      tex_origin = dfb_gfxcard_memory_virtual( nvdrv->device,
                                               nvdev->buf_offset[1] );
 
      if (buffer->policy != CSP_SYSTEMONLY) {
-          __u8 *src_origin;
+          u8 *src_origin;
           
           /* check if source texture was modified */
           if (nvdev->set & SMF_SOURCE_TEXTURE &&
Index: gfxdrivers/nvidia/nvidia_accel.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/nvidia/nvidia_accel.h,v
retrieving revision 1.1
diff -u -r1.1 nvidia_accel.h
--- gfxdrivers/nvidia/nvidia_accel.h	28 Jan 2006 11:36:56 -0000	1.1
+++ gfxdrivers/nvidia/nvidia_accel.h	7 Oct 2006 19:54:38 -0000
@@ -36,50 +36,50 @@
 
 
 static __inline__ void
-nv_out8( volatile void *mmioaddr, __u32 reg, __u8 value )
+nv_out8( volatile void *mmioaddr, u32 reg, u8 value )
 {
-     *((volatile __u8*)(mmioaddr+reg)) = value;
+     *((volatile u8*)(mmioaddr+reg)) = value;
 }
 
 static __inline__ void
-nv_out16( volatile void *mmioaddr, __u32 reg, __u16 value )
+nv_out16( volatile void *mmioaddr, u32 reg, u16 value )
 {
-     *((volatile __u16*)(mmioaddr+reg)) = value;
+     *((volatile u16*)(mmioaddr+reg)) = value;
 }
 
 static __inline__ void
-nv_out32( volatile void *mmioaddr, __u32 reg, __u32 value )
+nv_out32( volatile void *mmioaddr, u32 reg, u32 value )
 {
-    *((volatile __u32*)(mmioaddr+reg)) = value;
+    *((volatile u32*)(mmioaddr+reg)) = value;
 }
 
-static __inline__ __u8
-nv_in8( volatile void *mmioaddr, __u32 reg )
+static __inline__ u8
+nv_in8( volatile void *mmioaddr, u32 reg )
 {
-     return *((volatile __u8*)(mmioaddr+reg));
+     return *((volatile u8*)(mmioaddr+reg));
 }
 
-static __inline__ __u16
-nv_in16( volatile void *mmioaddr, __u32 reg )
+static __inline__ u16
+nv_in16( volatile void *mmioaddr, u32 reg )
 {
-     return *((volatile __u16*)(mmioaddr+reg));
+     return *((volatile u16*)(mmioaddr+reg));
 }
 
-static __inline__ __u32
-nv_in32( volatile void *mmioaddr, __u32 reg )
+static __inline__ u32
+nv_in32( volatile void *mmioaddr, u32 reg )
 {
-    return *((volatile __u32*)(mmioaddr+reg));
+    return *((volatile u32*)(mmioaddr+reg));
 }
 
 static __inline__ void
-nv_outcrtc( volatile void *mmioaddr, __u8 reg, __u8 value )
+nv_outcrtc( volatile void *mmioaddr, u8 reg, u8 value )
 {
      nv_out8( mmioaddr, PCIO_CRTC_INDEX, reg );
      nv_out8( mmioaddr, PCIO_CRTC_DATA, value );
 }
 
-static __inline__ __u8
-nv_incrtc( volatile void *mmioaddr, __u8 reg )
+static __inline__ u8
+nv_incrtc( volatile void *mmioaddr, u8 reg )
 {
      nv_out8( mmioaddr, PCIO_CRTC_INDEX, reg );
      return nv_in8( mmioaddr, PCIO_CRTC_DATA );
@@ -90,7 +90,7 @@
 static inline void
 nv_waitidle( NVidiaDriverData *nvdrv, NVidiaDeviceData *nvdev )
 {
-     __u32 status;
+     u32 status;
      int   waitcycles = 0;
      
      do {
@@ -149,7 +149,7 @@
 nv_emitdma( NVidiaDriverData *nvdrv, NVidiaDeviceData *nvdev )
 {
      if (nvdev->dma_put != nvdev->dma_cur) {
-          volatile __u8 scratch;
+          volatile u8 scratch;
           
           /* flush MTRR buffers */
           scratch = nv_in8( nvdrv->fb_base, 0 );
Index: gfxdrivers/nvidia/nvidia_objects.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/nvidia/nvidia_objects.h,v
retrieving revision 1.1
diff -u -r1.1 nvidia_objects.h
--- gfxdrivers/nvidia/nvidia_objects.h	28 Jan 2006 11:36:56 -0000	1.1
+++ gfxdrivers/nvidia/nvidia_objects.h	7 Oct 2006 19:54:38 -0000
@@ -38,8 +38,8 @@
 #define ENGINE_DVD       2
 
 
-static __inline__ __u32
-nv_hashkey( __u32 obj )
+static __inline__ u32
+nv_hashkey( u32 obj )
 {
      return ((obj >>  0) & 0x000001FF) ^
             ((obj >>  9) & 0x000001FF) ^
@@ -66,13 +66,13 @@
 #define DMA_FRAME_ACCESS_RDWR      (1 << 1)
 
 static inline void
-nv_store_dma( NVidiaDriverData *nvdrv, __u32 obj,
-              __u32 addr, __u32 class, __u32 flags,
-              __u32 size, __u32 frame, __u32 access )
+nv_store_dma( NVidiaDriverData *nvdrv, u32 obj,
+              u32 addr, u32 class, u32 flags,
+              u32 size, u32 frame, u32 access )
 {
      volatile void *mmio = nvdrv->mmio_base;
-     __u32          key  = nv_hashkey( obj );
-     __u32          ctx  = addr | (ENGINE_SW << 16) | (1 << 31);
+     u32            key  = nv_hashkey( obj );
+     u32            ctx  = addr | (ENGINE_SW << 16) | (1 << 31);
      
      /* NV_PRAMIN_RAMRO_0 */
      nv_out32( mmio, PRAMIN + (addr << 4) +  0, class | flags );
@@ -115,13 +115,13 @@
 
 static inline void
 nv_store_object( NVidiaDriverData *nvdrv, 
-                 __u32 obj,   __u32 addr, 
-                 __u32 class, __u32 flags,
-                 __u32 dma0,  __u32 dma1 )
+                 u32 obj,   u32 addr,
+                 u32 class, u32 flags,
+                 u32 dma0,  u32 dma1 )
 {
      volatile void *mmio = nvdrv->mmio_base;
-     __u32          key  = nv_hashkey( obj );
-     __u32          ctx  = addr | (ENGINE_GRAPHICS << 16) | (1 << 31);
+     u32            key  = nv_hashkey( obj );
+     u32            ctx  = addr | (ENGINE_GRAPHICS << 16) | (1 << 31);
      
      /* set the endian flag here, for simplicity */
 #ifdef WORDS_BIGENDIAN
@@ -146,7 +146,7 @@
 nv_assign_object( NVidiaDriverData *nvdrv,
                   NVidiaDeviceData *nvdev,
                   int               subc,
-                  __u32             object,
+                  u32               object,
                   bool              reset )
 {
      if (reset || nvdev->subchannel_object[subc] != object) {
Index: gfxdrivers/nvidia/nvidia_overlay.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/nvidia/nvidia_overlay.c,v
retrieving revision 1.34
diff -u -r1.34 nvidia_overlay.c
--- gfxdrivers/nvidia/nvidia_overlay.c	4 Jul 2006 09:21:37 -0000	1.34
+++ gfxdrivers/nvidia/nvidia_overlay.c	7 Oct 2006 19:54:38 -0000
@@ -55,24 +55,24 @@
      int                   field;
 
      struct {
-          __u32 BUFFER;
-          __u32 STOP;
-          __u32 BASE_0;
-          __u32 BASE_1;
-          __u32 SIZE_IN_0;
-          __u32 SIZE_IN_1;
-          __u32 POINT_IN_0;
-          __u32 POINT_IN_1;
-          __u32 DS_DX_0;
-          __u32 DS_DX_1;
-          __u32 DT_DY_0;
-          __u32 DT_DY_1;
-          __u32 POINT_OUT_0;
-          __u32 POINT_OUT_1;
-          __u32 SIZE_OUT_0;
-          __u32 SIZE_OUT_1;
-          __u32 FORMAT_0;
-          __u32 FORMAT_1;
+          u32 BUFFER;
+          u32 STOP;
+          u32 BASE_0;
+          u32 BASE_1;
+          u32 SIZE_IN_0;
+          u32 SIZE_IN_1;
+          u32 POINT_IN_0;
+          u32 POINT_IN_1;
+          u32 DS_DX_0;
+          u32 DS_DX_1;
+          u32 DT_DY_0;
+          u32 DT_DY_1;
+          u32 POINT_OUT_0;
+          u32 POINT_OUT_1;
+          u32 SIZE_OUT_0;
+          u32 SIZE_OUT_1;
+          u32 FORMAT_0;
+          u32 FORMAT_1;
      } regs;
 } NVidiaOverlayLayerData;
 
@@ -158,7 +158,7 @@
            void      *region_data )
 {
      NVidiaDriverData *nvdrv = (NVidiaDriverData*) driver_data;
-     volatile __u8    *mmio  = nvdrv->mmio_base;
+     volatile u8      *mmio  = nvdrv->mmio_base;
      
      /* disable overlay */
      nv_out32( mmio, PVIDEO_STOP, PVIDEO_STOP_OVERLAY_ACTIVE | 
@@ -432,10 +432,10 @@
 static void
 ov0CopyData420
 (
-     __u8 *src1,
-     __u8 *src2,
-     __u8 *src3,
-     __u8 *dst1,
+     u8 *src1,
+     u8 *src2,
+     u8 *src3,
+     u8 *dst1,
      int   srcPitch,
      int   srcPitch2,
      int   dstPitch,
@@ -443,14 +443,14 @@
      int   w
 )
 {
-     __u32 *dst;
-     __u8 *s1, *s2, *s3;
+     u32 *dst;
+     u8 *s1, *s2, *s3;
      int i, j;
 
      w >>= 1;
 
      for(j = 0; j < h; j++) {
-          dst = (__u32 *)dst1;
+          dst = (u32 *)dst1;
           s1 = src1;  s2 = src2;  s3 = src3;
           i = w;
           while(i > 4) {
@@ -504,11 +504,11 @@
      if (DFB_PLANAR_PIXELFORMAT( surface->format )) {  
           SurfaceBuffer *data_buffer;
           SurfaceBuffer *video_buffer;
-          __u32 srcPitch, srcPitch2, dstPitch, s2offset, s3offset, tmp;
-          __u32 width  = surface->width;
-          __u32 height = surface->height;
-          __u8 *dstStart;
-          __u8 *buf;
+          u32 srcPitch, srcPitch2, dstPitch, s2offset, s3offset, tmp;
+          u32 width  = surface->width;
+          u32 height = surface->height;
+          u8 *dstStart;
+          u8 *buf;
           
           data_buffer  = surface->front_buffer;
           video_buffer = nvov0->videoSurface->front_buffer;
@@ -557,11 +557,11 @@
      if (DFB_PLANAR_PIXELFORMAT( surface->format )) {  
           SurfaceBuffer *data_buffer;
           SurfaceBuffer *video_buffer;
-          __u32 srcPitch, srcPitch2, dstPitch, s2offset, s3offset, tmp;
-          __u32 width  = surface->width;
-          __u32 height = surface->height;
-          __u8 *dstStart;
-          __u8 *buf;
+          u32 srcPitch, srcPitch2, dstPitch, s2offset, s3offset, tmp;
+          u32 width  = surface->width;
+          u32 height = surface->height;
+          u8 *dstStart;
+          u8 *buf;
           
           data_buffer  = surface->front_buffer;
           video_buffer = nvov0->videoSurface->front_buffer;
@@ -662,7 +662,7 @@
 
 static void ov0_set_regs( NVidiaDriverData *nvdrv, NVidiaOverlayLayerData *nvov0 )
 {
-     volatile __u8 *mmio = nvdrv->mmio_base;
+     volatile u8 *mmio = nvdrv->mmio_base;
      
      nv_out32( mmio, PVIDEO_BASE_0,      nvov0->regs.BASE_0 );
      nv_out32( mmio, PVIDEO_BASE_1,      nvov0->regs.BASE_1 );
@@ -694,11 +694,11 @@
      DFBRectangle      source  = config->source;
      DFBRectangle      dest    = config->dest;
      SurfaceBuffer    *buffer  = nvov0->videoSurface->front_buffer;
-     __u32             offset  = buffer->video.offset;
-     __u32             pitch   = buffer->video.pitch;
+     u32               offset  = buffer->video.offset;
+     u32               pitch   = buffer->video.pitch;
      int               width   = config->width;
      int               height  = config->height;
-     __u32             format;
+     u32               format;
 
      source.x <<= 4;
      source.y <<= 4;
@@ -775,7 +775,7 @@
                   NVidiaOverlayLayerData *nvov0,
                   CoreLayerRegionConfig  *config )
 {
-     __u32 key;
+     u32 key;
      
      key = dfb_color_to_pixel( dfb_primary_layer_pixelformat(),
                                config->dst_key.r,
@@ -789,10 +789,10 @@
 ov0_set_csc( NVidiaDriverData       *nvdrv,
              NVidiaOverlayLayerData *nvov0 )
 {
-     volatile __u8 *mmio = nvdrv->mmio_base;
-     __s32          satSine;
-     __s32          satCosine;
-     double         angle;
+     volatile u8 *mmio = nvdrv->mmio_base;
+     s32          satSine;
+     s32          satCosine;
+     double       angle;
 
      angle = (double) nvov0->hue * M_PI / 180.0;
      satSine = nvov0->saturation * sin(angle);
Index: gfxdrivers/nvidia/nvidia_primary.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/nvidia/nvidia_primary.c,v
retrieving revision 1.14
diff -u -r1.14 nvidia_primary.c
--- gfxdrivers/nvidia/nvidia_primary.c	28 Jan 2006 11:36:56 -0000	1.14
+++ gfxdrivers/nvidia/nvidia_primary.c	7 Oct 2006 19:54:38 -0000
@@ -51,7 +51,7 @@
                  DFBScreenDescription *description )
 {
      NVidiaDriverData *nvdrv = (NVidiaDriverData*) driver_data;
-     volatile __u8    *mmio  = nvdrv->mmio_base;
+     volatile u8      *mmio  = nvdrv->mmio_base;
 
      if (OldPrimaryScreenFuncs.InitScreen)
           OldPrimaryScreenFuncs.InitScreen( screen, device, 
@@ -82,7 +82,7 @@
                 void       *screen_data )
 {
      NVidiaDriverData *nvdrv = (NVidiaDriverData*) driver_data;
-     volatile __u8    *mmio  = nvdrv->mmio_base;
+     volatile u8      *mmio  = nvdrv->mmio_base;
 
      if (!dfb_config->pollvsync_none) {
           int i;
@@ -116,7 +116,7 @@
                     int        *ret_height )
 {
      NVidiaDriverData *nvdrv = (NVidiaDriverData*) driver_data;
-     volatile __u8    *mmio  = nvdrv->mmio_base;
+     volatile u8      *mmio  = nvdrv->mmio_base;
      int               w, h;
      int               val;
 
@@ -167,7 +167,7 @@
      NVidiaDriverData *nvdrv  = (NVidiaDriverData*) driver_data;
      NVidiaDeviceData *nvdev  = nvdrv->device_data;
      SurfaceBuffer    *buffer = surface->back_buffer;
-     __u32             offset;
+     u32               offset;
 
      dfb_gfxcard_sync();
      
Index: gfxdrivers/nvidia/nvidia_regs.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/nvidia/nvidia_regs.h,v
retrieving revision 1.5
diff -u -r1.5 nvidia_regs.h
--- gfxdrivers/nvidia/nvidia_regs.h	28 Jan 2006 11:36:56 -0000	1.5
+++ gfxdrivers/nvidia/nvidia_regs.h	7 Oct 2006 19:54:38 -0000
@@ -1021,18 +1021,18 @@
  * 2D surfaces
  */
 typedef volatile struct {
-     __u32 NoOperation;            /* 0100-0103 */
-     __u32 Notify;                 /* 0104-0107 */
-     __u32 Reserved00[0x01E];
-     __u32 SetContextDmaNotify;    /* 0180-0183 */
-     __u32 SetContextDmaSource;    /* 0184-0187 */
-     __u32 SetContextDmaDestin;    /* 0188-018B */
-     __u32 Reserved01[0x05D];
-     __u32 Format;                 /* 0300-0303 */
-     __u32 Pitch;                  /* 0304-0307 */
-     __u32 SourceOffset;           /* 0308-030B */
-     __u32 DestOffset;             /* 030C-030F */
-     __u32 Reserved02[0x73C];
+     u32 NoOperation;              /* 0100-0103 */
+     u32 Notify;                   /* 0104-0107 */
+     u32 Reserved00[0x01E];
+     u32 SetContextDmaNotify;      /* 0180-0183 */
+     u32 SetContextDmaSource;      /* 0184-0187 */
+     u32 SetContextDmaDestin;      /* 0188-018B */
+     u32 Reserved01[0x05D];
+     u32 Format;                   /* 0300-0303 */
+     u32 Pitch;                    /* 0304-0307 */
+     u32 SourceOffset;             /* 0308-030B */
+     u32 DestOffset;               /* 030C-030F */
+     u32 Reserved02[0x73C];
 } NVSurfaces2D;
 #define SURFACES2D_FORMAT                    0x00000300
 #define   SURFACES2D_FORMAT_Y8                         0x00000001
@@ -1051,21 +1051,21 @@
  * 3D surfaces
  */
 typedef volatile struct {
-     __u32 NoOperation;            /* 0100-0103 */
-     __u32 Notify;                 /* 0104-0107 */
-     __u32 Reserved00[0x01E];
-     __u32 SetContextDmaNotify;    /* 0180-0183 */
-     __u32 SetContextDmaColor;     /* 0184-0187 */
-     __u32 SetContextDmaZeta;      /* 0188-018B */
-     __u32 Reserved01[0x05B];
-     __u32 ClipHorizontal;         /* 02F8-02FB */          
-     __u32 ClipVertical;           /* 02FC-02FF */
-     __u32 Format;                 /* 0300-0303 */
-     __u32 ClipSize;               /* 0304-0307 */
-     __u32 Pitch;                  /* 0308-030B */
-     __u32 RenderOffset;           /* 030C-030F */
-     __u32 DepthOffset;            /* 0310-0313 */
-     __u32 Reserved02[0x73B];
+     u32 NoOperation;              /* 0100-0103 */
+     u32 Notify;                   /* 0104-0107 */
+     u32 Reserved00[0x01E];
+     u32 SetContextDmaNotify;      /* 0180-0183 */
+     u32 SetContextDmaColor;       /* 0184-0187 */
+     u32 SetContextDmaZeta;        /* 0188-018B */
+     u32 Reserved01[0x05B];
+     u32 ClipHorizontal;           /* 02F8-02FB */
+     u32 ClipVertical;             /* 02FC-02FF */
+     u32 Format;                   /* 0300-0303 */
+     u32 ClipSize;                 /* 0304-0307 */
+     u32 Pitch;                    /* 0308-030B */
+     u32 RenderOffset;             /* 030C-030F */
+     u32 DepthOffset;              /* 0310-0313 */
+     u32 Reserved02[0x73B];
 } NVSurfaces3D;
 #define SURFACES3D_CLIP_HORIZONTAL           0x000002F8
 #define SURFACES3D_CLIP_VERTICAL             0x000002FC
@@ -1086,15 +1086,15 @@
  * Scissor clip rectangle
  */
 typedef volatile struct {
-     __u32 NoOperation;            /* 0100-0103 */
-     __u32 Notify;                 /* 0104-0107 */
-     __u32 Reserved00[0x01E];
-     __u32 SetContextDmaNotify;    /* 0180-0183 */
-     __u32 SetContextDmaImage;     /* 0184-0187 */
-     __u32 Reserved01[0x05E];
-     __u32 TopLeft;                /* 0300-0303 */
-     __u32 WidthHeight;            /* 0304-0307 */
-     __u32 Reserved02[0x73E];
+     u32 NoOperation;              /* 0100-0103 */
+     u32 Notify;                   /* 0104-0107 */
+     u32 Reserved00[0x01E];
+     u32 SetContextDmaNotify;      /* 0180-0183 */
+     u32 SetContextDmaImage;       /* 0184-0187 */
+     u32 Reserved01[0x05E];
+     u32 TopLeft;                  /* 0300-0303 */
+     u32 WidthHeight;              /* 0304-0307 */
+     u32 Reserved02[0x73E];
 } NVClip;
 #define CLIP_TOP_LEFT                        0x00000300
 #define CLIP_WIDTH_HEIGHT                    0x00000304
@@ -1103,13 +1103,13 @@
  * Global alpha factor
  */
 typedef volatile struct {
-     __u32 NoOperation;            /* 0100-0103 */
-     __u32 Notify;                 /* 0104-0107 */
-     __u32 Reserved00[0x01E];
-     __u32 SetContextDmaNotify;    /* 0180-0183 */
-     __u32 Reserved01[0x05F];
-     __u32 SetBeta1D31;            /* 0300-0303 */
-     __u32 Reserved02[0x73F];
+     u32 NoOperation;              /* 0100-0103 */
+     u32 Notify;                   /* 0104-0107 */
+     u32 Reserved00[0x01E];
+     u32 SetContextDmaNotify;      /* 0180-0183 */
+     u32 Reserved01[0x05F];
+     u32 SetBeta1D31;              /* 0300-0303 */
+     u32 Reserved02[0x73F];
 } NVBeta1;
 #define BETA1_FACTOR                         0x00000300
 
@@ -1117,13 +1117,13 @@
  * Global ARGB factor
  */
 typedef volatile struct {
-     __u32 NoOperation;            /* 0100-0103 */
-     __u32 Notify;                 /* 0104-0107 */
-     __u32 Reserved00[0x01E];
-     __u32 SetContextDmaNotify;    /* 0180-0183 */
-     __u32 Reserved01[0x05F];
-     __u32 SetBetaFactor;          /* 0300-0303 */
-     __u32 Reserved02[0x73F];
+     u32 NoOperation;              /* 0100-0103 */
+     u32 Notify;                   /* 0104-0107 */
+     u32 Reserved00[0x01E];
+     u32 SetContextDmaNotify;      /* 0180-0183 */
+     u32 Reserved01[0x05F];
+     u32 SetBetaFactor;            /* 0300-0303 */
+     u32 Reserved02[0x73F];
 } NVBeta4;
 #define BETA4_FACTOR                         0x00000300
 
@@ -1146,23 +1146,23 @@
  * 2D solid rectangle
  */
 typedef volatile struct {
-     __u32 NoOperation;            /* 0100-0103 */
-     __u32 Notify;                 /* 0104-0107 */
-     __u32 Reserved00[0x01E];
-     __u32 SetContextDmaNotify;    /* 0180-0183 */
-     __u32 SetContextClip;         /* 0184-0187 */
-     __u32 SetContextPattern;      /* 0188-018B */
-     __u32 SetContextRop;          /* 018C-018F */
-     __u32 SetContextBeta1;        /* 0190-0193 */
-     __u32 SetContextSurface;      /* 0194-0197 */
-     __u32 Reserved01[0x059];
-     __u32 SetOperation;           /* 02FC-02FF */
-     __u32 SetColorFormat;         /* 0300-0303 */
-     __u32 Color;                  /* 0304-0307 */
-     __u32 Reserved02[0x03E];
-     __u32 TopLeft;                /* 0400-0403 */
-     __u32 WidthHeight;            /* 0404-0407 */
-     __u32 Reserved03[0x6FE];
+     u32 NoOperation;              /* 0100-0103 */
+     u32 Notify;                   /* 0104-0107 */
+     u32 Reserved00[0x01E];
+     u32 SetContextDmaNotify;      /* 0180-0183 */
+     u32 SetContextClip;           /* 0184-0187 */
+     u32 SetContextPattern;        /* 0188-018B */
+     u32 SetContextRop;            /* 018C-018F */
+     u32 SetContextBeta1;          /* 0190-0193 */
+     u32 SetContextSurface;        /* 0194-0197 */
+     u32 Reserved01[0x059];
+     u32 SetOperation;             /* 02FC-02FF */
+     u32 SetColorFormat;           /* 0300-0303 */
+     u32 Color;                    /* 0304-0307 */
+     u32 Reserved02[0x03E];
+     u32 TopLeft;                  /* 0400-0403 */
+     u32 WidthHeight;              /* 0404-0407 */
+     u32 Reserved03[0x6FE];
 } NVRectangle;
 #define RECT_OPERATION                       0x000002FC
 #define RECT_COLOR_FORMAT                    0x00000300
@@ -1177,47 +1177,47 @@
  * 2D solid triangle
  */
 typedef volatile struct {
-     __u32 NoOperation;            /* 0100-0103 */
-     __u32 Notify;                 /* 0104-0107 */
-     __u32 Reserved00[0x01E];
-     __u32 SetContextDmaNotify;    /* 0180-0183 */
-     __u32 SetContextClip;         /* 0184-0187 */
-     __u32 SetContextPattern;      /* 0188-018B */
-     __u32 SetContextRop;          /* 018C-018F */
-     __u32 SetContextBeta1;        /* 0190-0193 */
-     __u32 SetContextSurface;      /* 0194-0197 */
-     __u32 Reserved01[0x059];
-     __u32 SetOperation;           /* 02FC-02FF */
-     __u32 SetColorFormat;         /* 0300-0303 */
-     __u32 Color;                  /* 0304-0307 */
-     __u32 Reserved02[0x002];
-     __u32 TrianglePoint0;         /* 0310-0313 */
-     __u32 TrianglePoint1;         /* 0314-0317 */
-     __u32 TrianglePoint2;         /* 0318-031B */
-     __u32 Reserved03[0x001];
-     __s32 Triangle32Point0X;      /* 0320-0323 */
-     __s32 Triangle32Point0Y;      /* 0324-0327 */
-     __s32 Triangle32Point1X;      /* 0328-032B */
-     __s32 Triangle32Point1Y;      /* 032C-032F */
-     __s32 Triangle32Point2X;      /* 0330-0333 */
-     __s32 Triangle32Point2Y;      /* 0334-0337 */
-     __u32 Reserved04[0x032];
-     __u32 Trimesh[32];            /* 0400-047F */
+     u32 NoOperation;              /* 0100-0103 */
+     u32 Notify;                   /* 0104-0107 */
+     u32 Reserved00[0x01E];
+     u32 SetContextDmaNotify;      /* 0180-0183 */
+     u32 SetContextClip;           /* 0184-0187 */
+     u32 SetContextPattern;        /* 0188-018B */
+     u32 SetContextRop;            /* 018C-018F */
+     u32 SetContextBeta1;          /* 0190-0193 */
+     u32 SetContextSurface;        /* 0194-0197 */
+     u32 Reserved01[0x059];
+     u32 SetOperation;             /* 02FC-02FF */
+     u32 SetColorFormat;           /* 0300-0303 */
+     u32 Color;                    /* 0304-0307 */
+     u32 Reserved02[0x002];
+     u32 TrianglePoint0;           /* 0310-0313 */
+     u32 TrianglePoint1;           /* 0314-0317 */
+     u32 TrianglePoint2;           /* 0318-031B */
+     u32 Reserved03[0x001];
+     s32 Triangle32Point0X;        /* 0320-0323 */
+     s32 Triangle32Point0Y;        /* 0324-0327 */
+     s32 Triangle32Point1X;        /* 0328-032B */
+     s32 Triangle32Point1Y;        /* 032C-032F */
+     s32 Triangle32Point2X;        /* 0330-0333 */
+     s32 Triangle32Point2Y;        /* 0334-0337 */
+     u32 Reserved04[0x032];
+     u32 Trimesh[32];              /* 0400-047F */
      struct {                      /* 0480-     */
-          __s32 x;                 /*    0-   3 */
-          __s32 y;                 /*    4-   7 */
+          s32 x;                   /*    0-   3 */
+          s32 y;                   /*    4-   7 */
      } Trimesh32[16];              /*     -04FF */
      struct {                      /* 0500-     */
-          __u32 color;             /*    0-   3 */
-          __u32 point0;            /*    4-   7 */
-          __u32 point1;            /*    8-   B */
-          __u32 point2;            /*    C-   F */
+          u32 color;               /*    0-   3 */
+          u32 point0;              /*    4-   7 */
+          u32 point1;              /*    8-   B */
+          u32 point2;              /*    C-   F */
      } ColorTriangle[8];           /*     -057F */
      struct {                      /* 0580-     */
-          __u32 color;             /*    0-   3 */
-          __u32 point;             /*    4-   7 */
+          u32 color;               /*    0-   3 */
+          u32 point;               /*    4-   7 */
      } ColorTrimesh[16];           /*     -05FF */
-     __u32 Reserved05[0x680];
+     u32 Reserved05[0x680];
 } NVTriangle;
 #define TRI_OPERATION                        0x000002FC
 #define TRI_COLOR_FORMAT                     0x00000300
@@ -1233,40 +1233,40 @@
  * 2D solid 
  */
 typedef volatile struct {
-     __u32 NoOperation;            /* 0100-0103 */
-     __u32 Notify;                 /* 0104-0107 */
-     __u32 Reserved00[0x01E];
-     __u32 SetContextDmaNotify;    /* 0180-0183 */
-     __u32 SetContextClip;         /* 0184-0187 */
-     __u32 SetContextPattern;      /* 0188-018B */
-     __u32 SetContextRop;          /* 018C-018F */
-     __u32 SetContextBeta1;        /* 0190-0193 */
-     __u32 SetContextSurface;      /* 0194-0197 */
-     __u32 Reserved01[0x059];
-     __u32 SetOperation;           /* 02FC-02FF */
-     __u32 SetColorFormat;         /* 0300-0303 */
-     __u32 Color;                  /* 0304-0307 */
-     __u32 Reserved02[0x03E];
+     u32 NoOperation;              /* 0100-0103 */
+     u32 Notify;                   /* 0104-0107 */
+     u32 Reserved00[0x01E];
+     u32 SetContextDmaNotify;      /* 0180-0183 */
+     u32 SetContextClip;           /* 0184-0187 */
+     u32 SetContextPattern;        /* 0188-018B */
+     u32 SetContextRop;            /* 018C-018F */
+     u32 SetContextBeta1;          /* 0190-0193 */
+     u32 SetContextSurface;        /* 0194-0197 */
+     u32 Reserved01[0x059];
+     u32 SetOperation;             /* 02FC-02FF */
+     u32 SetColorFormat;           /* 0300-0303 */
+     u32 Color;                    /* 0304-0307 */
+     u32 Reserved02[0x03E];
      struct {                      /* 0400-     */
-          __u32 point0;            /*    0-   3 */
-          __u32 point1;            /*    4-   7 */
+          u32 point0;              /*    0-   3 */
+          u32 point1;              /*    4-   7 */
      } Lin[16];                    /*     -047F */
      struct {                      /* 0480-     */
-          __u32 point0X;           /*    0-   3 */
-          __u32 point0Y;           /*    4-   7 */
-          __u32 point1X;           /*    8-   B */
-          __u32 point1Y;           /*    C-   F */
+          u32 point0X;             /*    0-   3 */
+          u32 point0Y;             /*    4-   7 */
+          u32 point1X;             /*    8-   B */
+          u32 point1Y;             /*    C-   F */
      } Lin32[8];                   /*     -04FF */
-     __u32 PolyLin[32];            /* 0500-057F */
+     u32 PolyLin[32];              /* 0500-057F */
      struct {                      /* 0580-     */
-          __u32 x;                 /*    0-   3 */
-          __u32 y;                 /*    4-   7 */
+          u32 x;                   /*    0-   3 */
+          u32 y;                   /*    4-   7 */
      } PolyLin32[16];              /*     -05FF */
      struct {                      /* 0600-     */
-          __u32 color;             /*    0-   3 */
-          __u32 point;             /*    4-   7 */
+          u32 color;               /*    0-   3 */
+          u32 point;               /*    4-   7 */
      } ColorPolyLin[16];           /*     -067F */
-     __u32 Reserved03[0x660];
+     u32 Reserved03[0x660];
 } NVLine;
 #define LINE_OPERATION                       0x000002FC
 #define LINE_COLOR_FORMAT                    0x00000300
@@ -1281,25 +1281,25 @@
  * 2D screen-screen BLT
  */
 typedef volatile struct {
-     __u32 NoOperation;            /* 0100-0103 */
-     __u32 Notify;                 /* 0104-0107 */
-     __u32 WaitForIdle;            /* 0108-010B (09F_WAIT_FOR_IDLE) */
-     __u32 WaitForSync;            /* 010C-010F (09F_WAIT_FOR_CRTC) */
-     __u32 Reserved00[0x01C];
-     __u32 SetContextDmaNotify;    /* 0180-0183 */
-     __u32 SetContextColorKey;     /* 0184-0187 */
-     __u32 SetContextClip;         /* 0188-018B */
-     __u32 SetContextPattern;      /* 018C-018F */
-     __u32 SetContextRop;          /* 0190-0193 */
-     __u32 SetContextBeta1;        /* 0194-0197 */
-     __u32 SetContextBeta4;        /* 0198-019B */
-     __u32 SetContextSurface;      /* 019C-019F */
-     __u32 Reserved01[0x057];
-     __u32 SetOperation;           /* 02FC-02FF */
-     __u32 TopLeftSrc;             /* 0300-0303 */
-     __u32 TopLeftDst;             /* 0304-0307 */
-     __u32 WidthHeight;            /* 0308-030B */
-     __u32 Reserved02[0x73D];
+     u32 NoOperation;              /* 0100-0103 */
+     u32 Notify;                   /* 0104-0107 */
+     u32 WaitForIdle;              /* 0108-010B (09F_WAIT_FOR_IDLE) */
+     u32 WaitForSync;              /* 010C-010F (09F_WAIT_FOR_CRTC) */
+     u32 Reserved00[0x01C];
+     u32 SetContextDmaNotify;      /* 0180-0183 */
+     u32 SetContextColorKey;       /* 0184-0187 */
+     u32 SetContextClip;           /* 0188-018B */
+     u32 SetContextPattern;        /* 018C-018F */
+     u32 SetContextRop;            /* 0190-0193 */
+     u32 SetContextBeta1;          /* 0194-0197 */
+     u32 SetContextBeta4;          /* 0198-019B */
+     u32 SetContextSurface;        /* 019C-019F */
+     u32 Reserved01[0x057];
+     u32 SetOperation;             /* 02FC-02FF */
+     u32 TopLeftSrc;               /* 0300-0303 */
+     u32 TopLeftDst;               /* 0304-0307 */
+     u32 WidthHeight;              /* 0308-030B */
+     u32 Reserved02[0x73D];
 } NVScreenBlt;
 #define BLIT_OPERATION                       0x000002FC
 #define BLIT_TOP_LEFT_SRC                    0x00000300
@@ -1310,26 +1310,26 @@
  * 2D CPU to screen BLT
  */
 typedef volatile struct {
-     __u32 NoOperation;            /* 0100-0103 */
-     __u32 Notify;                 /* 0104-0107 */
-     __u32 Reserved00[0x01E];
-     __u32 SetContextDmaNotify;    /* 0180-0183 */
-     __u32 SetContextColorKey;     /* 0184-0187 */
-     __u32 SetContextClip;         /* 0188-018B */
-     __u32 SetContextPattern;      /* 018C-018F */
-     __u32 SetContextRop;          /* 0190-0193 */
-     __u32 SetContextBeta1;        /* 0194-0197 */
-     __u32 SetContextBeta4;        /* 0198-019B */
-     __u32 SetContextSurface;      /* 019C-019F */
-     __u32 Reserved01[0x056];
-     __u32 SetColorConversion;     /* 02F8-02FB */
-     __u32 SetOperation;           /* 02FC-02FF */
-     __u32 SetColorFormat;         /* 0300-0303 */
-     __u32 Point;                  /* 0304-0307 */
-     __u32 SizeOut;                /* 0308-030B */
-     __u32 SizeIn;                 /* 030C-030F */
-     __u32 Reserved02[0x03C];
-     __u32 Pixel[1792];            /* 0400-     */
+     u32 NoOperation;              /* 0100-0103 */
+     u32 Notify;                   /* 0104-0107 */
+     u32 Reserved00[0x01E];
+     u32 SetContextDmaNotify;      /* 0180-0183 */
+     u32 SetContextColorKey;       /* 0184-0187 */
+     u32 SetContextClip;           /* 0188-018B */
+     u32 SetContextPattern;        /* 018C-018F */
+     u32 SetContextRop;            /* 0190-0193 */
+     u32 SetContextBeta1;          /* 0194-0197 */
+     u32 SetContextBeta4;          /* 0198-019B */
+     u32 SetContextSurface;        /* 019C-019F */
+     u32 Reserved01[0x056];
+     u32 SetColorConversion;       /* 02F8-02FB */
+     u32 SetOperation;             /* 02FC-02FF */
+     u32 SetColorFormat;           /* 0300-0303 */
+     u32 Point;                    /* 0304-0307 */
+     u32 SizeOut;                  /* 0308-030B */
+     u32 SizeIn;                   /* 030C-030F */
+     u32 Reserved02[0x03C];
+     u32 Pixel[1792];              /* 0400-     */
 } NVImageBlt;
 #define IBLIT_COLOR_CONVERSION               0x000002F8
 #define IBLIT_OPERATION                      0x000002FC
@@ -1348,32 +1348,32 @@
  * 2D scaled image BLT
  */
 typedef volatile struct {
-     __u32 NoOperation;            /* 0100-0103 */
-     __u32 Notify;                 /* 0104-0107 */
-     __u32 Reserved00[0x01E];
-     __u32 SetContextDmaNotify;    /* 0180-0183 */
-     __u32 SetContextDmaImage;     /* 0184-0187 */
-     __u32 SetContextPattern;      /* 0188-018B */
-     __u32 SetContextRop;          /* 018C-018F */
-     __u32 SetContextBeta1;        /* 0190-0193 */
-     __u32 SetContextBeta4;        /* 0194-0197 */
-     __u32 SetContextSurface;      /* 0198-019C */
-     __u32 Reserved01[0x058];
-     __u32 SetColorConversion;     /* 02FC-02FF */
-     __u32 SetColorFormat;         /* 0300-0303 */
-     __u32 SetOperation;           /* 0304-0307 */
-     __u32 ClipPoint;              /* 0308-030B */
-     __u32 ClipSize;               /* 030C-030F */
-     __u32 ImageOutPoint;          /* 0310-0313 */
-     __u32 ImageOutSize;           /* 0314-0317 */
-     __u32 DuDx;                   /* 0318-031B */
-     __u32 DvDy;                   /* 031C-031F */
-     __u32 Reserved02[0x038];
-     __u32 ImageInSize;            /* 0400-0403 */
-     __u32 ImageInFormat;          /* 0404-0407 */
-     __u32 ImageInOffset;          /* 0408-040B */
-     __u32 ImageInPoint;           /* 040C-040F */
-     __u32 Reserved03[0x6FC];
+     u32 NoOperation;              /* 0100-0103 */
+     u32 Notify;                   /* 0104-0107 */
+     u32 Reserved00[0x01E];
+     u32 SetContextDmaNotify;      /* 0180-0183 */
+     u32 SetContextDmaImage;       /* 0184-0187 */
+     u32 SetContextPattern;        /* 0188-018B */
+     u32 SetContextRop;            /* 018C-018F */
+     u32 SetContextBeta1;          /* 0190-0193 */
+     u32 SetContextBeta4;          /* 0194-0197 */
+     u32 SetContextSurface;        /* 0198-019C */
+     u32 Reserved01[0x058];
+     u32 SetColorConversion;       /* 02FC-02FF */
+     u32 SetColorFormat;           /* 0300-0303 */
+     u32 SetOperation;             /* 0304-0307 */
+     u32 ClipPoint;                /* 0308-030B */
+     u32 ClipSize;                 /* 030C-030F */
+     u32 ImageOutPoint;            /* 0310-0313 */
+     u32 ImageOutSize;             /* 0314-0317 */
+     u32 DuDx;                     /* 0318-031B */
+     u32 DvDy;                     /* 031C-031F */
+     u32 Reserved02[0x038];
+     u32 ImageInSize;              /* 0400-0403 */
+     u32 ImageInFormat;            /* 0404-0407 */
+     u32 ImageInOffset;            /* 0408-040B */
+     u32 ImageInPoint;             /* 040C-040F */
+     u32 Reserved03[0x6FC];
 } NVScaledImage;
 #define SCALER_COLOR_CONVERSION              0x000002FC
 #define SCALER_COLOR_FORMAT                  0x00000300
@@ -1406,28 +1406,28 @@
  * 2D stretched image from CPU BLT
  */
 typedef volatile struct {
-     __u32 NoOperation;            /* 0100-0103 */
-     __u32 Notify;                 /* 0104-0107 */
-     __u32 Reserved00[0x01E];
-     __u32 SetContextDmaNotify;    /* 0180-0183 */
-     __u32 SetContextColorKey;     /* 0184-0187 */
-     __u32 SetContextPattern;      /* 0188-018B */
-     __u32 SetContextRop;          /* 018C-018F */
-     __u32 SetContextBeta1;        /* 0190-0193 */
-     __u32 SetContextBeta4;        /* 0194-0197 */
-     __u32 SetContextSurface;      /* 0198-019C */
-     __u32 Reserved01[0x057];
-     __u32 SetColorConversion;     /* 02F8-02FB */
-     __u32 SetOperation;           /* 02FC-02FF */
-     __u32 SetColorFormat;         /* 0300-0303 */
-     __u32 ImageInSize;            /* 0304-0307 */
-     __u32 DxDu;                   /* 0308-030B */
-     __u32 DyDv;                   /* 030C-030F */
-     __u32 ClipPoint;              /* 0310-0313 */
-     __u32 ClipSize;               /* 0314-0317 */
-     __u32 ImageOutPoint;          /* 0318-031B */
-     __u32 Reserved02[0x039];
-     __u32 Pixel[1792];            /* 0400-     */
+     u32 NoOperation;              /* 0100-0103 */
+     u32 Notify;                   /* 0104-0107 */
+     u32 Reserved00[0x01E];
+     u32 SetContextDmaNotify;      /* 0180-0183 */
+     u32 SetContextColorKey;       /* 0184-0187 */
+     u32 SetContextPattern;        /* 0188-018B */
+     u32 SetContextRop;            /* 018C-018F */
+     u32 SetContextBeta1;          /* 0190-0193 */
+     u32 SetContextBeta4;          /* 0194-0197 */
+     u32 SetContextSurface;        /* 0198-019C */
+     u32 Reserved01[0x057];
+     u32 SetColorConversion;       /* 02F8-02FB */
+     u32 SetOperation;             /* 02FC-02FF */
+     u32 SetColorFormat;           /* 0300-0303 */
+     u32 ImageInSize;              /* 0304-0307 */
+     u32 DxDu;                     /* 0308-030B */
+     u32 DyDv;                     /* 030C-030F */
+     u32 ClipPoint;                /* 0310-0313 */
+     u32 ClipSize;                 /* 0314-0317 */
+     u32 ImageOutPoint;            /* 0318-031B */
+     u32 Reserved02[0x039];
+     u32 Pixel[1792];              /* 0400-     */
 } NVStretchedImage;
 #define ISTRETCH_COLOR_CONVERSION            0x000002F8
 #define ISTRETCH_OPERATION                   0x000002FC
@@ -1449,34 +1449,34 @@
  * 3D textured, Z buffered triangle
  */
 typedef volatile struct {
-     __u32 NoOperation;            /* 0100-0103 */
-     __u32 Notify;                 /* 0104-0107 */
-     __u32 Reserved00[0x01E];
-     __u32 SetContextDmaNotify;    /* 0180-0183 */
-     __u32 SetContextDmaA;         /* 0184-0187 */
-     __u32 SetContextDmaB;         /* 0188-018B */
-     __u32 SetContextSurfaces;     /* 018C-018F */
-     __u32 Reserved01[0x05C];
-     __u32 ColorKey;               /* 0300-0303 */
-     __u32 TextureOffset;          /* 0304-0307 */
-     __u32 TextureFormat;          /* 0308-030B */
-     __u32 TextureFilter;          /* 030C-030F */
-     __u32 Blend;                  /* 0310-0313 */
-     __u32 Control;                /* 0314-0317 */
-     __u32 FogColor;               /* 0318-031B */
-     __u32 Reserved02[0x039];
+     u32 NoOperation;              /* 0100-0103 */
+     u32 Notify;                   /* 0104-0107 */
+     u32 Reserved00[0x01E];
+     u32 SetContextDmaNotify;      /* 0180-0183 */
+     u32 SetContextDmaA;           /* 0184-0187 */
+     u32 SetContextDmaB;           /* 0188-018B */
+     u32 SetContextSurfaces;       /* 018C-018F */
+     u32 Reserved01[0x05C];
+     u32 ColorKey;                 /* 0300-0303 */
+     u32 TextureOffset;            /* 0304-0307 */
+     u32 TextureFormat;            /* 0308-030B */
+     u32 TextureFilter;            /* 030C-030F */
+     u32 Blend;                    /* 0310-0313 */
+     u32 Control;                  /* 0314-0317 */
+     u32 FogColor;                 /* 0318-031B */
+     u32 Reserved02[0x039];
      struct {                      /* 0400-     */
           float sx;                /*   00-  03 */
           float sy;                /*   04-  07 */
           float sz;                /*   08-  0B */
           float rhw;               /*   0C-  0F */
-          __u32 color;             /*   10-  13 */
-          __u32 specular;          /*   14-  17 */
+          u32 color;               /*   10-  13 */
+          u32 specular;            /*   14-  17 */
           float ts;                /*   18-  1B */
           float tt;                /*   1C-  1F */
      } Tlvertex[16];               /*     -05FF */
-     __u32 DrawPrimitives[64];     /* 0600-063F */
-     __u32 Reserved03[0x640];
+     u32 DrawPrimitives[64];       /* 0600-063F */
+     u32 Reserved03[0x640];
 } NVTexturedTriangleDx5;
 #define TXTRI_COLOR_KEY                      0x00000300
 #define TXTRI_OFFSET                         0x00000304
@@ -1613,18 +1613,18 @@
 
 
 typedef volatile struct {
-     __u32 SetObject;              /* 0000-0003 */
-     __u32 Reserved00[0x003];
+     u32 SetObject;                /* 0000-0003 */
+     u32 Reserved00[0x003];
 #ifdef WORDS_BIGENDIAN
-     __u32 Free;                   /* 0010-0013 */
+     u32 Free;                     /* 0010-0013 */
 #else
-     __u16 Free;                   /* 0010-0011 */
-     __u16 Nop;                    /* 0012-0013 */
+     u16 Free;                     /* 0010-0011 */
+     u16 Nop;                      /* 0012-0013 */
 #endif
-     __u32 Reserved01[0x00B];
-     __u32 DmaPut;                 /* 0040-0043 */
-     __u32 DmaGet;                 /* 0044-0047 */
-     __u32 Reserved02[0x02E];
+     u32 Reserved01[0x00B];
+     u32 DmaPut;                   /* 0040-0043 */
+     u32 DmaGet;                   /* 0044-0047 */
+     u32 Reserved02[0x02E];
      union {
           NVSurfaces2D          Surfaces2D;
           NVSurfaces3D          Surfaces3D;
Index: gfxdrivers/nvidia/nvidia_state.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/nvidia/nvidia_state.c,v
retrieving revision 1.7
diff -u -r1.7 nvidia_state.c
--- gfxdrivers/nvidia/nvidia_state.c	28 Jun 2006 17:12:58 -0000	1.7
+++ gfxdrivers/nvidia/nvidia_state.c	7 Oct 2006 19:54:39 -0000
@@ -65,12 +65,12 @@
 {
      CoreSurface   *surface     = state->destination;
      SurfaceBuffer *buffer      = surface->back_buffer;
-     volatile __u8 *mmio        = nvdrv->mmio_base;
-     __u32          dst_offset;
-     __u32          dst_pitch;
-     __u32          src_pitch;
-     __u32          depth_offset;
-     __u32          depth_pitch;
+     volatile u8   *mmio        = nvdrv->mmio_base;
+     u32            dst_offset;
+     u32            dst_pitch;
+     u32            src_pitch;
+     u32            depth_offset;
+     u32            depth_pitch;
      
      if (NVIDIA_IS_SET( DESTINATION ))
           return;
@@ -89,9 +89,9 @@
      }
 
      if (nvdev->dst_format != buffer->format) {
-          __u32 sformat2D = 0;
-          __u32 sformat3D = 0;
-          __u32 cformat   = 0;
+          u32   sformat2D = 0;
+          u32   sformat3D = 0;
+          u32   cformat   = 0;
           bool  dst_422 = false;
 
           switch (buffer->format) {
@@ -273,8 +273,8 @@
           nvdev->src_system  = true;
      }
      else {
-          __u32 src_offset = (buffer->video.offset + nvdev->fb_offset) & ~63;
-          __u32 src_pitch  = buffer->video.pitch & ~31;
+          u32 src_offset = (buffer->video.offset + nvdev->fb_offset) & ~63;
+          u32 src_pitch  = buffer->video.pitch & ~31;
 
           nv_assign_object( nvdrv, nvdev,
                             SUBC_SURFACES2D, OBJ_SURFACES2D, false );
@@ -319,8 +319,8 @@
           nvdev->src_interlaced = false;
      
      if (nvdev->enabled_3d) {
-          __u32 size_u = direct_log2( surface->width  ) & 0xF;
-          __u32 size_v = direct_log2( surface->height ) & 0xF;
+          u32 size_u = direct_log2( surface->width  ) & 0xF;
+          u32 size_v = direct_log2( surface->height ) & 0xF;
 
           nvdev->state3d[1].offset  = nvdev->fb_offset + nvdev->buf_offset[1];
           nvdev->state3d[1].format &= 0xFF00FFFF;
@@ -500,7 +500,7 @@
      }
      else if (state->blittingflags & (DSBLIT_BLEND_COLORALPHA |
                                       DSBLIT_BLEND_ALPHACHANNEL)) {
-          __u32 beta1;
+          u32 beta1;
           
           if (state->blittingflags & DSBLIT_BLEND_COLORALPHA) {
                nvdev->color3d = (color.a << 24) | 0x00FFFFFF;
@@ -530,7 +530,7 @@
                             NVidiaDeviceData *nvdev,
                             CardState        *state )
 {
-     __u32 blend;
+     u32 blend;
      
      if (NVIDIA_IS_SET( SRC_BLEND ) && NVIDIA_IS_SET( DST_BLEND ))
           return;
@@ -568,7 +568,7 @@
           return;
           
      if (!nvdev->enabled_3d) {
-          __u32 operation;
+          u32 operation;
           
           if (state->drawingflags & DSDRAW_BLEND)
                operation = OPERATION_BLEND;
@@ -598,7 +598,7 @@
                            NVidiaDeviceData *nvdev,
                            CardState        *state )
 {
-     __u32 operation;
+     u32 operation;
      bool  src_alpha;
      
      if (NVIDIA_IS_SET( BLITTING_FLAGS ))
Index: gfxdrivers/radeon/r100_3d.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/radeon/r100_3d.c,v
retrieving revision 1.2
diff -u -r1.2 r100_3d.c
--- gfxdrivers/radeon/r100_3d.c	19 Aug 2006 13:01:04 -0000	1.2
+++ gfxdrivers/radeon/r100_3d.c	7 Oct 2006 19:54:39 -0000
@@ -46,14 +46,14 @@
 
 
 static __inline__ void
-out_vertex2d0( volatile __u8 *mmio, float x, float y )
+out_vertex2d0( volatile u8 *mmio, float x, float y )
 {
      radeon_out32( mmio, SE_PORT_DATA0, f2d(x) );
      radeon_out32( mmio, SE_PORT_DATA0, f2d(y) );
 }
 
 static __inline__ void
-out_vertex2d2( volatile __u8 *mmio, float x, float y, float s, float t )
+out_vertex2d2( volatile u8 *mmio, float x, float y, float s, float t )
 {
      radeon_out32( mmio, SE_PORT_DATA0, f2d(x) );
      radeon_out32( mmio, SE_PORT_DATA0, f2d(y) );
@@ -62,7 +62,7 @@
 }
 
 static __inline__ void
-out_vertex3d( volatile __u8 *mmio,
+out_vertex3d( volatile u8 *mmio,
               float x, float y, float z, float w, float s, float t )
 {
      radeon_out32( mmio, SE_PORT_DATA0, f2d(x) );
@@ -79,7 +79,7 @@
                        RadeonDeviceData *rdev,
                        DFBRectangle     *rect )
 {
-     volatile __u8 *mmio = rdrv->mmio_base;
+     volatile u8 *mmio = rdrv->mmio_base;
 
      if (rect->w == 1 && rect->h == 1) {
           radeon_waitfifo( rdrv, rdev, 3 );
@@ -120,7 +120,7 @@
      RadeonDriverData *rdrv = (RadeonDriverData*) drv;
      RadeonDeviceData *rdev = (RadeonDeviceData*) dev;
      DFBRegion        *clip = &rdev->clip;
-     volatile __u8    *mmio = rdrv->mmio_base;
+     volatile u8      *mmio = rdrv->mmio_base;
 
      /* Fill Luma plane */
      r100DoFillRectangle3D( rdrv, rdev, rect );
@@ -169,7 +169,7 @@
                     RadeonDeviceData *rdev,
                     DFBTriangle      *tri )
 {
-     volatile __u8 *mmio = rdrv->mmio_base;
+     volatile u8 *mmio = rdrv->mmio_base;
 
      radeon_waitfifo( rdrv, rdev, 7 );
      
@@ -198,7 +198,7 @@
      RadeonDriverData *rdrv = (RadeonDriverData*) drv;
      RadeonDeviceData *rdev = (RadeonDeviceData*) dev;
      DFBRegion        *clip = &rdev->clip;
-     volatile __u8    *mmio = rdrv->mmio_base;
+     volatile u8      *mmio = rdrv->mmio_base;
 
      /* Fill Luma plane */
      r100DoFillTriangle( rdrv, rdev, tri );
@@ -249,7 +249,7 @@
                        RadeonDeviceData *rdev,
                        DFBRectangle     *rect )
 {
-     volatile __u8 *mmio = rdrv->mmio_base;
+     volatile u8 *mmio = rdrv->mmio_base;
 
      radeon_waitfifo( rdrv, rdev, 25 );
           
@@ -290,7 +290,7 @@
      RadeonDriverData *rdrv = (RadeonDriverData*) drv;
      RadeonDeviceData *rdev = (RadeonDeviceData*) dev;
      DFBRegion        *clip = &rdev->clip;
-     volatile __u8    *mmio = rdrv->mmio_base;
+     volatile u8      *mmio = rdrv->mmio_base;
      
      /* Fill Luma plane */
      r100DoDrawRectangle3D( rdrv, rdev, rect );
@@ -339,7 +339,7 @@
                   RadeonDeviceData *rdev,
                   DFBRegion        *line )
 {
-     volatile __u8 *mmio = rdrv->mmio_base;
+     volatile u8 *mmio = rdrv->mmio_base;
      
      radeon_waitfifo( rdrv, rdev, 5 );
      
@@ -367,7 +367,7 @@
      RadeonDriverData *rdrv = (RadeonDriverData*) drv;
      RadeonDeviceData *rdev = (RadeonDeviceData*) dev;
      DFBRegion        *clip = &rdev->clip;
-     volatile __u8    *mmio = rdrv->mmio_base;
+     volatile u8      *mmio = rdrv->mmio_base;
      
      line->x1 &= ~1;
      line->y1 &= ~1;
@@ -420,7 +420,7 @@
 r100DoBlit3D( RadeonDriverData *rdrv, RadeonDeviceData *rdev,
               DFBRectangle     *sr,   DFBRectangle     *dr )
 {
-     volatile __u8 *mmio = rdrv->mmio_base;
+     volatile u8 *mmio = rdrv->mmio_base;
      
      radeon_waitfifo( rdrv, rdev, 13 );
 
@@ -477,7 +477,7 @@
      RadeonDriverData *rdrv    = (RadeonDriverData*) drv;
      RadeonDeviceData *rdev    = (RadeonDeviceData*) dev; 
      DFBRegion        *clip    = &rdev->clip;
-     volatile __u8    *mmio    = rdrv->mmio_base;
+     volatile u8      *mmio    = rdrv->mmio_base;
      bool              src_420 = DFB_PLANAR_PIXELFORMAT( rdev->src_format );
      
      if (rdev->blittingflags & DSBLIT_DEINTERLACE) {
@@ -550,9 +550,9 @@
 
 static void
 r100DoTextureTriangles( RadeonDriverData *rdrv, RadeonDeviceData *rdev,
-                        DFBVertex *ve, int num, __u32 primitive )
+                        DFBVertex *ve, int num, u32 primitive )
 {
-     volatile __u8 *mmio = rdrv->mmio_base;
+     volatile u8   *mmio = rdrv->mmio_base;
      int            i;
  
      radeon_waitfifo( rdrv, rdev, 1 ); 
@@ -583,7 +583,7 @@
 { 
      RadeonDriverData *rdrv = (RadeonDriverData*) drv;
      RadeonDeviceData *rdev = (RadeonDeviceData*) dev;
-     __u32             prim = 0;
+     u32               prim = 0;
 
      if (num > 65535) {
           D_WARN( "R100 supports maximum 65535 vertices" );
@@ -616,9 +616,9 @@
      RadeonDriverData *rdrv    = (RadeonDriverData*) drv;
      RadeonDeviceData *rdev    = (RadeonDeviceData*) dev;
      DFBRegion        *clip    = &rdev->clip;
-     volatile __u8    *mmio    = rdrv->mmio_base;
+     volatile u8      *mmio    = rdrv->mmio_base;
      bool              src_420 = DFB_PLANAR_PIXELFORMAT( rdev->src_format );
-     __u32             prim    = 0;
+     u32               prim    = 0;
      int               i;
 
      if (num > 65535) {
Index: gfxdrivers/radeon/r100_state.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/radeon/r100_state.c,v
retrieving revision 1.4
diff -u -r1.4 r100_state.c
--- gfxdrivers/radeon/r100_state.c	19 Aug 2006 13:02:15 -0000	1.4
+++ gfxdrivers/radeon/r100_state.c	7 Oct 2006 19:54:39 -0000
@@ -44,7 +44,7 @@
 #include "radeon_state.h"
 
 
-static const __u32 r100SrcBlend[] = {
+static const u32 r100SrcBlend[] = {
      SRC_BLEND_GL_ZERO,                 // DSBF_ZERO
      SRC_BLEND_GL_ONE,                  // DSBF_ONE
      SRC_BLEND_GL_SRC_COLOR,            // DSBF_SRCCOLOR
@@ -58,7 +58,7 @@
      SRC_BLEND_GL_SRC_ALPHA_SATURATE    // DSBF_SRCALPHASAT
 };
 
-static const __u32 r100DstBlend[] = {
+static const u32 r100DstBlend[] = {
      DST_BLEND_GL_ZERO,                 // DSBF_ZERO
      DST_BLEND_GL_ONE,                  // DSBF_ONE
      DST_BLEND_GL_SRC_COLOR,            // DSBF_SRCCOLOR
@@ -75,7 +75,7 @@
 
 void r100_restore( RadeonDriverData *rdrv, RadeonDeviceData *rdev )
 {
-     volatile __u8 *mmio = rdrv->mmio_base;
+     volatile u8 *mmio = rdrv->mmio_base;
      
      radeon_waitfifo( rdrv, rdev, 10 );
      /* enable caches */
@@ -106,9 +106,9 @@
 {
      CoreSurface   *surface = state->destination;
      SurfaceBuffer *buffer  = surface->back_buffer;
-     volatile __u8 *mmio    = rdrv->mmio_base;
-     __u32          offset;
-     __u32          pitch;
+     volatile u8   *mmio    = rdrv->mmio_base;
+     u32            offset;
+     u32            pitch;
     
      if (RADEON_IS_SET( DESTINATION ))
           return;
@@ -226,9 +226,9 @@
 {
      CoreSurface   *surface  = state->source;
      SurfaceBuffer *buffer   = surface->front_buffer;
-     volatile __u8 *mmio     = rdrv->mmio_base;
-     __u32          txformat = TXFORMAT_NON_POWER2;
-     __u32          txfilter = MAG_FILTER_LINEAR  |
+     volatile u8   *mmio     = rdrv->mmio_base;
+     u32            txformat = TXFORMAT_NON_POWER2;
+     u32            txfilter = MAG_FILTER_LINEAR  |
                                MIN_FILTER_LINEAR  |
                                CLAMP_S_CLAMP_LAST |
                                CLAMP_T_CLAMP_LAST;
@@ -373,7 +373,7 @@
                     CardState        *state )
 {
      DFBRegion     *clip = &state->clip;
-     volatile __u8 *mmio = rdrv->mmio_base;
+     volatile u8   *mmio = rdrv->mmio_base;
      
      if (RADEON_IS_SET( CLIP ))
           return;
@@ -419,8 +419,8 @@
 {
      DFBColor color   = state->color;
      int      index   = state->color_index;
-     __u32    color2d;
-     __u32    color3d;
+     u32      color2d;
+     u32      color3d;
      int      y, u, v;
 
      if (RADEON_IS_SET( COLOR ) && RADEON_IS_SET( DRAWING_FLAGS ))
@@ -515,7 +515,7 @@
                               CardState        *state )
 {
      DFBColor color   = state->color;
-     __u32    color3d;
+     u32      color3d;
      int      y, u, v;
      
      if (RADEON_IS_SET( COLOR ) && RADEON_IS_SET( BLITTING_FLAGS ))
@@ -564,7 +564,7 @@
                             RadeonDeviceData *rdev,
                             CardState        *state )
 {
-     volatile __u8 *mmio = rdrv->mmio_base;
+     volatile u8 *mmio = rdrv->mmio_base;
      
      if (RADEON_IS_SET( SRC_COLORKEY ))
           return;
@@ -581,9 +581,9 @@
                          RadeonDeviceData *rdev,
                          CardState        *state )
 {
-     volatile __u8 *mmio   = rdrv->mmio_base;
-     __u32          sblend;
-     __u32          dblend;
+     volatile u8   *mmio   = rdrv->mmio_base;
+     u32            sblend;
+     u32            dblend;
      
      if (RADEON_IS_SET( SRC_BLEND ) && RADEON_IS_SET( DST_BLEND ))
           return;
@@ -621,14 +621,14 @@
                             RadeonDeviceData *rdev,
                             CardState        *state )
 {
-     volatile __u8 *mmio        = rdrv->mmio_base;
-     __u32          master_cntl = rdev->gui_master_cntl       |
+     volatile u8   *mmio        = rdrv->mmio_base;
+     u32            master_cntl = rdev->gui_master_cntl       |
                                   GMC_SRC_DATATYPE_MONO_FG_LA |
                                   GMC_BRUSH_SOLID_COLOR       |
                                   GMC_CLR_CMP_CNTL_DIS;
-     __u32          rb3d_cntl   = rdev->rb3d_cntl & ~DITHER_ENABLE;
-     __u32          pp_cntl     = SCISSOR_ENABLE | TEX_BLEND_1_ENABLE;
-     __u32          cblend      = COLOR_ARG_C_TFACTOR_COLOR;
+     u32            rb3d_cntl   = rdev->rb3d_cntl & ~DITHER_ENABLE;
+     u32            pp_cntl     = SCISSOR_ENABLE | TEX_BLEND_1_ENABLE;
+     u32            cblend      = COLOR_ARG_C_TFACTOR_COLOR;
      
      if (RADEON_IS_SET( DRAWING_FLAGS ))
           return;
@@ -677,23 +677,23 @@
                              RadeonDeviceData *rdev,
                              CardState        *state )
 {
-     volatile __u8 *mmio        = rdrv->mmio_base;
-     __u32          master_cntl = rdev->gui_master_cntl |
+     volatile u8   *mmio        = rdrv->mmio_base;
+     u32            master_cntl = rdev->gui_master_cntl |
                                   GMC_BRUSH_NONE        |
                                   GMC_SRC_DATATYPE_COLOR;
-     __u32          cmp_cntl    = 0;
-     __u32          rb3d_cntl   = rdev->rb3d_cntl;
-     __u32          se_cntl     = BFACE_SOLID        |
+     u32            cmp_cntl    = 0;
+     u32            rb3d_cntl   = rdev->rb3d_cntl;
+     u32            se_cntl     = BFACE_SOLID        |
                                   FFACE_SOLID        |
                                   VTX_PIX_CENTER_OGL |
                                   ROUND_MODE_ROUND;
-     __u32          pp_cntl     = SCISSOR_ENABLE    | 
+     u32            pp_cntl     = SCISSOR_ENABLE    | 
                                   TEX_0_ENABLE      |
                                   TEX_BLEND_0_ENABLE;
-     __u32          cblend      = COLOR_ARG_C_T0_COLOR;
-     __u32          ablend      = ALPHA_ARG_C_T0_ALPHA;
-     __u32          vtx_fmt     = SE_VTX_FMT_XY | SE_VTX_FMT_ST0;
-     __u32          coord_fmt   = VTX_XY_PRE_MULT_1_OVER_W0 | 
+     u32            cblend      = COLOR_ARG_C_T0_COLOR;
+     u32            ablend      = ALPHA_ARG_C_T0_ALPHA;
+     u32            vtx_fmt     = SE_VTX_FMT_XY | SE_VTX_FMT_ST0;
+     u32            coord_fmt   = VTX_XY_PRE_MULT_1_OVER_W0 | 
                                   TEX1_W_ROUTING_USE_W0;
      
      if (RADEON_IS_SET( BLITTING_FLAGS ))
Index: gfxdrivers/radeon/r200_3d.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/radeon/r200_3d.c,v
retrieving revision 1.3
diff -u -r1.3 r200_3d.c
--- gfxdrivers/radeon/r200_3d.c	19 Aug 2006 13:01:04 -0000	1.3
+++ gfxdrivers/radeon/r200_3d.c	7 Oct 2006 19:54:39 -0000
@@ -46,14 +46,14 @@
 
 
 static __inline__ void
-out_vertex2d0( volatile __u8 *mmio, float x, float y )
+out_vertex2d0( volatile u8 *mmio, float x, float y )
 {
      radeon_out32( mmio, SE_PORT_DATA0, f2d(x) );
      radeon_out32( mmio, SE_PORT_DATA0, f2d(y) );
 }
 
 static __inline__ void
-out_vertex2d2( volatile __u8 *mmio, float x, float y, float s, float t )
+out_vertex2d2( volatile u8 *mmio, float x, float y, float s, float t )
 {
      radeon_out32( mmio, SE_PORT_DATA0, f2d(x) );
      radeon_out32( mmio, SE_PORT_DATA0, f2d(y) );
@@ -62,7 +62,7 @@
 }
 
 static __inline__ void
-out_vertex3d( volatile __u8 *mmio,
+out_vertex3d( volatile u8 *mmio,
               float x, float y, float z, float w, float s, float t )
 {
      radeon_out32( mmio, SE_PORT_DATA0, f2d(x) );
@@ -79,7 +79,7 @@
                        RadeonDeviceData *rdev,
                        DFBRectangle     *rect )
 {
-     volatile __u8 *mmio = rdrv->mmio_base;
+     volatile u8 *mmio = rdrv->mmio_base;
 
      if (rect->w == 1 && rect->h == 1) {
           radeon_waitfifo( rdrv, rdev, 3 );
@@ -118,7 +118,7 @@
      RadeonDriverData *rdrv = (RadeonDriverData*) drv;
      RadeonDeviceData *rdev = (RadeonDeviceData*) dev;
      DFBRegion      *clip = &rdev->clip;
-     volatile __u8  *mmio = rdrv->mmio_base;
+     volatile u8    *mmio = rdrv->mmio_base;
 
      /* Fill Luma plane */
      r200DoFillRectangle3D( rdrv, rdev, rect );
@@ -167,7 +167,7 @@
                     RadeonDeviceData *rdev,
                     DFBTriangle      *tri )
 {
-     volatile __u8 *mmio = rdrv->mmio_base;
+     volatile u8 *mmio = rdrv->mmio_base;
 
      radeon_waitfifo( rdrv, rdev, 7 );
      
@@ -195,7 +195,7 @@
      RadeonDriverData *rdrv = (RadeonDriverData*) drv;
      RadeonDeviceData *rdev = (RadeonDeviceData*) dev;
      DFBRegion        *clip = &rdev->clip;
-     volatile __u8    *mmio = rdrv->mmio_base;
+     volatile u8      *mmio = rdrv->mmio_base;
 
      /* Fill Luma plane */
      r200DoFillTriangle( rdrv, rdev, tri );
@@ -246,7 +246,7 @@
                        RadeonDeviceData *rdev,
                        DFBRectangle     *rect )
 {
-     volatile __u8 *mmio = rdrv->mmio_base;
+     volatile u8 *mmio = rdrv->mmio_base;
 
      radeon_waitfifo( rdrv, rdev, 25 );
           
@@ -286,7 +286,7 @@
      RadeonDriverData *rdrv = (RadeonDriverData*) drv;
      RadeonDeviceData *rdev = (RadeonDeviceData*) dev;
      DFBRegion        *clip = &rdev->clip;
-     volatile __u8    *mmio = rdrv->mmio_base;
+     volatile u8      *mmio = rdrv->mmio_base;
 
      /* Fill Luma plane */
      r200DoDrawRectangle3D( rdrv, rdev, rect );
@@ -335,7 +335,7 @@
                   RadeonDeviceData *rdev,
                   DFBRegion        *line )
 {
-     volatile __u8 *mmio = rdrv->mmio_base;
+     volatile u8 *mmio = rdrv->mmio_base;
      
      radeon_waitfifo( rdrv, rdev, 5 );
      
@@ -362,7 +362,7 @@
      RadeonDriverData *rdrv = (RadeonDriverData*) drv;
      RadeonDeviceData *rdev = (RadeonDeviceData*) dev;
      DFBRegion      *clip = &rdev->clip;
-     volatile __u8  *mmio = rdrv->mmio_base;
+     volatile u8    *mmio = rdrv->mmio_base;
      
      line->x1 &= ~1;
      line->y1 &= ~1;
@@ -415,7 +415,7 @@
 r200DoBlit3D( RadeonDriverData *rdrv, RadeonDeviceData *rdev,
               DFBRectangle     *sr,   DFBRectangle     *dr )
 {
-     volatile __u8 *mmio = rdrv->mmio_base;
+     volatile u8 *mmio = rdrv->mmio_base;
      
      radeon_waitfifo( rdrv, rdev, 13 );
 
@@ -471,7 +471,7 @@
      RadeonDriverData *rdrv    = (RadeonDriverData*) drv;
      RadeonDeviceData *rdev    = (RadeonDeviceData*) dev; 
      DFBRegion        *clip    = &rdev->clip;
-     volatile __u8    *mmio    = rdrv->mmio_base;
+     volatile u8      *mmio    = rdrv->mmio_base;
      bool              src_420 = DFB_PLANAR_PIXELFORMAT( rdev->src_format );
      
      if (rdev->blittingflags & DSBLIT_DEINTERLACE) {
@@ -544,9 +544,9 @@
 
 static void
 r200DoTextureTriangles( RadeonDriverData *rdrv, RadeonDeviceData *rdev,
-                        DFBVertex *ve, int num, __u32 primitive )
+                        DFBVertex *ve, int num, u32 primitive )
 {
-     volatile __u8 *mmio = rdrv->mmio_base;
+     volatile u8 *mmio = rdrv->mmio_base;
      int            i;
  
      radeon_waitfifo( rdrv, rdev, 1 ); 
@@ -575,7 +575,7 @@
 { 
      RadeonDriverData *rdrv = (RadeonDriverData*) drv;
      RadeonDeviceData *rdev = (RadeonDeviceData*) dev;
-     __u32             prim = 0;
+     u32               prim = 0;
 
      if (num > 65535) {
           D_WARN( "R200 supports maximum 65535 vertices" );
@@ -608,9 +608,9 @@
      RadeonDriverData *rdrv    = (RadeonDriverData*) drv;
      RadeonDeviceData *rdev    = (RadeonDeviceData*) dev;
      DFBRegion        *clip    = &rdev->clip;
-     volatile __u8    *mmio    = rdrv->mmio_base;
+     volatile u8      *mmio    = rdrv->mmio_base;
      bool              src_420 = DFB_PLANAR_PIXELFORMAT( rdev->src_format );
-     __u32             prim    = 0;
+     u32               prim    = 0;
      int               i;
 
      if (num > 65535) {
Index: gfxdrivers/radeon/r200_state.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/radeon/r200_state.c,v
retrieving revision 1.4
diff -u -r1.4 r200_state.c
--- gfxdrivers/radeon/r200_state.c	19 Aug 2006 13:02:15 -0000	1.4
+++ gfxdrivers/radeon/r200_state.c	7 Oct 2006 19:54:39 -0000
@@ -44,7 +44,7 @@
 #include "radeon_state.h"
 
 
-static const __u32 r200SrcBlend[] = {
+static const u32 r200SrcBlend[] = {
      SRC_BLEND_GL_ZERO,                 // DSBF_ZERO
      SRC_BLEND_GL_ONE,                  // DSBF_ONE
      SRC_BLEND_GL_SRC_COLOR,            // DSBF_SRCCOLOR
@@ -58,7 +58,7 @@
      SRC_BLEND_GL_SRC_ALPHA_SATURATE    // DSBF_SRCALPHASAT
 };
 
-static const __u32 r200DstBlend[] = {
+static const u32 r200DstBlend[] = {
      DST_BLEND_GL_ZERO,                 // DSBF_ZERO
      DST_BLEND_GL_ONE,                  // DSBF_ONE
      DST_BLEND_GL_SRC_COLOR,            // DSBF_SRCCOLOR
@@ -75,7 +75,7 @@
 
 void r200_restore( RadeonDriverData *rdrv, RadeonDeviceData *rdev )
 {
-     volatile __u8 *mmio = rdrv->mmio_base;
+     volatile u8 *mmio = rdrv->mmio_base;
      
      radeon_waitfifo( rdrv, rdev, 15 );
      /* enable caches */
@@ -115,9 +115,9 @@
 {
      CoreSurface   *surface = state->destination;
      SurfaceBuffer *buffer  = surface->back_buffer;
-     volatile __u8 *mmio    = rdrv->mmio_base;
-     __u32          offset;
-     __u32          pitch;
+     volatile u8   *mmio    = rdrv->mmio_base;
+     u32            offset;
+     u32            pitch;
     
      if (RADEON_IS_SET( DESTINATION ))
           return;
@@ -235,9 +235,9 @@
 {
      CoreSurface   *surface  = state->source;
      SurfaceBuffer *buffer   = surface->front_buffer;
-     volatile __u8 *mmio     = rdrv->mmio_base;
-     __u32          txformat = R200_TXFORMAT_NON_POWER2;
-     __u32          txfilter = R200_MAG_FILTER_LINEAR  |
+     volatile u8   *mmio     = rdrv->mmio_base;
+     u32            txformat = R200_TXFORMAT_NON_POWER2;
+     u32            txfilter = R200_MAG_FILTER_LINEAR  |
                                R200_MIN_FILTER_LINEAR  |
                                R200_CLAMP_S_CLAMP_LAST |
                                R200_CLAMP_T_CLAMP_LAST;
@@ -383,7 +383,7 @@
                     CardState        *state )
 {
      DFBRegion     *clip = &state->clip;
-     volatile __u8 *mmio = rdrv->mmio_base;
+     volatile u8 *mmio = rdrv->mmio_base;
      
      if (RADEON_IS_SET( CLIP ))
           return;
@@ -429,8 +429,8 @@
 {
      DFBColor color   = state->color;
      int      index   = state->color_index;
-     __u32    color2d;
-     __u32    color3d;
+     u32      color2d;
+     u32      color3d;
      int      y, u, v;
 
      if (RADEON_IS_SET( COLOR ) && RADEON_IS_SET( DRAWING_FLAGS ))
@@ -525,7 +525,7 @@
                               CardState        *state )
 {
      DFBColor color   = state->color;
-     __u32    color3d;
+     u32      color3d;
      int      y, u, v;
      
      if (RADEON_IS_SET( COLOR ) && RADEON_IS_SET( BLITTING_FLAGS ))
@@ -574,7 +574,7 @@
                             RadeonDeviceData *rdev,
                             CardState        *state )
 {
-     volatile __u8 *mmio = rdrv->mmio_base;
+     volatile u8 *mmio = rdrv->mmio_base;
      
      if (RADEON_IS_SET( SRC_COLORKEY ))
           return;
@@ -591,9 +591,9 @@
                          RadeonDeviceData *rdev,
                          CardState        *state )
 {
-     volatile __u8 *mmio   = rdrv->mmio_base;
-     __u32          sblend;
-     __u32          dblend;
+     volatile u8   *mmio   = rdrv->mmio_base;
+     u32            sblend;
+     u32            dblend;
      
      if (RADEON_IS_SET( SRC_BLEND ) && RADEON_IS_SET( DST_BLEND ))
           return;
@@ -631,14 +631,14 @@
                             RadeonDeviceData *rdev,
                             CardState        *state )
 {
-     volatile __u8 *mmio        = rdrv->mmio_base;
-     __u32          master_cntl = rdev->gui_master_cntl       |
+     volatile u8   *mmio        = rdrv->mmio_base;
+     u32            master_cntl = rdev->gui_master_cntl       |
                                   GMC_SRC_DATATYPE_MONO_FG_LA | 
                                   GMC_BRUSH_SOLID_COLOR       |
                                   GMC_CLR_CMP_CNTL_DIS;
-     __u32          rb3d_cntl   = rdev->rb3d_cntl & ~DITHER_ENABLE;
-     __u32          pp_cntl     = TEX_BLEND_1_ENABLE;
-     __u32          cblend      = R200_TXC_ARG_C_TFACTOR_COLOR;
+     u32            rb3d_cntl   = rdev->rb3d_cntl & ~DITHER_ENABLE;
+     u32            pp_cntl     = TEX_BLEND_1_ENABLE;
+     u32            cblend      = R200_TXC_ARG_C_TFACTOR_COLOR;
      
      if (RADEON_IS_SET( DRAWING_FLAGS ))
           return;
@@ -694,21 +694,21 @@
                              RadeonDeviceData *rdev,
                              CardState        *state )
 {
-     volatile __u8 *mmio        = rdrv->mmio_base;
-     __u32          master_cntl = rdev->gui_master_cntl |
+     volatile u8   *mmio        = rdrv->mmio_base;
+     u32            master_cntl = rdev->gui_master_cntl |
                                   GMC_BRUSH_NONE        |
                                   GMC_SRC_DATATYPE_COLOR;
-     __u32          cmp_cntl    = 0;
-     __u32          rb3d_cntl   = rdev->rb3d_cntl;
-     __u32          se_cntl     = BFACE_SOLID        |
+     u32            cmp_cntl    = 0;
+     u32            rb3d_cntl   = rdev->rb3d_cntl;
+     u32            se_cntl     = BFACE_SOLID        |
                                   FFACE_SOLID        |
                                   VTX_PIX_CENTER_OGL |
                                   ROUND_MODE_ROUND;
-     __u32          pp_cntl     = TEX_0_ENABLE;
-     __u32          cblend      = R200_TXC_ARG_C_R0_COLOR;
-     __u32          ablend      = R200_TXA_ARG_C_R0_ALPHA;
-     __u32          vtx_fmt     = R200_VTX_XY;
-     __u32          vte_cntl;
+     u32            pp_cntl     = TEX_0_ENABLE;
+     u32            cblend      = R200_TXC_ARG_C_R0_COLOR;
+     u32            ablend      = R200_TXA_ARG_C_R0_ALPHA;
+     u32            vtx_fmt     = R200_VTX_XY;
+     u32            vte_cntl;
      
      if (RADEON_IS_SET( BLITTING_FLAGS ))
           return;
Index: gfxdrivers/radeon/r300_3d.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/radeon/r300_3d.c,v
retrieving revision 1.2
diff -u -r1.2 r300_3d.c
--- gfxdrivers/radeon/r300_3d.c	19 Aug 2006 13:01:04 -0000	1.2
+++ gfxdrivers/radeon/r300_3d.c	7 Oct 2006 19:54:39 -0000
@@ -46,7 +46,7 @@
 
 
 static __inline__ void
-out_vertex2d0( volatile __u8 *mmio, float x, float y, float c[4] )
+out_vertex2d0( volatile u8 *mmio, float x, float y, float c[4] )
 {
      radeon_out32( mmio, SE_PORT_DATA0, f2d(x) );
      radeon_out32( mmio, SE_PORT_DATA0, f2d(y) );
@@ -59,7 +59,7 @@
 }
 
 static __inline__ void
-out_vertex2d2( volatile __u8 *mmio, float x, float y, float s, float t )
+out_vertex2d2( volatile u8 *mmio, float x, float y, float s, float t )
 {
      radeon_out32( mmio, SE_PORT_DATA0, f2d(x) );
      radeon_out32( mmio, SE_PORT_DATA0, f2d(y) );
@@ -77,7 +77,7 @@
                        RadeonDeviceData *rdev,
                        DFBRectangle     *rect )
 {
-     volatile __u8 *mmio = rdrv->mmio_base;
+     volatile u8 *mmio = rdrv->mmio_base;
 
      if (rect->w == 1 && rect->h == 1) {
           radeon_waitfifo( rdrv, rdev, 1+1*8 );
@@ -122,7 +122,7 @@
                     RadeonDeviceData *rdev,
                     DFBTriangle      *tri )
 {
-     volatile __u8 *mmio = rdrv->mmio_base;
+     volatile u8 *mmio = rdrv->mmio_base;
 
      radeon_waitfifo( rdrv, rdev, 1+3*8 );
      
@@ -156,7 +156,7 @@
                        DFBRectangle     *rect )
 {
 #if 0
-     volatile __u8 *mmio = rdrv->mmio_base;
+     volatile u8 *mmio = rdrv->mmio_base;
      
      radeon_waitfifo( rdrv, rdev, 1+16*8 );
           
@@ -220,7 +220,7 @@
                   RadeonDeviceData *rdev,
                   DFBRegion        *line )
 {
-     volatile __u8 *mmio = rdrv->mmio_base;
+     volatile u8 *mmio = rdrv->mmio_base;
      
      radeon_waitfifo( rdrv, rdev, 1+2*8 );
      
@@ -251,7 +251,7 @@
 r300DoBlit3D( RadeonDriverData *rdrv, RadeonDeviceData *rdev,
               DFBRectangle     *sr,   DFBRectangle     *dr )
 {
-     volatile __u8 *mmio = rdrv->mmio_base;
+     volatile u8 *mmio = rdrv->mmio_base;
      
      radeon_waitfifo( rdrv, rdev, 1+4*8 );
 
@@ -313,7 +313,7 @@
 {
      RadeonDriverData *rdrv = (RadeonDriverData*) drv;
      RadeonDeviceData *rdev = (RadeonDeviceData*) dev;
-     volatile __u8    *mmio = rdrv->mmio_base;
+     volatile u8      *mmio = rdrv->mmio_base;
      
      radeon_waitfifo( rdrv, rdev, 2 );
      radeon_out32( mmio, R300_RB3D_DSTCACHE_CTLSTAT, 0xa );
Index: gfxdrivers/radeon/r300_state.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/radeon/r300_state.c,v
retrieving revision 1.4
diff -u -r1.4 r300_state.c
--- gfxdrivers/radeon/r300_state.c	3 Aug 2006 17:20:00 -0000	1.4
+++ gfxdrivers/radeon/r300_state.c	7 Oct 2006 19:54:39 -0000
@@ -49,7 +49,7 @@
 #define R300_HAS_3DREGS()  (rdrv->mmio_size > 0x4000)
 
 
-static const __u32 r300SrcBlend[] = {
+static const u32 r300SrcBlend[] = {
      R300_SRC_BLEND_GL_ZERO,                 // DSBF_ZERO
      R300_SRC_BLEND_GL_ONE,                  // DSBF_ONE
      R300_SRC_BLEND_GL_SRC_COLOR,            // DSBF_SRCCOLOR
@@ -63,7 +63,7 @@
      R300_SRC_BLEND_GL_SRC_ALPHA_SATURATE    // DSBF_SRCALPHASAT
 };
 
-static const __u32 r300DstBlend[] = {
+static const u32 r300DstBlend[] = {
      R300_DST_BLEND_GL_ZERO,                 // DSBF_ZERO
      R300_DST_BLEND_GL_ONE,                  // DSBF_ONE
      R300_DST_BLEND_GL_SRC_COLOR,            // DSBF_SRCCOLOR
@@ -80,9 +80,9 @@
 
 void r300_restore( RadeonDriverData *rdrv, RadeonDeviceData *rdev )
 {
-     const __u32    rs_magic[8] = { 0x00, 0x44, 0x84, 0xc4,
+     const u32      rs_magic[8] = { 0x00, 0x44, 0x84, 0xc4,
                                     0x04, 0x04, 0x04, 0x04 };
-     volatile __u8 *mmio        = rdrv->mmio_base;
+     volatile u8   *mmio        = rdrv->mmio_base;
      int            i;
      
      /* enable caches */
@@ -292,10 +292,10 @@
 {
      CoreSurface   *surface = state->destination;
      SurfaceBuffer *buffer  = surface->back_buffer;
-     volatile __u8 *mmio    = rdrv->mmio_base;
-     __u32          offset;
-     __u32          pitch;
-     __u32          format  = 0; 
+     volatile u8   *mmio    = rdrv->mmio_base;
+     u32            offset;
+     u32            pitch;
+     u32            format  = 0;
      bool           dst_422 = false;
     
      if (RADEON_IS_SET( DESTINATION ))
@@ -410,9 +410,9 @@
 {
      CoreSurface   *surface  = state->source;
      SurfaceBuffer *buffer   = surface->front_buffer;
-     volatile __u8 *mmio     = rdrv->mmio_base;
-     __u32          txformat = 0;
-     __u32          txfilter = R300_TX_MAG_FILTER_LINEAR |
+     volatile u8   *mmio     = rdrv->mmio_base;
+     u32            txformat = 0;
+     u32            txfilter = R300_TX_MAG_FILTER_LINEAR |
                                R300_TX_MIN_FILTER_LINEAR;
 
      if (RADEON_IS_SET( SOURCE )) {
@@ -556,7 +556,7 @@
                     CardState        *state )
 {
      DFBRegion      clip = state->clip;
-     volatile __u8 *mmio = rdrv->mmio_base;
+     volatile u8   *mmio = rdrv->mmio_base;
      
      if (RADEON_IS_SET( CLIP ))
           return;
@@ -619,7 +619,7 @@
 {
      DFBColor color   = state->color;
      int      index   = state->color_index;
-     __u32    color2d;
+     u32      color2d;
      int      y, u, v;
 
      if (RADEON_IS_SET( COLOR ) && RADEON_IS_SET( DRAWING_FLAGS ))
@@ -763,9 +763,9 @@
                             RadeonDeviceData *rdev,
                             CardState        *state )
 {
-     volatile __u8 *mmio   = rdrv->mmio_base;
-     __u32          key    = state->src_colorkey;
-     __u32          chroma = key;
+     volatile u8 *mmio   = rdrv->mmio_base;
+     u32          key    = state->src_colorkey;
+     u32          chroma = key;
      
      if (RADEON_IS_SET( SRC_COLORKEY ))
           return;
@@ -814,7 +814,7 @@
                          RadeonDeviceData *rdev,
                          CardState        *state )
 {
-     __u32 sblend, dblend;
+     u32 sblend, dblend;
      
      if (RADEON_IS_SET( SRC_BLEND ) && RADEON_IS_SET( DST_BLEND ))
           return;
@@ -847,12 +847,12 @@
                             RadeonDeviceData *rdev,
                             CardState        *state )
 {
-     volatile __u8 *mmio        = rdrv->mmio_base;
-     __u32          master_cntl = rdev->gui_master_cntl       |
+     volatile u8   *mmio        = rdrv->mmio_base;
+     u32            master_cntl = rdev->gui_master_cntl       |
                                   GMC_SRC_DATATYPE_MONO_FG_LA |
                                   GMC_BRUSH_SOLID_COLOR       |
                                   GMC_CLR_CMP_CNTL_DIS;
-     __u32          rb3d_blend;
+     u32            rb3d_blend;
      
      if (RADEON_IS_SET( DRAWING_FLAGS ))
           return;
@@ -932,12 +932,12 @@
                              RadeonDeviceData *rdev,
                              CardState      *state )
 {
-     volatile __u8 *mmio        = rdrv->mmio_base;
-     __u32          master_cntl = rdev->gui_master_cntl |
+     volatile u8   *mmio        = rdrv->mmio_base;
+     u32            master_cntl = rdev->gui_master_cntl |
                                   GMC_BRUSH_NONE        |
                                   GMC_SRC_DATATYPE_COLOR;
-     __u32          cmp_cntl    = 0;
-     __u32          rb3d_blend;
+     u32            cmp_cntl    = 0;
+     u32            rb3d_blend;
      
      if (RADEON_IS_SET( BLITTING_FLAGS ))
           return;
Index: gfxdrivers/radeon/radeon.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/radeon/radeon.c,v
retrieving revision 1.40
diff -u -r1.40 radeon.c
--- gfxdrivers/radeon/radeon.c	26 Aug 2006 09:34:19 -0000	1.40
+++ gfxdrivers/radeon/radeon.c	7 Oct 2006 19:54:40 -0000
@@ -162,7 +162,7 @@
      const char        *name[] = { "NONE", "CRT", "DFP", 
                                    "LCD",  "CTV", "STV" }; 
 #endif
-     __u32              tmp;
+     u32                tmp;
       
      if (rdev->chipset != CHIP_R100) {        
           if (rdev->chipset >= CHIP_R300 ||
@@ -229,11 +229,11 @@
 void
 radeon_reset( RadeonDriverData *rdrv, RadeonDeviceData *rdev )
 {
-     volatile __u8 *mmio = rdrv->mmio_base;
-     __u32          clock_cntl_index;
-     __u32          mclk_cntl;
-     __u32          rbbm_soft_reset;
-     __u32          host_path_cntl;
+     volatile u8   *mmio = rdrv->mmio_base;
+     u32            clock_cntl_index;
+     u32            mclk_cntl;
+     u32            rbbm_soft_reset;
+     u32            host_path_cntl;
      
      clock_cntl_index = radeon_in32( mmio, CLOCK_CNTL_INDEX );
      
@@ -290,8 +290,8 @@
 {
      RadeonDriverData *rdrv = (RadeonDriverData*) drv;
      RadeonDeviceData *rdev = (RadeonDeviceData*) dev;
-     volatile __u8    *mmio = rdrv->mmio_base;
-     __u32             tmp;
+     volatile u8      *mmio = rdrv->mmio_base;
+     u32               tmp;
 
      radeon_out32( mmio, SURFACE_CNTL, rdev->surface_cntl_c );
      
@@ -336,7 +336,7 @@
 {
      RadeonDriverData *rdrv = (RadeonDriverData*) drv;
      RadeonDeviceData *rdev = (RadeonDeviceData*) dev;
-     volatile __u8    *mmio = rdrv->mmio_base;
+     volatile u8      *mmio = rdrv->mmio_base;
      
      radeon_waitfifo( rdrv, rdev, 1 );
      if (rdev->chipset >= CHIP_R300) {
@@ -357,8 +357,8 @@
 {
      RadeonDriverData *rdrv = (RadeonDriverData*) drv;
      RadeonDeviceData *rdev = (RadeonDeviceData*) dev;
-     volatile __u8    *mmio = rdrv->mmio_base;
-     __u32             tmp;
+     volatile u8      *mmio = rdrv->mmio_base;
+     u32               tmp;
 
      if (!(flags & DSLF_WRITE))
           return;
@@ -406,7 +406,7 @@
 { 
      RadeonDriverData *rdrv = (RadeonDriverData*) drv;
      RadeonDeviceData *rdev = (RadeonDeviceData*) dev;
-     volatile __u8    *mmio = rdrv->mmio_base;
+     volatile u8      *mmio = rdrv->mmio_base;
      
      if (rdev->surface_cntl_p != rdev->surface_cntl_c) {
           radeon_out32( mmio, SURFACE_CNTL, rdev->surface_cntl_p );
@@ -1105,7 +1105,7 @@
 static int 
 radeon_find_chipset( RadeonDriverData *rdrv, int *ret_devid, int *ret_index )
 {
-     volatile __u8 *mmio = rdrv->mmio_base;
+     volatile u8   *mmio = rdrv->mmio_base;
      unsigned int   vendor_id;
      unsigned int   device_id;
      int            i;
@@ -1188,7 +1188,7 @@
      rdrv->device_data = (RadeonDeviceData*) device_data;
      
      /* gain access to memory mapped registers */
-     rdrv->mmio_base = (volatile __u8*) dfb_gfxcard_map_mmio( device, 0, 0x4000 );
+     rdrv->mmio_base = (volatile u8*) dfb_gfxcard_map_mmio( device, 0, 0x4000 );
      if (!rdrv->mmio_base)
           return DFB_IO;
      rdrv->mmio_size = 0x4000;
@@ -1345,7 +1345,7 @@
 
      /* reserve memory for YUV422 color buffer */
      rdev->yuv422_buffer = dfb_gfxcard_reserve_memory( device, 128 );
-     if (rdev->yuv422_buffer == (__u32)-1) {
+     if (rdev->yuv422_buffer == (u32)-1) {
           D_ERROR( "DirectFB/Radeon: "
                    "couldn't reserve 128 bytes of video memory!\n" );
           return DFB_NOVIDEOMEMORY;
@@ -1379,7 +1379,7 @@
      rdev->surface_cntl_c = rdev->surface_cntl_p;
      
      if (rdev->igp) {
-          __u32 tom;
+          u32 tom;
           /* force MC_FB_LOCATION to NB_TOM */
           tom = radeon_in32( mmio, NB_TOM );
           rdev->fb_offset = tom << 16;
@@ -1444,7 +1444,7 @@
 {
      RadeonDriverData *rdrv = (RadeonDriverData*) driver_data;
      RadeonDeviceData *rdev = (RadeonDeviceData*) device_data;
-     volatile __u8    *mmio = rdrv->mmio_base;
+     volatile u8      *mmio = rdrv->mmio_base;
     
      D_DEBUG( "DirectFB/Radeon: FIFO Performance Monitoring:\n" );
      D_DEBUG( "DirectFB/Radeon:  %9d radeon_waitfifo calls\n",
Index: gfxdrivers/radeon/radeon.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/radeon/radeon.h,v
retrieving revision 1.8
diff -u -r1.8 radeon.h
--- gfxdrivers/radeon/radeon.h	3 Aug 2006 17:20:00 -0000	1.8
+++ gfxdrivers/radeon/radeon.h	7 Oct 2006 19:54:40 -0000
@@ -72,33 +72,33 @@
      /* mask of currently supported blitting functions */
      DFBAccelerationMask     blitting_mask;
 
-     __u32                   fb_offset;
-     __u32                   fb_size;
-     __u32                   agp_offset;
-     __u32                   agp_size;
+     u32                     fb_offset;
+     u32                     fb_size;
+     u32                     agp_offset;
+     u32                     agp_size;
      
      DFBSurfacePixelFormat   dst_format;
-     __u32                   dst_offset;
-     __u32                   dst_offset_cb;
-     __u32                   dst_offset_cr;
-     __u32                   dst_pitch;
+     u32                     dst_offset;
+     u32                     dst_offset_cb;
+     u32                     dst_offset_cr;
+     u32                     dst_pitch;
      DFBBoolean              dst_422;
      
      DFBSurfacePixelFormat   src_format;
-     __u32                   src_offset;
-     __u32                   src_offset_cb;
-     __u32                   src_offset_cr;
-     __u32                   src_pitch;
-     __u32                   src_width;
-     __u32                   src_height;
-     __u32                   src_mask;
+     u32                     src_offset;
+     u32                     src_offset_cb;
+     u32                     src_offset_cr;
+     u32                     src_pitch;
+     u32                     src_width;
+     u32                     src_height;
+     u32                     src_mask;
 
      DFBRegion               clip;
 
      float                   color[4];
-     __u32                   y_cop;
-     __u32                   cb_cop;
-     __u32                   cr_cop;
+     u32                     y_cop;
+     u32                     cb_cop;
+     u32                     cr_cop;
 
      DFBSurfaceDrawingFlags  drawingflags;
      DFBSurfaceBlittingFlags blittingflags;
@@ -112,30 +112,30 @@
      RadeonMonitorType       monitor2;
  
      /* saved registers */
-     __u32                   mc_fb_location;
-     __u32                   mc_agp_location; 
-     __u32                   crtc_base_addr;
-     __u32                   crtc2_base_addr;
-     __u32                   agp_base;
-     __u32                   agp_cntl;
-     __u32                   aic_cntl;
-     __u32                   bus_cntl;
-     __u32                   fcp_cntl;
-     __u32                   cap0_trig_cntl;
-     __u32                   vid_buffer_control;
-     __u32                   display_test_debug_cntl;
-     __u32                   surface_cntl;
-     __u32                   dp_gui_master_cntl;
+     u32                     mc_fb_location;
+     u32                     mc_agp_location;
+     u32                     crtc_base_addr;
+     u32                     crtc2_base_addr;
+     u32                     agp_base;
+     u32                     agp_cntl;
+     u32                     aic_cntl;
+     u32                     bus_cntl;
+     u32                     fcp_cntl;
+     u32                     cap0_trig_cntl;
+     u32                     vid_buffer_control;
+     u32                     display_test_debug_cntl;
+     u32                     surface_cntl;
+     u32                     dp_gui_master_cntl;
 
      /* recorded registers */
-     __u32                   surface_cntl_p;
-     __u32                   surface_cntl_c;
-     __u32                   gui_master_cntl;
-     __u32                   rb3d_cntl;
-     __u32                   rb3d_blend;
+     u32                     surface_cntl_p;
+     u32                     surface_cntl_c;
+     u32                     gui_master_cntl;
+     u32                     rb3d_cntl;
+     u32                     rb3d_blend;
 
      /* faked texture for YUV422 drawing functions */
-     __u32                   yuv422_buffer;
+     u32                     yuv422_buffer;
      
      /* for fifo/performance monitoring */
      unsigned int            fifo_space;
@@ -150,8 +150,8 @@
 typedef struct {
      RadeonDeviceData       *device_data; 
      
-     __u8                   *fb_base;
-     volatile __u8          *mmio_base;
+     u8                     *fb_base;
+     volatile u8            *mmio_base;
      unsigned int            mmio_size;
 } RadeonDriverData;
 
@@ -174,11 +174,11 @@
 
 
 /* utility function */
-static __inline__ __u32 f2d( float f )
+static __inline__ u32 f2d( float f )
 {
      union {
           float f;
-          __u32 d;
+          u32 d;
      } tmp;
      tmp.f = f;
      return tmp.d;
Index: gfxdrivers/radeon/radeon_2d.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/radeon/radeon_2d.c,v
retrieving revision 1.1
diff -u -r1.1 radeon_2d.c
--- gfxdrivers/radeon/radeon_2d.c	20 Mar 2006 14:27:21 -0000	1.1
+++ gfxdrivers/radeon/radeon_2d.c	7 Oct 2006 19:54:40 -0000
@@ -50,7 +50,7 @@
                          RadeonDeviceData *rdev,
                          DFBRectangle     *rect )
 {
-     volatile __u8 *mmio = rdrv->mmio_base;
+     volatile u8 *mmio = rdrv->mmio_base;
      
      radeon_waitfifo( rdrv, rdev, 2 );
      
@@ -79,8 +79,8 @@
 {
      RadeonDriverData *rdrv = (RadeonDriverData*) drv;
      RadeonDeviceData *rdev = (RadeonDeviceData*) dev;
-     DFBRegion      *clip = &rdev->clip;
-     volatile __u8  *mmio = rdrv->mmio_base;
+     DFBRegion        *clip = &rdev->clip;
+     volatile u8      *mmio = rdrv->mmio_base;
 
      /* Fill Luma plane */
      radeonDoFillRectangle2D( rdrv, rdev, rect );
@@ -130,7 +130,7 @@
                          RadeonDeviceData *rdev,
                          DFBRectangle     *rect )
 {
-     volatile __u8 *mmio = rdrv->mmio_base;
+     volatile u8 *mmio = rdrv->mmio_base;
      
      radeon_waitfifo( rdrv, rdev, 7 );
      
@@ -166,8 +166,8 @@
 {
      RadeonDriverData *rdrv = (RadeonDriverData*) drv;
      RadeonDeviceData *rdev = (RadeonDeviceData*) dev;
-     DFBRegion      *clip = &rdev->clip;
-     volatile __u8  *mmio = rdrv->mmio_base;
+     DFBRegion        *clip = &rdev->clip;
+     volatile u8      *mmio = rdrv->mmio_base;
 
      /* Fill Luma plane */
      radeonDoDrawRectangle2D( rdrv, rdev, rect );
@@ -217,7 +217,7 @@
                     RadeonDeviceData *rdev,
                     DFBRegion        *line )
 {
-     volatile __u8 *mmio = rdrv->mmio_base;
+     volatile u8 *mmio = rdrv->mmio_base;
 
      radeon_waitfifo( rdrv, rdev, 2 );
      
@@ -246,8 +246,8 @@
 {
      RadeonDriverData *rdrv = (RadeonDriverData*) drv;
      RadeonDeviceData *rdev = (RadeonDeviceData*) dev;
-     DFBRegion      *clip = &rdev->clip;
-     volatile __u8  *mmio = rdrv->mmio_base;
+     DFBRegion        *clip = &rdev->clip;
+     volatile u8      *mmio = rdrv->mmio_base;
      
      line->x1 &= ~1;
      line->y1 &= ~1;
@@ -301,8 +301,8 @@
 radeonDoBlit2D( RadeonDriverData *rdrv, RadeonDeviceData *rdev,
                 int sx, int sy, int dx, int dy, int w, int h )
 {
-     volatile __u8 *mmio = rdrv->mmio_base;
-     __u32          dir  = 0;
+     volatile u8   *mmio = rdrv->mmio_base;
+     u32            dir  = 0;
      
      /* check which blitting direction should be used */
      if (sx <= dx) {
@@ -345,8 +345,8 @@
 {
      RadeonDriverData *rdrv = (RadeonDriverData*) drv;
      RadeonDeviceData *rdev = (RadeonDeviceData*) dev;  
-     DFBRegion      *clip = &rdev->clip;
-     volatile __u8  *mmio = rdrv->mmio_base;
+     DFBRegion        *clip = &rdev->clip;
+     volatile u8      *mmio = rdrv->mmio_base;
 
      /* Blit Luma plane */
      radeonDoBlit2D( rdrv, rdev, sr->x, sr->y, dx, dy, sr->w, sr->h );
Index: gfxdrivers/radeon/radeon_chipsets.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/radeon/radeon_chipsets.h,v
retrieving revision 1.1
diff -u -r1.1 radeon_chipsets.h
--- gfxdrivers/radeon/radeon_chipsets.h	20 Mar 2006 14:27:21 -0000	1.1
+++ gfxdrivers/radeon/radeon_chipsets.h	7 Oct 2006 19:54:40 -0000
@@ -24,8 +24,8 @@
 #define __RADEON_CHIPSETS_H__
 
 static const struct {
-     __u16       id;
-     __u16       chip;
+     u16         id;
+     u16         chip;
      bool        igp;
      const char *name;
 } dev_table[] = {
Index: gfxdrivers/radeon/radeon_crtc1.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/radeon/radeon_crtc1.c,v
retrieving revision 1.2
diff -u -r1.2 radeon_crtc1.c
--- gfxdrivers/radeon/radeon_crtc1.c	22 Jun 2006 12:30:39 -0000	1.2
+++ gfxdrivers/radeon/radeon_crtc1.c	7 Oct 2006 19:54:40 -0000
@@ -56,7 +56,7 @@
                 void       *screen_data )
 {
      RadeonDriverData *rdrv = (RadeonDriverData*) driver_data;
-     volatile __u8    *mmio = rdrv->mmio_base; 
+     volatile u8      *mmio = rdrv->mmio_base;
      int               i;
      
      if (dfb_config->pollvsync_none)
Index: gfxdrivers/radeon/radeon_crtc2.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/radeon/radeon_crtc2.c,v
retrieving revision 1.4
diff -u -r1.4 radeon_crtc2.c
--- gfxdrivers/radeon/radeon_crtc2.c	22 Jun 2006 12:30:39 -0000	1.4
+++ gfxdrivers/radeon/radeon_crtc2.c	7 Oct 2006 19:54:40 -0000
@@ -67,41 +67,41 @@
 
      struct {
           unsigned int      size;
-          __u8              r[256];
-          __u8              g[256];
-          __u8              b[256];
+          u8                r[256];
+          u8                g[256];
+          u8                b[256];
      } lut;
 
      struct { 
-          __u32 rCRTC2_GEN_CNTL;
-          __u32 rFP2_GEN_CNTL;
-          __u32 rDAC_CNTL2;
-          __u32 rTV_DAC_CNTL;
-          __u32 rDISP_OUTPUT_CNTL;
-          __u32 rDISP_HW_DEBUG;
-          __u32 rCRTC2_OFFSET_CNTL;
+          u32 rCRTC2_GEN_CNTL;
+          u32 rFP2_GEN_CNTL;
+          u32 rDAC_CNTL2;
+          u32 rTV_DAC_CNTL;
+          u32 rDISP_OUTPUT_CNTL;
+          u32 rDISP_HW_DEBUG;
+          u32 rCRTC2_OFFSET_CNTL;
      } save;
      
      struct {
-          __u32 rCRTC2_GEN_CNTL;
-          __u32 rDAC_CNTL2;
-          __u32 rTV_DAC_CNTL;
-          __u32 rDISP_OUTPUT_CNTL;
-          __u32 rDISP_HW_DEBUG;
-          __u32 rCRTC2_H_TOTAL_DISP;
-          __u32 rCRTC2_H_SYNC_STRT_WID;
-          __u32 rCRTC2_V_TOTAL_DISP;
-          __u32 rCRTC2_V_SYNC_STRT_WID;
-          __u32 rCRTC2_BASE_ADDR;
-          __u32 rCRTC2_OFFSET;
-          __u32 rCRTC2_OFFSET_CNTL;
-          __u32 rCRTC2_PITCH;
-          __u32 rFP2_GEN_CNTL;
-          __u32 rFP2_H_SYNC_STRT_WID;
-          __u32 rFP2_V_SYNC_STRT_WID;
-          __u32 rP2PLL_REF_DIV;
-          __u32 rP2PLL_DIV_0;
-          __u32 rHTOTAL2_CNTL;
+          u32 rCRTC2_GEN_CNTL;
+          u32 rDAC_CNTL2;
+          u32 rTV_DAC_CNTL;
+          u32 rDISP_OUTPUT_CNTL;
+          u32 rDISP_HW_DEBUG;
+          u32 rCRTC2_H_TOTAL_DISP;
+          u32 rCRTC2_H_SYNC_STRT_WID;
+          u32 rCRTC2_V_TOTAL_DISP;
+          u32 rCRTC2_V_SYNC_STRT_WID;
+          u32 rCRTC2_BASE_ADDR;
+          u32 rCRTC2_OFFSET;
+          u32 rCRTC2_OFFSET_CNTL;
+          u32 rCRTC2_PITCH;
+          u32 rFP2_GEN_CNTL;
+          u32 rFP2_H_SYNC_STRT_WID;
+          u32 rFP2_V_SYNC_STRT_WID;
+          u32 rP2PLL_REF_DIV;
+          u32 rP2PLL_DIV_0;
+          u32 rHTOTAL2_CNTL;
      } regs;
 } RadeonCrtc2LayerData;
 
@@ -148,8 +148,8 @@
                    DFBScreenPowerMode  mode )
 {
      RadeonDriverData *rdrv          = (RadeonDriverData*) driver_data;
-     volatile __u8    *mmio          = rdrv->mmio_base;
-     __u32             crtc2_gen_cntl;
+     volatile u8      *mmio          = rdrv->mmio_base;
+     u32               crtc2_gen_cntl;
      
      crtc2_gen_cntl  = radeon_in32( mmio, CRTC2_GEN_CNTL );
      crtc2_gen_cntl &= ~(CRTC2_HSYNC_DIS | CRTC2_VSYNC_DIS | CRTC2_DISP_DIS);
@@ -186,7 +186,7 @@
                 void       *screen_data )
 {
      RadeonDriverData *rdrv = (RadeonDriverData*) driver_data;
-     volatile __u8    *mmio = rdrv->mmio_base; 
+     volatile u8      *mmio = rdrv->mmio_base;
      int               i;
      
      if (dfb_config->pollvsync_none)
@@ -214,7 +214,7 @@
                     int        *ret_height )
 {
      RadeonDriverData *rdrv = (RadeonDriverData*) driver_data;
-     volatile __u8    *mmio = rdrv->mmio_base;
+     volatile u8      *mmio = rdrv->mmio_base;
      unsigned int      xres;
      unsigned int      yres;
     
@@ -268,7 +268,7 @@
 {
      RadeonDriverData     *rdrv   = (RadeonDriverData*) driver_data;
      RadeonCrtc2LayerData *rcrtc2 = (RadeonCrtc2LayerData*) layer_data;
-     volatile __u8        *mmio   = rdrv->mmio_base; 
+     volatile u8          *mmio   = rdrv->mmio_base;
      VideoMode            *mode;
      
      mode = dfb_system_modes();
@@ -440,7 +440,7 @@
 {
      RadeonDriverData     *rdrv   = (RadeonDriverData*) driver_data;
      RadeonCrtc2LayerData *rcrtc2 = (RadeonCrtc2LayerData*) layer_data;
-     volatile __u8        *mmio   = rdrv->mmio_base;
+     volatile u8          *mmio   = rdrv->mmio_base;
     
      radeon_waitidle( rdrv, rdrv->device_data );
     
@@ -466,7 +466,7 @@
      RadeonDriverData     *rdrv   = (RadeonDriverData*) driver_data;
      RadeonDeviceData     *rdev   = rdrv->device_data;
      RadeonCrtc2LayerData *rcrtc2 = (RadeonCrtc2LayerData*) layer_data;
-     volatile __u8        *mmio   = rdrv->mmio_base;
+     volatile u8          *mmio   = rdrv->mmio_base;
      SurfaceBuffer        *buffer = surface->back_buffer;
      
      switch (buffer->storage) {
@@ -584,8 +584,8 @@
           { 12, 7 }, /* VCLK_SRC/12 */
           {  0, 0 }
      };
-     __u32 pll_output_freq_2 = 0;
-     __u32 feedback_div_2;
+     u32 pll_output_freq_2 = 0;
+     u32 feedback_div_2;
 
      if (freq > rcrtc2->pll_max_freq)
           freq = rcrtc2->pll_max_freq;
@@ -626,7 +626,7 @@
      RadeonDeviceData *rdev   = rdrv->device_data;
      SurfaceBuffer    *buffer = surface->front_buffer;
      VideoMode        *mode; 
-     __u32             format = 0;
+     u32               format = 0;
     
      int   h_total, h_sync_start, h_sync_end, h_sync_wid;
      int   v_total, v_sync_start, v_sync_end, v_sync_wid;
@@ -789,8 +789,8 @@
 crtc2_set_regs ( RadeonDriverData     *rdrv,
                  RadeonCrtc2LayerData *rcrtc2 )
 {
-     volatile __u8 *mmio = rdrv->mmio_base;
-     __u32          tmp;
+     volatile u8 *mmio = rdrv->mmio_base;
+     u32          tmp;
      
      /* Lock the card during mode switching. */
      dfb_gfxcard_lock( GDLF_WAIT | GDLF_SYNC );
@@ -862,7 +862,7 @@
      dfb_gfxcard_unlock();
 }
 
-static inline __u8
+static inline u8
 calc_gamma( float n, float d )
 {
      int ret;
@@ -991,8 +991,8 @@
 crtc2_set_palette( RadeonDriverData     *rdrv,
                    RadeonCrtc2LayerData *rcrtc2 )
 {
-     volatile __u8 *mmio = rdrv->mmio_base;
-     __u32          tmp;
+     volatile u8   *mmio = rdrv->mmio_base;
+     u32            tmp;
      int            i, j;
 
      if (!rcrtc2->lut.size) {
Index: gfxdrivers/radeon/radeon_mmio.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/radeon/radeon_mmio.h,v
retrieving revision 1.5
diff -u -r1.5 radeon_mmio.h
--- gfxdrivers/radeon/radeon_mmio.h	27 May 2006 13:05:53 -0000	1.5
+++ gfxdrivers/radeon/radeon_mmio.h	7 Oct 2006 19:54:40 -0000
@@ -30,75 +30,75 @@
 
 
 static __inline__ void
-radeon_out8( volatile __u8 *mmioaddr, __u32 reg, __u8 value )
+radeon_out8( volatile u8 *mmioaddr, u32 reg, u8 value )
 {
-     *((volatile __u8*)(mmioaddr+reg)) = value;
+     *((volatile u8*)(mmioaddr+reg)) = value;
 }
 
 static __inline__ void
-radeon_out16( volatile __u8 *mmioaddr, __u32 reg, __u32 value )
+radeon_out16( volatile u8 *mmioaddr, u32 reg, u32 value )
 {
 #ifdef __powerpc__
      asm volatile( "sthbrx %0,%1,%2;eieio"
                   :: "r" (value), "b"(reg), "r" (mmioaddr) : "memory" );
 #else
-     *((volatile __u16*)(mmioaddr+reg)) = value;
+     *((volatile u16*)(mmioaddr+reg)) = value;
 #endif
 }
 
 static __inline__ void
-radeon_out32( volatile __u8 *mmioaddr, __u32 reg, __u32 value )
+radeon_out32( volatile u8 *mmioaddr, u32 reg, u32 value )
 {
 #ifdef __powerpc__
      asm volatile( "stwbrx %0,%1,%2;eieio" 
                    :: "r" (value), "b"(reg), "r" (mmioaddr) : "memory" );
 #else
-     *((volatile __u32*)(mmioaddr+reg)) = value;
+     *((volatile u32*)(mmioaddr+reg)) = value;
 #endif
 }
 
-static __inline__ __u8
-radeon_in8( volatile __u8 *mmioaddr, __u32 reg )
+static __inline__ u8
+radeon_in8( volatile u8 *mmioaddr, u32 reg )
 {
-     return *((volatile __u8*)(mmioaddr+reg));
+     return *((volatile u8*)(mmioaddr+reg));
 }
 
-static __inline__ __u16
-radeon_in16( volatile __u8 *mmioaddr, __u32 reg )
+static __inline__ u16
+radeon_in16( volatile u8 *mmioaddr, u32 reg )
 {
 #ifdef __powerpc__
-     __u32 value;
+     u32 value;
      asm volatile( "lhbrx %0,%1,%2;eieio"
                    : "=r" (value) : "b" (reg), "r" (mmioaddr) );
      return value;
 #else
-     return *((volatile __u16*)(mmioaddr+reg));
+     return *((volatile u16*)(mmioaddr+reg));
 #endif
 }
 
-static __inline__ __u32
-radeon_in32( volatile __u8 *mmioaddr, __u32 reg )
+static __inline__ u32
+radeon_in32( volatile u8 *mmioaddr, u32 reg )
 {
 #ifdef __powerpc__
-     __u32 value;
+     u32 value;
      asm volatile( "lwbrx %0,%1,%2;eieio"
                   : "=r" (value) : "b" (reg), "r" (mmioaddr) );
      return value;
 #else
-     return *((volatile __u32*)(mmioaddr+reg));
+     return *((volatile u32*)(mmioaddr+reg));
 #endif
 }
 
 
 static __inline__ void
-radeon_outpll( volatile __u8 *mmioaddr, __u32 addr, __u32 value )
+radeon_outpll( volatile u8 *mmioaddr, u32 addr, u32 value )
 {
      radeon_out8( mmioaddr, CLOCK_CNTL_INDEX, (addr & 0x3f) | PLL_WR_EN );
      radeon_out32( mmioaddr, CLOCK_CNTL_DATA, value );
 }
 
-static __inline__ __u32
-radeon_inpll( volatile __u8 *mmioaddr, __u32 addr )
+static __inline__ u32
+radeon_inpll( volatile u8 *mmioaddr, u32 addr )
 {
      radeon_out8( mmioaddr, CLOCK_CNTL_INDEX, addr & 0x3f );
      return radeon_in32( mmioaddr, CLOCK_CNTL_DATA );
Index: gfxdrivers/radeon/radeon_overlay.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/radeon/radeon_overlay.c,v
retrieving revision 1.9
diff -u -r1.9 radeon_overlay.c
--- gfxdrivers/radeon/radeon_overlay.c	22 Jun 2006 12:31:35 -0000	1.9
+++ gfxdrivers/radeon/radeon_overlay.c	7 Oct 2006 19:54:40 -0000
@@ -69,36 +69,36 @@
      
      /* overlay registers */
      struct {
-          __u32 H_INC;
-          __u32 STEP_BY;
-          __u32 Y_X_START;
-          __u32 Y_X_END;
-          __u32 V_INC;
-          __u32 P1_BLANK_LINES_AT_TOP;
-          __u32 P23_BLANK_LINES_AT_TOP;
-          __u32 VID_BUF_PITCH0_VALUE;
-          __u32 VID_BUF_PITCH1_VALUE;
-          __u32 P1_X_START_END;
-          __u32 P2_X_START_END;
-          __u32 P3_X_START_END;
-          __u32 BASE_ADDR;
-          __u32 VID_BUF0_BASE_ADRS;
-          __u32 VID_BUF1_BASE_ADRS;
-          __u32 VID_BUF2_BASE_ADRS;
-          __u32 VID_BUF3_BASE_ADRS;
-          __u32 VID_BUF4_BASE_ADRS;
-          __u32 VID_BUF5_BASE_ADRS;
-          __u32 P1_V_ACCUM_INIT;
-          __u32 P23_V_ACCUM_INIT;
-          __u32 P1_H_ACCUM_INIT;
-          __u32 P23_H_ACCUM_INIT;
-          __u32 VID_KEY_CLR_LOW;
-          __u32 VID_KEY_CLR_HIGH;
-          __u32 GRPH_KEY_CLR_LOW;
-          __u32 GRPH_KEY_CLR_HIGH;
-          __u32 KEY_CNTL;
-          __u32 MERGE_CNTL;
-          __u32 SCALE_CNTL;
+          u32 H_INC;
+          u32 STEP_BY;
+          u32 Y_X_START;
+          u32 Y_X_END;
+          u32 V_INC;
+          u32 P1_BLANK_LINES_AT_TOP;
+          u32 P23_BLANK_LINES_AT_TOP;
+          u32 VID_BUF_PITCH0_VALUE;
+          u32 VID_BUF_PITCH1_VALUE;
+          u32 P1_X_START_END;
+          u32 P2_X_START_END;
+          u32 P3_X_START_END;
+          u32 BASE_ADDR;
+          u32 VID_BUF0_BASE_ADRS;
+          u32 VID_BUF1_BASE_ADRS;
+          u32 VID_BUF2_BASE_ADRS;
+          u32 VID_BUF3_BASE_ADRS;
+          u32 VID_BUF4_BASE_ADRS;
+          u32 VID_BUF5_BASE_ADRS;
+          u32 P1_V_ACCUM_INIT;
+          u32 P23_V_ACCUM_INIT;
+          u32 P1_H_ACCUM_INIT;
+          u32 P23_H_ACCUM_INIT;
+          u32 VID_KEY_CLR_LOW;
+          u32 VID_KEY_CLR_HIGH;
+          u32 GRPH_KEY_CLR_LOW;
+          u32 GRPH_KEY_CLR_HIGH;
+          u32 KEY_CNTL;
+          u32 MERGE_CNTL;
+          u32 SCALE_CNTL;
      } regs;
 } RadeonOverlayLayerData;
 
@@ -145,7 +145,7 @@
 {
      RadeonDriverData       *rdrv = (RadeonDriverData*) driver_data;
      RadeonOverlayLayerData *rovl = (RadeonOverlayLayerData*) layer_data;
-     volatile __u8          *mmio = rdrv->mmio_base;
+     volatile u8            *mmio = rdrv->mmio_base;
      DFBScreenDescription    dsc;
      
      dfb_screen_get_info( layer->screen, NULL, &dsc );
@@ -473,12 +473,12 @@
      RadeonDeviceData *rdev    = rdrv->device_data;
      DFBRectangle      source  = config->source;
      DFBRectangle      dest    = config->dest; 
-     __u32             ecp_div = 0;
-     __u32             h_inc;
-     __u32             h_inc2;
-     __u32             v_inc;
-     __u32             step_by;
-     __u32             tmp;
+     u32               ecp_div = 0;
+     u32               h_inc;
+     u32               h_inc2;
+     u32               v_inc;
+     u32               step_by;
+     u32               tmp;
      int               xres;
      int               yres;
 
@@ -619,8 +619,8 @@
      RadeonDeviceData *rdev       = rdrv->device_data;
      SurfaceBuffer    *buffer     = surface->front_buffer;
      DFBRectangle      source     = config->source;
-     __u32             offsets[3] = { 0, 0, 0 };
-     __u32             pitch      = buffer->video.pitch;
+     u32               offsets[3] = { 0, 0, 0 };
+     u32               pitch      = buffer->video.pitch;
      int               even       = 0;
      int               cropleft;
      int               croptop;
@@ -659,7 +659,7 @@
           }
 
           if (surface->format == DSPF_YV12) {
-               __u32 tmp  = offsets[1];
+               u32 tmp    = offsets[1];
                offsets[1] = offsets[2];
                offsets[2] = tmp;
           }
@@ -798,7 +798,7 @@
               RadeonOverlayLayerData *rovl )
 {
      RadeonDeviceData *rdev = rdrv->device_data;
-     volatile __u8    *mmio = rdrv->mmio_base;
+     volatile u8      *mmio = rdrv->mmio_base;
      
      radeon_waitfifo( rdrv, rdev, 1 );
      radeon_out32( mmio, OV0_REG_LOAD_CNTL, REG_LD_CTL_LOCK );
@@ -848,7 +848,7 @@
                  RadeonOverlayLayerData *rovl )
 {
      RadeonDeviceData *rdev = rdrv->device_data;
-     volatile __u8    *mmio = rdrv->mmio_base;
+     volatile u8      *mmio = rdrv->mmio_base;
       
      radeon_waitfifo( rdrv, rdev, 1 );
      radeon_out32( mmio, OV0_REG_LOAD_CNTL, REG_LD_CTL_LOCK );
@@ -871,10 +871,10 @@
                   RadeonOverlayLayerData *rovl,
                   CoreLayerRegionConfig  *config )              
 {
-     volatile __u8 *mmio = rdrv->mmio_base; 
-     __u32          SkeyLow, SkeyHigh;
-     __u32          DkeyLow, DkeyHigh;
-     __u32          tmp;
+     volatile u8 *mmio = rdrv->mmio_base;
+     u32          SkeyLow, SkeyHigh;
+     u32          DkeyLow, DkeyHigh;
+     u32          tmp;
      
      SkeyLow  = PIXEL_RGB32( config->src_key.r,
                              config->src_key.g,
@@ -925,17 +925,17 @@
                     float                   saturation,
                     float                   hue )
 {
-     volatile __u8 *mmio = rdrv->mmio_base;
+     volatile u8   *mmio = rdrv->mmio_base;
      float          HueSin, HueCos; 
      float          Luma;
      float          RCb, RCr;
      float          GCb, GCr;
      float          BCb, BCr;
      float          AdjOff, ROff, GOff, BOff;
-     __u32          dwLuma, dwROff, dwGOff, dwBOff;
-     __u32          dwRCb, dwRCr;
-     __u32          dwGCb, dwGCr;
-     __u32          dwBCb, dwBCr;
+     u32            dwLuma, dwROff, dwGOff, dwBOff;
+     u32            dwRCb, dwRCr;
+     u32            dwGCb, dwGCr;
+     u32            dwBCb, dwBCr;
      
      HueSin = sin( hue );
      HueCos = cos( hue );
@@ -955,17 +955,17 @@
      ROff   = CLAMP( ROff, -2048.0, 2047.5 );
      GOff   = CLAMP( GOff, -2048.0, 2047.5 );
      BOff   = CLAMP( BOff, -2048.0, 2047.5 );
-     dwROff = ((__u32)(ROff * 2.0)) & 0x1fff;
-     dwGOff = ((__u32)(GOff * 2.0)) & 0x1fff;
-     dwBOff = ((__u32)(BOff * 2.0)) & 0x1fff;
+     dwROff = ((u32)(ROff * 2.0)) & 0x1fff;
+     dwGOff = ((u32)(GOff * 2.0)) & 0x1fff;
+     dwBOff = ((u32)(BOff * 2.0)) & 0x1fff;
  
-     dwLuma = (((__u32)(Luma * 256.0)) & 0xfff) << 20;
-     dwRCb  = (((__u32)(RCb  * 256.0)) & 0xfff) <<  4;
-     dwRCr  = (((__u32)(RCr  * 256.0)) & 0xfff) << 20;
-     dwGCb  = (((__u32)(GCb  * 256.0)) & 0xfff) <<  4;
-     dwGCr  = (((__u32)(GCr  * 256.0)) & 0xfff) << 20;
-     dwBCb  = (((__u32)(BCb  * 256.0)) & 0xfff) <<  4;
-     dwBCr  = (((__u32)(BCr  * 256.0)) & 0xfff) << 20;
+     dwLuma = (((u32)(Luma * 256.0)) & 0xfff) << 20;
+     dwRCb  = (((u32)(RCb  * 256.0)) & 0xfff) <<  4;
+     dwRCr  = (((u32)(RCr  * 256.0)) & 0xfff) << 20;
+     dwGCb  = (((u32)(GCb  * 256.0)) & 0xfff) <<  4;
+     dwGCr  = (((u32)(GCr  * 256.0)) & 0xfff) << 20;
+     dwBCb  = (((u32)(BCb  * 256.0)) & 0xfff) <<  4;
+     dwBCr  = (((u32)(BCr  * 256.0)) & 0xfff) << 20;
  
      radeon_waitfifo( rdrv, rdrv->device_data, 6 );
      radeon_out32( mmio, OV0_LIN_TRANS_A, dwRCb  | dwLuma );
Index: gfxdrivers/radeon/radeon_state.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/radeon/radeon_state.h,v
retrieving revision 1.4
diff -u -r1.4 radeon_state.h
--- gfxdrivers/radeon/radeon_state.h	3 Aug 2006 17:20:00 -0000	1.4
+++ gfxdrivers/radeon/radeon_state.h	7 Oct 2006 19:54:40 -0000
@@ -127,7 +127,7 @@
      rdev->set &= ~(SMF_##flag)
      
      
-static inline __u32
+static inline u32
 radeon_buffer_offset( RadeonDeviceData *rdev, SurfaceBuffer *buffer )
 {
      switch (buffer->storage) {
Index: gfxdrivers/savage/mmio.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/savage/mmio.h,v
retrieving revision 1.4
diff -u -r1.4 mmio.h
--- gfxdrivers/savage/mmio.h	10 Sep 2002 21:42:04 -0000	1.4
+++ gfxdrivers/savage/mmio.h	7 Oct 2006 19:54:40 -0000
@@ -29,13 +29,13 @@
 
 #include <dfb_types.h>
 
-typedef __u8 uint8;
-typedef __u16 uint16;
-typedef __u32 uint32;
-
-typedef __s8 sint8;
-typedef __s16 sint16;
-typedef __s32 sint32;
+typedef u8 uint8;
+typedef u16 uint16;
+typedef u32 uint32;
+
+typedef s8 sint8;
+typedef s16 sint16;
+typedef s32 sint32;
 
 #if 0
 
Index: gfxdrivers/savage/savage.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/savage/savage.c,v
retrieving revision 1.15
diff -u -r1.15 savage.c
--- gfxdrivers/savage/savage.c	1 May 2006 19:09:28 -0000	1.15
+++ gfxdrivers/savage/savage.c	7 Oct 2006 19:54:40 -0000
@@ -147,11 +147,11 @@
 {
      SavageDriverData *sdrv = (SavageDriverData*) driver_data;
 
-     sdrv->mmio_base = (volatile __u8*) dfb_gfxcard_map_mmio( device, 0, -1 );
+     sdrv->mmio_base = (volatile u8*) dfb_gfxcard_map_mmio( device, 0, -1 );
      if (!sdrv->mmio_base)
           return DFB_IO;
 
-     sdrv->bci_base = (volatile __u32*)(sdrv->mmio_base + BCI_BUFFER_OFFSET);
+     sdrv->bci_base = (volatile u32*)(sdrv->mmio_base + BCI_BUFFER_OFFSET);
 
      switch (dfb_gfxcard_get_accelerator( device )) {
           case FB_ACCEL_SAVAGE3D:       /* Savage3D series */
@@ -184,7 +184,7 @@
 {
      SavageDriverData *sdrv = (SavageDriverData*) driver_data;
      SavageDeviceData *sdev = (SavageDeviceData*) device_data;
-     volatile __u8    *mmio = sdrv->mmio_base;
+     volatile u8      *mmio = sdrv->mmio_base;
 
      /* use polling for syncing, artefacts occur otherwise */
      dfb_config->pollvsync_after = 1;
Index: gfxdrivers/savage/savage.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/savage/savage.h,v
retrieving revision 1.2
diff -u -r1.2 savage.h
--- gfxdrivers/savage/savage.h	17 Jul 2002 14:09:13 -0000	1.2
+++ gfxdrivers/savage/savage.h	7 Oct 2006 19:54:40 -0000
@@ -58,8 +58,8 @@
 } SavageDeviceData;
 
 typedef struct {
-     volatile __u8  *mmio_base;
-     volatile __u32 *bci_base;
+     volatile u8  *mmio_base;
+     volatile u32 *bci_base;
 } SavageDriverData;
 
 
Index: gfxdrivers/savage/savage2000.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/savage/savage2000.h,v
retrieving revision 1.1
diff -u -r1.1 savage2000.h
--- gfxdrivers/savage/savage2000.h	29 May 2002 03:54:58 -0000	1.1
+++ gfxdrivers/savage/savage2000.h	7 Oct 2006 19:54:40 -0000
@@ -74,7 +74,7 @@
                     Savage2000DeviceData *sdev, int space)
 {
      uint32         slots = MAXFIFO - space;
-     volatile __u8 *mmio  = sdrv->s.mmio_base;
+     volatile u8   *mmio  = sdrv->s.mmio_base;
 
      sdev->s.waitfifo_sum += space;
      sdev->s.waitfifo_calls++;
Index: gfxdrivers/savage/savage3d.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/savage/savage3d.c,v
retrieving revision 1.11
diff -u -r1.11 savage3d.c
--- gfxdrivers/savage/savage3d.c	26 Aug 2006 09:34:19 -0000	1.11
+++ gfxdrivers/savage/savage3d.c	7 Oct 2006 19:54:40 -0000
@@ -89,7 +89,7 @@
                                           Savage3DDeviceData *sdev,
                                           CardState          *state )
 {
-     __u32 BitmapDescriptor;
+     u32 BitmapDescriptor;
      CoreSurface *destination;
      SurfaceBuffer *buffer;
      int bpp;
@@ -124,7 +124,7 @@
                                           Savage3DDeviceData *sdev,
                                           CardState          *state )
 {
-     __u32 BitmapDescriptor;
+     u32 BitmapDescriptor;
      CoreSurface *source;
      SurfaceBuffer *buffer;
      int bpp;
@@ -412,9 +412,9 @@
      Savage3DDriverData *sdrv = (Savage3DDriverData*) drv;
      Savage3DDeviceData *sdev = (Savage3DDeviceData*) dev;
 
-     __u32 cmd = ( BCI_CMD_RECT | sdev->Cmd_Src_Transparent |
-                   BCI_CMD_CLIP_CURRENT | BCI_CMD_DEST_GBD | 
-                   BCI_CMD_SRC_PBD_COLOR | (0xcc << 16) );
+     u32 cmd = ( BCI_CMD_RECT | sdev->Cmd_Src_Transparent |
+                 BCI_CMD_CLIP_CURRENT | BCI_CMD_DEST_GBD |
+                 BCI_CMD_SRC_PBD_COLOR | (0xcc << 16) );
      
      if (dx < rect->x) {
           cmd |= BCI_CMD_RECT_XP;
@@ -498,7 +498,7 @@
                       void               *device_data )
 {
      SavageDriverData *sdrv = (SavageDriverData*) driver_data;
-     volatile __u8    *mmio = sdrv->mmio_base;
+     volatile u8      *mmio = sdrv->mmio_base;
 
      unsigned long	cobIndex;	/* size index */
      unsigned long	cobSize;	/* size in bytes */
Index: gfxdrivers/savage/savage3d.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/savage/savage3d.h,v
retrieving revision 1.1
diff -u -r1.1 savage3d.h
--- gfxdrivers/savage/savage3d.h	29 May 2002 03:54:58 -0000	1.1
+++ gfxdrivers/savage/savage3d.h	7 Oct 2006 19:54:40 -0000
@@ -42,8 +42,8 @@
      int v_color;    /* opaque fill color */
 
      /* saved values */
-     __u32 Cmd_Src_Transparent;
-     __u32 src_colorkey;
+     u32 Cmd_Src_Transparent;
+     u32 src_colorkey;
 } Savage3DDeviceData;
 
 typedef struct {
@@ -90,7 +90,7 @@
 savage3D_waitfifo(Savage3DDriverData *sdrv, Savage3DDeviceData *sdev, int space)
 {
      uint32         slots = MAXFIFO - space;
-     volatile __u8 *mmio  = sdrv->s.mmio_base;
+     volatile u8   *mmio  = sdrv->s.mmio_base;
 
      sdev->s.waitfifo_sum += space;
      sdev->s.waitfifo_calls++;
Index: gfxdrivers/savage/savage4.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/savage/savage4.c,v
retrieving revision 1.14
diff -u -r1.14 savage4.c
--- gfxdrivers/savage/savage4.c	26 Aug 2006 09:34:19 -0000	1.14
+++ gfxdrivers/savage/savage4.c	7 Oct 2006 19:54:40 -0000
@@ -99,7 +99,7 @@
                                          Savage4DeviceData *sdev,
                                          CardState         *state )
 {
-     __u32 BitmapDescriptor;
+     u32 BitmapDescriptor;
      CoreSurface *destination;
      SurfaceBuffer *buffer;
      int bpp;
@@ -131,7 +131,7 @@
                                          Savage4DeviceData *sdev,
                                          CardState         *state )
 {
-     __u32 BitmapDescriptor;
+     u32 BitmapDescriptor;
      CoreSurface *source;
      SurfaceBuffer *buffer;
      int bpp;
@@ -430,9 +430,9 @@
      Savage4DriverData *sdrv = (Savage4DriverData*) drv;
      Savage4DeviceData *sdev = (Savage4DeviceData*) dev;
      
-     __u32 cmd = ( BCI_CMD_RECT | sdev->Cmd_Src_Transparent |
-                   BCI_CMD_CLIP_CURRENT | BCI_CMD_DEST_GBD | 
-                   BCI_CMD_SRC_PBD_COLOR | (0xcc << 16) );
+     u32 cmd = ( BCI_CMD_RECT | sdev->Cmd_Src_Transparent |
+                 BCI_CMD_CLIP_CURRENT | BCI_CMD_DEST_GBD |
+                 BCI_CMD_SRC_PBD_COLOR | (0xcc << 16) );
  
      SVGDBG("savage4Blit x:%i y:%i w:%i h:%i dx:%i dy:%i\n",
             rect->x, rect->y, rect->w, rect->h, dx, dy);
@@ -530,7 +530,7 @@
                      void               *device_data )
 {
      SavageDriverData *sdrv = (SavageDriverData*) driver_data;
-     volatile __u8    *mmio = sdrv->mmio_base;
+     volatile u8      *mmio = sdrv->mmio_base;
 
      SVGDBG("savage4initdevice\n");
 
Index: gfxdrivers/savage/savage4.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/savage/savage4.h,v
retrieving revision 1.1
diff -u -r1.1 savage4.h
--- gfxdrivers/savage/savage4.h	29 May 2002 03:54:58 -0000	1.1
+++ gfxdrivers/savage/savage4.h	7 Oct 2006 19:54:40 -0000
@@ -40,9 +40,9 @@
      int v_color;    /* opaque fill color */
 
      /* saved values */
-     __u32 Cmd_Src_Transparent;
-     __u32 Fill_Color;
-     __u32 src_colorkey;
+     u32 Cmd_Src_Transparent;
+     u32 Fill_Color;
+     u32 src_colorkey;
 } Savage4DeviceData;
 
 typedef struct {
@@ -114,7 +114,7 @@
 savage4_waitfifo(Savage4DriverData *sdrv, Savage4DeviceData *sdev, int space)
 {
      uint32         slots = MAXFIFO - space;
-     volatile __u8 *mmio  = sdrv->s.mmio_base;
+     volatile u8   *mmio  = sdrv->s.mmio_base;
 
      sdev->s.waitfifo_sum += space;
      sdev->s.waitfifo_calls++;
Index: gfxdrivers/savage/savage_bci.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/savage/savage_bci.h,v
retrieving revision 1.1
diff -u -r1.1 savage_bci.h
--- gfxdrivers/savage/savage_bci.h	29 May 2002 03:54:58 -0000	1.1
+++ gfxdrivers/savage/savage_bci.h	7 Oct 2006 19:54:41 -0000
@@ -39,7 +39,7 @@
 
 #define BCI_SEND(dw)   { \
                            if (sdev->s.bci_ptr == BCI_SIZE) sdev->s.bci_ptr = 0; \
-                           sdrv->s.bci_base[sdev->s.bci_ptr++] = (__u32)(dw); \
+                           sdrv->s.bci_base[sdev->s.bci_ptr++] = (u32)(dw); \
                        }
 
 #define BCI_SENDF(dw)  { \
Index: gfxdrivers/savage/savage_streams_old.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/savage/savage_streams_old.c,v
retrieving revision 1.18
diff -u -r1.18 savage_streams_old.c
--- gfxdrivers/savage/savage_streams_old.c	20 Nov 2004 21:18:08 -0000	1.18
+++ gfxdrivers/savage/savage_streams_old.c	7 Oct 2006 19:54:41 -0000
@@ -75,23 +75,23 @@
 
      struct {
           /* secondary stream registers */
-          __u32 SSTREAM_CTRL;
-          __u32 SSTREAM_H_SCALE;
-          __u32 BLEND_CTRL;
-          __u32 SSTREAM_MULTIBUF;
-          __u32 SSTREAM_FB_ADDR0;
-          __u32 SSTREAM_FB_ADDR1;
-          __u32 SSTREAM_STRIDE;
-          __u32 SSTREAM_V_SCALE;
-          __u32 SSTREAM_V_INIT_VALUE;
-          __u32 SSTREAM_SRC_LINE_COUNT;
-          __u32 SSTREAM_WIN_START;
-          __u32 SSTREAM_WIN_SIZE;
-          __u32 SSTREAM_FB_CB_ADDR;
-          __u32 SSTREAM_FB_CR_ADDR;
-          __u32 SSTREAM_CBCR_STRIDE;
-          __u32 SSTREAM_FB_SIZE;
-          __u32 SSTREAM_FB_ADDR2;
+          u32 SSTREAM_CTRL;
+          u32 SSTREAM_H_SCALE;
+          u32 BLEND_CTRL;
+          u32 SSTREAM_MULTIBUF;
+          u32 SSTREAM_FB_ADDR0;
+          u32 SSTREAM_FB_ADDR1;
+          u32 SSTREAM_STRIDE;
+          u32 SSTREAM_V_SCALE;
+          u32 SSTREAM_V_INIT_VALUE;
+          u32 SSTREAM_SRC_LINE_COUNT;
+          u32 SSTREAM_WIN_START;
+          u32 SSTREAM_WIN_SIZE;
+          u32 SSTREAM_FB_CB_ADDR;
+          u32 SSTREAM_FB_CR_ADDR;
+          u32 SSTREAM_CBCR_STRIDE;
+          u32 SSTREAM_FB_SIZE;
+          u32 SSTREAM_FB_ADDR2;
      } regs;
 } SavageSecondaryLayerData;
 
@@ -103,13 +103,13 @@
 
      struct {
           /* primary stream registers */
-          __u32 PSTREAM_CTRL;
-          __u32 PSTREAM_FB_ADDR0;
-          __u32 PSTREAM_FB_ADDR1;
-          __u32 PSTREAM_STRIDE;
-          __u32 PSTREAM_WIN_START;
-          __u32 PSTREAM_WIN_SIZE;
-          __u32 PSTREAM_FB_SIZE;
+          u32 PSTREAM_CTRL;
+          u32 PSTREAM_FB_ADDR0;
+          u32 PSTREAM_FB_ADDR1;
+          u32 PSTREAM_STRIDE;
+          u32 PSTREAM_WIN_START;
+          u32 PSTREAM_WIN_SIZE;
+          u32 PSTREAM_FB_SIZE;
      } regs;
 } SavagePrimaryLayerData;
 
@@ -148,7 +148,7 @@
 static void
 streamOnOff(SavageDriverData * sdrv, int on)
 {
-     volatile __u8 *mmio = sdrv->mmio_base;
+     volatile u8 *mmio = sdrv->mmio_base;
 
      waitretrace();
 
@@ -233,7 +233,7 @@
                                         void      *layer_data )
 {
      SavageDriverData *sdrv = (SavageDriverData*) driver_data;
-     volatile __u8 *mmio = sdrv->mmio_base;
+     volatile u8 *mmio = sdrv->mmio_base;
 
      SVGDBG("savageSecondaryEnable\n");
 
@@ -249,7 +249,7 @@
                                          void      *layer_data )
 {
      SavageDriverData *sdrv = (SavageDriverData*) driver_data;
-     volatile __u8 *mmio = sdrv->mmio_base;
+     volatile u8 *mmio = sdrv->mmio_base;
 
      SVGDBG("savageSecondaryDisable\n");
 
@@ -345,11 +345,11 @@
 savageSecondarySetOpacity( CoreLayer *layer,
                            void      *driver_data,
                            void      *layer_data,
-                           __u8       opacity )
+                           u8         opacity )
 {
      SavageDriverData *sdrv = (SavageDriverData*) driver_data;
      SavageSecondaryLayerData *slay = (SavageSecondaryLayerData*) layer_data;
-     volatile __u8 *mmio = sdrv->mmio_base;
+     volatile u8 *mmio = sdrv->mmio_base;
 
      SVGDBG("savageSecondarySetOpacity\n");
      switch (opacity) {
@@ -396,7 +396,7 @@
 {
      SavageDriverData *sdrv = (SavageDriverData*) driver_data;
      SavageSecondaryLayerData *slay = (SavageSecondaryLayerData*) layer_data;
-     volatile __u8    *mmio = sdrv->mmio_base;
+     volatile u8      *mmio = sdrv->mmio_base;
 
      SVGDBG("savageSecondarySetScreenLocation x:%f y:%f w:%f h:%f\n",
             x, y, width, height);
@@ -434,18 +434,18 @@
 savageSecondarySetSrcColorKey( CoreLayer *layer,
                                void      *driver_data,
                                void      *layer_data,
-                               __u8       r,
-                               __u8       g,
-                               __u8       b )
+                               u8         r,
+                               u8         g,
+                               u8         b )
 {
      SavageDriverData *sdrv = (SavageDriverData*) driver_data;
      SavageSecondaryLayerData *slay = (SavageSecondaryLayerData*) layer_data;
-     volatile __u8    *mmio = sdrv->mmio_base;
+     volatile u8      *mmio = sdrv->mmio_base;
 
      SVGDBG("savageSecondarySetSrcColorKey\n");
 
      if (slay->config.options == DLOP_SRC_COLORKEY) {
-          __u32 reg;
+          u32 reg;
 
           switch (slay->config.pixelformat) {
                case DSPF_ARGB1555:
@@ -476,18 +476,18 @@
 savageSecondarySetDstColorKey( CoreLayer *layer,
                                void      *driver_data,
                                void      *layer_data,
-                               __u8       r,
-                               __u8       g,
-                               __u8       b )
+                               u8         r,
+                               u8         g,
+                               u8         b )
 {
      SavageDriverData *sdrv = (SavageDriverData*) driver_data;
      SavageSecondaryLayerData *slay = (SavageSecondaryLayerData*) layer_data;
-     volatile __u8    *mmio = sdrv->mmio_base;
+     volatile u8      *mmio = sdrv->mmio_base;
 
      SVGDBG("savageSecondarySetDstColorKey\n");
 
      if (slay->config.options == DLOP_DST_COLORKEY) {
-          __u32 reg;
+          u32 reg;
 
           switch (dfb_primary_layer_pixelformat()) {
                case DSPF_RGB16:
@@ -545,14 +545,14 @@
 {
      SavageDriverData *sdrv = (SavageDriverData*) driver_data;
      SavageSecondaryLayerData *slay = (SavageSecondaryLayerData*) layer_data;
-     volatile __u8    *mmio = sdrv->mmio_base;
+     volatile u8      *mmio = sdrv->mmio_base;
 
      SVGDBG("savageSecondaryColorAdjustment b:%i c:%i h:%i s:%i\n",
             adj->brightness, adj->contrast, adj->hue, adj->saturation);
 
      if ((slay->regs.SSTREAM_FB_SIZE & 0x00400000) == 0) {
           /* secondary is yuv format */
-          __u32 reg;
+          u32 reg;
           long sat = adj->saturation * 16 / 65536;
           double hue = (adj->hue - 0x8000) * 3.141592654 / 32768.0;
           unsigned char hs1 = ((char)(sat * cos(hue))) & 0x1f;
@@ -596,7 +596,7 @@
 static void
 secondary_set_regs(SavageDriverData *sdrv, SavageSecondaryLayerData *slay)
 {
-     volatile __u8 *mmio = sdrv->mmio_base;
+     volatile u8 *mmio = sdrv->mmio_base;
 
      SVGDBG("secondary_set_regs\n");
 
@@ -900,7 +900,7 @@
 static void
 primary_set_regs(SavageDriverData *sdrv, SavagePrimaryLayerData *play)
 {
-     volatile __u8 *mmio = sdrv->mmio_base;
+     volatile u8 *mmio = sdrv->mmio_base;
 
      SVGDBG("primary_set_regs\n");
 
Index: gfxdrivers/sis315/sis315.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/sis315/sis315.c,v
retrieving revision 1.14
diff -u -r1.14 sis315.c
--- gfxdrivers/sis315/sis315.c	26 Aug 2006 09:34:19 -0000	1.14
+++ gfxdrivers/sis315/sis315.c	7 Oct 2006 19:54:41 -0000
@@ -165,9 +165,9 @@
 
 static void check_sisfb_version(SiSDriverData *drv, const sisfb_info *i)
 {
-	__u32 sisfb_version = SISFB_VERSION(i->sisfb_version,
-					    i->sisfb_revision,
-					    i->sisfb_patchlevel);
+	u32 sisfb_version = SISFB_VERSION(i->sisfb_version,
+					  i->sisfb_revision,
+					  i->sisfb_patchlevel);
 
 	if (sisfb_version < SISFB_VERSION(1, 6, 23)) {
 		fprintf(stderr, "*** Warning: sisfb version < 1.6.23 detected, "
@@ -220,8 +220,8 @@
 	SiSDriverData *drv = (SiSDriverData *)driver_data;
 	FBDev *dfb_fbdev;
 	sisfb_info *fbinfo;
-	__u32 fbinfo_size;
-	__u32 zero = 0;
+	u32 fbinfo_size;
+	u32 zero = 0;
 
 	(void)device_data;
 
Index: gfxdrivers/sis315/sis315.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/sis315/sis315.h,v
retrieving revision 1.3
diff -u -r1.3 sis315.h
--- gfxdrivers/sis315/sis315.h	10 Jul 2005 16:25:41 -0000	1.3
+++ gfxdrivers/sis315/sis315.h	7 Oct 2006 19:54:41 -0000
@@ -25,7 +25,7 @@
 #include <direct/types.h>
 
 typedef struct {
-	volatile __u8 *mmio_base;
+	volatile u8 *mmio_base;
 	bool has_auto_maximize;
 	unsigned long auto_maximize;
 	/* ioctls */
Index: gfxdrivers/sis315/sis315_accel.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/sis315/sis315_accel.c,v
retrieving revision 1.1
diff -u -r1.1 sis315_accel.c
--- gfxdrivers/sis315/sis315_accel.c	25 Nov 2003 10:53:48 -0000	1.1
+++ gfxdrivers/sis315/sis315_accel.c	7 Oct 2006 19:54:41 -0000
@@ -31,7 +31,7 @@
 	while (!(sis_rl(drv->mmio_base, SIS315_2D_CMD_QUEUE_STATUS) & 0x80000000));
 }
 
-static void sis_cmd(SiSDriverData *drv, SiSDeviceData *dev, __u8 pat, __u8 src, __u8 type, __u8 rop)
+static void sis_cmd(SiSDriverData *drv, SiSDeviceData *dev, u8 pat, u8 src, u8 type, u8 rop)
 {
 	sis_wl(drv->mmio_base, SIS315_2D_CMD, SIS315_2D_CMD_RECT_CLIP_EN |
 					      dev->cmd_bpp | (rop << 8) |
Index: gfxdrivers/sis315/sis315_mmio.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/sis315/sis315_mmio.c,v
retrieving revision 1.2
diff -u -r1.2 sis315_mmio.c
--- gfxdrivers/sis315/sis315_mmio.c	20 Nov 2003 10:38:37 -0000	1.2
+++ gfxdrivers/sis315/sis315_mmio.c	7 Oct 2006 19:54:41 -0000
@@ -1,13 +1,13 @@
 
 #include "sis315_mmio.h"
 
-__u32 sis_rl(volatile __u8 *mmio, unsigned int offset)
+u32 sis_rl(volatile u8 *mmio, unsigned int offset)
 {
-	return *(volatile __u32 *)(mmio + offset);
+	return *(volatile u32 *)(mmio + offset);
 }
 
-void sis_wl(volatile __u8 *mmio, unsigned int offset, __u32 value)
+void sis_wl(volatile u8 *mmio, unsigned int offset, u32 value)
 {
-	*(volatile __u32 *)(mmio + offset) = value;
+	*(volatile u32 *)(mmio + offset) = value;
 }
 
Index: gfxdrivers/sis315/sis315_mmio.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/sis315/sis315_mmio.h,v
retrieving revision 1.3
diff -u -r1.3 sis315_mmio.h
--- gfxdrivers/sis315/sis315_mmio.h	1 May 2006 18:51:52 -0000	1.3
+++ gfxdrivers/sis315/sis315_mmio.h	7 Oct 2006 19:54:41 -0000
@@ -3,7 +3,7 @@
 
 #include <dfb_types.h>
 
-extern __inline__ __u32 sis_rl(volatile __u8 *mmio, unsigned int offset);
-extern __inline__ void sis_wl(volatile __u8 *mmio, unsigned int offset, __u32 value);
+extern __inline__ u32 sis_rl(volatile u8 *mmio, unsigned int offset);
+extern __inline__ void sis_wl(volatile u8 *mmio, unsigned int offset, u32 value);
 
 #endif
Index: gfxdrivers/sis315/sis315_state.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/sis315/sis315_state.c,v
retrieving revision 1.3
diff -u -r1.3 sis315_state.c
--- gfxdrivers/sis315/sis315_state.c	30 Mar 2004 19:13:45 -0000	1.3
+++ gfxdrivers/sis315/sis315_state.c	7 Oct 2006 19:54:41 -0000
@@ -33,7 +33,7 @@
 #include "sis315_regs.h"
 #include "sis315_state.h"
 
-static __u16 dspfToSrcColor(DFBSurfacePixelFormat pf)
+static u16 dspfToSrcColor(DFBSurfacePixelFormat pf)
 {
 	switch (DFB_BITS_PER_PIXEL(pf)) {
 	case 16:
@@ -45,7 +45,7 @@
 	}
 }
 
-static __u32 dspfToCmdBpp(DFBSurfacePixelFormat pf)
+static u32 dspfToCmdBpp(DFBSurfacePixelFormat pf)
 {
 	switch (DFB_BITS_PER_PIXEL(pf)) {
 	case 16:
@@ -59,7 +59,7 @@
 
 void sis_validate_color(SiSDriverData *drv, SiSDeviceData *dev, CardState *state)
 {
-	__u32 color;
+	u32 color;
 
 	if (dev->v_color)
 		return;
Index: gfxdrivers/sis315/sisfb.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/sis315/sisfb.h,v
retrieving revision 1.1
diff -u -r1.1 sisfb.h
--- gfxdrivers/sis315/sisfb.h	10 Jul 2005 16:25:41 -0000	1.1
+++ gfxdrivers/sis315/sisfb.h	7 Oct 2006 19:54:41 -0000
@@ -19,6 +19,8 @@
 #ifndef _LINUX_SISFB
 #define _LINUX_SISFB
 
+#include <linux/types.h>
+
 /* vbflags */
 #define CRT2_DEFAULT            0x00000001
 #define CRT2_LCD                0x00000002  /* TW: Never change the order of the CRT2_XXX entries */
Index: gfxdrivers/tdfx/tdfx.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/tdfx/tdfx.c,v
retrieving revision 1.32
diff -u -r1.32 tdfx.c
--- gfxdrivers/tdfx/tdfx.c	26 Aug 2006 09:34:19 -0000	1.32
+++ gfxdrivers/tdfx/tdfx.c	7 Oct 2006 19:54:41 -0000
@@ -88,7 +88,7 @@
 } TDFXDeviceData;
 
 typedef struct {
-     volatile __u8 *mmio_base;
+     volatile u8   *mmio_base;
      Voodoo2D      *voodoo2D;
      Voodoo3D      *voodoo3D;
 } TDFXDriverData;
@@ -203,8 +203,8 @@
      SurfaceBuffer *buffer      = destination->back_buffer;
      Voodoo3D      *voodoo3D    = tdrv->voodoo3D;
 
-     __u32 lfbmode = TDFX_LFBMODE_PIXEL_PIPELINE_ENABLE;
-     __u32 fbzMode = (1 << 9) | 1;
+     u32 lfbmode = TDFX_LFBMODE_PIXEL_PIPELINE_ENABLE;
+     u32 fbzMode = (1 << 9) | 1;
 
      if (tdev->v_destination3D)
           return;
@@ -674,7 +674,7 @@
      TDFXDeviceData *tdev     = (TDFXDeviceData*) dev;
      Voodoo2D       *voodoo2D = tdrv->voodoo2D;
 
-     __u32 cmd = 1 | (1 <<8) | (0xCC << 24);//SST_2D_GO | SST_2D_SCRNTOSCRNBLIT | (ROP_COPY << 24);
+     u32 cmd = 1 | (1 <<8) | (0xCC << 24);//SST_2D_GO | SST_2D_SCRNTOSCRNBLIT | (ROP_COPY << 24);
 
      if (rect->x <= dx) {
           cmd |= (1 << 14);//SST_2D_X_RIGHT_TO_LEFT;
@@ -760,7 +760,7 @@
 {
      TDFXDriverData *tdrv = (TDFXDriverData*) driver_data;
 
-     tdrv->mmio_base = (volatile __u8*) dfb_gfxcard_map_mmio( device, 0, -1 );
+     tdrv->mmio_base = (volatile u8*) dfb_gfxcard_map_mmio( device, 0, -1 );
      if (!tdrv->mmio_base)
           return DFB_IO;
 
@@ -828,7 +828,7 @@
 
      tdfx_waitfifo( tdrv, tdev, 1 );           /* VOODOO !!!  */
 
-     *((volatile __u32*)((volatile __u8*) tdrv->mmio_base + 0x10c)) =
+     *((volatile u32*)((volatile u8*) tdrv->mmio_base + 0x10c)) =
           1 << 4 | 1 << 8 | 5 << 12 | 1 << 18 | 5 << 24;
 
      dfb_config->pollvsync_after = 1;
Index: gfxdrivers/tdfx/tdfx.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/tdfx/tdfx.h,v
retrieving revision 1.5
diff -u -r1.5 tdfx.h
--- gfxdrivers/tdfx/tdfx.h	5 Dec 2003 04:01:06 -0000	1.5
+++ gfxdrivers/tdfx/tdfx.h	7 Oct 2006 19:54:41 -0000
@@ -31,8 +31,8 @@
 #include <dfb_types.h>
 
 
-#define S12_4(val)    (((__u32)((__s32)((val) << 4))) & 0xffff)
-#define S12_4_(a,b)   (((__u32)((__s32)(((a) << 4) + (b)))) & 0xffff)
+#define S12_4(val)    (((u32)((s32)((val) << 4))) & 0xffff)
+#define S12_4_(a,b)   (((u32)((s32)(((a) << 4) + (b)))) & 0xffff)
 
 
 #define TDFX_LFBMODE_RGB565                   0
@@ -50,45 +50,45 @@
 #define TDFX_FBZCOLORPATH_ASELECT_COLOR1     (2 << 2)
 
 typedef volatile struct {
-    __u32 status;
-    __u32 intrCtrl;
+    u32 status;
+    u32 intrCtrl;
 
-    __u32 vertexAx;
-    __u32 vertexAy;
-    __u32 vertexBx;
-    __u32 vertexBy;
-    __u32 vertexCx;
-    __u32 vertexCy;
-
-    __s32 startR;
-    __s32 startG;
-    __s32 startB;
-    __s32 startZ;
-    __s32 startA;
-    __s32 startS;
-    __s32 startT;
-    __s32 startW;
-
-    __s32 dRdX;
-    __s32 dGdX;
-    __s32 dBdX;
-    __s32 dZdX;
-    __s32 dAdX;
-    __s32 dSdX;
-    __s32 dTdX;
-    __s32 dWdX;
-
-    __s32 dRdY;
-    __s32 dGdY;
-    __s32 dBdY;
-    __s32 dZdY;
-    __s32 dAdY;
-    __s32 dSdY;
-    __s32 dTdY;
-    __s32 dWdY;
+    u32 vertexAx;
+    u32 vertexAy;
+    u32 vertexBx;
+    u32 vertexBy;
+    u32 vertexCx;
+    u32 vertexCy;
+
+    s32 startR;
+    s32 startG;
+    s32 startB;
+    s32 startZ;
+    s32 startA;
+    s32 startS;
+    s32 startT;
+    s32 startW;
+
+    s32 dRdX;
+    s32 dGdX;
+    s32 dBdX;
+    s32 dZdX;
+    s32 dAdX;
+    s32 dSdX;
+    s32 dTdX;
+    s32 dWdX;
+
+    s32 dRdY;
+    s32 dGdY;
+    s32 dBdY;
+    s32 dZdY;
+    s32 dAdY;
+    s32 dSdY;
+    s32 dTdY;
+    s32 dWdY;
 
-    __u32 triangleCMD;
-    __u32 reserved0;
+    u32 triangleCMD;
+    u32 reserved0;
 
     float fvertexAx;
     float fvertexAy;
@@ -124,57 +124,57 @@
     float fdTdY;
     float fdWdY;
 
-    __u32 ftriangleCMD;
-    __u32 fbzColorPath;
-    __u32 fogMode;
-    __u32 alphaMode;
-    __u32 fbzMode;
-    __u32 lfbMode;
-    __u32 clipLeftRight;
-    __u32 clipTopBottom;
-
-    __u32 nopCMD;
-    __u32 fastfillCMD;
-    __u32 swapbufferCMD;
-    __u32 fogColor;
-    __u32 zaColor;
-    __u32 chromaKey;
-    __u32 chromaRange;
-    __u32 userIntrCMD;
-    __u32 stipple;
-    __u32 color0;
-    __u32 color1;
-
-    __u32 fbiPixelsIn;
-    __u32 fbiChromaFail;
-    __u32 fbiZfuncFail;
-    __u32 fbiAfuncFail;
-    __u32 fbiPixelsOut;
-
-    __u32 fogTable[32];
-
-    __u32 reserved1[3];
-
-    __u32 colBufferAddr;
-    __u32 colBufferStride;
-    __u32 auxBufferAddr;
-    __u32 auxBufferStride;
-
-    __u32 reserved2;
-
-    __u32 clipLeftRight1;
-    __u32 clipTopBottom1;
-
-    __u32 reserved3[17];
-    __u32 swapPending;
-    __u32 leftOverlayBuf;
-    __u32 rightOverlayBuf;
-    __u32 fbiSwapHistory;
-    __u32 fbiTrianglesOut;
-    __u32 sSetupMode;
+    u32 ftriangleCMD;
+    u32 fbzColorPath;
+    u32 fogMode;
+    u32 alphaMode;
+    u32 fbzMode;
+    u32 lfbMode;
+    u32 clipLeftRight;
+    u32 clipTopBottom;
+
+    u32 nopCMD;
+    u32 fastfillCMD;
+    u32 swapbufferCMD;
+    u32 fogColor;
+    u32 zaColor;
+    u32 chromaKey;
+    u32 chromaRange;
+    u32 userIntrCMD;
+    u32 stipple;
+    u32 color0;
+    u32 color1;
+
+    u32 fbiPixelsIn;
+    u32 fbiChromaFail;
+    u32 fbiZfuncFail;
+    u32 fbiAfuncFail;
+    u32 fbiPixelsOut;
+
+    u32 fogTable[32];
+
+    u32 reserved1[3];
+
+    u32 colBufferAddr;
+    u32 colBufferStride;
+    u32 auxBufferAddr;
+    u32 auxBufferStride;
+
+    u32 reserved2;
+
+    u32 clipLeftRight1;
+    u32 clipTopBottom1;
+
+    u32 reserved3[17];
+    u32 swapPending;
+    u32 leftOverlayBuf;
+    u32 rightOverlayBuf;
+    u32 fbiSwapHistory;
+    u32 fbiTrianglesOut;
+    u32 sSetupMode;
     float sVx;
     float sVy;
-    __u32 sARGB;
+    u32 sARGB;
     float sRed;
     float sGreen;
     float sBlue;
@@ -187,63 +187,63 @@
     float sWtmu1;
     float sS_Wtmu1;
     float sT_Wtmu1;
-    __u32 sDrawTriCMD;
-    __u32 sBeginTriCMD;
+    u32 sDrawTriCMD;
+    u32 sBeginTriCMD;
 
-    __u32 reserved[22];
-    __u32 textureMode;
-    __u32 tLOD;
-    __u32 tDetail;
-    __u32 texBaseAddr;
-    __u32 texBaseAddr1;
-    __u32 texBaseAddr2;
-    __u32 texBaseAddr3_8;
-    __u32 texStride;
-    __u32 trexInit1;
+    u32 reserved[22];
+    u32 textureMode;
+    u32 tLOD;
+    u32 tDetail;
+    u32 texBaseAddr;
+    u32 texBaseAddr1;
+    u32 texBaseAddr2;
+    u32 texBaseAddr3_8;
+    u32 texStride;
+    u32 trexInit1;
 
-    __u32 nccTable0[12];
-    __u32 nccTable1[12];
+    u32 nccTable0[12];
+    u32 nccTable1[12];
 
-    __u32 reserved4[31];
+    u32 reserved4[31];
 } Voodoo3D;
 
 
 typedef volatile struct {
-     __u32 status;
-     __u32 intCtrl;
-     __u32 clip0Min;
-     __u32 clip0Max;
-     __u32 dstBaseAddr;
-     __u32 dstFormat;
-     __u32 srcColorkeyMin;
-     __u32 srcColorkeyMax;
-     __u32 dstColorkeyMin;
-     __u32 dstColorkeyMax;
-     __u32 bresError0;
-     __u32 bresError1;
-     __u32 rop;
-     __u32 srcBaseAddr;
-     __u32 commandExtra;
-     __u32 lineStipple;
-     __u32 lineStyle;
-     __u32 pattern0Alias;
-     __u32 pattern1Alias;
-     __u32 clip1Min;
-     __u32 clip1Max;
-     __u32 srcFormat;
-     __u32 srcSize;
-     __u32 srcXY;
-     __u32 colorBack;
-     __u32 colorFore;
-     __u32 dstSize;
-     __u32 dstXY;
-     __u32 command;
+     u32 status;
+     u32 intCtrl;
+     u32 clip0Min;
+     u32 clip0Max;
+     u32 dstBaseAddr;
+     u32 dstFormat;
+     u32 srcColorkeyMin;
+     u32 srcColorkeyMax;
+     u32 dstColorkeyMin;
+     u32 dstColorkeyMax;
+     u32 bresError0;
+     u32 bresError1;
+     u32 rop;
+     u32 srcBaseAddr;
+     u32 commandExtra;
+     u32 lineStipple;
+     u32 lineStyle;
+     u32 pattern0Alias;
+     u32 pattern1Alias;
+     u32 clip1Min;
+     u32 clip1Max;
+     u32 srcFormat;
+     u32 srcSize;
+     u32 srcXY;
+     u32 colorBack;
+     u32 colorFore;
+     u32 dstSize;
+     u32 dstXY;
+     u32 command;
 
-     __u32 reserved[3];
+     u32 reserved[3];
 
-     __u32 launchArea[32];
+     u32 launchArea[32];
 
-     __u32 colorPattern[64];
+     u32 colorPattern[64];
 } Voodoo2D;
 
 #endif
Index: gfxdrivers/unichrome/mmio.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/unichrome/mmio.h,v
retrieving revision 1.1
diff -u -r1.1 mmio.h
--- gfxdrivers/unichrome/mmio.h	14 Jun 2004 11:53:35 -0000	1.1
+++ gfxdrivers/unichrome/mmio.h	7 Oct 2006 19:54:41 -0000
@@ -25,13 +25,13 @@
 
 #else // !KERNEL
 
-#define VIA_OUT(hwregs, reg, val)   *(volatile __u32 *)((hwregs) + (reg)) = (val)
-#define VIA_IN(hwregs, reg)         *(volatile __u32 *)((hwregs) + (reg))
-#define VGA_OUT8(hwregs, reg, val)  *(volatile __u8 *)((hwregs) + (reg) + 0x8000) = (val)
-#define VGA_IN8(hwregs, reg)        *(volatile __u8 *)((hwregs) + (reg) + 0x8000)
+#define VIA_OUT(hwregs, reg, val)   *(volatile u32 *)((hwregs) + (reg)) = (val)
+#define VIA_IN(hwregs, reg)         *(volatile u32 *)((hwregs) + (reg))
+#define VGA_OUT8(hwregs, reg, val)  *(volatile u8 *)((hwregs) + (reg) + 0x8000) = (val)
+#define VGA_IN8(hwregs, reg)        *(volatile u8 *)((hwregs) + (reg) + 0x8000)
 
-#define RS16(val)               ((__u16)((__s16)(val)))
-#define RS12(val)               (((__u16)((__s16)(val))) & 0xfff)
+#define RS16(val)               ((u16)((s16)(val)))
+#define RS12(val)               (((u16)((s16)(val))) & 0xfff)
 
 #endif // KERNEL
 
Index: gfxdrivers/unichrome/uc_fifo.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/unichrome/uc_fifo.c,v
retrieving revision 1.2
diff -u -r1.2 uc_fifo.c
--- gfxdrivers/unichrome/uc_fifo.c	29 Oct 2005 00:40:58 -0000	1.2
+++ gfxdrivers/unichrome/uc_fifo.c	7 Oct 2006 19:54:41 -0000
@@ -67,15 +67,15 @@
 
 void uc_fifo_flush_sys(struct uc_fifo* fifo, volatile void *regs)
 {
-    __u32* p;
-    __u32* q;
+    u32* p;
+    u32* q;
 
-    volatile __u32* hwregs     = regs;
-    volatile __u32* reg_tset   = regs + VIA_REG_TRANSET;
-    volatile __u32* reg_tspace = regs + VIA_REG_TRANSPACE;
+    volatile u32* hwregs     = regs;
+    volatile u32* reg_tset   = regs + VIA_REG_TRANSET;
+    volatile u32* reg_tspace = regs + VIA_REG_TRANSPACE;
 
     int check2Dcmd;
-    __u32 addr;
+    u32 addr;
 
     p = fifo->buf;
     q = fifo->head;
@@ -164,7 +164,7 @@
 
     // Note: malloc won't work for DMA buffers...
 
-    fifo->buf = SHMALLOC(pool, sizeof(__u32) * size);
+    fifo->buf = SHMALLOC(pool, sizeof(u32) * size);
     if (!(fifo->buf)) {
         SHFREE(pool, fifo);
         return NULL;
Index: gfxdrivers/unichrome/uc_fifo.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/unichrome/uc_fifo.h,v
retrieving revision 1.2
diff -u -r1.2 uc_fifo.h
--- gfxdrivers/unichrome/uc_fifo.h	29 Oct 2005 00:40:58 -0000	1.2
+++ gfxdrivers/unichrome/uc_fifo.h	7 Oct 2006 19:54:41 -0000
@@ -39,8 +39,8 @@
 
 struct uc_fifo
 {
-    __u32* buf;
-    __u32* head;
+    u32* buf;
+    u32* head;
 
     unsigned int size;
     unsigned int prep;
@@ -142,7 +142,7 @@
 
 #define UC_FIFO_ADD_FLOAT(fifo, val)        \
     do {                                    \
-        union {float f; __u32 i;} v;        \
+        union {float f; u32 i;} v;          \
         v.f = (float) (val);                \
         UC_FIFO_ADD(fifo, v.i);             \
     } while(0)
Index: gfxdrivers/unichrome/uc_hwset.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/unichrome/uc_hwset.c,v
retrieving revision 1.3
diff -u -r1.3 uc_hwset.c
--- gfxdrivers/unichrome/uc_hwset.c	10 Nov 2005 10:26:16 -0000	1.3
+++ gfxdrivers/unichrome/uc_hwset.c	7 Oct 2006 19:54:41 -0000
@@ -337,7 +337,7 @@
                  CardState    *state )
 {
      struct uc_fifo *fifo  = ucdrv->fifo;
-     __u32           color = 0;
+     u32             color = 0;
 
      if (UC_IS_VALID( uc_color2d ))
           return;
Index: gfxdrivers/unichrome/uc_overlay.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/unichrome/uc_overlay.c,v
retrieving revision 1.6
diff -u -r1.6 uc_overlay.c
--- gfxdrivers/unichrome/uc_overlay.c	1 Aug 2006 09:35:07 -0000	1.6
+++ gfxdrivers/unichrome/uc_overlay.c	7 Oct 2006 19:54:41 -0000
@@ -170,7 +170,7 @@
 {
     UcDriverData*  ucdrv = (UcDriverData*) driver_data;
     UcOverlayData* ucovl = (UcOverlayData*) layer_data;
-    volatile __u8* vio = ucdrv->hwregs;
+    volatile u8*   vio = ucdrv->hwregs;
 
     ucovl->v1.isenabled = false;
 
Index: gfxdrivers/unichrome/uc_overlay.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/unichrome/uc_overlay.h,v
retrieving revision 1.6
diff -u -r1.6 uc_overlay.h
--- gfxdrivers/unichrome/uc_overlay.h	15 Nov 2005 15:51:15 -0000	1.6
+++ gfxdrivers/unichrome/uc_overlay.h	7 Oct 2006 19:54:41 -0000
@@ -27,7 +27,7 @@
     DFBDisplayLayerConfig cfg;      // Layer configuration
     int ox, oy;                     // Top-left visible corner (the offset)
                                     // in the source surface
-    __u8 opacity;                   // Layer opacity
+    u8 opacity;                     // Layer opacity
     int level;                      // Position in the DirectFB layer stack
                                     // < 0 = underlay mode, > 0 = overlay mode
     DFBColorAdjustment adj;         // Color adjustment (brightness etc)
@@ -39,11 +39,11 @@
 
     // TODO: initialize the variables!!!
 
-    __u8                hwrev;       // Unichrome revision
+    u8                  hwrev;       // Unichrome revision
     int                 scrwidth;    // Current screen width
 
     bool                extfifo_on;  // True when we're using the extended fifo.
-    __u8                mclk_save[3];
+    u8                  mclk_save[3];
 
     struct uc_ovl_vinfo v1;          // Video overlay V1
 
@@ -62,28 +62,28 @@
 
 // Video engine - mapping functions (uc_ovl_hwmap.c)
 
-bool uc_ovl_map_vzoom(int sh, int dh, __u32* zoom, __u32* mini);
-bool uc_ovl_map_hzoom(int sw, int dw,  __u32* zoom, __u32* mini,
-                      __u32* falign, __u32* dcount);
-__u32 uc_ovl_map_qwpitch(int falign, DFBSurfacePixelFormat format, int sw);
-__u32 uc_ovl_map_format(DFBSurfacePixelFormat format);
+bool uc_ovl_map_vzoom(int sh, int dh, u32* zoom, u32* mini);
+bool uc_ovl_map_hzoom(int sw, int dw,  u32* zoom, u32* mini,
+                      u32* falign, u32* dcount);
+u32 uc_ovl_map_qwpitch(int falign, DFBSurfacePixelFormat format, int sw);
+u32 uc_ovl_map_format(DFBSurfacePixelFormat format);
 void uc_ovl_map_window(int scrw, int scrh, DFBRectangle* win, int sw, int sh,
-                       __u32* win_start, __u32* win_end, int* ox, int* oy);
-void uc_ovl_map_buffer(DFBSurfacePixelFormat format, __u32 buf,
+                       u32* win_start, u32* win_end, int* ox, int* oy);
+void uc_ovl_map_buffer(DFBSurfacePixelFormat format, u32 buf,
                        int x, int y, int w, int h, int pitch, int field,
-                       __u32* y_start, __u32* u_start, __u32* v_start);
-__u32 uc_ovl_map_alpha(int opacity);
+                       u32* y_start, u32* u_start, u32* v_start);
+u32 uc_ovl_map_alpha(int opacity);
 void uc_ovl_map_v1_control(DFBSurfacePixelFormat format, int sw,
                            int hwrev, bool extfifo_on,
-                           __u32* control, __u32* fifo);
-__u32 uc_ovl_map_fifo(__u8 depth, __u8 pre_thr, __u8 thr);
-void uc_ovl_map_adjustment(DFBColorAdjustment* adj, __u32* a1, __u32* a2);
-__u32 uc_ovl_map_colorkey(DFBColor* c);
+                           u32* control, u32* fifo);
+u32 uc_ovl_map_fifo(u8 depth, u8 pre_thr, u8 thr);
+void uc_ovl_map_adjustment(DFBColorAdjustment* adj, u32* a1, u32* a2);
+u32 uc_ovl_map_colorkey(DFBColor* c);
 
 // Video engine - setting functions (uc_ovl_hwset.c)
 
 void uc_ovl_setup_fifo(UcOverlayData* ucovl, int scrwidth);
-void uc_ovl_vcmd_wait(volatile __u8* vio);
+void uc_ovl_vcmd_wait(volatile u8* vio);
 DFBResult uc_ovl_update(UcDriverData* ucdrv,
                         UcOverlayData* ucovl, int action,
                         CoreSurface* surface);
Index: gfxdrivers/unichrome/uc_ovl_hwmap.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/unichrome/uc_ovl_hwmap.c,v
retrieving revision 1.5
diff -u -r1.5 uc_ovl_hwmap.c
--- gfxdrivers/unichrome/uc_ovl_hwmap.c	8 Nov 2005 19:29:11 -0000	1.5
+++ gfxdrivers/unichrome/uc_ovl_hwmap.c	7 Oct 2006 19:54:42 -0000
@@ -31,9 +31,9 @@
  *       See ddover.c, DDOVER_HQVCalcZoomHeight()
  */
 
-bool uc_ovl_map_vzoom(int sh, int dh, __u32* zoom, __u32* mini)
+bool uc_ovl_map_vzoom(int sh, int dh, u32* zoom, u32* mini)
 {
-    __u32 sh1, tmp, d;
+    u32 sh1, tmp, d;
     bool zoom_ok = true;
 
     if (sh == dh) { // No zoom
@@ -93,10 +93,10 @@
  * @note Derived from VIA's V4L driver.
  *       See ddover.c, DDOVER_HQVCalcZoomWidth() and DDOver_GetDisplayCount()
  */
-bool uc_ovl_map_hzoom(int sw, int dw,  __u32* zoom, __u32* mini,
-                      __u32* falign, __u32* dcount)
+bool uc_ovl_map_hzoom(int sw, int dw,  u32* zoom, u32* mini,
+                      u32* falign, u32* dcount)
 {
-    __u32 tmp, sw1, d;
+    u32 tmp, sw1, d;
     int md; // Minify-divider
     bool zoom_ok = true;
 
@@ -159,7 +159,7 @@
  * @note Derived from VIA's V4L driver. See ddover.c, DDOver_GetFetch()
  * @note Only call after uc_ovl_map_hzoom()
  */
-__u32 uc_ovl_map_qwpitch(int falign, DFBSurfacePixelFormat format, int sw)
+u32 uc_ovl_map_qwpitch(int falign, DFBSurfacePixelFormat format, int sw)
 {
     int fetch = 0;
 
@@ -200,7 +200,7 @@
  *
  * @note Derived from VIA's V4L driver. See ddover.c, DDOver_GetV1Format()
  */
-__u32 uc_ovl_map_format(DFBSurfacePixelFormat format)
+u32 uc_ovl_map_format(DFBSurfacePixelFormat format)
 {
     switch (format) {
     case DSPF_YV12:
@@ -239,7 +239,7 @@
  * @parm oy         will hold new topmost coordinate in source surface
  */
 void uc_ovl_map_window(int scrw, int scrh, DFBRectangle* win, int sw, int sh,
-                       __u32* win_start, __u32* win_end, int* ox, int* oy)
+                       u32* win_start, u32* win_end, int* ox, int* oy)
 {
     int x1, y1, x2, y2;
     int x,y,dw,dh;      // These help making the code readable...
@@ -338,14 +338,14 @@
  * @note Derived from VIA's V4L driver. See ddover.c,
  *       DDOver_GetSrcStartAddress() and DDOVer_GetYCbCrStartAddress()
  */
-void uc_ovl_map_buffer(DFBSurfacePixelFormat format, __u32 buf,
+void uc_ovl_map_buffer(DFBSurfacePixelFormat format, u32 buf,
                        int ox, int oy, int sw, int sh, int sp, int field,
-                       __u32* y_start, __u32* u_start, __u32* v_start)
+                       u32* y_start, u32* u_start, u32* v_start)
 {
     int swap_cb_cr = 0;
 
-    __u32 tmp;
-    __u32 y_offset, uv_offset = 0;
+    u32 tmp;
+    u32 y_offset, uv_offset = 0;
 
     switch (format) {
 
@@ -418,9 +418,9 @@
  * @note: Derived from ddmpeg.c, VIAAlphaWin()
  */
 
-__u32 uc_ovl_map_alpha(int opacity)
+u32 uc_ovl_map_alpha(int opacity)
 {
-    __u32 ctrl = 0x00080000;    // Not sure what this number is, supposedly
+    u32 ctrl = 0x00080000;      // Not sure what this number is, supposedly
                                 // it is the "expire number divided by 4".
 
     if (opacity > 255) opacity = 255;
@@ -447,7 +447,7 @@
  */
 void uc_ovl_map_v1_control(DFBSurfacePixelFormat format, int sw,
                            int hwrev, bool extfifo_on,
-                           __u32* control, __u32* fifo)
+                           u32* control, u32* fifo)
 {
     *control = V1_BOB_ENABLE | V1_ENABLE | uc_ovl_map_format(format);
 
@@ -505,11 +505,11 @@
  * @param mask  Bitmask
  * @param shift Position in hardware register.
  */
-static int fmt(float x, int ndec, int sbit, __u32 mask, int shift)
+static int fmt(float x, int ndec, int sbit, u32 mask, int shift)
 {
     int y = (x * (1 << ndec));
     if (sbit && (y < 0)) y = -y | (1 << sbit);
-    return (((__u32) y) & mask) << shift;
+    return (((u32) y) & mask) << shift;
 }
 
 /**
@@ -519,7 +519,7 @@
  * @param a1    Will hold value for V1_ColorSpaceReg_1
  * @param a2    Will hold value for V1_ColorSpaceReg_2
  */
-void uc_ovl_map_adjustment(DFBColorAdjustment* adj, __u32* a1, __u32* a2)
+void uc_ovl_map_adjustment(DFBColorAdjustment* adj, u32* a1, u32* a2)
 {
     float con, sat, bri, hue;
     float c, s;
@@ -558,9 +558,9 @@
         fmt(B3, 2, 0, 0xf, 10) | fmt(C3, 2, 3, 0xf,  2);
 }
 
-__u32 uc_ovl_map_colorkey(DFBColor* c)
+u32 uc_ovl_map_colorkey(DFBColor* c)
 {
-    __u32 color;
+    u32 color;
     DFBSurfacePixelFormat fmt;
 
     color = 0;
Index: gfxdrivers/unichrome/uc_ovl_hwset.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/unichrome/uc_ovl_hwset.c,v
retrieving revision 1.3
diff -u -r1.3 uc_ovl_hwset.c
--- gfxdrivers/unichrome/uc_ovl_hwset.c	15 Nov 2005 16:00:47 -0000	1.3
+++ gfxdrivers/unichrome/uc_ovl_hwset.c	7 Oct 2006 19:54:42 -0000
@@ -25,7 +25,7 @@
 
 void uc_ovl_setup_fifo(UcOverlayData* ucovl, int scrwidth)
 {
-     __u8* mclk_save = ucovl->mclk_save;
+     u8* mclk_save = ucovl->mclk_save;
 
      if (!iopl(3)) {
           if (scrwidth <= 1024) { // Disable
@@ -62,7 +62,7 @@
      ucovl->scrwidth = scrwidth;
 }
 
-void uc_ovl_vcmd_wait(volatile __u8* vio)
+void uc_ovl_vcmd_wait(volatile u8* vio)
 {
      while ((VIDEO_IN(vio, V_COMPOSE_MODE)
              & (V1_COMMAND_FIRE | V3_COMMAND_FIRE)));
@@ -88,19 +88,19 @@
      int dw, dh;             // Destination width and height
      VideoMode *videomode;
      DFBRectangle scr;       // Screen size
-     __u32 dst_key = 0;      // Destination color key (hw format)
+     u32 dst_key = 0;        // Destination color key (hw format)
 
      bool write_buffers = false;
      bool write_settings = false;
 
-     volatile __u8* vio = ucdrv->hwregs;
+     volatile u8* vio = ucdrv->hwregs;
 
-     __u32 win_start, win_end;   // Overlay register settings
-     __u32 zoom, mini;
-     __u32 dcount, falign, qwpitch;
-     __u32 y_start, u_start, v_start;
-     __u32 v_ctrl, fifo_ctrl;
-     __u32 alpha = 0;
+     u32 win_start, win_end;   // Overlay register settings
+     u32 zoom, mini;
+     u32 dcount, falign, qwpitch;
+     u32 y_start, u_start, v_start;
+     u32 v_ctrl, fifo_ctrl;
+     u32 alpha = 0;
 
      int offset = surface->front_buffer->video.offset;
 
@@ -256,7 +256,7 @@
     UcOverlayData* ucovl = (UcOverlayData*) layer_data;
     UcDriverData*  ucdrv = (UcDriverData*) driver_data;
     DFBColorAdjustment* ucadj;
-    __u32 a1, a2;
+    u32 a1, a2;
 
     ucadj = &ucovl->v1.adj;
 
Index: gfxdrivers/unichrome/uc_probe.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/unichrome/uc_probe.h,v
retrieving revision 1.2
diff -u -r1.2 uc_probe.h
--- gfxdrivers/unichrome/uc_probe.h	27 Jul 2006 15:36:18 -0000	1.2
+++ gfxdrivers/unichrome/uc_probe.h	7 Oct 2006 19:54:42 -0000
@@ -23,7 +23,7 @@
 #ifdef KERNEL
     u16 id;                 // PCI id
 #else
-    __u16 id;
+    u16 id;
 #endif
     char* name;             // Human readable name, e.g CLE266/UniChrome
 };
Index: gfxdrivers/unichrome/uc_spic.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/unichrome/uc_spic.c,v
retrieving revision 1.3
diff -u -r1.3 uc_spic.c
--- gfxdrivers/unichrome/uc_spic.c	26 Oct 2005 09:37:28 -0000	1.3
+++ gfxdrivers/unichrome/uc_spic.c	7 Oct 2006 19:54:42 -0000
@@ -25,7 +25,7 @@
 }
 
 static void
-uc_spic_set_palette( volatile __u8* hwregs, CorePalette *palette )
+uc_spic_set_palette( volatile u8* hwregs, CorePalette *palette )
 {
     int i;
 
@@ -41,7 +41,7 @@
     }
 }
 
-static void uc_spic_enable( volatile __u8 *hwregs, bool enable )
+static void uc_spic_enable( volatile u8 *hwregs, bool enable )
 {
     VIDEO_OUT(hwregs, SUBP_CONTROL_STRIDE,
         (VIDEO_IN(hwregs, SUBP_CONTROL_STRIDE) & ~SUBP_HQV_ENABLE) |
@@ -49,7 +49,7 @@
 }
 
 static void
-uc_spic_set_buffer( volatile __u8 *hwregs, CoreSurface *surface )
+uc_spic_set_buffer( volatile u8 *hwregs, CoreSurface *surface )
 {
     if (surface) {
         VIDEO_OUT(hwregs, SUBP_STARTADDR,
Index: gfxdrivers/unichrome/uc_state.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/unichrome/uc_state.c,v
retrieving revision 1.3
diff -u -r1.3 uc_state.c
--- gfxdrivers/unichrome/uc_state.c	10 Nov 2005 10:26:16 -0000	1.3
+++ gfxdrivers/unichrome/uc_state.c	7 Oct 2006 19:54:42 -0000
@@ -170,8 +170,8 @@
      UcDeviceData   *ucdev = (UcDeviceData*) dev;
      struct uc_fifo *fifo  = ucdrv->fifo;
 
-     __u32 rop3d     = HC_HROP_P;
-     __u32 regEnable = HC_HenCW_MASK | HC_HenAW_MASK;
+     u32 rop3d     = HC_HROP_P;
+     u32 regEnable = HC_HenCW_MASK | HC_HenAW_MASK;
 
      StateModificationFlags modified = state->modified;
 
Index: gfxdrivers/unichrome/uc_state.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/unichrome/uc_state.h,v
retrieving revision 1.1
diff -u -r1.1 uc_state.h
--- gfxdrivers/unichrome/uc_state.h	14 Jun 2004 11:53:35 -0000	1.1
+++ gfxdrivers/unichrome/uc_state.h	7 Oct 2006 19:54:42 -0000
@@ -26,27 +26,27 @@
 {
     // These control clipping...
 
-    __u32 regHClipTB;
-    __u32 regHClipLR;
-    __u32 regHFPClipTL;
-    __u32 regHFPClipBL;
-    __u32 regHFPClipLL;
-    __u32 regHFPClipRL;
-    __u32 regHFPClipTBH;
-    __u32 regHFPClipLRH;
+    u32 regHClipTB;
+    u32 regHClipLR;
+    u32 regHFPClipTL;
+    u32 regHFPClipBL;
+    u32 regHFPClipLL;
+    u32 regHFPClipRL;
+    u32 regHFPClipTBH;
+    u32 regHFPClipLRH;
 
     // Other functions
 
-    __u32 regHLP;           // Line stipple pattern
-    __u32 regHLPRF;         // Line stipple factor
-    __u32 regHSolidCL;      // --- Don't know. Unused in DRI.
-    __u32 regHPixGC;        // Don't know. Is kept cleared in DRI.
-    //__u32 regHSPXYOS;     // Polygon stipple x and y offsets. Unused here.
-    __u32 regHVertexCNT;    // --- Don't know. Unused in DRI.
-
-    __u8 ps_xos;            // Polygon stipple x-offset. => regHSPXYOS
-    __u8 ps_yos;            // Polygon stipple y-offset. => regHSPXYOS
-    __u32 ps_pat[32];       // Polygon stipple pattern buffer.
+    u32 regHLP;             // Line stipple pattern
+    u32 regHLPRF;           // Line stipple factor
+    u32 regHSolidCL;        // --- Don't know. Unused in DRI.
+    u32 regHPixGC;          // Don't know. Is kept cleared in DRI.
+    //u32 regHSPXYOS;       // Polygon stipple x and y offsets. Unused here.
+    u32 regHVertexCNT;      // --- Don't know. Unused in DRI.
+
+    u8 ps_xos;              // Polygon stipple x-offset. => regHSPXYOS
+    u8 ps_yos;              // Polygon stipple y-offset. => regHSPXYOS
+    u32 ps_pat[32];         // Polygon stipple pattern buffer.
                             // These are not registers...
 };
 
@@ -55,12 +55,12 @@
 
 struct uc_hw_stencil
 {
-    //__u32 regHSBBasL;     // These aren't in regs3d.h, but they should exist...
-    //__u32 regHSBBasH;
-    //__u32 regHSBFM;
+    //u32 regHSBBasL;       // These aren't in regs3d.h, but they should exist...
+    //u32 regHSBBasH;
+    //u32 regHSBFM;
 
-    __u32 regHSTREF;        // Stencil reference value and plane mask
-    __u32 regHSTMD;         // Stencil test function and fail operation and
+    u32 regHSTREF;          // Stencil reference value and plane mask
+    u32 regHSTMD;           // Stencil test function and fail operation and
                             // zpass/zfail operations.
 };
 */
Index: gfxdrivers/unichrome/unichrome.c
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/unichrome/unichrome.c,v
retrieving revision 1.9
diff -u -r1.9 unichrome.c
--- gfxdrivers/unichrome/unichrome.c	30 Sep 2006 22:46:24 -0000	1.9
+++ gfxdrivers/unichrome/unichrome.c	7 Oct 2006 19:54:42 -0000
@@ -64,7 +64,7 @@
 static int pci_config_in8( unsigned int bus,
                            unsigned int slot,
                            unsigned int func,
-                           __u8 reg )
+                           u8 reg )
 {
     char  filename[512];
     int   fd;
@@ -154,7 +154,7 @@
 static void uc_dump_vq(UcDeviceData *ucdev)
 {
      int i;
-     __u8* vq;
+     u8* vq;
 
      if (!ucdev->vq_start) return;
      vq = dfb_system_video_memory_virtual(ucdev->vq_start);
@@ -197,7 +197,7 @@
 DFBResult uc_init_2d_engine(GraphicsDevice *device, UcDeviceData *ucdev, UcDriverData *ucdrv, bool enable)
 {
      DFBResult result = DFB_OK;
-     volatile __u8* hwregs = ucdrv->hwregs;
+     volatile u8* hwregs = ucdrv->hwregs;
      int i;
 
      // Init 2D engine registers to reset 2D engine
@@ -265,9 +265,9 @@
      return result;
 }
 
-void uc_init_3d_engine(volatile __u8* hwregs, int hwrev, bool init_all)
+void uc_init_3d_engine(volatile u8* hwregs, int hwrev, bool init_all)
 {
-     __u32 i;
+     u32 i;
 
      if (init_all) {
 
Index: gfxdrivers/unichrome/unichrome.h
===================================================================
RCS file: /cvs/directfb/DirectFB/gfxdrivers/unichrome/unichrome.h,v
retrieving revision 1.4
diff -u -r1.4 unichrome.h
--- gfxdrivers/unichrome/unichrome.h	15 Nov 2005 15:51:15 -0000	1.4
+++ gfxdrivers/unichrome/unichrome.h	7 Oct 2006 19:54:42 -0000
@@ -29,52 +29,52 @@
 struct uc_hw_texture {
      DFBSurfaceBlittingFlags bltflags;
 
-     __u32 l2w;      //width, rounded up to nearest 2^m, eg 600 => 1024
-     __u32 l2h;      //height, rounded up, e.g 480 => 512
-     __u32 we;       //width exponent, i.e m in the number 2^m
-     __u32 he;       //height exponent
+     u32 l2w;        //width, rounded up to nearest 2^m, eg 600 => 1024
+     u32 l2h;        //height, rounded up, e.g 480 => 512
+     u32 we;         //width exponent, i.e m in the number 2^m
+     u32 he;         //height exponent
 
-     __u32 format;   // HW pixel format
+     u32 format;     // HW pixel format
 
      // 3d engine texture environment, texture unit 0
 
      // Used for the DSBLIT_BLEND_ALPHACHANNEL, DSBLIT_BLEND_COLORALPHA
      // and DSBLIT_COLORIZE blitting flags.
 
-     __u32 regHTXnTB;
-     __u32 regHTXnMPMD;
+     u32 regHTXnTB;
+     u32 regHTXnMPMD;
 
-     __u32 regHTXnTBLCsat_0;
-     __u32 regHTXnTBLCop_0;
-     __u32 regHTXnTBLMPfog_0;
-     __u32 regHTXnTBLAsat_0;
-     __u32 regHTXnTBLRCb_0;
-     __u32 regHTXnTBLRAa_0;
-     __u32 regHTXnTBLRFog_0;
+     u32 regHTXnTBLCsat_0;
+     u32 regHTXnTBLCop_0;
+     u32 regHTXnTBLMPfog_0;
+     u32 regHTXnTBLAsat_0;
+     u32 regHTXnTBLRCb_0;
+     u32 regHTXnTBLRAa_0;
+     u32 regHTXnTBLRFog_0;
 };
 
 
 /** Hardware source-destination blending registers. */
 struct uc_hw_alpha {
 /*
-    __u32 regHABBasL;       // Alpha buffer, low 24 bits.
-    __u32 regHABBasH;       // Alpha buffer, high 8 bits.
-    __u32 regHABFM;         // Alpha pixel format, memory type and pitch.
-    __u32 regHATMD;         // Alpha test function and reference value.
+    u32 regHABBasL;         // Alpha buffer, low 24 bits.
+    u32 regHABBasH;         // Alpha buffer, high 8 bits.
+    u32 regHABFM;           // Alpha pixel format, memory type and pitch.
+    u32 regHATMD;           // Alpha test function and reference value.
 
     // Blending function
 */
-     __u32 regHABLCsat;
-     __u32 regHABLCop;
-     __u32 regHABLAsat;
-     __u32 regHABLAop;
-     __u32 regHABLRCa;
-     __u32 regHABLRFCa;
-     __u32 regHABLRCbias;
-     __u32 regHABLRCb;
-     __u32 regHABLRFCb;
-     __u32 regHABLRAa;
-     __u32 regHABLRAb;
+     u32 regHABLCsat;
+     u32 regHABLCop;
+     u32 regHABLAsat;
+     u32 regHABLAop;
+     u32 regHABLRCa;
+     u32 regHABLRFCa;
+     u32 regHABLRCbias;
+     u32 regHABLRCb;
+     u32 regHABLRFCb;
+     u32 regHABLRAa;
+     u32 regHABLRAb;
 };
 
 typedef enum {
@@ -96,11 +96,11 @@
      UcStateBits valid;
 
      /* Current state settings */
-     __u32                   pitch;      // combined src/dst pitch (2D)
-     __u32                   color;      // 2D fill color
-     __u32                   color3d;    // color for 3D operations
-     __u32                   draw_rop2d; // logical drawing ROP (2D)
-     __u32                   draw_rop3d; // logical drawing ROP (3D)
+     u32                     pitch;      // combined src/dst pitch (2D)
+     u32                     color;      // 2D fill color
+     u32                     color3d;    // color for 3D operations
+     u32                     draw_rop2d; // logical drawing ROP (2D)
+     u32                     draw_rop3d; // logical drawing ROP (3D)
 
      DFBSurfaceBlittingFlags bflags;     // blitting flags
      DFBRegion               clip;       // clipping region
@@ -123,9 +123,9 @@
      unsigned int cmd_waitcycles;
      unsigned int idle_waitcycles;
 
-     __u32           vq_start;   // VQ related
-     __u32           vq_size;
-     __u32           vq_end;
+     u32             vq_start;   // VQ related
+     u32             vq_size;
+     u32             vq_end;
 
 } UcDeviceData;
 
Index: include/dfb_types.h
===================================================================
RCS file: /cvs/directfb/DirectFB/include/dfb_types.h,v
retrieving revision 1.5
diff -u -r1.5 dfb_types.h
--- include/dfb_types.h	26 Jul 2005 20:58:50 -0000	1.5
+++ include/dfb_types.h	7 Oct 2006 19:54:42 -0000
@@ -1,31 +1,34 @@
 #ifndef __DFB_TYPES_H__
 #define __DFB_TYPES_H__
 
-#include <sys/types.h>
 
-#ifndef USE_KOS
+#ifdef USE_KOS
+
+#include <sys/types.h>
 
-#define __u8  u_int8_t
-#define __u16 u_int16_t
-#define __u32 u_int32_t
-#define __u64 u_int64_t
-
-#define __s8  int8_t
-#define __s16 int16_t
-#define __s32 int32_t
-#define __s64 int64_t
+typedef uint8 u8;
+typedef uint16 u16;
+typedef uint32 u32;
+typedef uint64 u64;
+
+typedef sint8 s8;
+typedef sint16 s16;
+typedef sint32 s32;
+typedef sint64 s64;
 
 #else
 
-#define __u8  uint8
-#define __u16 uint16
-#define __u32 uint32
-#define __u64 uint64
-
-#define __s8  sint8
-#define __s16 sint16
-#define __s32 sint32
-#define __s64 sint64
+#include <stdint.h>
+
+typedef uint8_t u8;
+typedef uint16_t u16;
+typedef uint32_t u32;
+typedef uint64_t u64;
+
+typedef int8_t s8;
+typedef int16_t s16;
+typedef int32_t s32;
+typedef int64_t s64;
 
 #endif
 
Index: include/directfb.h
===================================================================
RCS file: /cvs/directfb/DirectFB/include/directfb.h,v
retrieving revision 1.314
diff -u -r1.314 directfb.h
--- include/directfb.h	1 Oct 2006 00:08:51 -0000	1.314
+++ include/directfb.h	7 Oct 2006 19:54:43 -0000
@@ -287,10 +287,10 @@
  * A color defined by channels with 8bit each.
  */
 typedef struct {
-     __u8           a;   /* alpha channel */
-     __u8           r;   /* red channel */
-     __u8           g;   /* green channel */
-     __u8           b;   /* blue channel */
+     u8             a;   /* alpha channel */
+     u8             r;   /* red channel */
+     u8             g;   /* green channel */
+     u8             b;   /* blue channel */
 } DFBColor;
 
 /*
@@ -392,7 +392,7 @@
 typedef unsigned int DFBInputDeviceID;
 typedef unsigned int DFBTextEncodingID;
 
-typedef __u32 DFBDisplayLayerIDs;
+typedef u32 DFBDisplayLayerIDs;
 
 /*
  * Maximum number of layer ids.
@@ -1335,10 +1335,10 @@
 typedef struct {
      DFBColorAdjustmentFlags  flags;
 
-     __u16                    brightness;
-     __u16                    contrast;
-     __u16                    hue;
-     __u16                    saturation;
+     u16                      brightness;
+     u16                      contrast;
+     u16                      hue;
+     u16                      saturation;
 } DFBColorAdjustment;
 
 
@@ -2509,7 +2509,7 @@
       */
      DFBResult (*SetOpacity) (
           IDirectFBDisplayLayer              *thiz,
-          __u8                                opacity
+          u8                                  opacity
      );
 
      /*
@@ -2565,9 +2565,9 @@
       */
      DFBResult (*SetSrcColorKey) (
           IDirectFBDisplayLayer              *thiz,
-          __u8                                r,
-          __u8                                g,
-          __u8                                b
+          u8                                  r,
+          u8                                  g,
+          u8                                  b
      );
 
      /*
@@ -2578,9 +2578,9 @@
       */
      DFBResult (*SetDstColorKey) (
           IDirectFBDisplayLayer              *thiz,
-          __u8                                r,
-          __u8                                g,
-          __u8                                b
+          u8                                  r,
+          u8                                  g,
+          u8                                  b
      );
 
 
@@ -2644,10 +2644,10 @@
       */
      DFBResult (*SetBackgroundColor) (
           IDirectFBDisplayLayer              *thiz,
-          __u8                                r,
-          __u8                                g,
-          __u8                                b,
-          __u8                                a
+          u8                                  r,
+          u8                                  g,
+          u8                                  b,
+          u8                                  a
      );
 
    /** Color adjustment **/
@@ -2768,7 +2768,7 @@
       */
      DFBResult (*SetCursorOpacity) (
           IDirectFBDisplayLayer              *thiz,
-          __u8                                opacity
+          u8                                  opacity
      );
 
 
@@ -3016,10 +3016,10 @@
       */
      DFBResult (*SetAlphaRamp) (
           IDirectFBSurface         *thiz,
-          __u8                      a0,
-          __u8                      a1,
-          __u8                      a2,
-          __u8                      a3
+          u8                        a0,
+          u8                        a1,
+          u8                        a2,
+          u8                        a3
      );
 
 
@@ -3091,10 +3091,10 @@
       */
      DFBResult (*Clear) (
           IDirectFBSurface         *thiz,
-          __u8                      r,
-          __u8                      g,
-          __u8                      b,
-          __u8                      a
+          u8                        r,
+          u8                        g,
+          u8                        b,
+          u8                        a
      );
 
 
@@ -3135,10 +3135,10 @@
       */
      DFBResult (*SetColor) (
           IDirectFBSurface         *thiz,
-          __u8                      r,
-          __u8                      g,
-          __u8                      b,
-          __u8                      a
+          u8                        r,
+          u8                        g,
+          u8                        b,
+          u8                        a
      );
 
      /*
@@ -3186,9 +3186,9 @@
       */
      DFBResult (*SetSrcColorKey) (
           IDirectFBSurface         *thiz,
-          __u8                      r,
-          __u8                      g,
-          __u8                      b
+          u8                        r,
+          u8                        g,
+          u8                        b
      );
 
      /*
@@ -3211,9 +3211,9 @@
       */
      DFBResult (*SetDstColorKey) (
           IDirectFBSurface         *thiz,
-          __u8                      r,
-          __u8                      g,
-          __u8                      b
+          u8                        r,
+          u8                        g,
+          u8                        b
      );
 
      /*
@@ -3626,10 +3626,10 @@
       */
      DFBResult (*FindBestMatch) (
           IDirectFBPalette         *thiz,
-          __u8                      r,
-          __u8                      g,
-          __u8                      b,
-          __u8                      a,
+          u8                        r,
+          u8                        g,
+          u8                        b,
+          u8                        a,
           unsigned int             *ret_index
      );
 
@@ -4434,9 +4434,9 @@
       */
      DFBResult (*SetColorKey) (
           IDirectFBWindow               *thiz,
-          __u8                           r,
-          __u8                           g,
-          __u8                           b
+          u8                             r,
+          u8                             g,
+          u8                             b
      );
 
      /*
@@ -4460,7 +4460,7 @@
       */
      DFBResult (*SetOpacity) (
           IDirectFBWindow               *thiz,
-          __u8                           opacity
+          u8                             opacity
      );
 
      /*
@@ -4486,7 +4486,7 @@
       */
      DFBResult (*GetOpacity) (
           IDirectFBWindow               *thiz,
-          __u8                          *ret_opacity
+          u8                            *ret_opacity
      );
 
      /*
@@ -4907,9 +4907,9 @@
 typedef struct {
      DFBImageCapabilities     caps;        /* capabilities              */
 
-     __u8                     colorkey_r;  /* colorkey red channel      */
-     __u8                     colorkey_g;  /* colorkey green channel    */
-     __u8                     colorkey_b;  /* colorkey blue channel     */
+     u8                       colorkey_r;  /* colorkey red channel      */
+     u8                       colorkey_g;  /* colorkey green channel    */
+     u8                       colorkey_b;  /* colorkey blue channel     */
 } DFBImageDescription;
 
 
Index: inputdrivers/dbox2remote/dbox2remote.c
===================================================================
RCS file: /cvs/directfb/DirectFB/inputdrivers/dbox2remote/dbox2remote.c,v
retrieving revision 1.19
diff -u -r1.19 dbox2remote.c
--- inputdrivers/dbox2remote/dbox2remote.c	20 Nov 2004 23:57:54 -0000	1.19
+++ inputdrivers/dbox2remote/dbox2remote.c	7 Oct 2006 19:54:43 -0000
@@ -57,7 +57,7 @@
 
 typedef struct {
      DFBInputDeviceKeySymbol  key;
-     __u16                    rccode;
+     u16                      rccode;
 } KeyCode;
 
 /* REMOTE_NEW is the one with _fewer_ buttons */
@@ -153,7 +153,7 @@
  * helper function for translating rccode
  */
 static DFBInputDeviceKeySymbol
-dbox2remote_parse_rccode( __u16 rccode )
+dbox2remote_parse_rccode( u16 rccode )
 {
      KeyCode *keycode;
 
@@ -184,7 +184,7 @@
 {
      Dbox2remoteData *data = (Dbox2remoteData*) driver_data;
      int              readlen;
-     __u16            rccode;
+     u16              rccode;
      DFBInputEvent    evt;
 
      while ((readlen = read( data->fd, &rccode, 2 )) == 2) {
Index: inputdrivers/dreamboxremote/dreamboxremote.c
===================================================================
RCS file: /cvs/directfb/DirectFB/inputdrivers/dreamboxremote/dreamboxremote.c,v
retrieving revision 1.2
diff -u -r1.2 dreamboxremote.c
--- inputdrivers/dreamboxremote/dreamboxremote.c	2 May 2005 19:47:34 -0000	1.2
+++ inputdrivers/dreamboxremote/dreamboxremote.c	7 Oct 2006 19:54:43 -0000
@@ -63,7 +63,7 @@
 
 typedef struct {
      DFBInputDeviceKeySymbol  key;
-     __u16                    rccode;
+     u16                      rccode;
 } KeyCode;
 
 static KeyCode keycodes_remote[] = {
@@ -130,10 +130,10 @@
  * helper function for translating rccode
  */
 static DFBInputDeviceKeySymbol
-dreamboxremote_parse_rccode( __u16 rccode )
+dreamboxremote_parse_rccode( u16 rccode )
 {
 	KeyCode *keycode;
-	static  __u16 rccodeOld = 0;
+	static  u16 rccodeOld = 0;
 
 	keycode = keycodes_remote;
 	/* 0x00ff indicates key was released
@@ -173,7 +173,7 @@
 {
      DreamboxremoteData *data = (DreamboxremoteData*) driver_data;
      int              readlen;
-     __u16            rccode;
+     u16              rccode;
      DFBInputEvent    evt;
 
      while ((readlen = read( data->fd, &rccode, 2 )) == 2) {
Index: inputdrivers/ps2mouse/ps2mouse.c
===================================================================
RCS file: /cvs/directfb/DirectFB/inputdrivers/ps2mouse/ps2mouse.c,v
retrieving revision 1.53
diff -u -r1.53 ps2mouse.c
--- inputdrivers/ps2mouse/ps2mouse.c	4 Oct 2006 10:04:25 -0000	1.53
+++ inputdrivers/ps2mouse/ps2mouse.c	7 Oct 2006 19:54:43 -0000
@@ -169,7 +169,7 @@
                     if (data->mouseId == PS2_ID_IMPS2) {
                          /* Just strip off the extra buttons if present
                             and sign extend the 4 bit value */
-                         dz = (__s8)((packet[3] & 0x80) ?
+                         dz = (s8)((packet[3] & 0x80) ?
                                       packet[3] | 0xf0 : packet[3] & 0x0F);
                          if (dz) {
                               DFBInputEvent evt;
Index: inputdrivers/sonypi/sonypi.c
===================================================================
RCS file: /cvs/directfb/DirectFB/inputdrivers/sonypi/sonypi.c,v
retrieving revision 1.12
diff -u -r1.12 sonypi.c
--- inputdrivers/sonypi/sonypi.c	20 Nov 2004 23:57:55 -0000	1.12
+++ inputdrivers/sonypi/sonypi.c	7 Oct 2006 19:54:43 -0000
@@ -76,7 +76,7 @@
 {
      SonypiData    *data = (SonypiData*) driver_data;
      int            readlen;
-     __u8           buffer[16];
+     u8             buffer[16];
 
      /* loop until error occurs except EINTR */
      while ((readlen = read( data->fd, buffer, 16 )) > 0 || errno == EINTR) {
Index: inputdrivers/ucb1x00_ts/ucb1x00_ts.c
===================================================================
RCS file: /cvs/directfb/DirectFB/inputdrivers/ucb1x00_ts/ucb1x00_ts.c,v
retrieving revision 1.9
diff -u -r1.9 ucb1x00_ts.c
--- inputdrivers/ucb1x00_ts/ucb1x00_ts.c	20 Nov 2004 23:57:55 -0000	1.9
+++ inputdrivers/ucb1x00_ts/ucb1x00_ts.c	7 Oct 2006 19:54:43 -0000
@@ -68,10 +68,10 @@
 
 /* I copied this from the kernel driver since there is no include file */
 typedef struct {
-     __u16             pressure;
-     __u16             x;
-     __u16             y;
-     __u16             pad;
+     u16               pressure;
+     u16               x;
+     u16               y;
+     u16               pad;
      struct timeval  stamp;
 } TS_EVENT;
 
Index: inputdrivers/wm97xx_ts/wm97xx_ts.c
===================================================================
RCS file: /cvs/directfb/DirectFB/inputdrivers/wm97xx_ts/wm97xx_ts.c,v
retrieving revision 1.8
diff -u -r1.8 wm97xx_ts.c
--- inputdrivers/wm97xx_ts/wm97xx_ts.c	4 Oct 2006 10:14:01 -0000	1.8
+++ inputdrivers/wm97xx_ts/wm97xx_ts.c	7 Oct 2006 19:54:43 -0000
@@ -74,10 +74,10 @@
 
 /* I copied this from the kernel driver since there is no include file */
 typedef struct {
-     __u16             pressure;
-     __u16             x;
-     __u16             y;
-     __u16             pad;
+     u16               pressure;
+     u16               x;
+     u16               y;
+     u16               pad;
      struct timeval  stamp;
 } TS_EVENT;
 
Index: interfaces/IDirectFBFont/idirectfbfont_default.c
===================================================================
RCS file: /cvs/directfb/DirectFB/interfaces/IDirectFBFont/idirectfbfont_default.c,v
retrieving revision 1.40
diff -u -r1.40 idirectfbfont_default.c
--- interfaces/IDirectFBFont/idirectfbfont_default.c	30 Sep 2006 21:16:08 -0000	1.40
+++ interfaces/IDirectFBFont/idirectfbfont_default.c	7 Oct 2006 19:54:43 -0000
@@ -84,7 +84,7 @@
      CoreSurface      *surface;
      CoreFontCacheRow *row;
      void             *dst;
-     __u8             *pixels;
+     u8               *pixels;
      int               pitch;
      int               i;
 
@@ -216,9 +216,9 @@
 
      for (i = 1; i < font_desc.height; i++) {
           int    j, n;
-          __u8  *dst8  = dst;
-          __u16 *dst16 = dst;
-          __u32 *dst32 = dst;
+          u8    *dst8  = dst;
+          u16   *dst16 = dst;
+          u32   *dst32 = dst;
 
           pixels += font_desc.preallocated[0].pitch;
           switch (surface->format) {
@@ -251,7 +251,7 @@
                     break;
                case DSPF_A1:
                     for (i=0, j=0; i < font_desc.width; ++j) {
-                         register __u8 p = 0;
+                         register u8 p = 0;
 
                          for (n=0; n<8 && i<font_desc.width; ++i, ++n)
                               p |= (pixels[i] & 0x80) >> n;
Index: interfaces/IDirectFBFont/idirectfbfont_ft2.c
===================================================================
RCS file: /cvs/directfb/DirectFB/interfaces/IDirectFBFont/idirectfbfont_ft2.c,v
retrieving revision 1.31
diff -u -r1.31 idirectfbfont_ft2.c
--- interfaces/IDirectFBFont/idirectfbfont_ft2.c	30 Sep 2006 20:16:14 -0000	1.31
+++ interfaces/IDirectFBFont/idirectfbfont_ft2.c	7 Oct 2006 19:54:44 -0000
@@ -131,7 +131,7 @@
                    int            *ret_num )
 {
      int pos = 0, num = 0;
-     const __u8 *bytes = text;
+     const u8 *bytes   = text;
      FT2ImplData *data = thiz->impl_data;
 
      D_MAGIC_ASSERT( thiz, CoreFont );
@@ -191,7 +191,7 @@
                      int            *ret_num )
 {
      int i;
-     const __u8 *bytes = text;
+     const u8 *bytes   = text;
      FT2ImplData *data = thiz->impl_data;
 
      D_MAGIC_ASSERT( thiz, CoreFont );
@@ -223,7 +223,7 @@
      FT_Error     err;
      FT_Face      face;
      FT_Int       load_flags;
-     __u8        *src;
+     u8          *src;
      void        *dst;
      int          y;
      int          pitch;
@@ -268,9 +268,9 @@
 
      for (y=0; y < info->height; y++) {
           int    i, j, n;
-          __u8  *dst8  = dst;
-          __u16 *dst16 = dst;
-          __u32 *dst32 = dst;
+          u8    *dst8  = dst;
+          u16   *dst16 = dst;
+          u32   *dst32 = dst;
 
           switch (face->glyph->bitmap.pixel_mode) {
                case ft_pixel_mode_grays:
@@ -311,7 +311,7 @@
                               break;
                          case DSPF_A1:
                               for (i=0, j=0; i < info->width; ++j) {
-                                   register __u8 p = 0;
+                                   register u8 p = 0;
 
                                    for (n=0; n<8 && i<info->width; ++i, ++n)
                                         p |= (src[i] & 0x80) >> n;
Index: interfaces/IDirectFBImageProvider/idirectfbimageprovider_gif.c
===================================================================
RCS file: /cvs/directfb/DirectFB/interfaces/IDirectFBImageProvider/idirectfbimageprovider_gif.c,v
retrieving revision 1.54
diff -u -r1.54 idirectfbimageprovider_gif.c
--- interfaces/IDirectFBImageProvider/idirectfbimageprovider_gif.c	30 Sep 2006 20:16:14 -0000	1.54
+++ interfaces/IDirectFBImageProvider/idirectfbimageprovider_gif.c	7 Oct 2006 19:54:44 -0000
@@ -94,18 +94,18 @@
 
      IDirectFBDataBuffer *buffer;
 
-     __u32               *image;
+     u32                 *image;
      int                  image_width;
      int                  image_height;
      bool                 image_transparency;
-     __u32                image_colorkey;
+     u32                  image_colorkey;
 
      unsigned int  Width;
      unsigned int  Height;
-     __u8          ColorMap[3][MAXCOLORMAPSIZE];
+     u8            ColorMap[3][MAXCOLORMAPSIZE];
      unsigned int  BitPixel;
      unsigned int  ColorResolution;
-     __u32         Background;
+     u32           Background;
      unsigned int  AspectRatio;
 
 
@@ -116,7 +116,7 @@
      int disposal;
 
 
-     __u8 buf[280];
+     u8 buf[280];
      int curbit, lastbit, done, last_byte;
 
 
@@ -136,9 +136,9 @@
 static bool showComment   = false;
 static bool ZeroDataBlock = false;
 
-static __u32* ReadGIF( IDirectFBImageProvider_GIF_data *data, int imageNumber,
+static u32* ReadGIF( IDirectFBImageProvider_GIF_data *data, int imageNumber,
                        int *width, int *height, bool *transparency,
-                       __u32 *key_rgb, bool alpha, bool headeronly);
+                       u32 *key_rgb, bool alpha, bool headeronly);
 
 static bool ReadOK( IDirectFBDataBuffer *buffer, void *data, unsigned int len );
 
@@ -379,10 +379,10 @@
  **********************************/
 
 static int ReadColorMap( IDirectFBDataBuffer *buffer, int number,
-                         __u8 buf[3][MAXCOLORMAPSIZE] )
+                         u8 buf[3][MAXCOLORMAPSIZE] )
 {
      int     i;
-     __u8 rgb[3];
+     u8 rgb[3];
 
      for (i = 0; i < number; ++i) {
           if (! ReadOK( buffer, rgb, sizeof(rgb) )) {
@@ -397,7 +397,7 @@
      return false;
 }
 
-static int GetDataBlock(IDirectFBDataBuffer *buffer, __u8 *buf)
+static int GetDataBlock(IDirectFBDataBuffer *buffer, u8 *buf)
 {
      unsigned char count;
 
@@ -469,21 +469,21 @@
                break;
           case 0xfe:              /* Comment Extension */
                str = "Comment Extension";
-               while (GetDataBlock( data->buffer, (__u8*) buf ) != 0) {
+               while (GetDataBlock( data->buffer, (u8*) buf ) != 0) {
                     if (showComment)
                          GIFERRORMSG("gif comment: %s", buf );
                     }
                return false;
           case 0xf9:              /* Graphic Control Extension */
                str = "Graphic Control Extension";
-               (void) GetDataBlock( data->buffer, (__u8*) buf );
+               (void) GetDataBlock( data->buffer, (u8*) buf );
                data->disposal    = (buf[0] >> 2) & 0x7;
                data->inputFlag   = (buf[0] >> 1) & 0x1;
                data->delayTime   = LM_to_uint( buf[1], buf[2] );
                if ((buf[0] & 0x1) != 0) {
                     data->transparent = buf[3];
                }
-               while (GetDataBlock( data->buffer, (__u8*) buf ) != 0)
+               while (GetDataBlock( data->buffer, (u8*) buf ) != 0)
                     ;
                return false;
           default:
@@ -495,7 +495,7 @@
      if (verbose)
           GIFERRORMSG("got a '%s' extension", str );
 
-     while (GetDataBlock( data->buffer, (__u8*) buf ) != 0)
+     while (GetDataBlock( data->buffer, (u8*) buf ) != 0)
           ;
 
      return false;
@@ -561,7 +561,7 @@
           }
           else if (code == data->end_code) {
                int count;
-               __u8 buf[260];
+               u8 buf[260];
 
                if (ZeroDataBlock) {
                     return -2;
@@ -617,15 +617,15 @@
 
 static int SortColors (const void *a, const void *b)
 {
-     return (*((const __u8 *) a) - *((const __u8 *) b));
+     return (*((const u8 *) a) - *((const u8 *) b));
 }
 
 /*  looks for a color that is not in the colormap and ideally not
     even close to the colors used in the colormap  */
-static __u32 FindColorKey( int n_colors, __u8 cmap[3][MAXCOLORMAPSIZE] )
+static u32 FindColorKey( int n_colors, u8 cmap[3][MAXCOLORMAPSIZE] )
 {
-     __u32 color = 0xFF000000;
-     __u8  csort[MAXCOLORMAPSIZE];
+     u32   color = 0xFF000000;
+     u8    csort[MAXCOLORMAPSIZE];
      int   i, j, index, d;
 
      if (n_colors < 1)
@@ -664,14 +664,14 @@
      return color;
 }
 
-static __u32* ReadImage( IDirectFBImageProvider_GIF_data *data, int width, int height,
-                         __u8 cmap[3][MAXCOLORMAPSIZE], __u32 key_rgb,
-                         bool interlace, bool ignore )
+static u32* ReadImage( IDirectFBImageProvider_GIF_data *data, int width, int height,
+                       u8 cmap[3][MAXCOLORMAPSIZE], u32 key_rgb,
+                       bool interlace, bool ignore )
 {
-     __u8 c;
+     u8 c;
      int v;
      int xpos = 0, ypos = 0, pass = 0;
-     __u32 *image;
+     u32 *image;
 
      /*
      **  Initialize the decompression routines
@@ -707,7 +707,7 @@
      }
 
      while ((v = LWZReadByte( data, false, c )) >= 0 ) {
-          __u32 *dst = image + (ypos * width + xpos);
+          u32 *dst = image + (ypos * width + xpos);
 
           if (v == data->transparent) {
                *dst++ = key_rgb;
@@ -771,14 +771,14 @@
 }
 
 
-static __u32* ReadGIF( IDirectFBImageProvider_GIF_data *data, int imageNumber,
-                       int *width, int *height, bool *transparency,
-                       __u32 *key_rgb, bool alpha, bool headeronly)
-{
-     __u8  buf[16];
-     __u8  c;
-     __u8  localColorMap[3][MAXCOLORMAPSIZE];
-     __u32 colorKey = 0;
+static u32* ReadGIF( IDirectFBImageProvider_GIF_data *data, int imageNumber,
+                     int *width, int *height, bool *transparency,
+                     u32 *key_rgb, bool alpha, bool headeronly)
+{
+     u8    buf[16];
+     u8    c;
+     u8    localColorMap[3][MAXCOLORMAPSIZE];
+     u32   colorKey = 0;
      bool  useGlobalColormap;
      int   bitPixel;
      int   imageCount = 0;
Index: interfaces/IDirectFBImageProvider/idirectfbimageprovider_jpeg.c
===================================================================
RCS file: /cvs/directfb/DirectFB/interfaces/IDirectFBImageProvider/idirectfbimageprovider_jpeg.c,v
retrieving revision 1.50
diff -u -r1.50 idirectfbimageprovider_jpeg.c
--- interfaces/IDirectFBImageProvider/idirectfbimageprovider_jpeg.c	30 Sep 2006 21:16:08 -0000	1.50
+++ interfaces/IDirectFBImageProvider/idirectfbimageprovider_jpeg.c	7 Oct 2006 19:54:44 -0000
@@ -79,7 +79,7 @@
      DIRenderCallback     render_callback;
      void                *render_callback_context;
 
-     __u32               *image;
+     u32                 *image;
      int                  width;
      int                  height;
 } IDirectFBImageProvider_JPEG_data;
@@ -230,9 +230,9 @@
 
 
 static void
-copy_line32( __u32 *dst, __u8 *src, int width)
+copy_line32( u32 *dst, u8 *src, int width)
 {
-     __u32 r, g , b;
+     u32 r, g , b;
      while (width--) {
           r = (*src++) << 16;
           g = (*src++) << 8;
@@ -404,7 +404,7 @@
           struct my_error_mgr jerr;
           JSAMPARRAY buffer;      /* Output row buffer */
           int row_stride;         /* physical row width in output buffer */
-          __u32 *row_ptr;
+          u32 *row_ptr;
           int y = 0;
 
           cinfo.err = jpeg_std_error(&jerr.pub);
Index: interfaces/IDirectFBImageProvider/idirectfbimageprovider_mpeg2.c
===================================================================
RCS file: /cvs/directfb/DirectFB/interfaces/IDirectFBImageProvider/idirectfbimageprovider_mpeg2.c,v
retrieving revision 1.12
diff -u -r1.12 idirectfbimageprovider_mpeg2.c
--- interfaces/IDirectFBImageProvider/idirectfbimageprovider_mpeg2.c	30 Sep 2006 20:16:14 -0000	1.12
+++ interfaces/IDirectFBImageProvider/idirectfbimageprovider_mpeg2.c	7 Oct 2006 19:54:44 -0000
@@ -88,7 +88,7 @@
      int                  width;
      int                  height;
 
-     __u32               *image;
+     u32                 *image;
 } IDirectFBImageProvider_MPEG2_data;
 
 static DFBResult
@@ -117,7 +117,7 @@
 
 
 static int  mpeg2_read_func ( void *buf, int count, void *ctx );
-static void mpeg2_write_func( int x, int y, __u32 argb, void *ctx );
+static void mpeg2_write_func( int x, int y, u32 argb, void *ctx );
 
 static DFBResult
 Probe( IDirectFBImageProvider_ProbeContext *ctx )
@@ -347,7 +347,7 @@
 }
 
 static void
-mpeg2_write_func( int x, int y, __u32 argb, void *ctx )
+mpeg2_write_func( int x, int y, u32 argb, void *ctx )
 {
      IDirectFBImageProvider_MPEG2_data *data =
                                        (IDirectFBImageProvider_MPEG2_data*) ctx;
Index: interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
===================================================================
RCS file: /cvs/directfb/DirectFB/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c,v
retrieving revision 1.56
diff -u -r1.56 idirectfbimageprovider_png.c
--- interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c	30 Sep 2006 20:16:14 -0000	1.56
+++ interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c	7 Oct 2006 19:54:44 -0000
@@ -101,7 +101,7 @@
      png_uint_32          color_key;
      bool                 color_keyed;
 
-     __u32               *image;
+     u32                 *image;
 
      DIRenderCallback     render_callback;
      void                *render_callback_context;
@@ -393,15 +393,15 @@
 
 static int SortColors (const void *a, const void *b)
 {
-     return (*((const __u8 *) a) - *((const __u8 *) b));
+     return (*((const u8 *) a) - *((const u8 *) b));
 }
 
 /*  looks for a color that is not in the colormap and ideally not
     even close to the colors used in the colormap  */
-static __u32 FindColorKey( int n_colors, __u8 cmap[3][MAXCOLORMAPSIZE] )
+static u32 FindColorKey( int n_colors, u8 cmap[3][MAXCOLORMAPSIZE] )
 {
-     __u32 color = 0xFF000000;
-     __u8  csort[MAXCOLORMAPSIZE];
+     u32   color = 0xFF000000;
+     u8    csort[MAXCOLORMAPSIZE];
      int   i, j, index, d;
 
      if (n_colors < 1)
@@ -473,12 +473,12 @@
           /* generate color key based on palette... */
           if (data->color_type == PNG_COLOR_TYPE_PALETTE) {
                int        i;
-               __u32      key;
+               u32        key;
                png_colorp palette    = data->info_ptr->palette;
                png_bytep  trans      = data->info_ptr->trans;
                int        num_colors = MIN( MAXCOLORMAPSIZE,
                                             data->info_ptr->num_palette );
-               __u8       cmap[3][num_colors];
+               u8         cmap[3][num_colors];
 
                for (i=0; i<num_colors; i++) {
                     cmap[0][i] = palette[i].red;
Index: interfaces/IDirectFBImageProvider/mpeg2/mpeg2dec.h
===================================================================
RCS file: /cvs/directfb/DirectFB/interfaces/IDirectFBImageProvider/mpeg2/mpeg2dec.h,v
retrieving revision 1.3
diff -u -r1.3 mpeg2dec.h
--- interfaces/IDirectFBImageProvider/mpeg2/mpeg2dec.h	24 Nov 2003 13:08:31 -0000	1.3
+++ interfaces/IDirectFBImageProvider/mpeg2/mpeg2dec.h	7 Oct 2006 19:54:44 -0000
@@ -30,7 +30,7 @@
 #include <dfb_types.h>
 
 typedef int  (*MPEG2_Read)(void *buf, int count, void *ctx);
-typedef void (*MPEG2_Write)(int x, int y, __u32 argb, void *ctx);
+typedef void (*MPEG2_Write)(int x, int y, u32 argb, void *ctx);
 
 typedef struct {
      int Fault_Flag;
Index: interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_gif.c
===================================================================
RCS file: /cvs/directfb/DirectFB/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_gif.c,v
retrieving revision 1.4
diff -u -r1.4 idirectfbvideoprovider_gif.c
--- interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_gif.c	23 Jul 2006 14:10:38 -0000	1.4
+++ interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_gif.c	7 Oct 2006 19:54:44 -0000
@@ -94,7 +94,7 @@
      IDirectFBSurface_data         *dst_data;
      DFBRectangle                   dst_rect;
      
-     __u32                         *image;
+     u32                           *image;
      
      DirectThread                  *thread;
      pthread_mutex_t                lock;
@@ -109,10 +109,10 @@
      char                           Version[4];
      unsigned int                   Width;
      unsigned int                   Height;
-     __u8                           ColorMap[3][MAXCOLORMAPSIZE];
+     u8                             ColorMap[3][MAXCOLORMAPSIZE];
      unsigned int                   BitPixel;
      unsigned int                   ColorResolution;
-     __u32                          Background;
+     u32                            Background;
      unsigned int                   AspectRatio;
 
      int                            transparent;
@@ -120,7 +120,7 @@
      int                            inputFlag;
      int                            disposal;
 
-     __u8                           buf[280];
+     u8                             buf[280];
      int                            curbit, lastbit, done, last_byte;
 
      int                            fresh;
@@ -167,10 +167,10 @@
 }
 
 static int ReadColorMap( IDirectFBDataBuffer *buffer, int number,
-                         __u8 buf[3][MAXCOLORMAPSIZE] )
+                         u8 buf[3][MAXCOLORMAPSIZE] )
 {
      int  i;
-     __u8 rgb[3*number];
+     u8   rgb[3*number];
      
      if (FetchData( buffer, rgb, sizeof(rgb) )) {
           GIFERRORMSG("bad colormap");
@@ -186,7 +186,7 @@
      return 0;
 }
 
-static int GetDataBlock(IDirectFBDataBuffer *buffer, __u8 *buf)
+static int GetDataBlock(IDirectFBDataBuffer *buffer, u8 *buf)
 {
      unsigned char count;
 
@@ -258,12 +258,12 @@
                break;
           case 0xfe:              /* Comment Extension */
                str = "Comment Extension";
-               while (GetDataBlock( data->buffer, (__u8*) buf ) != 0)
+               while (GetDataBlock( data->buffer, (u8*) buf ) != 0)
                     GIFDEBUGMSG("gif comment: %s", buf);
                return false;
           case 0xf9:              /* Graphic Control Extension */
                str = "Graphic Control Extension";
-               (void) GetDataBlock( data->buffer, (__u8*) buf );
+               (void) GetDataBlock( data->buffer, (u8*) buf );
                data->disposal    = (buf[0] >> 2) & 0x7;
                data->inputFlag   = (buf[0] >> 1) & 0x1;
                data->delayTime   = LM_to_uint( buf[1], buf[2] ) * 10000;
@@ -271,7 +271,7 @@
                     data->transparent = buf[3];
                else
                     data->transparent = -1;
-               while (GetDataBlock( data->buffer, (__u8*) buf ) != 0)
+               while (GetDataBlock( data->buffer, (u8*) buf ) != 0)
                     ;
                return false;
           default:
@@ -282,7 +282,7 @@
 
      GIFDEBUGMSG("got a '%s' extension", str );
 
-     while (GetDataBlock( data->buffer, (__u8*) buf ) != 0);
+     while (GetDataBlock( data->buffer, (u8*) buf ) != 0);
 
      return 0;
 }
@@ -347,7 +347,7 @@
           }
           else if (code == data->end_code) {
                int count;
-               __u8 buf[260];
+               u8 buf[260];
 
                if (ZeroDataBlock) {
                     return -2;
@@ -402,12 +402,12 @@
 
 static int ReadImage( IDirectFBVideoProvider_GIF_data *data, 
                       int left, int top, int width, int height,
-                      __u8 cmap[3][MAXCOLORMAPSIZE], bool interlace, bool ignore )
+                      u8 cmap[3][MAXCOLORMAPSIZE], bool interlace, bool ignore )
 {
-     __u8   c;
+     u8     c;
      int    v;
      int    xpos = 0, ypos = 0, pass = 0;
-     __u32 *image;
+     u32   *image;
 
      /*
      **  Initialize the decompression routines
@@ -448,7 +448,7 @@
 
      while ((v = LWZReadByte( data, false, c )) >= 0 ) {
           if (v != data->transparent) {
-               __u32 *dst = image + (ypos * data->Width + xpos);
+               u32 *dst = image + (ypos * data->Width + xpos);
                *dst = (0xFF000000              |
                        cmap[CM_RED][v]   << 16 |
                        cmap[CM_GREEN][v] << 8  |
@@ -522,7 +522,7 @@
 static DFBResult GIFReadHeader( IDirectFBVideoProvider_GIF_data *data )
 {
      DFBResult ret;
-     __u8      buf[7];
+     u8        buf[7];
      
      ret = FetchData( data->buffer, buf, 6 );
      if (ret) {
@@ -567,10 +567,10 @@
 
 static DFBResult GIFReadFrame( IDirectFBVideoProvider_GIF_data *data )
 {
-     __u8  buf[16], c;
+     u8    buf[16], c;
      int   top, left;
      int   width, height;
-     __u8  localColorMap[3][MAXCOLORMAPSIZE];
+     u8    localColorMap[3][MAXCOLORMAPSIZE];
      bool  useGlobalColormap;
 
      data->curbit = data->lastbit = data->done = data->last_byte = 0;
Index: interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_v4l.c
===================================================================
RCS file: /cvs/directfb/DirectFB/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_v4l.c,v
retrieving revision 1.96
diff -u -r1.96 idirectfbvideoprovider_v4l.c
--- interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_v4l.c	30 Sep 2006 20:16:14 -0000	1.96
+++ interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_v4l.c	7 Oct 2006 19:54:45 -0000
@@ -1120,7 +1120,7 @@
                int i;
                for (i = 0; i < data->req.count; i++) {
                     struct v4l2_buffer *vidbuf = &data->vidbuf[i];
-                    D_DEBUG("DirectFB/Video4Linux2: %d => 0x%08x, len:%d\n", i, (__u32) data->ptr[i], vidbuf->length);
+                    D_DEBUG("DirectFB/Video4Linux2: %d => 0x%08x, len:%d\n", i, (u32) data->ptr[i], vidbuf->length);
                     if (0 != munmap(data->ptr[i], vidbuf->length)) {
                          D_PERROR("DirectFB/Video4Linux2: munmap().\n");
                     }
@@ -1457,7 +1457,7 @@
                     return err;
                }
           }
-          D_DEBUG("DirectFB/Video4Linux2: len:0x%08x, %d => 0x%08x\n", vidbuf->length, i, (__u32) data->ptr[i]);
+          D_DEBUG("DirectFB/Video4Linux2: len:0x%08x, %d => 0x%08x\n", vidbuf->length, i, (u32) data->ptr[i]);
      }
 
      if (!data->cleanup)
Index: lib/direct/cpu_accel.c
===================================================================
RCS file: /cvs/directfb/DirectFB/lib/direct/cpu_accel.c,v
retrieving revision 1.4
diff -u -r1.4 cpu_accel.c
--- lib/direct/cpu_accel.c	31 Jul 2005 09:34:22 -0000	1.4
+++ lib/direct/cpu_accel.c	7 Oct 2006 19:54:45 -0000
@@ -63,11 +63,11 @@
 D_DEBUG_DOMAIN( Direct_CPU, "Direct/CPU", "CPU model and feature detection" );
 
 
-static __u32 arch_accel (void)
+static u32 arch_accel (void)
 {
-     __u32 eax, ebx, ecx, edx;
+     u32 eax, ebx, ecx, edx;
      int AMD;
-     __u32 caps = 0;
+     u32 caps = 0;
 
 #define cpuid(op,eax,ebx,ecx,edx)  \
      asm ("pushl %%ebx\n\t"        \
@@ -158,7 +158,7 @@
      siglongjmp (jmpbuf, 1);
 }
 
-static __u32 arch_accel (void)
+static u32 arch_accel (void)
 {
      signal (SIGILL, sigill_handler);
      if (sigsetjmp (jmpbuf, 1)) {
@@ -178,10 +178,10 @@
 }
 #endif /* ARCH_PPC */
 
-__u32 direct_mm_accel (void)
+u32 direct_mm_accel (void)
 {
 #if defined (ARCH_X86) || (defined (ARCH_PPC) && defined (ENABLE_ALTIVEC))
-     static __u32 accel = ~0U;
+     static u32 accel = ~0U;
 
      if (accel != ~0U)
           return accel;
@@ -206,7 +206,7 @@
      return accel;
 
 #elif defined (ARCH_X86_64)
-     __u32 accel = 0;
+     u32 accel = 0;
      
 #ifdef USE_MMX
      accel |= MM_ACCEL_X86_MMX | MM_ACCEL_X86_MMXEXT;
Index: lib/direct/cpu_accel.h
===================================================================
RCS file: /cvs/directfb/DirectFB/lib/direct/cpu_accel.h,v
retrieving revision 1.1
diff -u -r1.1 cpu_accel.h
--- lib/direct/cpu_accel.h	30 Mar 2004 09:31:23 -0000	1.1
+++ lib/direct/cpu_accel.h	7 Oct 2006 19:54:45 -0000
@@ -79,7 +79,7 @@
 #define MM_SSE                  MM_ACCEL_X86_SSE
 #define MM_SSE2                 MM_ACCEL_X86_SSE2
 
-__u32 direct_mm_accel (void);
+u32 direct_mm_accel (void);
 
 #endif
 
Index: lib/direct/hash.c
===================================================================
RCS file: /cvs/directfb/DirectFB/lib/direct/hash.c,v
retrieving revision 1.5
diff -u -r1.5 hash.c
--- lib/direct/hash.c	10 Jul 2006 22:39:57 -0000	1.5
+++ lib/direct/hash.c	7 Oct 2006 19:54:45 -0000
@@ -41,7 +41,7 @@
 #define REMOVED  ((void *) -1)
 
 typedef struct {
-     __u32     key;
+     u32       key;
      void     *value;
 } Element;
 
@@ -59,7 +59,7 @@
 /**************************************************************************************************/
 
 static inline int
-locate_key( const DirectHash *hash, __u32 key )
+locate_key( const DirectHash *hash, u32 key )
 {
      int            pos;
      const Element *element;
@@ -129,7 +129,7 @@
 
 DirectResult
 direct_hash_insert( DirectHash *hash,
-                    __u32       key,
+                    u32         key,
                     void       *value )
 {
      int      pos;
@@ -211,7 +211,7 @@
 
 void
 direct_hash_remove( DirectHash  *hash,
-                    __u32        key )
+                    u32          key )
 {
      int pos;
 
@@ -234,7 +234,7 @@
 
 void *
 direct_hash_lookup( DirectHash *hash,
-                    __u32       key )
+                    u32         key )
 {
      int pos;
 
Index: lib/direct/hash.h
===================================================================
RCS file: /cvs/directfb/DirectFB/lib/direct/hash.h,v
retrieving revision 1.1
diff -u -r1.1 hash.h
--- lib/direct/hash.h	29 Apr 2004 19:08:39 -0000	1.1
+++ lib/direct/hash.h	7 Oct 2006 19:54:45 -0000
@@ -32,7 +32,7 @@
 
 
 typedef bool (*DirectHashIteratorFunc)( DirectHash *hash,
-                                        __u32       key,
+                                        u32         key,
                                         void       *value,
                                         void       *ctx );
 
@@ -43,14 +43,14 @@
 void          direct_hash_destroy( DirectHash  *hash );
 
 DirectResult  direct_hash_insert ( DirectHash  *hash,
-                                   __u32        key,
+                                   u32          key,
                                    void        *value );
 
 void          direct_hash_remove ( DirectHash  *hash,
-                                   __u32        key );
+                                   u32          key );
 
 void         *direct_hash_lookup ( DirectHash  *hash,
-                                   __u32        key );
+                                   u32          key );
 
 void          direct_hash_iterate( DirectHash             *hash,
                                    DirectHashIteratorFunc  func,
Index: lib/direct/memcpy.c
===================================================================
RCS file: /cvs/directfb/DirectFB/lib/direct/memcpy.c,v
retrieving revision 1.8
diff -u -r1.8 memcpy.c
--- lib/direct/memcpy.c	31 Jul 2005 18:07:59 -0000	1.8
+++ lib/direct/memcpy.c	7 Oct 2006 19:54:45 -0000
@@ -413,8 +413,8 @@
 
 static void * generic64_memcpy( void * to, const void * from, size_t len )
 {
-     register __u8 *d = (__u8*)to;
-     register __u8 *s = (__u8*)from;
+     register u8   *d = (u8*)to;
+     register u8   *s = (u8*)from;
      size_t         n;
 
      if (len >= 128) {
@@ -429,11 +429,11 @@
                     *d++ = *s++;
                }
                if ((unsigned long)d & 2) {
-                    *((__u16*)d) = *((__u16*)s);
+                    *((u16*)d) = *((u16*)s);
                     d += 2; s += 2;
                }
                if ((unsigned long)d & 4) {
-                    *((__u32*)d) = *((__u32*)s);
+                    *((u32*)d) = *((u32*)s);
                     d += 4; s += 4;
                }
           }
@@ -442,14 +442,14 @@
           len &= 63;
           
           for (; n; n--) {
-               ((__u64*)d)[0] = ((__u64*)s)[0];
-               ((__u64*)d)[1] = ((__u64*)s)[1];
-               ((__u64*)d)[2] = ((__u64*)s)[2];
-               ((__u64*)d)[3] = ((__u64*)s)[3];
-               ((__u64*)d)[4] = ((__u64*)s)[4];
-               ((__u64*)d)[5] = ((__u64*)s)[5];
-               ((__u64*)d)[6] = ((__u64*)s)[6];
-               ((__u64*)d)[7] = ((__u64*)s)[7];
+               ((u64*)d)[0] = ((u64*)s)[0];
+               ((u64*)d)[1] = ((u64*)s)[1];
+               ((u64*)d)[2] = ((u64*)s)[2];
+               ((u64*)d)[3] = ((u64*)s)[3];
+               ((u64*)d)[4] = ((u64*)s)[4];
+               ((u64*)d)[5] = ((u64*)s)[5];
+               ((u64*)d)[6] = ((u64*)s)[6];
+               ((u64*)d)[7] = ((u64*)s)[7];
                d += 64; s += 64;
           }
      }
@@ -460,15 +460,15 @@
           n = len >> 3;
           
           for (; n; n--) {
-               *((__u64*)d) = *((__u64*)s);
+               *((u64*)d) = *((u64*)s);
                d += 8; s += 8;
           }
           if (len & 4) {
-               *((__u32*)d) = *((__u32*)s);
+               *((u32*)d) = *((u32*)s);
                d += 4; s += 4;
           }
           if (len & 2)  {
-               *((__u16*)d) = *((__u16*)s);
+               *((u16*)d) = *((u16*)s);
                d += 2; s += 2;
           }
           if (len & 1)
@@ -488,7 +488,7 @@
      char                 *desc;
      memcpy_func           function;
      unsigned long long    time;
-     __u32                 cpu_require;
+     u32                   cpu_require;
 } memcpy_method[] =
 {
      { NULL, NULL, NULL, 0, 0},
@@ -547,7 +547,7 @@
      unsigned long long t;
      char *buf1, *buf2;
      int i, j, best = 0;
-     __u32 config_flags = direct_mm_accel();
+     u32 config_flags = direct_mm_accel();
 
      if (direct_config->memcpy) {
           for (i=1; memcpy_method[i].name; i++) {
@@ -611,7 +611,7 @@
 direct_print_memcpy_routines()
 {
      int   i;
-     __u32 config_flags = direct_mm_accel();
+     u32 config_flags = direct_mm_accel();
 
      fprintf( stderr, "\nPossible values for memcpy option are:\n\n" );
 
Index: lib/direct/serial.h
===================================================================
RCS file: /cvs/directfb/DirectFB/lib/direct/serial.h,v
retrieving revision 1.2
diff -u -r1.2 serial.h
--- lib/direct/serial.h	3 Jul 2006 16:40:40 -0000	1.2
+++ lib/direct/serial.h	7 Oct 2006 19:54:45 -0000
@@ -34,8 +34,8 @@
 struct __D_DirectSerial {
      int   magic;
 
-     __u32 value;
-     __u32 overflow;
+     u32 value;
+     u32 overflow;
 };
 
 static inline void
Index: lib/direct/types.h
===================================================================
RCS file: /cvs/directfb/DirectFB/lib/direct/types.h,v
retrieving revision 1.18
diff -u -r1.18 types.h
--- lib/direct/types.h	26 Sep 2006 22:20:37 -0000	1.18
+++ lib/direct/types.h	7 Oct 2006 19:54:45 -0000
@@ -61,10 +61,10 @@
 #ifndef true
 #define true (!false)
 #endif
-typedef __u8 bool;
+typedef u8 bool;
 #endif
 
-typedef __u32 unichar;
+typedef u32 unichar;
 
 typedef struct __D_DirectConfig              DirectConfig;
 typedef struct __D_DirectHash                DirectHash;
Index: lib/direct/utf8.h
===================================================================
RCS file: /cvs/directfb/DirectFB/lib/direct/utf8.h,v
retrieving revision 1.2
diff -u -r1.2 utf8.h
--- lib/direct/utf8.h	29 Apr 2004 03:53:21 -0000	1.2
+++ lib/direct/utf8.h	7 Oct 2006 19:54:45 -0000
@@ -33,10 +33,10 @@
 #include <direct/types.h>
 
 
-#define DIRECT_UTF8_SKIP(c)     (((__u8)(c) < 0xc0) ? 1 : __direct_utf8_skip[(__u8)(c)&0x3f])
+#define DIRECT_UTF8_SKIP(c)     (((u8)(c) < 0xc0) ? 1 : __direct_utf8_skip[(u8)(c)&0x3f])
 
-#define DIRECT_UTF8_GET_CHAR(p) (*(const __u8*)(p) < 0xc0 ? \
-                                 *(const __u8*)(p) : __direct_utf8_get_char((const __u8*)(p)))
+#define DIRECT_UTF8_GET_CHAR(p) (*(const u8*)(p) < 0xc0 ? \
+                                 *(const u8*)(p) : __direct_utf8_get_char((const u8*)(p)))
 
 
 /*
@@ -49,7 +49,7 @@
      3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,1,1
 };
 
-static inline unichar __direct_utf8_get_char( const __u8 *p )
+static inline unichar __direct_utf8_get_char( const u8 *p )
 {
      int              len;
      register unichar result = p[0];
Index: lib/direct/util.c
===================================================================
RCS file: /cvs/directfb/DirectFB/lib/direct/util.c,v
retrieving revision 1.16
diff -u -r1.16 util.c
--- lib/direct/util.c	24 Sep 2006 17:53:14 -0000	1.16
+++ lib/direct/util.c	7 Oct 2006 19:54:45 -0000
@@ -343,14 +343,14 @@
 /*
  * Compute MD5 sum.
  */
-static const __u8 S[4][4] = {
+static const u8 S[4][4] = {
      { 7, 12, 17, 22 },  /* Round 1 */
      { 5,  9, 14, 20 },  /* Round 2 */
      { 4, 11, 16, 23 },  /* Round 3 */
      { 6, 10, 15, 21 }   /* Round 4 */
 };
 
-static const __u32 T[64] = {
+static const u32 T[64] = {
      0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee,   /* Round 1 */
      0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501,
      0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be,
@@ -373,12 +373,12 @@
 };
                 
 static void
-md5_hash( __u32 ABCD[4], __u32 X[16] )
+md5_hash( u32 ABCD[4], u32 X[16] )
 {
-     __u32 a = ABCD[3];
-     __u32 b = ABCD[2];
-     __u32 c = ABCD[1];
-     __u32 d = ABCD[0];
+     u32 a = ABCD[3];
+     u32 b = ABCD[2];
+     u32 c = ABCD[1];
+     u32 d = ABCD[0];
      int   t;
      int   i;
     
@@ -409,8 +409,8 @@
 void 
 direct_md5_sum( void *dst, const void *src, const int len )
 {
-     __u8  block[64];
-     __u32 ABCD[4];
+     u8    block[64];
+     u32 ABCD[4];
      int   i, j;
      
      D_ASSERT( dst != NULL );
@@ -422,9 +422,9 @@
      ABCD[3] = 0x67452301;
      
      for (i = 0, j = 0; i < len; i++) {
-          block[j++] = ((__u8*)src)[i];
+          block[j++] = ((u8*)src)[i];
           if (j == 64) {
-               md5_hash( ABCD, (__u32*)block );
+               md5_hash( ABCD, (u32*)block );
                j = 0;
           }
      }
@@ -433,19 +433,19 @@
      memset( &block[j], 0, 64-j );
      
      if (j > 56) {
-          md5_hash( ABCD, (__u32*)block );
+          md5_hash( ABCD, (u32*)block );
           memset( block, 0, 64 );
      }
      
      for (i = 0; i < 8; i++)
-          block[56+i] = ((__u64)len << 3) >> (i << 3);
+          block[56+i] = ((u64)len << 3) >> (i << 3);
           
-     md5_hash( ABCD, (__u32*)block );
+     md5_hash( ABCD, (u32*)block );
      
      for (i = 0; i < 4; i++)
 #ifdef WORDS_BIGENDIAN
-          ((__u32*)dst)[i] = BSWAP32(ABCD[3-i]);
+          ((u32*)dst)[i] = BSWAP32(ABCD[3-i]);
 #else
-          ((__u32*)dst)[i] = ABCD[3-i];
+          ((u32*)dst)[i] = ABCD[3-i];
 #endif
 }
Index: lib/direct/util.h
===================================================================
RCS file: /cvs/directfb/DirectFB/lib/direct/util.h,v
retrieving revision 1.21
diff -u -r1.21 util.h
--- lib/direct/util.h	24 Sep 2006 17:53:14 -0000	1.21
+++ lib/direct/util.h	7 Oct 2006 19:54:45 -0000
@@ -53,12 +53,12 @@
 #endif
 
 #ifndef BSWAP16
-#define BSWAP16(x) (((__u16)(x)>>8) | ((__u16)(x)<<8))
+#define BSWAP16(x) (((u16)(x)>>8) | ((u16)(x)<<8))
 #endif
 
 #ifndef BSWAP32
-#define BSWAP32(x) ((((__u32)(x)>>24) & 0x000000ff) | (((__u32)(x)>> 8) & 0x0000ff00) | \
-                    (((__u32)(x)<< 8) & 0x00ff0000) | (((__u32)(x)<<24) & 0xff000000))
+#define BSWAP32(x) ((((u32)(x)>>24) & 0x000000ff) | (((u32)(x)>> 8) & 0x0000ff00) | \
+                    (((u32)(x)<< 8) & 0x00ff0000) | (((u32)(x)<<24) & 0xff000000))
 #endif
 
 
Index: lib/voodoo/manager.c
===================================================================
RCS file: /cvs/directfb/DirectFB/lib/voodoo/manager.c,v
retrieving revision 1.12
diff -u -r1.12 manager.c
--- lib/voodoo/manager.c	3 Jul 2006 16:40:40 -0000	1.12
+++ lib/voodoo/manager.c	7 Oct 2006 19:54:46 -0000
@@ -104,7 +104,7 @@
           DirectThread          *thread;
           pthread_mutex_t        lock;
           pthread_cond_t         wait;
-          __u8                   buffer[IN_BUF_MAX + MAX_MSG_SIZE];
+          u8                     buffer[IN_BUF_MAX + MAX_MSG_SIZE];
           int                    start;
           int                    end;
           int                    max;
@@ -114,7 +114,7 @@
           DirectThread          *thread;
           pthread_mutex_t        lock;
           pthread_cond_t         wait;
-          __u8                   buffer[OUT_BUF_MAX];
+          u8                     buffer[OUT_BUF_MAX];
           int                    start;
           int                    end;
      } output;
@@ -282,7 +282,7 @@
 
 static bool
 instance_iterator( DirectHash *hash,
-                   __u32       key,
+                   u32         key,
                    void       *value,
                    void       *ctx )
 {
@@ -460,29 +460,29 @@
      int size = 4;  /* for the terminating VMBT_NONE */
 
      while (type != VMBT_NONE) {
-          __u32 arg;
-          __s32 in;
+          u32 arg;
+          s32 in;
           void *ptr;
           int   len = 0;
 
           switch (type) {
                case VMBT_ID:
                     len = 4;
-                    arg = va_arg( args, __u32 );
+                    arg = va_arg( args, u32 );
 
                     D_DEBUG( "Voodoo/Message: + ID %u\n", arg );
                     break;
 
                case VMBT_INT:
                     len = 4;
-                    in  = va_arg( args, __s32 );
+                    in  = va_arg( args, s32 );
 
                     D_DEBUG( "Voodoo/Message: + INT %d\n", in );
                     break;
 
                case VMBT_UINT:
                     len = 4;
-                    arg = va_arg( args, __u32 );
+                    arg = va_arg( args, u32 );
 
                     D_DEBUG( "Voodoo/Message: + UINT %u\n", arg );
                     break;
@@ -534,7 +534,7 @@
 write_blocks( void *dst, VoodooMessageBlockType type, va_list args )
 {
      while (type != VMBT_NONE) {
-          __u32 arg = 0;
+          u32 arg = 0;
           int   len = 0;
           void *ptr = NULL;
 
@@ -543,7 +543,7 @@
                case VMBT_INT:
                case VMBT_UINT:
                     len = 4;
-                    arg = va_arg( args, __u32 );
+                    arg = va_arg( args, u32 );
                     break;
                case VMBT_DATA:
                     len = va_arg( args, int );
@@ -564,14 +564,14 @@
           }
 
           /* Write block type and length. */
-          *(__u32*) (dst + 0) = type;
-          *(__s32*) (dst + 4) = len;
+          *(u32*) (dst + 0) = type;
+          *(s32*) (dst + 4) = len;
 
           /* Write block content. */
           if (ptr)
                direct_memcpy( dst + 8, ptr, len );
           else if (len)
-               *(__u32*) (dst + 8) = arg;
+               *(u32*) (dst + 8) = arg;
 
           /* Advance message data pointer. */
           dst += len + 8;
@@ -581,7 +581,7 @@
      }
 
      /* Write terminator. */
-     *(__u32*) dst = VMBT_NONE;
+     *(u32*) dst = VMBT_NONE;
 }
 
 DirectResult
Index: lib/voodoo/message.h
===================================================================
RCS file: /cvs/directfb/DirectFB/lib/voodoo/message.h,v
retrieving revision 1.4
diff -u -r1.4 message.h
--- lib/voodoo/message.h	29 Oct 2005 01:47:18 -0000	1.4
+++ lib/voodoo/message.h	7 Oct 2006 19:54:46 -0000
@@ -109,12 +109,12 @@
      _vp_ptr = (parser).ptr;                                \
                                                             \
      /* Read message block type. */                         \
-     _vp_type = *(const __u32*) _vp_ptr;                    \
+     _vp_type = *(const u32*) _vp_ptr;                      \
                                                             \
      D_ASSERT( _vp_type == (req_type) );                    \
                                                             \
      /* Read data block length. */                          \
-     _vp_length = *(const __s32*) (_vp_ptr + 4)
+     _vp_length = *(const s32*) (_vp_ptr + 4)
 
 
 #define __VOODOO_PARSER_EPILOG( parser )                    \
@@ -144,7 +144,7 @@
           D_ASSERT( _vp_length == 4 );                                \
                                                                       \
           /* Read the ID. */                                          \
-          (ret_id) = *(const __u32*) (_vp_ptr + 8);                   \
+          (ret_id) = *(const u32*) (_vp_ptr + 8);                     \
                                                                       \
           __VOODOO_PARSER_EPILOG( parser );                           \
      } while (0)
@@ -156,7 +156,7 @@
           D_ASSERT( _vp_length == 4 );                                \
                                                                       \
           /* Read the integer. */                                     \
-          (ret_int) = *(const __s32*) (_vp_ptr + 8);                  \
+          (ret_int) = *(const s32*) (_vp_ptr + 8);                    \
                                                                       \
           __VOODOO_PARSER_EPILOG( parser );                           \
      } while (0)
@@ -168,7 +168,7 @@
           D_ASSERT( _vp_length == 4 );                                \
                                                                       \
           /* Read the unsigned integer. */                            \
-          (ret_uint) = *(const __u32*) (_vp_ptr + 8);                 \
+          (ret_uint) = *(const u32*) (_vp_ptr + 8);                   \
                                                                       \
           __VOODOO_PARSER_EPILOG( parser );                           \
      } while (0)
@@ -245,7 +245,7 @@
      do {                                                             \
           D_MAGIC_ASSERT( &(parser), VoodooMessageParser );           \
                                                                       \
-          D_ASSUME( *(const __u32*) ((parser).ptr) == VMBT_NONE );    \
+          D_ASSUME( *(const u32*) ((parser).ptr) == VMBT_NONE );      \
                                                                       \
           D_MAGIC_CLEAR( &(parser) );                                 \
      } while (0)
Index: lib/voodoo/types.h
===================================================================
RCS file: /cvs/directfb/DirectFB/lib/voodoo/types.h,v
retrieving revision 1.1
diff -u -r1.1 types.h
--- lib/voodoo/types.h	29 Apr 2004 19:08:40 -0000	1.1
+++ lib/voodoo/types.h	7 Oct 2006 19:54:46 -0000
@@ -31,9 +31,9 @@
 #include <direct/types.h>
 
 
-typedef __u32 VoodooInstanceID;
-typedef __u32 VoodooMethodID;
-typedef __u64 VoodooMessageSerial;
+typedef u32 VoodooInstanceID;
+typedef u32 VoodooMethodID;
+typedef u64 VoodooMessageSerial;
 
 #define VOODOO_INSTANCE_NONE  ((VoodooInstanceID) 0)
 
Index: proxy/dispatcher/idirectfbdisplaylayer_dispatcher.c
===================================================================
RCS file: /cvs/directfb/DirectFB/proxy/dispatcher/idirectfbdisplaylayer_dispatcher.c,v
retrieving revision 1.5
diff -u -r1.5 idirectfbdisplaylayer_dispatcher.c
--- proxy/dispatcher/idirectfbdisplaylayer_dispatcher.c	14 Jul 2004 09:08:29 -0000	1.5
+++ proxy/dispatcher/idirectfbdisplaylayer_dispatcher.c	7 Oct 2006 19:54:46 -0000
@@ -144,7 +144,7 @@
 
 static DFBResult
 IDirectFBDisplayLayer_Dispatcher_SetOpacity( IDirectFBDisplayLayer *thiz,
-                                            __u8                   opacity )
+                                             u8                     opacity )
 {
      DIRECT_INTERFACE_GET_DATA(IDirectFBDisplayLayer_Dispatcher)
 
@@ -189,9 +189,9 @@
 
 static DFBResult
 IDirectFBDisplayLayer_Dispatcher_SetSrcColorKey( IDirectFBDisplayLayer *thiz,
-                                                 __u8                   r,
-                                                 __u8                   g,
-                                                 __u8                   b )
+                                                 u8                     r,
+                                                 u8                     g,
+                                                 u8                     b )
 {
      DIRECT_INTERFACE_GET_DATA(IDirectFBDisplayLayer_Dispatcher)
 
@@ -202,9 +202,9 @@
 
 static DFBResult
 IDirectFBDisplayLayer_Dispatcher_SetDstColorKey( IDirectFBDisplayLayer *thiz,
-                                                 __u8                   r,
-                                                 __u8                   g,
-                                                 __u8                   b )
+                                                 u8                     r,
+                                                 u8                     g,
+                                                 u8                     b )
 {
      DIRECT_INTERFACE_GET_DATA(IDirectFBDisplayLayer_Dispatcher)
 
@@ -293,7 +293,7 @@
 
 static DFBResult
 IDirectFBDisplayLayer_Dispatcher_SetBackgroundColor( IDirectFBDisplayLayer *thiz,
-                                                     __u8 r, __u8 g, __u8 b, __u8 a )
+                                                     u8 r, u8 g, u8 b, u8 a )
 {
      DIRECT_INTERFACE_GET_DATA(IDirectFBDisplayLayer_Dispatcher)
 
@@ -385,7 +385,7 @@
 
 static DFBResult
 IDirectFBDisplayLayer_Dispatcher_SetCursorOpacity( IDirectFBDisplayLayer *thiz,
-                                                   __u8                   opacity )
+                                                   u8                     opacity )
 {
      DIRECT_INTERFACE_GET_DATA(IDirectFBDisplayLayer_Dispatcher)
 
Index: proxy/dispatcher/idirectfbpalette_dispatcher.c
===================================================================
RCS file: /cvs/directfb/DirectFB/proxy/dispatcher/idirectfbpalette_dispatcher.c,v
retrieving revision 1.5
diff -u -r1.5 idirectfbpalette_dispatcher.c
--- proxy/dispatcher/idirectfbpalette_dispatcher.c	8 Jun 2004 08:38:12 -0000	1.5
+++ proxy/dispatcher/idirectfbpalette_dispatcher.c	7 Oct 2006 19:54:46 -0000
@@ -151,10 +151,10 @@
 
 static DFBResult
 IDirectFBPalette_Dispatcher_FindBestMatch( IDirectFBPalette *thiz,
-                                           __u8              r,
-                                           __u8              g,
-                                           __u8              b,
-                                           __u8              a,
+                                           u8                r,
+                                           u8                g,
+                                           u8                b,
+                                           u8                a,
                                            unsigned int     *index )
 {
      DIRECT_INTERFACE_GET_DATA(IDirectFBPalette_Dispatcher)
Index: proxy/dispatcher/idirectfbsurface_dispatcher.c
===================================================================
RCS file: /cvs/directfb/DirectFB/proxy/dispatcher/idirectfbsurface_dispatcher.c,v
retrieving revision 1.10
diff -u -r1.10 idirectfbsurface_dispatcher.c
--- proxy/dispatcher/idirectfbsurface_dispatcher.c	29 Dec 2005 03:29:19 -0000	1.10
+++ proxy/dispatcher/idirectfbsurface_dispatcher.c	7 Oct 2006 19:54:46 -0000
@@ -260,7 +260,7 @@
 
 static DFBResult
 IDirectFBSurface_Dispatcher_Clear( IDirectFBSurface *thiz,
-                                   __u8 r, __u8 g, __u8 b, __u8 a )
+                                   u8 r, u8 g, u8 b, u8 a )
 {
      DIRECT_INTERFACE_GET_DATA(IDirectFBSurface_Dispatcher)
 
@@ -277,7 +277,7 @@
 
 static DFBResult
 IDirectFBSurface_Dispatcher_SetColor( IDirectFBSurface *thiz,
-                                      __u8 r, __u8 g, __u8 b, __u8 a )
+                                      u8 r, u8 g, u8 b, u8 a )
 {
      DIRECT_INTERFACE_GET_DATA(IDirectFBSurface_Dispatcher)
 
@@ -322,9 +322,9 @@
 
 static DFBResult
 IDirectFBSurface_Dispatcher_SetSrcColorKey( IDirectFBSurface *thiz,
-                                            __u8              r,
-                                            __u8              g,
-                                            __u8              b )
+                                            u8                r,
+                                            u8                g,
+                                            u8                b )
 {
      DIRECT_INTERFACE_GET_DATA(IDirectFBSurface_Dispatcher)
 
@@ -342,9 +342,9 @@
 
 static DFBResult
 IDirectFBSurface_Dispatcher_SetDstColorKey( IDirectFBSurface *thiz,
-                                            __u8              r,
-                                            __u8              g,
-                                            __u8              b )
+                                            u8                r,
+                                            u8                g,
+                                            u8                b )
 {
      DIRECT_INTERFACE_GET_DATA(IDirectFBSurface_Dispatcher)
 
Index: proxy/dispatcher/idirectfbwindow_dispatcher.c
===================================================================
RCS file: /cvs/directfb/DirectFB/proxy/dispatcher/idirectfbwindow_dispatcher.c,v
retrieving revision 1.6
diff -u -r1.6 idirectfbwindow_dispatcher.c
--- proxy/dispatcher/idirectfbwindow_dispatcher.c	8 Jun 2004 08:38:12 -0000	1.6
+++ proxy/dispatcher/idirectfbwindow_dispatcher.c	7 Oct 2006 19:54:46 -0000
@@ -203,9 +203,9 @@
 
 static DFBResult
 IDirectFBWindow_Dispatcher_SetColorKey( IDirectFBWindow *thiz,
-                                        __u8             r,
-                                        __u8             g,
-                                        __u8             b )
+                                        u8               r,
+                                        u8               g,
+                                        u8               b )
 {
      DIRECT_INTERFACE_GET_DATA(IDirectFBWindow_Dispatcher)
 
@@ -241,7 +241,7 @@
 
 static DFBResult
 IDirectFBWindow_Dispatcher_SetOpacity( IDirectFBWindow *thiz,
-                                       __u8             opacity )
+                                       u8               opacity )
 {
      DIRECT_INTERFACE_GET_DATA(IDirectFBWindow_Dispatcher)
 
@@ -252,7 +252,7 @@
 
 static DFBResult
 IDirectFBWindow_Dispatcher_GetOpacity( IDirectFBWindow *thiz,
-                                       __u8            *opacity )
+                                       u8              *opacity )
 {
      DIRECT_INTERFACE_GET_DATA(IDirectFBWindow_Dispatcher)
 
@@ -622,7 +622,7 @@
                      VoodooManager *manager, VoodooRequestMessage *msg )
 {
      VoodooMessageParser parser;
-     __u8                opacity;
+     u8                  opacity;
 
      DIRECT_INTERFACE_GET_DATA(IDirectFBWindow_Dispatcher)
 
@@ -640,7 +640,7 @@
                      VoodooManager *manager, VoodooRequestMessage *msg )
 {
      DirectResult     ret;
-     __u8             opacity;
+     u8               opacity;
 
      DIRECT_INTERFACE_GET_DATA(IDirectFBWindow_Dispatcher)
 
Index: proxy/requestor/idirectfbdisplaylayer_requestor.c
===================================================================
RCS file: /cvs/directfb/DirectFB/proxy/requestor/idirectfbdisplaylayer_requestor.c,v
retrieving revision 1.3
diff -u -r1.3 idirectfbdisplaylayer_requestor.c
--- proxy/requestor/idirectfbdisplaylayer_requestor.c	14 Jul 2004 09:08:29 -0000	1.3
+++ proxy/requestor/idirectfbdisplaylayer_requestor.c	7 Oct 2006 19:54:46 -0000
@@ -145,7 +145,7 @@
 
 static DFBResult
 IDirectFBDisplayLayer_Requestor_SetOpacity( IDirectFBDisplayLayer *thiz,
-                                            __u8                   opacity )
+                                            u8                     opacity )
 {
      DIRECT_INTERFACE_GET_DATA(IDirectFBDisplayLayer_Requestor)
 
@@ -190,9 +190,9 @@
 
 static DFBResult
 IDirectFBDisplayLayer_Requestor_SetSrcColorKey( IDirectFBDisplayLayer *thiz,
-                                                __u8                   r,
-                                                __u8                   g,
-                                                __u8                   b )
+                                                u8                     r,
+                                                u8                     g,
+                                                u8                     b )
 {
      DIRECT_INTERFACE_GET_DATA(IDirectFBDisplayLayer_Requestor)
 
@@ -203,9 +203,9 @@
 
 static DFBResult
 IDirectFBDisplayLayer_Requestor_SetDstColorKey( IDirectFBDisplayLayer *thiz,
-                                                __u8                   r,
-                                                __u8                   g,
-                                                __u8                   b )
+                                                u8                     r,
+                                                u8                     g,
+                                                u8                     b )
 {
      DIRECT_INTERFACE_GET_DATA(IDirectFBDisplayLayer_Requestor)
 
@@ -312,7 +312,7 @@
 
 static DFBResult
 IDirectFBDisplayLayer_Requestor_SetBackgroundColor( IDirectFBDisplayLayer *thiz,
-                                                    __u8 r, __u8 g, __u8 b, __u8 a )
+                                                    u8 r, u8 g, u8 b, u8 a )
 {
      DIRECT_INTERFACE_GET_DATA(IDirectFBDisplayLayer_Requestor)
 
@@ -425,7 +425,7 @@
 
 static DFBResult
 IDirectFBDisplayLayer_Requestor_SetCursorOpacity( IDirectFBDisplayLayer *thiz,
-                                                  __u8                   opacity )
+                                                  u8                     opacity )
 {
      DIRECT_INTERFACE_GET_DATA(IDirectFBDisplayLayer_Requestor)
 
Index: proxy/requestor/idirectfbpalette_requestor.c
===================================================================
RCS file: /cvs/directfb/DirectFB/proxy/requestor/idirectfbpalette_requestor.c,v
retrieving revision 1.3
diff -u -r1.3 idirectfbpalette_requestor.c
--- proxy/requestor/idirectfbpalette_requestor.c	14 May 2004 12:16:02 -0000	1.3
+++ proxy/requestor/idirectfbpalette_requestor.c	7 Oct 2006 19:54:46 -0000
@@ -238,10 +238,10 @@
 
 static DFBResult
 IDirectFBPalette_Requestor_FindBestMatch( IDirectFBPalette *thiz,
-                                          __u8              r,
-                                          __u8              g,
-                                          __u8              b,
-                                          __u8              a,
+                                          u8                r,
+                                          u8                g,
+                                          u8                b,
+                                          u8                a,
                                           unsigned int     *ret_index )
 {
      DirectResult            ret;
Index: proxy/requestor/idirectfbsurface_requestor.c
===================================================================
RCS file: /cvs/directfb/DirectFB/proxy/requestor/idirectfbsurface_requestor.c,v
retrieving revision 1.13
diff -u -r1.13 idirectfbsurface_requestor.c
--- proxy/requestor/idirectfbsurface_requestor.c	29 Dec 2005 03:29:19 -0000	1.13
+++ proxy/requestor/idirectfbsurface_requestor.c	7 Oct 2006 19:54:46 -0000
@@ -415,7 +415,7 @@
 
 static DFBResult
 IDirectFBSurface_Requestor_Clear( IDirectFBSurface *thiz,
-                                  __u8 r, __u8 g, __u8 b, __u8 a )
+                                  u8 r, u8 g, u8 b, u8 a )
 {
      DFBColor color = { a, r, g, b };
 
@@ -440,7 +440,7 @@
 
 static DFBResult
 IDirectFBSurface_Requestor_SetColor( IDirectFBSurface *thiz,
-                                     __u8 r, __u8 g, __u8 b, __u8 a )
+                                     u8 r, u8 g, u8 b, u8 a )
 {
      DFBColor color = { a, r, g, b };
 
@@ -498,9 +498,9 @@
 
 static DFBResult
 IDirectFBSurface_Requestor_SetSrcColorKey( IDirectFBSurface *thiz,
-                                           __u8              r,
-                                           __u8              g,
-                                           __u8              b )
+                                           u8                r,
+                                           u8                g,
+                                           u8                b )
 {
      DFBColor color = { 0, r, g, b };
 
@@ -526,9 +526,9 @@
 
 static DFBResult
 IDirectFBSurface_Requestor_SetDstColorKey( IDirectFBSurface *thiz,
-                                           __u8              r,
-                                           __u8              g,
-                                           __u8              b )
+                                           u8                r,
+                                           u8                g,
+                                           u8                b )
 {
      DFBColor color = { 0, r, g, b };
 
Index: proxy/requestor/idirectfbwindow_requestor.c
===================================================================
RCS file: /cvs/directfb/DirectFB/proxy/requestor/idirectfbwindow_requestor.c,v
retrieving revision 1.5
diff -u -r1.5 idirectfbwindow_requestor.c
--- proxy/requestor/idirectfbwindow_requestor.c	14 May 2004 12:16:02 -0000	1.5
+++ proxy/requestor/idirectfbwindow_requestor.c	7 Oct 2006 19:54:46 -0000
@@ -342,9 +342,9 @@
 
 static DFBResult
 IDirectFBWindow_Requestor_SetColorKey( IDirectFBWindow *thiz,
-                                       __u8             r,
-                                       __u8             g,
-                                       __u8             b )
+                                       u8               r,
+                                       u8               g,
+                                       u8               b )
 {
      DIRECT_INTERFACE_GET_DATA(IDirectFBWindow_Requestor)
 
@@ -380,7 +380,7 @@
 
 static DFBResult
 IDirectFBWindow_Requestor_SetOpacity( IDirectFBWindow *thiz,
-                                      __u8             opacity )
+                                      u8               opacity )
 {
      DIRECT_INTERFACE_GET_DATA(IDirectFBWindow_Requestor)
 
@@ -392,12 +392,12 @@
 
 static DFBResult
 IDirectFBWindow_Requestor_GetOpacity( IDirectFBWindow *thiz,
-                                      __u8            *ret_opacity )
+                                      u8              *ret_opacity )
 {
      DirectResult           ret;
      VoodooResponseMessage *response;
      VoodooMessageParser    parser;
-     __u8                   opacity;
+     u8                     opacity;
 
      DIRECT_INTERFACE_GET_DATA(IDirectFBWindow_Requestor)
 
Index: src/core/colorhash.c
===================================================================
RCS file: /cvs/directfb/DirectFB/src/core/colorhash.c,v
retrieving revision 1.15
diff -u -r1.15 colorhash.c
--- src/core/colorhash.c	29 Oct 2005 00:40:59 -0000	1.15
+++ src/core/colorhash.c	7 Oct 2006 19:54:46 -0000
@@ -179,10 +179,10 @@
 
 unsigned int
 dfb_colorhash_lookup( CorePalette *palette,
-                      __u8         r,
-                      __u8         g,
-                      __u8         b,
-                      __u8         a )
+                      u8           r,
+                      u8           g,
+                      u8           b,
+                      u8           a )
 {
      Colorhash    *hash;
      unsigned int  pixel = PIXEL_ARGB(a, r, g, b);
Index: src/core/colorhash.h
===================================================================
RCS file: /cvs/directfb/DirectFB/src/core/colorhash.h,v
retrieving revision 1.3
diff -u -r1.3 colorhash.h
--- src/core/colorhash.h	30 Mar 2004 18:35:36 -0000	1.3
+++ src/core/colorhash.h	7 Oct 2006 19:54:46 -0000
@@ -35,10 +35,10 @@
 void          dfb_colorhash_attach     (CorePalette *palette);
 void          dfb_colorhash_detach     (CorePalette *palette);
 unsigned int  dfb_colorhash_lookup     (CorePalette *palette,
-                                        __u8         r,
-                                        __u8         g,
-                                        __u8         b,
-                                        __u8         a);
+                                        u8           r,
+                                        u8           g,
+                                        u8           b,
+                                        u8           a);
 void          dfb_colorhash_invalidate (CorePalette *palette);
 
 #endif
Index: src/core/fonts.c
===================================================================
RCS file: /cvs/directfb/DirectFB/src/core/fonts.c,v
retrieving revision 1.60
diff -u -r1.60 fonts.c
--- src/core/fonts.c	3 Sep 2006 14:29:18 -0000	1.60
+++ src/core/fonts.c	7 Oct 2006 19:54:46 -0000
@@ -61,7 +61,7 @@
 /**********************************************************************************************************************/
 
 static bool free_glyphs( DirectHash *hash,
-                         __u32       key,
+                         u32         key,
                          void       *value,
                          void       *ctx );
 
@@ -527,7 +527,7 @@
                       int               *ret_num )
 {
      int pos = 0, num = 0;
-     const __u8 *bytes = text;
+     const u8 *bytes = text;
 
      D_DEBUG_AT( Core_Font, "%s()\n", __FUNCTION__ );
 
@@ -590,7 +590,7 @@
 DFBResult
 dfb_font_decode_character( CoreFont          *font,
                            DFBTextEncodingID  encoding,
-                           __u32              character,
+                           u32                character,
                            unsigned int      *ret_index )
 {
      D_DEBUG_AT( Core_Font, "%s()\n", __FUNCTION__ );
@@ -625,7 +625,7 @@
 
 static bool
 free_glyphs( DirectHash *hash,
-             __u32       key,
+             u32         key,
              void       *value,
              void       *ctx )
 {
Index: src/core/fonts.h
===================================================================
RCS file: /cvs/directfb/DirectFB/src/core/fonts.h,v
retrieving revision 1.26
diff -u -r1.26 fonts.h
--- src/core/fonts.h	3 Sep 2006 14:29:18 -0000	1.26
+++ src/core/fonts.h	7 Oct 2006 19:54:46 -0000
@@ -227,7 +227,7 @@
 
 DFBResult dfb_font_decode_character( CoreFont          *font,
                                      DFBTextEncodingID  encoding,
-                                     __u32              character,
+                                     u32                character,
                                      unsigned int      *ret_index );
 
 #endif
Index: src/core/gfxcard.c
===================================================================
RCS file: /cvs/directfb/DirectFB/src/core/gfxcard.c,v
retrieving revision 1.191
diff -u -r1.191 gfxcard.c
--- src/core/gfxcard.c	26 Sep 2006 20:17:04 -0000	1.191
+++ src/core/gfxcard.c	7 Oct 2006 19:54:47 -0000
@@ -1550,7 +1550,7 @@
 }
 
 void
-dfb_gfxcard_drawstring( const __u8 *text, int bytes,
+dfb_gfxcard_drawstring( const u8 *text, int bytes,
                         DFBTextEncodingID encoding, int x, int y,
                         CoreFont *font, CardState *state )
 {
Index: src/core/gfxcard.h
===================================================================
RCS file: /cvs/directfb/DirectFB/src/core/gfxcard.h,v
retrieving revision 1.93
diff -u -r1.93 gfxcard.h
--- src/core/gfxcard.h	4 Oct 2006 10:12:43 -0000	1.93
+++ src/core/gfxcard.h	7 Oct 2006 19:54:47 -0000
@@ -317,7 +317,7 @@
                                     DFBTriangleFormation formation,
                                     CardState *state );
 
-void dfb_gfxcard_drawstring( const __u8 *text, int bytes,
+void dfb_gfxcard_drawstring( const u8 *text, int bytes,
                              DFBTextEncodingID encoding, int x, int y,
                              CoreFont *font, CardState *state );
 void dfb_gfxcard_drawstring_check_state( CoreFont *font, CardState *state );
Index: src/core/layer_context.c
===================================================================
RCS file: /cvs/directfb/DirectFB/src/core/layer_context.c,v
retrieving revision 1.50
diff -u -r1.50 layer_context.c
--- src/core/layer_context.c	12 Jun 2006 17:31:44 -0000	1.50
+++ src/core/layer_context.c	7 Oct 2006 19:54:47 -0000
@@ -740,7 +740,7 @@
 
 DFBResult
 dfb_layer_context_set_src_colorkey( CoreLayerContext *context,
-                                    __u8 r, __u8 g, __u8 b )
+                                    u8 r, u8 g, u8 b )
 {
      DFBResult             ret;
      CoreLayerRegionConfig config;
@@ -770,7 +770,7 @@
 
 DFBResult
 dfb_layer_context_set_dst_colorkey( CoreLayerContext *context,
-                                    __u8 r, __u8 g, __u8 b )
+                                    u8 r, u8 g, u8 b )
 {
      DFBResult             ret;
      CoreLayerRegionConfig config;
@@ -967,7 +967,7 @@
 
 DFBResult
 dfb_layer_context_set_opacity( CoreLayerContext *context,
-                               __u8              opacity )
+                               u8                opacity )
 {
      DFBResult             ret;
      CoreLayerRegionConfig config;
Index: src/core/layer_context.h
===================================================================
RCS file: /cvs/directfb/DirectFB/src/core/layer_context.h,v
retrieving revision 1.16
diff -u -r1.16 layer_context.h
--- src/core/layer_context.h	12 Jun 2006 17:31:44 -0000	1.16
+++ src/core/layer_context.h	7 Oct 2006 19:54:47 -0000
@@ -79,14 +79,14 @@
  * configuration details
  */
 DFBResult dfb_layer_context_set_src_colorkey   ( CoreLayerContext            *context,
-                                                 __u8                         r,
-                                                 __u8                         g,
-                                                 __u8                         b );
+                                                 u8                           r,
+                                                 u8                           g,
+                                                 u8                           b );
 
 DFBResult dfb_layer_context_set_dst_colorkey   ( CoreLayerContext            *context,
-                                                 __u8                         r,
-                                                 __u8                         g,
-                                                 __u8                         b );
+                                                 u8                           r,
+                                                 u8                           g,
+                                                 u8                           b );
 
 DFBResult dfb_layer_context_set_sourcerectangle( CoreLayerContext            *context,
                                                  const DFBRectangle          *source );
@@ -102,7 +102,7 @@
                                                  int                          y );
 
 DFBResult dfb_layer_context_set_opacity        ( CoreLayerContext            *context,
-                                                 __u8                         opacity);
+                                                 u8                           opacity);
 
 DFBResult dfb_layer_context_set_coloradjustment( CoreLayerContext            *context,
                                                  const DFBColorAdjustment    *adjustment );
Index: src/core/layers.h
===================================================================
RCS file: /cvs/directfb/DirectFB/src/core/layers.h,v
retrieving revision 1.72
diff -u -r1.72 layers.h
--- src/core/layers.h	12 Jun 2006 17:31:44 -0000	1.72
+++ src/core/layers.h	7 Oct 2006 19:54:47 -0000
@@ -46,14 +46,14 @@
      DFBRectangle               source;           /* viewport within source (input) */
      DFBRectangle               dest;             /* viewport on screen (output) */
 
-     __u8                       opacity;          /* global region alpha */
+     u8                         opacity;          /* global region alpha */
 
      DFBColor                   src_key;          /* source color key */
      DFBColor                   dst_key;          /* destination color key */
 
      int                        parity;           /* field parity (for interlaced) */
 
-     __u8                       alpha_ramp[4];    /* alpha values for 1 or 2 bit lookup */
+     u8                         alpha_ramp[4];    /* alpha values for 1 or 2 bit lookup */
 
      DFBRegion                 *clips;            /* clip regions */
      int                        num_clips;        /* number of clip regions */
Index: src/core/palette.c
===================================================================
RCS file: /cvs/directfb/DirectFB/src/core/palette.c,v
retrieving revision 1.27
diff -u -r1.27 palette.c
--- src/core/palette.c	25 Jun 2006 13:49:00 -0000	1.27
+++ src/core/palette.c	7 Oct 2006 19:54:47 -0000
@@ -42,8 +42,8 @@
 
 #include <misc/util.h>
 
-static const __u8 lookup3to8[] = { 0x00, 0x24, 0x49, 0x6d, 0x92, 0xb6, 0xdb, 0xff };
-static const __u8 lookup2to8[] = { 0x00, 0x55, 0xaa, 0xff };
+static const u8 lookup3to8[] = { 0x00, 0x24, 0x49, 0x6d, 0x92, 0xb6, 0xdb, 0xff };
+static const u8 lookup2to8[] = { 0x00, 0x55, 0xaa, 0xff };
 
 static const ReactionFunc dfb_palette_globals[] = {
 /* 0 */   _dfb_surface_palette_listener,
@@ -167,10 +167,10 @@
 
 unsigned int
 dfb_palette_search( CorePalette *palette,
-                    __u8         r,
-                    __u8         g,
-                    __u8         b,
-                    __u8         a )
+                    u8           r,
+                    u8           g,
+                    u8           b,
+                    u8           a )
 {
      unsigned int index;
 
@@ -235,8 +235,8 @@
 bool
 dfb_palette_equal( CorePalette *palette1, CorePalette *palette2 )
 {
-     __u32 *entries1;
-     __u32 *entries2;
+     u32 *entries1;
+     u32 *entries2;
      int    i;
      
      D_ASSERT( palette1 != NULL );
@@ -248,8 +248,8 @@
      if (palette1->num_entries != palette2->num_entries)
           return false;
 
-     entries1 = (__u32*)palette1->entries;
-     entries2 = (__u32*)palette2->entries;
+     entries1 = (u32*)palette1->entries;
+     entries2 = (u32*)palette2->entries;
 
      for (i = 0; i < palette1->num_entries; i++) {
           if (entries1[i] != entries2[i])
Index: src/core/palette.h
===================================================================
RCS file: /cvs/directfb/DirectFB/src/core/palette.h,v
retrieving revision 1.18
diff -u -r1.18 palette.h
--- src/core/palette.h	25 Jun 2006 13:49:00 -0000	1.18
+++ src/core/palette.h	7 Oct 2006 19:54:47 -0000
@@ -69,10 +69,10 @@
 void         dfb_palette_generate_rgb121_map( CorePalette   *palette );
 
 unsigned int dfb_palette_search             ( CorePalette   *palette,
-                                              __u8           r,
-                                              __u8           g,
-                                              __u8           b,
-                                              __u8           a );
+                                              u8             r,
+                                              u8             g,
+                                              u8             b,
+                                              u8             a );
 
 void         dfb_palette_update             ( CorePalette   *palette,
                                               int            first,
Index: src/core/state.h
===================================================================
RCS file: /cvs/directfb/DirectFB/src/core/state.h,v
retrieving revision 1.26
diff -u -r1.26 state.h
--- src/core/state.h	30 Mar 2006 12:38:09 -0000	1.26
+++ src/core/state.h	7 Oct 2006 19:54:47 -0000
@@ -96,8 +96,8 @@
      unsigned int             color_index;   /* index to color in palette */
      DFBSurfaceBlendFunction  src_blend;     /* blend function for source */
      DFBSurfaceBlendFunction  dst_blend;     /* blend function for destination */
-     __u32                    src_colorkey;  /* colorkey for source */
-     __u32                    dst_colorkey;  /* colorkey for destination */
+     u32                      src_colorkey;  /* colorkey for source */
+     u32                      dst_colorkey;  /* colorkey for destination */
 
      CoreSurface             *destination;   /* destination surface */
      CoreSurface             *source;        /* source surface */
Index: src/core/surfaces.c
===================================================================
RCS file: /cvs/directfb/DirectFB/src/core/surfaces.c,v
retrieving revision 1.140
diff -u -r1.140 surfaces.c
--- src/core/surfaces.c	20 Sep 2006 16:03:18 -0000	1.140
+++ src/core/surfaces.c	7 Oct 2006 19:54:48 -0000
@@ -72,8 +72,8 @@
 
 D_DEBUG_DOMAIN( Core_Surface, "Core/Surface", "DirectFB Surface Core" );
 
-static const __u8 lookup3to8[] = { 0x00, 0x24, 0x49, 0x6d, 0x92, 0xb6, 0xdb, 0xff };
-static const __u8 lookup2to8[] = { 0x00, 0x55, 0xaa, 0xff };
+static const u8 lookup3to8[] = { 0x00, 0x24, 0x49, 0x6d, 0x92, 0xb6, 0xdb, 0xff };
+static const u8 lookup2to8[] = { 0x00, 0x55, 0xaa, 0xff };
 
 #if D_DEBUG_ENABLED
 
@@ -734,10 +734,10 @@
 
 void
 dfb_surface_set_alpha_ramp( CoreSurface *surface,
-                            __u8         a0,
-                            __u8         a1,
-                            __u8         a2,
-                            __u8         a3 )
+                            u8           a0,
+                            u8           a1,
+                            u8           a2,
+                            u8           a3 )
 {
      D_DEBUG_AT( Core_Surface, "dfb_surface_set_alpha_ramp( %p, %02x %02x %02x %02x )\n", surface, a0, a1, a2, a3 );
 
@@ -1322,17 +1322,17 @@
      /* Write the pixmap (and graymap) data. */
      for (i=0; i<surface->height; i++) {
           int    n3;
-          __u8  *data8;
-          __u16 *data16;
-          __u32 *data32;
+          u8    *data8;
+          u16 *data16;
+          u32 *data32;
 
-          __u8 buf_p[surface->width * 3];
-          __u8 buf_g[surface->width];
+          u8 buf_p[surface->width * 3];
+          u8 buf_g[surface->width];
 
           /* Prepare one row. */
           data8  = dfb_surface_data_offset( surface, data, pitch, 0, i );
-          data16 = (__u16*) data8;
-          data32 = (__u32*) data8;
+          data16 = (u16*) data8;
+          data32 = (u32*) data8;
 
           switch (surface->format) {
                case DSPF_LUT8:
@@ -1442,7 +1442,7 @@
                     break;
                case DSPF_YUY2:
                     for (n=0, n3=0; n<surface->width/2; n++, n3+=6) {
-                         register __u32 y0, cb, y1, cr;
+                         register u32 y0, cb, y1, cr;
                          y0 = (data32[n] & 0x000000FF);
                          cb = (data32[n] & 0x0000FF00) >>  8;
                          y1 = (data32[n] & 0x00FF0000) >> 16;
@@ -1455,7 +1455,7 @@
                     break;
                case DSPF_UYVY:
                     for (n=0, n3=0; n<surface->width/2; n++, n3+=6) {
-                         register __u32 y0, cb, y1, cr;
+                         register u32 y0, cb, y1, cr;
                          cb = (data32[n] & 0x000000FF);
                          y0 = (data32[n] & 0x0000FF00) >>  8;
                          cr = (data32[n] & 0x00FF0000) >> 16;
Index: src/core/surfaces.h
===================================================================
RCS file: /cvs/directfb/DirectFB/src/core/surfaces.h,v
retrieving revision 1.66
diff -u -r1.66 surfaces.h
--- src/core/surfaces.h	26 Sep 2006 19:42:36 -0000	1.66
+++ src/core/surfaces.h	7 Oct 2006 19:54:48 -0000
@@ -169,7 +169,7 @@
 
      int                    field;
 
-     __u8                   alpha_ramp[4];
+     u8                     alpha_ramp[4];
 
      SurfaceBuffer         *front_buffer;  /* buffer for reading
                                               (blit from or display buffer) */
@@ -209,7 +209,7 @@
           y >>= 1;
      }
 
-     return (__u8*) data + pitch * y + DFB_BYTES_PER_LINE( surface->format, x );
+     return (u8*) data + pitch * y + DFB_BYTES_PER_LINE( surface->format, x );
 }
 
 static inline void
@@ -329,10 +329,10 @@
                                            int          field );
 
 void dfb_surface_set_alpha_ramp          ( CoreSurface *surface,
-                                           __u8         a0,
-                                           __u8         a1,
-                                           __u8         a2,
-                                           __u8         a3 );
+                                           u8           a0,
+                                           u8           a1,
+                                           u8           a2,
+                                           u8           a3 );
 
 /*
  * This is a utility function for easier usage.
Index: src/core/windows.c
===================================================================
RCS file: /cvs/directfb/DirectFB/src/core/windows.c,v
retrieving revision 1.225
diff -u -r1.225 windows.c
--- src/core/windows.c	4 Aug 2006 21:05:09 -0000	1.225
+++ src/core/windows.c	7 Oct 2006 19:54:48 -0000
@@ -844,7 +844,7 @@
 
 DFBResult
 dfb_window_set_colorkey( CoreWindow *window,
-                         __u32       color_key )
+                         u32         color_key )
 {
      DFBResult         ret;
      CoreWindowConfig  config;
@@ -877,7 +877,7 @@
 
 DFBResult
 dfb_window_set_opacity( CoreWindow *window,
-                        __u8        opacity )
+                        u8          opacity )
 {
      DFBResult         ret;
      CoreWindowConfig  config;
Index: src/core/windows.h
===================================================================
RCS file: /cvs/directfb/DirectFB/src/core/windows.h,v
retrieving revision 1.62
diff -u -r1.62 windows.h
--- src/core/windows.h	29 Oct 2005 00:41:00 -0000	1.62
+++ src/core/windows.h	7 Oct 2006 19:54:48 -0000
@@ -78,7 +78,7 @@
      DFBWindowStackingClass  stacking;       /* level boundaries */
      DFBWindowOptions        options;        /* flags for appearance/behaviour */
      DFBWindowEventType      events;         /* mask of enabled events */
-     __u32                   color_key;      /* transparent pixel */
+     u32                     color_key;      /* transparent pixel */
      DFBRegion               opaque;         /* region of the window forced to be opaque */
 };
 
@@ -187,14 +187,14 @@
  */
 DFBResult
 dfb_window_set_colorkey( CoreWindow *window,
-                         __u32       color_key );
+                         u32         color_key );
 
 /*
  * sets the global alpha factor
  */
 DFBResult
 dfb_window_set_opacity( CoreWindow *window,
-                        __u8        opacity );
+                        u8          opacity );
 
 /*
  * sets the window options
Index: src/core/windows_internal.h
===================================================================
RCS file: /cvs/directfb/DirectFB/src/core/windows_internal.h,v
retrieving revision 1.13
diff -u -r1.13 windows_internal.h
--- src/core/windows_internal.h	16 Jul 2006 10:15:29 -0000	1.13
+++ src/core/windows_internal.h	7 Oct 2006 19:54:48 -0000
@@ -106,7 +106,7 @@
           DFBDimension       size;        /* cursor shape size */
           DFBPoint           hot;         /* hot spot */
           CoreSurface       *surface;     /* shape */
-          __u8               opacity;     /* cursor opacity */
+          u8                 opacity;     /* cursor opacity */
           DFBRegion          region;      /* cursor is clipped by this region */
 
           int                numerator;   /* cursor acceleration */
Index: src/core/windowstack.c
===================================================================
RCS file: /cvs/directfb/DirectFB/src/core/windowstack.c,v
retrieving revision 1.27
diff -u -r1.27 windowstack.c
--- src/core/windowstack.c	16 Jul 2006 10:15:29 -0000	1.27
+++ src/core/windowstack.c	7 Oct 2006 19:54:48 -0000
@@ -430,7 +430,7 @@
 }
 
 DFBResult
-dfb_windowstack_cursor_set_opacity( CoreWindowStack *stack, __u8 opacity )
+dfb_windowstack_cursor_set_opacity( CoreWindowStack *stack, u8 opacity )
 {
      D_DEBUG_AT( Core_WindowStack, "%s( %p, 0x%02x )\n", __FUNCTION__, stack, opacity );
 
@@ -765,7 +765,7 @@
 #ifdef WORDS_BIGENDIAN
           {
                int i = MIN (40, pitch/4);
-               __u32 *tmp_data = data;
+               u32 *tmp_data = data;
 
                while (i--) {
                     *tmp_data = (*tmp_data & 0xFF000000) >> 24 |
Index: src/core/windowstack.h
===================================================================
RCS file: /cvs/directfb/DirectFB/src/core/windowstack.h,v
retrieving revision 1.9
diff -u -r1.9 windowstack.h
--- src/core/windowstack.h	7 Nov 2004 09:15:21 -0000	1.9
+++ src/core/windowstack.h	7 Oct 2006 19:54:48 -0000
@@ -78,7 +78,7 @@
                                             int              hot_y );
 
 DFBResult dfb_windowstack_cursor_set_opacity( CoreWindowStack *stack,
-                                              __u8             opacity );
+                                              u8               opacity );
 
 DFBResult dfb_windowstack_cursor_set_acceleration( CoreWindowStack *stack,
                                                    int              numerator,
Index: src/display/idirectfbdisplaylayer.c
===================================================================
RCS file: /cvs/directfb/DirectFB/src/display/idirectfbdisplaylayer.c,v
retrieving revision 1.85
diff -u -r1.85 idirectfbdisplaylayer.c
--- src/display/idirectfbdisplaylayer.c	30 Sep 2006 23:36:31 -0000	1.85
+++ src/display/idirectfbdisplaylayer.c	7 Oct 2006 19:54:48 -0000
@@ -284,7 +284,7 @@
 
 static DFBResult
 IDirectFBDisplayLayer_SetOpacity( IDirectFBDisplayLayer *thiz,
-                                  __u8                   opacity )
+                                  u8                     opacity )
 {
      DIRECT_INTERFACE_GET_DATA(IDirectFBDisplayLayer)
 
@@ -417,9 +417,9 @@
 
 static DFBResult
 IDirectFBDisplayLayer_SetSrcColorKey( IDirectFBDisplayLayer *thiz,
-                                      __u8                   r,
-                                      __u8                   g,
-                                      __u8                   b )
+                                      u8                     r,
+                                      u8                     g,
+                                      u8                     b )
 {
      DIRECT_INTERFACE_GET_DATA(IDirectFBDisplayLayer)
 
@@ -431,9 +431,9 @@
 
 static DFBResult
 IDirectFBDisplayLayer_SetDstColorKey( IDirectFBDisplayLayer *thiz,
-                                      __u8                   r,
-                                      __u8                   g,
-                                      __u8                   b )
+                                      u8                     r,
+                                      u8                     g,
+                                      u8                     b )
 {
      DIRECT_INTERFACE_GET_DATA(IDirectFBDisplayLayer)
 
@@ -584,7 +584,7 @@
 
 static DFBResult
 IDirectFBDisplayLayer_SetBackgroundColor( IDirectFBDisplayLayer *thiz,
-                                          __u8 r, __u8 g, __u8 b, __u8 a )
+                                          u8 r, u8 g, u8 b, u8 a )
 {
      DFBColor color = { a: a, r: r, g: g, b: b };
 
@@ -754,7 +754,7 @@
 
 static DFBResult
 IDirectFBDisplayLayer_SetCursorOpacity( IDirectFBDisplayLayer *thiz,
-                                        __u8                   opacity )
+                                        u8                     opacity )
 {
      DIRECT_INTERFACE_GET_DATA(IDirectFBDisplayLayer)
 
Index: src/display/idirectfbpalette.c
===================================================================
RCS file: /cvs/directfb/DirectFB/src/display/idirectfbpalette.c,v
retrieving revision 1.16
diff -u -r1.16 idirectfbpalette.c
--- src/display/idirectfbpalette.c	29 Apr 2004 19:08:43 -0000	1.16
+++ src/display/idirectfbpalette.c	7 Oct 2006 19:54:48 -0000
@@ -175,10 +175,10 @@
 
 static DFBResult
 IDirectFBPalette_FindBestMatch( IDirectFBPalette *thiz,
-                                __u8              r,
-                                __u8              g,
-                                __u8              b,
-                                __u8              a,
+                                u8                r,
+                                u8                g,
+                                u8                b,
+                                u8                a,
                                 unsigned int     *index )
 {
      CorePalette *palette;
Index: src/display/idirectfbsurface.c
===================================================================
RCS file: /cvs/directfb/DirectFB/src/display/idirectfbsurface.c,v
retrieving revision 1.123
diff -u -r1.123 idirectfbsurface.c
--- src/display/idirectfbsurface.c	1 Oct 2006 00:08:51 -0000	1.123
+++ src/display/idirectfbsurface.c	7 Oct 2006 19:54:49 -0000
@@ -347,10 +347,10 @@
 
 static DFBResult
 IDirectFBSurface_SetAlphaRamp( IDirectFBSurface *thiz,
-                               __u8              a0,
-                               __u8              a1,
-                               __u8              a2,
-                               __u8              a3 )
+                               u8                a0,
+                               u8                a1,
+                               u8                a2,
+                               u8                a3 )
 {
      DIRECT_INTERFACE_GET_DATA(IDirectFBSurface)
 
@@ -532,7 +532,7 @@
 
 static DFBResult
 IDirectFBSurface_Clear( IDirectFBSurface *thiz,
-                        __u8 r, __u8 g, __u8 b, __u8 a )
+                        u8 r, u8 g, u8 b, u8 a )
 {
      DFBColor                old_color;
      unsigned int            old_index;
@@ -644,7 +644,7 @@
 
 static DFBResult
 IDirectFBSurface_SetColor( IDirectFBSurface *thiz,
-                           __u8 r, __u8 g, __u8 b, __u8 a )
+                           u8 r, u8 g, u8 b, u8 a )
 {
      CoreSurface *surface;
      DFBColor     color = { a, r, g, b };
@@ -829,9 +829,9 @@
 
 static DFBResult
 IDirectFBSurface_SetSrcColorKey( IDirectFBSurface *thiz,
-                                 __u8              r,
-                                 __u8              g,
-                                 __u8              b )
+                                 u8                r,
+                                 u8                g,
+                                 u8                b )
 {
      CoreSurface *surface;
 
@@ -900,9 +900,9 @@
 
 static DFBResult
 IDirectFBSurface_SetDstColorKey( IDirectFBSurface *thiz,
-                                 __u8              r,
-                                 __u8              g,
-                                 __u8              b )
+                                 u8                r,
+                                 u8                g,
+                                 u8                b )
 {
      CoreSurface *surface;
 
Index: src/display/idirectfbsurface.h
===================================================================
RCS file: /cvs/directfb/DirectFB/src/display/idirectfbsurface.h,v
retrieving revision 1.20
diff -u -r1.20 idirectfbsurface.h
--- src/display/idirectfbsurface.h	31 Jul 2006 11:12:41 -0000	1.20
+++ src/display/idirectfbsurface.h	7 Oct 2006 19:54:49 -0000
@@ -69,18 +69,18 @@
      DFBTextEncodingID      encoding;        /* text encoding */
 
      struct {
-          __u8              r;               /* red component */
-          __u8              g;               /* green component */
-          __u8              b;               /* blue component */
-          __u32             value;           /* r/g/b in surface's format */
+          u8                r;               /* red component */
+          u8                g;               /* green component */
+          u8                b;               /* blue component */
+          u32               value;           /* r/g/b in surface's format */
      } src_key;                              /* src key for blitting from
                                                 this surface */
 
      struct {
-          __u8              r;               /* red component */
-          __u8              g;               /* green component */
-          __u8              b;               /* blue component */
-          __u32             value;           /* r/g/b in surface's format */
+          u8                r;               /* red component */
+          u8                g;               /* green component */
+          u8                b;               /* blue component */
+          u32               value;           /* r/g/b in surface's format */
      } dst_key;                              /* dst key for blitting to
                                                 this surface */
 
Index: src/gfx/convert.c
===================================================================
RCS file: /cvs/directfb/DirectFB/src/gfx/convert.c,v
retrieving revision 1.24
diff -u -r1.24 convert.c
--- src/gfx/convert.c	20 Sep 2006 16:03:18 -0000	1.24
+++ src/gfx/convert.c	7 Oct 2006 19:54:49 -0000
@@ -57,12 +57,12 @@
      return DSPF_UNKNOWN;
 }
 
-__u32
+u32
 dfb_color_to_pixel( DFBSurfacePixelFormat format,
-                    __u8 r, __u8 g, __u8 b )
+                    u8 r, u8 g, u8 b )
 {
-     __u32 pixel;
-     __u32 y, cb, cr;
+     u32 pixel;
+     u32 y, cb, cr;
 
      switch (format) {
           case DSPF_RGB332:
Index: src/gfx/convert.h
===================================================================
RCS file: /cvs/directfb/DirectFB/src/gfx/convert.h,v
retrieving revision 1.33
diff -u -r1.33 convert.h
--- src/gfx/convert.h	20 Sep 2006 16:03:18 -0000	1.33
+++ src/gfx/convert.h	7 Oct 2006 19:54:49 -0000
@@ -227,15 +227,15 @@
 
 /* RGB <-> YCbCr conversion */
 
-extern const __u16 y_for_rgb[256];
-extern const __s16 cr_for_r[256];
-extern const __s16 cr_for_g[256];
-extern const __s16 cb_for_g[256];
-extern const __s16 cb_for_b[256];
+extern const u16 y_for_rgb[256];
+extern const s16 cr_for_r[256];
+extern const s16 cr_for_g[256];
+extern const s16 cb_for_g[256];
+extern const s16 cb_for_b[256];
 
 #define YCBCR_TO_RGB( y, cb, cr, r, g, b ) do { \
-     __u16 _y, _cb, _cr;\
-     __s16 _r, _g, _b;\
+     u16 _y, _cb, _cr;\
+     s16 _r, _g, _b;\
      _y  = y_for_rgb[(y)]; _cb = (cb); _cr = (cr);\
      _r  = _y + cr_for_r[_cr]; \
      _g  = _y + cr_for_g[_cr] + cb_for_g[_cb]; \
@@ -245,12 +245,12 @@
      (b) = CLAMP( _b, 0, 255 ); \
 } while (0)
 
-extern const __u16 y_from_ey[256];
-extern const __u16 cb_from_bey[512];
-extern const __u16 cr_from_rey[512];
+extern const u16 y_from_ey[256];
+extern const u16 cb_from_bey[512];
+extern const u16 cr_from_rey[512];
 
 #define RGB_TO_YCBCR( r, g, b, y, cb, cr ) do { \
-     __u32 _ey, _r, _g, _b;\
+     u32 _ey, _r, _g, _b;\
      _r = (r); _g = (g); _b = (b);\
      _ey = (19595 * _r + 38469 * _g + 7471 * _b) >> 16;\
      (y)  = y_from_ey[_ey]; \
@@ -262,94 +262,94 @@
 
 DFBSurfacePixelFormat dfb_pixelformat_for_depth( int depth );
 
-__u32 dfb_color_to_pixel( DFBSurfacePixelFormat format,
-                          __u8 r, __u8 g, __u8 b );
+u32 dfb_color_to_pixel( DFBSurfacePixelFormat format,
+                        u8 r, u8 g, u8 b );
 
 const char *dfb_pixelformat_name( DFBSurfacePixelFormat format );
 
-static inline __u32
+static inline u32
 dfb_color_to_argb( const DFBColor *color )
 {
      return (color->a << 24) | (color->r << 16) | (color->g << 8) | color->b;
 }
 
-static inline __u32
+static inline u32
 dfb_color_to_aycbcr( const DFBColor *color )
 {
      unsigned int red   = color->r;
      unsigned int green = color->g;
      unsigned int blue  = color->b;
 
-     __u8 y  = (__u8)(((66 * red + 129 * green + 25 * blue) / 256) + 16);
+     u8 y  = (u8)(((66 * red + 129 * green + 25 * blue) / 256) + 16);
 
-     __u8 cb = (__u8)((128 * 256 -  38 * red   - 74 * green + 112 * blue) / 256);
-     __u8 cr = (__u8)((128 * 256 + 112 * red   - 94 * green -  18 * blue) / 256);
+     u8 cb = (u8)((128 * 256 -  38 * red   - 74 * green + 112 * blue) / 256);
+     u8 cr = (u8)((128 * 256 + 112 * red   - 94 * green -  18 * blue) / 256);
 
      return (color->a << 24) | (y << 16) | (cb << 8) | cr;
 }
 
 static inline void
-dfb_argb_to_rgb332( __u32 *src, __u8 *dst, int len )
+dfb_argb_to_rgb332( u32 *src, u8 *dst, int len )
 {
      int i;
 
      for (i=0; i<len; i++) {
-          register __u32 argb = src[i];
+          register u32 argb = src[i];
 
           dst[i] = RGB32_TO_RGB332( argb );
      }
 }
 
 static inline void
-dfb_argb_to_argb1555( __u32 *src, __u16 *dst, int len )
+dfb_argb_to_argb1555( u32 *src, u16 *dst, int len )
 {
      int i;
 
      for (i=0; i<len; i++) {
-          register __u32 argb = src[i];
+          register u32 argb = src[i];
 
           dst[i] = ARGB_TO_ARGB1555( argb );
      }
 }
 
 static inline void
-dfb_argb_to_argb2554( __u32 *src, __u16 *dst, int len )
+dfb_argb_to_argb2554( u32 *src, u16 *dst, int len )
 {
      int i;
 
      for (i=0; i<len; i++) {
-          register __u32 argb = src[i];
+          register u32 argb = src[i];
 
           dst[i] = ARGB_TO_ARGB2554( argb );
      }
 }
 
 static inline void
-dfb_argb_to_argb4444( __u32 *src, __u16 *dst, int len )
+dfb_argb_to_argb4444( u32 *src, u16 *dst, int len )
 {
      int i;
 
      for (i=0; i<len; i++) {
-          register __u32 argb = src[i];
+          register u32 argb = src[i];
 
           dst[i] = ARGB_TO_ARGB4444( argb );
      }
 }
 
 static inline void
-dfb_argb_to_rgb16( __u32 *src, __u16 *dst, int len )
+dfb_argb_to_rgb16( u32 *src, u16 *dst, int len )
 {
      int i;
 
      for (i=0; i<len; i++) {
-          register __u32 argb = src[i];
+          register u32 argb = src[i];
 
           dst[i] = RGB32_TO_RGB16( argb );
      }
 }
 
 static inline void
-dfb_argb_to_a8( __u32 *src, __u8 *dst, int len )
+dfb_argb_to_a8( u32 *src, u8 *dst, int len )
 {
      int i;
 
Index: src/gfx/generic/generic.c
===================================================================
RCS file: /cvs/directfb/DirectFB/src/gfx/generic/generic.c,v
retrieving revision 1.207
diff -u -r1.207 generic.c
--- src/gfx/generic/generic.c	4 Oct 2006 10:12:43 -0000	1.207
+++ src/gfx/generic/generic.c	7 Oct 2006 19:54:50 -0000
@@ -66,8 +66,8 @@
 
 
 /* lookup tables for 2/3bit to 8bit color conversion */
-static const __u8 lookup3to8[] = { 0x00, 0x24, 0x49, 0x6d, 0x92, 0xb6, 0xdb, 0xff};
-static const __u8 lookup2to8[] = { 0x00, 0x55, 0xaa, 0xff};
+static const u8 lookup3to8[] = { 0x00, 0x24, 0x49, 0x6d, 0x92, 0xb6, 0xdb, 0xff};
+static const u8 lookup2to8[] = { 0x00, 0x55, 0xaa, 0xff};
 
 #define EXPAND_1to8(v)   ((v) ? 0xff : 0x00)
 #define EXPAND_2to8(v)   (lookup2to8[v])
@@ -99,16 +99,16 @@
 {
      int    w;
      int    l   = gfxs->length;
-     __u32 *D   = gfxs->Aop[0];
-     __u32  Cop = gfxs->Cop;
+     u32   *D   = gfxs->Aop[0];
+     u32    Cop = gfxs->Cop;
 
-     __u32 DCop = ((Cop << 16) | Cop);
+     u32 DCop = ((Cop << 16) | Cop);
 
      if (((long)D)&2) {         /* align */
-          __u16* tmp = (__u16*) D;
+          u16* tmp = (u16*) D;
           --l;
           *tmp = Cop;
-          D = (__u32*)(tmp+1);
+          D = (u32*)(tmp+1);
      }
 
      w = (l >> 1);
@@ -119,19 +119,19 @@
      }
 
      if (l & 1)                 /* do the last ential pixel */
-          *((__u16*)D) = (__u16)Cop;
+          *((u16*)D) = (u16)Cop;
 }
 
 static void Cop_to_Aop_6666( GenefxState *gfxs )
 {
      int   w = gfxs->length;
-     __u8 *D = gfxs->Aop[0];
+     u8   *D = gfxs->Aop[0];
 
      /* use top 6 bits */
-     __u8 r = gfxs->color.r >> 2 & 0x3F;
-     __u8 g = gfxs->color.g >> 2 & 0x3F;
-     __u8 b = gfxs->color.b >> 2 & 0x3F;
-     __u8 a = gfxs->color.a >>2 & 0x3F;
+     u8 r = gfxs->color.r >> 2 & 0x3F;
+     u8 g = gfxs->color.g >> 2 & 0x3F;
+     u8 b = gfxs->color.b >> 2 & 0x3F;
+     u8 a = gfxs->color.a >>2 & 0x3F;
 
      while (w) {
           D[0] =  b | (g << 6 );
@@ -145,13 +145,13 @@
 static void Cop_to_Aop_1666( GenefxState *gfxs )
 {
      int   w = gfxs->length;
-     __u8 *D = gfxs->Aop[0];
+     u8   *D = gfxs->Aop[0];
 
      /* use top 6 bits */
-     __u8 r = gfxs->color.r >> 2 & 0x3F;
-     __u8 g = gfxs->color.g >> 2 & 0x3F;
-     __u8 b = gfxs->color.b >> 2 & 0x3F;
-     __u8 a = gfxs->color.a != 0 ? 1:0;
+     u8 r = gfxs->color.r >> 2 & 0x3F;
+     u8 g = gfxs->color.g >> 2 & 0x3F;
+     u8 b = gfxs->color.b >> 2 & 0x3F;
+     u8 a = gfxs->color.a != 0 ? 1:0;
      while (w) {
           D[0] =  b | (g << 6 );
           D[1] = ( g >> 2 ) |(r << 4 );
@@ -164,12 +164,12 @@
 static void Cop_to_Aop_18( GenefxState *gfxs )
 {
      int   w = gfxs->length;
-     __u8 *D = gfxs->Aop[0];
+     u8   *D = gfxs->Aop[0];
 
      /* use top 6 bits */
-     __u8 r = gfxs->color.r >> 2;
-     __u8 g = gfxs->color.g >> 2;
-     __u8 b = gfxs->color.b >> 2;
+     u8 r = gfxs->color.r >> 2;
+     u8 g = gfxs->color.g >> 2;
+     u8 b = gfxs->color.b >> 2;
 
      while (w) {
           D[0] =  b | (g << 6 );
@@ -183,7 +183,7 @@
 static void Cop_to_Aop_24( GenefxState *gfxs )
 {
      int   w = gfxs->length;
-     __u8 *D = gfxs->Aop[0];
+     u8   *D = gfxs->Aop[0];
 
      while (w) {
           D[0] = gfxs->color.b;
@@ -198,8 +198,8 @@
 static void Cop_to_Aop_32( GenefxState *gfxs )
 {
      int    w   = gfxs->length;
-     __u32 *D   = gfxs->Aop[0];
-     __u32  Cop = gfxs->Cop;
+     u32   *D   = gfxs->Aop[0];
+     u32    Cop = gfxs->Cop;
 
      while (w--)
           *D++ = Cop;
@@ -209,8 +209,8 @@
 {
      int    l;
      int    w   = gfxs->length;
-     __u16 *D   = gfxs->Aop[0];
-     __u32  Cop = gfxs->Cop;
+     u16   *D   = gfxs->Aop[0];
+     u32    Cop = gfxs->Cop;
 
      if ((long)D & 2) {
 #ifdef WORDS_BIGENDIAN
@@ -222,7 +222,7 @@
      }
 
      for (l = w>>1; l--;) {
-          *((__u32*)D) = Cop;
+          *((u32*)D) = Cop;
           D += 2;
      }
 
@@ -249,9 +249,9 @@
      memset( gfxs->Aop[0], gfxs->YCop, gfxs->length );
     
      if (gfxs->dst_format == DSPF_NV16 || gfxs->AopY & 1) {
-          __u16 *D   = gfxs->Aop[1];
+          u16   *D   = gfxs->Aop[1];
           int    w   = gfxs->length>>1;
-          __u16  Cop = gfxs->CbCop | (gfxs->CrCop << 8);
+          u16    Cop = gfxs->CbCop | (gfxs->CrCop << 8);
           
           while (w--)
                *D++ = Cop;
@@ -263,9 +263,9 @@
      memset( gfxs->Aop[0], gfxs->YCop, gfxs->length );
     
      if (gfxs->AopY & 1) {
-          __u16 *D   = gfxs->Aop[1];
+          u16   *D   = gfxs->Aop[1];
           int    w   = gfxs->length>>1;
-          __u16  Cop = gfxs->CrCop | (gfxs->CbCop << 8);
+          u16    Cop = gfxs->CrCop | (gfxs->CbCop << 8);
           
           while (w--)
                *D++ = Cop;
@@ -305,9 +305,9 @@
 static void Cop_toK_Aop_8( GenefxState *gfxs )
 {
      int    w    = gfxs->length;
-     __u8  *D    = gfxs->Aop[0];
-     __u32  Cop  = gfxs->Cop;
-     __u32  Dkey = gfxs->Dkey;
+     u8    *D    = gfxs->Aop[0];
+     u32    Cop  = gfxs->Cop;
+     u32    Dkey = gfxs->Dkey;
 
      while (w--) {
           if (Dkey == *D)
@@ -320,9 +320,9 @@
 static void Cop_toK_Aop_12( GenefxState *gfxs )
 {
      int    w    = gfxs->length;
-     __u16 *D    = gfxs->Aop[0];
-     __u32  Cop  = gfxs->Cop;
-     __u32  Dkey = gfxs->Dkey;
+     u16   *D    = gfxs->Aop[0];
+     u32    Cop  = gfxs->Cop;
+     u32    Dkey = gfxs->Dkey;
 
      while (w--) {
           if (Dkey == (*D & 0x0FFF))
@@ -335,9 +335,9 @@
 static void Cop_toK_Aop_14( GenefxState *gfxs )
 {
      int    w    = gfxs->length;
-     __u16 *D    = gfxs->Aop[0];
-     __u32  Cop  = gfxs->Cop;
-     __u32  Dkey = gfxs->Dkey;
+     u16   *D    = gfxs->Aop[0];
+     u32    Cop  = gfxs->Cop;
+     u32    Dkey = gfxs->Dkey;
 
      while (w--) {
           if (Dkey == (*D & 0x3FFF))
@@ -350,9 +350,9 @@
 static void Cop_toK_Aop_15( GenefxState *gfxs )
 {
      int    w    = gfxs->length;
-     __u16 *D    = gfxs->Aop[0];
-     __u32  Cop  = gfxs->Cop;
-     __u32  Dkey = gfxs->Dkey;
+     u16   *D    = gfxs->Aop[0];
+     u32    Cop  = gfxs->Cop;
+     u32    Dkey = gfxs->Dkey;
 
      while (w--) {
           if (Dkey == (*D & 0x7FFF))
@@ -365,9 +365,9 @@
 static void Cop_toK_Aop_16( GenefxState *gfxs )
 {
      int    w    = gfxs->length;
-     __u16 *D    = gfxs->Aop[0];
-     __u32  Cop  = gfxs->Cop;
-     __u32  Dkey = gfxs->Dkey;
+     u16   *D    = gfxs->Aop[0];
+     u32    Cop  = gfxs->Cop;
+     u32    Dkey = gfxs->Dkey;
 
      while (w--) {
           if (Dkey == *D)
@@ -380,16 +380,16 @@
 static void Cop_toK_Aop_6666( GenefxState *gfxs )
 {
      int   w   = gfxs->length;
-     __u8 *D   = gfxs->Aop[0];
-     __u8  Dkr = (gfxs->Dkey & 0xff0000) >> 16;
-     __u8  Dkg = (gfxs->Dkey & 0x00ff00) >>  8;
-     __u8  Dkb = (gfxs->Dkey & 0x0000ff);
+     u8   *D   = gfxs->Aop[0];
+     u8    Dkr = (gfxs->Dkey & 0xff0000) >> 16;
+     u8    Dkg = (gfxs->Dkey & 0x00ff00) >>  8;
+     u8    Dkb = (gfxs->Dkey & 0x0000ff);
 
      /* use top 6 bits */
-     __u8 r = gfxs->color.r >> 2;
-     __u8 g = gfxs->color.g >> 2;
-     __u8 b = gfxs->color.b >> 2;
-     __u8 a = gfxs->color.a >> 2;
+     u8 r = gfxs->color.r >> 2;
+     u8 g = gfxs->color.g >> 2;
+     u8 b = gfxs->color.b >> 2;
+     u8 a = gfxs->color.a >> 2;
 
      while (w) {
         if (D[0] == Dkb && D[1] == Dkg && D[2] == Dkr) {
@@ -405,16 +405,16 @@
 static void Cop_toK_Aop_1666( GenefxState *gfxs )
 {
      int   w   = gfxs->length;
-     __u8 *D   = gfxs->Aop[0];
-     __u8  Dkr = (gfxs->Dkey & 0xff0000) >> 16;
-     __u8  Dkg = (gfxs->Dkey & 0x00ff00) >>  8;
-     __u8  Dkb = (gfxs->Dkey & 0x0000ff);
+     u8   *D   = gfxs->Aop[0];
+     u8    Dkr = (gfxs->Dkey & 0xff0000) >> 16;
+     u8    Dkg = (gfxs->Dkey & 0x00ff00) >>  8;
+     u8    Dkb = (gfxs->Dkey & 0x0000ff);
 
      /* use top 6 bits */
-     __u8 r = gfxs->color.r >> 2;
-     __u8 g = gfxs->color.g >> 2;
-     __u8 b = gfxs->color.b >> 2;
-     __u8 a = gfxs->color.a != 0 ? 1:0;
+     u8 r = gfxs->color.r >> 2;
+     u8 g = gfxs->color.g >> 2;
+     u8 b = gfxs->color.b >> 2;
+     u8 a = gfxs->color.a != 0 ? 1:0;
 
      while (w) {
         if (D[0] == Dkb && D[1] == Dkg && D[2] == Dkr) {
@@ -430,15 +430,15 @@
 static void Cop_toK_Aop_18( GenefxState *gfxs )
 {
      int   w   = gfxs->length;
-     __u8 *D   = gfxs->Aop[0];
-     __u8  Dkr = (gfxs->Dkey & 0xff0000) >> 16;
-     __u8  Dkg = (gfxs->Dkey & 0x00ff00) >>  8;
-     __u8  Dkb = (gfxs->Dkey & 0x0000ff);
+     u8   *D   = gfxs->Aop[0];
+     u8    Dkr = (gfxs->Dkey & 0xff0000) >> 16;
+     u8    Dkg = (gfxs->Dkey & 0x00ff00) >>  8;
+     u8    Dkb = (gfxs->Dkey & 0x0000ff);
 
      /* use top 6 bits */
-     __u8 r = gfxs->color.r >> 2 & 0xF3;
-     __u8 g = gfxs->color.g >> 2 & 0xF3;
-     __u8 b = gfxs->color.b >> 2 & 0xF3;
+     u8 r = gfxs->color.r >> 2 & 0xF3;
+     u8 g = gfxs->color.g >> 2 & 0xF3;
+     u8 b = gfxs->color.b >> 2 & 0xF3;
 
      while (w) {
         if (D[0] == Dkb && D[1] == Dkg && D[2] == Dkr) {
@@ -455,10 +455,10 @@
 static void Cop_toK_Aop_24( GenefxState *gfxs )
 {
      int   w   = gfxs->length;
-     __u8 *D   = gfxs->Aop[0];
-     __u8  Dkr = (gfxs->Dkey & 0xff0000) >> 16;
-     __u8  Dkg = (gfxs->Dkey & 0x00ff00) >>  8;
-     __u8  Dkb = (gfxs->Dkey & 0x0000ff);
+     u8   *D   = gfxs->Aop[0];
+     u8    Dkr = (gfxs->Dkey & 0xff0000) >> 16;
+     u8    Dkg = (gfxs->Dkey & 0x00ff00) >>  8;
+     u8    Dkb = (gfxs->Dkey & 0x0000ff);
 
      while (w--) {
           if (D[0] == Dkb && D[1] == Dkg && D[2] == Dkr) {
@@ -474,9 +474,9 @@
 static void Cop_toK_Aop_32( GenefxState *gfxs )
 {
      int    w    = gfxs->length;
-     __u32 *D    = gfxs->Aop[0];
-     __u32  Cop  = gfxs->Cop;
-     __u32  Dkey = gfxs->Dkey;
+     u32   *D    = gfxs->Aop[0];
+     u32    Cop  = gfxs->Cop;
+     u32    Dkey = gfxs->Dkey;
 
      while (w--) {
           if (Dkey == (*D & 0xffffff))
@@ -490,9 +490,9 @@
 {
      int    l;
      int    w     = gfxs->length;
-     __u16 *D     = gfxs->Aop[0];
-     __u32  Cop   = gfxs->Cop;
-     __u32  Dkey  = gfxs->Dkey;
+     u16   *D     = gfxs->Aop[0];
+     u32    Cop   = gfxs->Cop;
+     u32    Dkey  = gfxs->Dkey;
 
      if ((long)D & 2) {
 #ifdef WORDS_BIGENDIAN
@@ -507,8 +507,8 @@
      }
 
      for (l = w>>1; l--;) {
-          if (*((__u32*)D) == Dkey)
-               *((__u32*)D) = Cop;
+          if (*((u32*)D) == Dkey)
+               *((u32*)D) = Cop;
           D += 2;
      }
 
@@ -526,9 +526,9 @@
 static void Cop_toK_Aop_alut44( GenefxState *gfxs )
 {
      int    w    = gfxs->length;
-     __u8  *D    = gfxs->Aop[0];
-     __u32  Cop  = gfxs->Cop;
-     __u32  Dkey = gfxs->Dkey;
+     u8    *D    = gfxs->Aop[0];
+     u32    Cop  = gfxs->Cop;
+     u32    Dkey = gfxs->Dkey;
 
      while (w--) {
           if (Dkey == (*D & 0x0F))
@@ -649,22 +649,22 @@
 {
      int    w;
      int    l    = gfxs->length;
-     __u32 *D    = gfxs->Aop[0];
-     __u32 *S    = gfxs->Bop[0];
-     __u32  Skey = gfxs->Skey & 0x7FFF;
+     u32   *D    = gfxs->Aop[0];
+     u32   *S    = gfxs->Bop[0];
+     u32    Skey = gfxs->Skey & 0x7FFF;
 
-     __u32 DSkey = (Skey << 16) | Skey;
+     u32 DSkey = (Skey << 16) | Skey;
 
      /* in the case when only one start is misaligned we have to be more
         careful copying the pixels to avoid crossing 32bit boundaries */
      if (((long)D + (long)S) & 2) {
-          __u16 *d = gfxs->Aop[0];
-          __u16 *s = gfxs->Bop[0];
+          u16 *d = gfxs->Aop[0];
+          u16 *s = gfxs->Bop[0];
 
           w = l; 
           while (w) {
-               __u16 mpixel = *s;
-               if ((mpixel & 0x7FFF) != (__u16)Skey) {
+               u16 mpixel = *s;
+               if ((mpixel & 0x7FFF) != (u16)Skey) {
                     *d = mpixel;
                }
                ++d;
@@ -674,19 +674,19 @@
      }
      else {
           if (((long)D)&2) {         /* align */
-               __u16 *tmp = gfxs->Aop[0];
+               u16 *tmp = gfxs->Aop[0];
                --l;
-               if ((*((__u16*)S) & 0x7FFF) != Skey)
-                    *tmp = *((__u16*)S);
+               if ((*((u16*)S) & 0x7FFF) != Skey)
+                    *tmp = *((u16*)S);
 
-               D = (__u32*)((__u16*)D+1);
-               S = (__u32*)((__u16*)S+1);
+               D = (u32*)((u16*)D+1);
+               S = (u32*)((u16*)S+1);
           }
 
           w = (l >> 1);
           while (w) {
-               __u32 dpixel = *S;
-               __u16 *tmp = (__u16*)D;
+               u32 dpixel = *S;
+               u16 *tmp = (u16*)D;
 
                if ((dpixel & 0x7FFF7FFF) != DSkey) {
                     if ((dpixel & 0x7FFF0000) != (DSkey & 0x7FFF0000)) {
@@ -695,17 +695,17 @@
                          }
                          else {
 #ifdef WORDS_BIGENDIAN
-                              tmp[0] = (__u16)(dpixel >> 16);
+                              tmp[0] = (u16)(dpixel >> 16);
 #else
-                              tmp[1] = (__u16)(dpixel >> 16);
+                              tmp[1] = (u16)(dpixel >> 16);
 #endif
                          }
                     }
                     else {
 #ifdef WORDS_BIGENDIAN
-                         tmp[1] = (__u16)dpixel;
+                         tmp[1] = (u16)dpixel;
 #else
-                         tmp[0] = (__u16)dpixel;
+                         tmp[0] = (u16)dpixel;
 #endif
                     }
                }
@@ -715,8 +715,8 @@
           }
 
           if (l & 1) {                 /* do the last potential pixel */
-               if ((*(__u16*)S & 0x7FFF) != Skey)
-                    *((__u16*)D) = *((__u16*)S);
+               if ((*(u16*)S & 0x7FFF) != Skey)
+                    *((u16*)D) = *((u16*)S);
           }
      }
 }
@@ -725,22 +725,22 @@
 static void Bop_rgb16_Kto_Aop( GenefxState *gfxs )
 {
      int    w, l = gfxs->length;
-     __u32 *D    = gfxs->Aop[0];
-     __u32 *S    = gfxs->Bop[0];
-     __u32  Skey = gfxs->Skey;
+     u32   *D    = gfxs->Aop[0];
+     u32   *S    = gfxs->Bop[0];
+     u32    Skey = gfxs->Skey;
 
-     __u32 DSkey = (Skey << 16) | Skey;
+     u32 DSkey = (Skey << 16) | Skey;
 
      /* in the case when only one start is misaligned we have to be more
         careful copying the pixels to avoid crossing 32bit boundaries */
      if (((long)D + (long)S) & 2) {
-          __u16 *d = gfxs->Aop[0];
-          __u16 *s = gfxs->Bop[0];
+          u16 *d = gfxs->Aop[0];
+          u16 *s = gfxs->Bop[0];
 
           w = l; 
           while (w) {
-               __u16 mpixel = *s;
-               if (mpixel != (__u16)Skey) {
+               u16 mpixel = *s;
+               if (mpixel != (u16)Skey) {
                     *d = mpixel;
                }
                ++d;
@@ -750,19 +750,19 @@
      }
      else {
           if (((long)D)&2) {         /* align */
-               __u16 *tmp = gfxs->Aop[0];
+               u16 *tmp = gfxs->Aop[0];
                --l;
-               if (*((__u16*)S) != Skey)
-                    *tmp = *((__u16*)S);
+               if (*((u16*)S) != Skey)
+                    *tmp = *((u16*)S);
      
-               D = (__u32*)((__u16*)D+1);
-               S = (__u32*)((__u16*)S+1);
+               D = (u32*)((u16*)D+1);
+               S = (u32*)((u16*)S+1);
           }
      
           w = (l >> 1);
           while (w) {
-               __u32 dpixel = *S;
-               __u16 *tmp = (__u16*)D;
+               u32 dpixel = *S;
+               u16 *tmp = (u16*)D;
      
                if (dpixel != DSkey) {
                     if ((dpixel & 0xFFFF0000) != (DSkey & 0xFFFF0000)) {
@@ -771,17 +771,17 @@
                          }
                          else {
 #ifdef WORDS_BIGENDIAN
-                              tmp[0] = (__u16)(dpixel >> 16);
+                              tmp[0] = (u16)(dpixel >> 16);
 #else
-                              tmp[1] = (__u16)(dpixel >> 16);
+                              tmp[1] = (u16)(dpixel >> 16);
 #endif
                          }
                     }
                     else {
 #ifdef WORDS_BIGENDIAN
-                         tmp[1] = (__u16)dpixel;
+                         tmp[1] = (u16)dpixel;
 #else
-                         tmp[0] = (__u16)dpixel;
+                         tmp[0] = (u16)dpixel;
 #endif
                     }
                }
@@ -791,8 +791,8 @@
           }
      
           if (l & 1) {                 /* do the last potential pixel */
-               if (*((__u16*)S) != Skey)
-                    *((__u16*)D) = *((__u16*)S);
+               if (*((u16*)S) != Skey)
+                    *((u16*)D) = *((u16*)S);
           }
      }
 }
@@ -801,9 +801,9 @@
 {
 
      int    w     = gfxs->length;
-     __u8  *D     = gfxs->Aop[0];
-     __u8  *S     = gfxs->Bop[0];
-     __u32  Skey  = gfxs->Skey;
+     u8    *D     = gfxs->Aop[0];
+     u8    *S     = gfxs->Bop[0];
+     u32    Skey  = gfxs->Skey;
      int    Ostep = gfxs->Ostep;
 
      if (Ostep < 0) {
@@ -812,11 +812,11 @@
      }
 
      while (w--) {
-          __u8 b = *S;
-          __u8 g = *(S+1);
-          __u8 r = *(S+2);
+          u8 b = *S;
+          u8 g = *(S+1);
+          u8 r = *(S+2);
 
-          if (Skey != (__u32)(r<<16 | g<<8 | b )) {
+          if (Skey != (u32)(r<<16 | g<<8 | b )) {
                r = r >> 2;
                g = g >> 2;
                b = b >> 2;
@@ -834,9 +834,9 @@
 {
 
      int    w     = gfxs->length;
-     __u8  *D     = gfxs->Aop[0];
-     __u8  *S     = gfxs->Bop[0];
-     __u32  Skey  = gfxs->Skey;
+     u8    *D     = gfxs->Aop[0];
+     u8    *S     = gfxs->Bop[0];
+     u32    Skey  = gfxs->Skey;
      int    Ostep = gfxs->Ostep;
 
      if (Ostep < 0) {
@@ -845,11 +845,11 @@
      }
 
      while (w--) {
-          __u8 b = *S;
-          __u8 g = *(S+1);
-          __u8 r = *(S+2);
+          u8 b = *S;
+          u8 g = *(S+1);
+          u8 r = *(S+2);
 
-          if (Skey != (__u32)(r<<16 | g<<8 | b )) {
+          if (Skey != (u32)(r<<16 | g<<8 | b )) {
                r = r >> 2;
                g = g >> 2;
                b = b >> 2;
@@ -867,9 +867,9 @@
 {
 
      int    w     = gfxs->length;
-     __u8  *D     = gfxs->Aop[0];
-     __u8  *S     = gfxs->Bop[0];
-     __u32  Skey  = gfxs->Skey;
+     u8    *D     = gfxs->Aop[0];
+     u8    *S     = gfxs->Bop[0];
+     u32    Skey  = gfxs->Skey;
      int    Ostep = gfxs->Ostep;
 
      if (Ostep < 0) {
@@ -878,11 +878,11 @@
      }
 
      while (w--) {
-          __u8 b = *S;
-          __u8 g = *(S+1);
-          __u8 r = *(S+2);
+          u8 b = *S;
+          u8 g = *(S+1);
+          u8 r = *(S+2);
 
-          if (Skey != (__u32)(r<<16 | g<<8 | b )) {
+          if (Skey != (u32)(r<<16 | g<<8 | b )) {
                r = r >> 2;
                g = g >> 2;
                b = b >> 2;
@@ -899,9 +899,9 @@
 static void Bop_rgb24_Kto_Aop( GenefxState *gfxs )
 {
      int    w     = gfxs->length;
-     __u8  *D     = gfxs->Aop[0];
-     __u8  *S     = gfxs->Bop[0];
-     __u32  Skey  = gfxs->Skey;
+     u8    *D     = gfxs->Aop[0];
+     u8    *S     = gfxs->Bop[0];
+     u32    Skey  = gfxs->Skey;
      int    Ostep = gfxs->Ostep;
 
      if (Ostep < 0) {
@@ -910,11 +910,11 @@
      }
 
      while (w--) {
-          __u8 b = *S;
-          __u8 g = *(S+1);
-          __u8 r = *(S+2);
+          u8 b = *S;
+          u8 g = *(S+1);
+          u8 r = *(S+2);
 
-          if (Skey != (__u32)(r<<16 | g<<8 | b )) {
+          if (Skey != (u32)(r<<16 | g<<8 | b )) {
                *D     = b;
                *(D+1) = g;
                *(D+2) = r;
@@ -928,9 +928,9 @@
 static void Bop_rgb32_Kto_Aop( GenefxState *gfxs )
 {
      int    w     = gfxs->length;
-     __u32 *D     = gfxs->Aop[0];
-     __u32 *S     = gfxs->Bop[0];
-     __u32  Skey  = gfxs->Skey;
+     u32   *D     = gfxs->Aop[0];
+     u32   *S     = gfxs->Bop[0];
+     u32    Skey  = gfxs->Skey;
      int    Ostep = gfxs->Ostep;
 
      if (Ostep < 0) {
@@ -939,7 +939,7 @@
      }
 
      while (w--) {
-          __u32 spixel = *S;
+          u32 spixel = *S;
 
           if ((spixel & 0xffffff) != Skey)
                *D = spixel;
@@ -959,9 +959,9 @@
 {
      int    l;
      int    w     = gfxs->length;
-     __u16 *D     = gfxs->Aop[0];
-     __u16 *S     = gfxs->Bop[0];
-     __u32  Skey  = gfxs->Skey;
+     u16   *D     = gfxs->Aop[0];
+     u16   *S     = gfxs->Bop[0];
+     u32    Skey  = gfxs->Skey;
      int    Ostep = gfxs->Ostep;
 
      if (Ostep < 0) {
@@ -970,7 +970,7 @@
      }
 
      if ((long)D & 2) {
-          __u16 s = *S;
+          u16 s = *S;
 #ifdef WORDS_BIGENDIAN
           if (s != (Skey >> 16))
                *D = s;
@@ -989,17 +989,17 @@
      }
 
      for (l = w>>1; l--;) {
-          __u32 s = *((__u32*)S);
+          u32 s = *((u32*)S);
 
           if (s != Skey)
-               *((__u32*)D) = s;
+               *((u32*)D) = s;
 
           S += Ostep << 1;
           D += Ostep << 1;
      }
 
      if (w & 1) {
-          __u16 s = *S;
+          u16 s = *S;
 #ifdef WORDS_BIGENDIAN
           if (s != (Skey & 0xffff))
                *D = s;
@@ -1017,7 +1017,7 @@
 
 #define SET_PIXEL( D, S )               \
      do {                               \
-          register __u32 s = S;         \
+          register u32 s = S;           \
                                         \
           if (s != Skey)                \
                D = s;                   \
@@ -1027,9 +1027,9 @@
 {
      int    i;
      int    w     = gfxs->length;
-     __u8  *D     = gfxs->Aop[0];
-     __u8  *S     = gfxs->Bop[0];
-     __u32  Skey  = gfxs->Skey;
+     u8    *D     = gfxs->Aop[0];
+     u8    *S     = gfxs->Bop[0];
+     u32    Skey  = gfxs->Skey;
 
      if (gfxs->Ostep > 0) {
           SET_PIXEL_DUFFS_DEVICE( D, S, w );
@@ -1047,9 +1047,9 @@
 static void Bop_alut44_Kto_Aop( GenefxState *gfxs )
 {
      int    w     = gfxs->length;
-     __u8  *D     = gfxs->Aop[0];
-     __u8  *S     = gfxs->Bop[0];
-     __u32  Skey  = gfxs->Skey;
+     u8    *D     = gfxs->Aop[0];
+     u8    *S     = gfxs->Bop[0];
+     u32    Skey  = gfxs->Skey;
      int    Ostep = gfxs->Ostep;
 
      if (Ostep < 0) {
@@ -1058,7 +1058,7 @@
      }
 
      while (w--) {
-          __u8 spixel = *S;
+          u8 spixel = *S;
 
           if ((spixel & 0x0F) != Skey)
                *D = spixel;
@@ -1071,9 +1071,9 @@
 static void Bop_argb2554_Kto_Aop( GenefxState *gfxs )
 {
      int    w     = gfxs->length;
-     __u16 *D     = gfxs->Aop[0];
-     __u16 *S     = gfxs->Bop[0];
-     __u16  Skey  = gfxs->Skey;
+     u16   *D     = gfxs->Aop[0];
+     u16   *S     = gfxs->Bop[0];
+     u16    Skey  = gfxs->Skey;
      int    Ostep = gfxs->Ostep;
 
      if (Ostep < 0) {
@@ -1082,7 +1082,7 @@
      }
 
      while (w--) {
-          __u16 spixel = *S;
+          u16 spixel = *S;
 
           if ((spixel & 0x3FFF) != Skey)
                *D = spixel;
@@ -1095,9 +1095,9 @@
 static void Bop_argb4444_Kto_Aop( GenefxState *gfxs )
 {
      int    w     = gfxs->length;
-     __u16 *D     = gfxs->Aop[0];
-     __u16 *S     = gfxs->Bop[0];
-     __u16  Skey  = gfxs->Skey;
+     u16   *D     = gfxs->Aop[0];
+     u16   *S     = gfxs->Bop[0];
+     u16    Skey  = gfxs->Skey;
      int    Ostep = gfxs->Ostep;
 
      if (Ostep < 0) {
@@ -1106,7 +1106,7 @@
      }
 
      while (w--) {
-          __u16 spixel = *S;
+          u16 spixel = *S;
 
           if ((spixel & 0x0FFF) != Skey)
                *D = spixel;
@@ -1150,44 +1150,44 @@
 static void Bop_rgb15_toK_Aop( GenefxState *gfxs )
 {
      int    w, l = gfxs->length;
-     __u32 *D    = gfxs->Aop[0];
-     __u32 *S    = gfxs->Bop[0];
-     __u32  Lkey = gfxs->Dkey;
-     __u32  Hkey = Lkey << 16;
+     u32   *D    = gfxs->Aop[0];
+     u32   *S    = gfxs->Bop[0];
+     u32    Lkey = gfxs->Dkey;
+     u32    Hkey = Lkey << 16;
 
      if (((long)D)&2) {         /* align */
-          __u16 *tmp = gfxs->Aop[0];
+          u16 *tmp = gfxs->Aop[0];
           --l;
-          if (*((__u16*)D) == Lkey)
-               *tmp = *((__u16*)S);
+          if (*((u16*)D) == Lkey)
+               *tmp = *((u16*)S);
 
-          D = (__u32*)((__u16*)D+1);
-          S = (__u32*)((__u16*)S+1);
+          D = (u32*)((u16*)D+1);
+          S = (u32*)((u16*)S+1);
      }
 
      w = (l >> 1);
      while (w) {
-          __u32 dpixel = *D;
+          u32 dpixel = *D;
 
           if ((dpixel & 0x7FFF0000) == Hkey) {
                if ((dpixel & 0x00007FFF) == Lkey) {
                     *D = *S;
                }
                else {
-                    __u16 *tmp = (__u16*)D;
+                    u16 *tmp = (u16*)D;
 #ifdef WORDS_BIGENDIAN
-                    tmp[0] = (__u16)(*S >> 16);
+                    tmp[0] = (u16)(*S >> 16);
 #else
-                    tmp[1] = (__u16)(*S >> 16);
+                    tmp[1] = (u16)(*S >> 16);
 #endif
                }
           }
           else if ((dpixel & 0x00007FFF) == Lkey) {
-               __u16 *tmp = (__u16*)D;
+               u16 *tmp = (u16*)D;
 #ifdef WORDS_BIGENDIAN
-               tmp[1] = (__u16)*S;
+               tmp[1] = (u16)*S;
 #else
-               tmp[0] = (__u16)*S;
+               tmp[0] = (u16)*S;
 #endif
           }
           ++S;
@@ -1196,8 +1196,8 @@
      }
 
      if (l & 1) {                 /* do the last potential pixel */
-          if (*((__u16*)D) == Lkey)
-               *((__u16*)D) = *((__u16*)S);
+          if (*((u16*)D) == Lkey)
+               *((u16*)D) = *((u16*)S);
      }
 
 }
@@ -1205,26 +1205,26 @@
 static void Bop_rgb16_toK_Aop( GenefxState *gfxs )
 {
      int    w, l = gfxs->length;
-     __u32 *D    = gfxs->Aop[0];
-     __u32 *S    = gfxs->Bop[0];
-     __u32  Dkey = gfxs->Dkey;
+     u32   *D    = gfxs->Aop[0];
+     u32   *S    = gfxs->Bop[0];
+     u32    Dkey = gfxs->Dkey;
 
-     __u32 DDkey = (Dkey << 16) | Dkey;
+     u32 DDkey = (Dkey << 16) | Dkey;
 
      if (((long)D)&2) {         /* align */
-          __u16 *tmp = gfxs->Aop[0];
+          u16 *tmp = gfxs->Aop[0];
           --l;
-          if (*((__u16*)D) == Dkey)
-               *tmp = *((__u16*)S);
+          if (*((u16*)D) == Dkey)
+               *tmp = *((u16*)S);
 
-          D = (__u32*)((__u16*)D+1);
-          S = (__u32*)((__u16*)S+1);
+          D = (u32*)((u16*)D+1);
+          S = (u32*)((u16*)S+1);
      }
 
      w = (l >> 1);
      while (w) {
-          __u32 dpixel = *D;
-          __u16 *tmp = (__u16*)D;
+          u32 dpixel = *D;
+          u16 *tmp = (u16*)D;
 
           if ((dpixel & 0xFFFF0000) == (DDkey & 0xFFFF0000)) {
                if ((dpixel & 0x0000FFFF) == (DDkey & 0x0000FFFF)) {
@@ -1232,17 +1232,17 @@
                }
                else {
 #ifdef WORDS_BIGENDIAN
-                    tmp[0] = (__u16)(*S >> 16);
+                    tmp[0] = (u16)(*S >> 16);
 #else
-                    tmp[1] = (__u16)(*S >> 16);
+                    tmp[1] = (u16)(*S >> 16);
 #endif
                }
           }
           else if ((dpixel & 0x0000FFFF) == (DDkey & 0x0000FFFF)) {
 #ifdef WORDS_BIGENDIAN
-               tmp[1] = (__u16)*S;
+               tmp[1] = (u16)*S;
 #else
-               tmp[0] = (__u16)*S;
+               tmp[0] = (u16)*S;
 #endif
           }
           ++S;
@@ -1251,25 +1251,25 @@
      }
 
      if (l & 1) {                 /* do the last potential pixel */
-          if (*((__u16*)D) == Dkey)
-               *((__u16*)D) = *((__u16*)S);
+          if (*((u16*)D) == Dkey)
+               *((u16*)D) = *((u16*)S);
      }
 }
 
 static void Bop_argb6666_toK_Aop( GenefxState *gfxs )
 {
      int    w     = gfxs->length;
-     __u8  *D     = gfxs->Aop[0];
-     __u8  *S     = gfxs->Bop[0];
-     __u8  Dkr  = (gfxs->Dkey & 0xff0000) >> 16;
-     __u8  Dkg  = (gfxs->Dkey & 0x00ff00) >>  8;
-     __u8  Dkb  = (gfxs->Dkey & 0x0000ff);
+     u8    *D     = gfxs->Aop[0];
+     u8    *S     = gfxs->Bop[0];
+     u8     Dkr   = (gfxs->Dkey & 0xff0000) >> 16;
+     u8     Dkg   = (gfxs->Dkey & 0x00ff00) >>  8;
+     u8     Dkb   = (gfxs->Dkey & 0x0000ff);
 
      while (w--) {
           if (D[0] == Dkb && D[1] == Dkg && D[2] == Dkr) {
-               __u8 b = S[0] >>2;
-               __u8 g = S[1] >> 2;
-               __u8 r = S[2] >> 2;
+               u8 b = S[0] >>2;
+               u8 g = S[1] >> 2;
+               u8 r = S[2] >> 2;
                *D     = b | (g << 6 );
                *(D+1) = ( g >> 2 ) |(r << 4 );
                *(D+2) = (r >> 4) | 0xfc;
@@ -1282,17 +1282,17 @@
 static void Bop_argb1666_toK_Aop( GenefxState *gfxs )
 {
      int    w     = gfxs->length;
-     __u8  *D     = gfxs->Aop[0];
-     __u8  *S     = gfxs->Bop[0];
-     __u8  Dkr  = (gfxs->Dkey & 0xff0000) >> 16;
-     __u8  Dkg  = (gfxs->Dkey & 0x00ff00) >>  8;
-     __u8  Dkb  = (gfxs->Dkey & 0x0000ff);
+     u8    *D     = gfxs->Aop[0];
+     u8    *S     = gfxs->Bop[0];
+     u8     Dkr   = (gfxs->Dkey & 0xff0000) >> 16;
+     u8     Dkg   = (gfxs->Dkey & 0x00ff00) >>  8;
+     u8     Dkb   = (gfxs->Dkey & 0x0000ff);
 
      while (w--) {
           if (D[0] == Dkb && D[1] == Dkg && D[2] == Dkr) {
-               __u8 b = S[0] >>2;
-               __u8 g = S[1] >> 2;
-               __u8 r = S[2] >> 2;
+               u8 b = S[0] >>2;
+               u8 g = S[1] >> 2;
+               u8 r = S[2] >> 2;
                *D     = b | (g << 6 );
                *(D+1) = ( g >> 2 ) |(r << 4 );
                *(D+2) = (r >> 4) | 0x4;
@@ -1305,17 +1305,17 @@
 static void Bop_rgb18_toK_Aop( GenefxState *gfxs )
 {
      int    w     = gfxs->length;
-     __u8  *D     = gfxs->Aop[0];
-     __u8  *S     = gfxs->Bop[0];
-     __u8  Dkr  = (gfxs->Dkey & 0xff0000) >> 16;
-     __u8  Dkg  = (gfxs->Dkey & 0x00ff00) >>  8;
-     __u8  Dkb  = (gfxs->Dkey & 0x0000ff);
+     u8    *D     = gfxs->Aop[0];
+     u8    *S     = gfxs->Bop[0];
+     u8     Dkr   = (gfxs->Dkey & 0xff0000) >> 16;
+     u8     Dkg   = (gfxs->Dkey & 0x00ff00) >>  8;
+     u8     Dkb   = (gfxs->Dkey & 0x0000ff);
 
      while (w--) {
           if (D[0] == Dkb && D[1] == Dkg && D[2] == Dkr) {
-               __u8 b = S[0] >>2;
-               __u8 g = S[1] >> 2;
-               __u8 r = S[2] >> 2;
+               u8 b = S[0] >>2;
+               u8 g = S[1] >> 2;
+               u8 r = S[2] >> 2;
                *D     = b | (g << 6 );
                *(D+1) = ( g >> 2 ) |(r << 4 );
                *(D+2) = (r >> 4) | 0xfc;
@@ -1328,11 +1328,11 @@
 static void Bop_rgb24_toK_Aop( GenefxState *gfxs )
 {
       int   w    = gfxs->length;
-      __u8 *S    = gfxs->Bop[0];
-      __u8 *D    = gfxs->Aop[0];
-      __u8  Dkr  = (gfxs->Dkey & 0xff0000) >> 16;
-      __u8  Dkg  = (gfxs->Dkey & 0x00ff00) >>  8;
-      __u8  Dkb  = (gfxs->Dkey & 0x0000ff);
+      u8   *S    = gfxs->Bop[0];
+      u8   *D    = gfxs->Aop[0];
+      u8    Dkr  = (gfxs->Dkey & 0xff0000) >> 16;
+      u8    Dkg  = (gfxs->Dkey & 0x00ff00) >>  8;
+      u8    Dkb  = (gfxs->Dkey & 0x0000ff);
 
       while (w--) {
            if (D[0] == Dkb && D[1] == Dkg && D[2] == Dkr) {
@@ -1348,9 +1348,9 @@
 static void Bop_rgb32_toK_Aop( GenefxState *gfxs )
 {
       int    w    = gfxs->length;
-      __u32 *S    = gfxs->Bop[0];
-      __u32 *D    = gfxs->Aop[0];
-      __u32  Dkey = gfxs->Dkey;
+      u32   *S    = gfxs->Bop[0];
+      u32   *D    = gfxs->Aop[0];
+      u32    Dkey = gfxs->Dkey;
 
       while (w--) {
            if (Dkey == *D) {
@@ -1364,9 +1364,9 @@
 static void Bop_argb_toK_Aop( GenefxState *gfxs )
 {
       int    w    = gfxs->length;
-      __u32 *S    = gfxs->Bop[0];
-      __u32 *D    = gfxs->Aop[0];
-      __u32  Dkey = gfxs->Dkey & 0xffffff;
+      u32   *S    = gfxs->Bop[0];
+      u32   *D    = gfxs->Aop[0];
+      u32    Dkey = gfxs->Dkey & 0xffffff;
 
       while (w--) {
            if (Dkey == (*D & 0xffffff)) {
@@ -1381,9 +1381,9 @@
 {
      int    l;
      int    w     = gfxs->length;
-     __u16 *S     = gfxs->Bop[0];
-     __u16 *D     = gfxs->Aop[0];
-     __u32  Dkey  = gfxs->Dkey;
+     u16   *S     = gfxs->Bop[0];
+     u16   *D     = gfxs->Aop[0];
+     u32    Dkey  = gfxs->Dkey;
      int    Ostep = gfxs->Ostep;
 
      if (Ostep < 0) {
@@ -1430,9 +1430,9 @@
 static void Bop_rgb332_toK_Aop( GenefxState *gfxs )
 {
       int   w    = gfxs->length;
-      __u8 *S    = gfxs->Bop[0];
-      __u8 *D    = gfxs->Aop[0];
-      __u8  Dkey = gfxs->Dkey;
+      u8   *S    = gfxs->Bop[0];
+      u8   *D    = gfxs->Aop[0];
+      u8    Dkey = gfxs->Dkey;
 
       while (w--) {
            if (*D == Dkey) {
@@ -1446,9 +1446,9 @@
 static void Bop_argb2554_toK_Aop( GenefxState *gfxs )
 {
      int    w     = gfxs->length;
-     __u16 *D     = gfxs->Aop[0];
-     __u16 *S     = gfxs->Bop[0];
-     __u16  Dkey  = gfxs->Dkey;
+     u16   *D     = gfxs->Aop[0];
+     u16   *S     = gfxs->Bop[0];
+     u16    Dkey  = gfxs->Dkey;
      int    Ostep = gfxs->Ostep;
 
      if (Ostep < 0) {
@@ -1468,9 +1468,9 @@
 static void Bop_argb4444_toK_Aop( GenefxState *gfxs )
 {
      int    w     = gfxs->length;
-     __u16 *D     = gfxs->Aop[0];
-     __u16 *S     = gfxs->Bop[0];
-     __u16  Dkey  = gfxs->Dkey;
+     u16   *D     = gfxs->Aop[0];
+     u16   *S     = gfxs->Bop[0];
+     u16    Dkey  = gfxs->Dkey;
      int    Ostep = gfxs->Ostep;
 
      if (Ostep < 0) {
@@ -1552,13 +1552,13 @@
      int    w2;
      int    w      = gfxs->length;
      int    i      = gfxs->Xphase;
-     __u32 *D      = gfxs->Aop[0];
-     __u16 *S      = gfxs->Bop[0];
+     u32   *D      = gfxs->Aop[0];
+     u16   *S      = gfxs->Bop[0];
      int    SperD  = gfxs->SperD;
      int    SperD2 = SperD << 1;
 
      if (((long)D)&2) {
-          *(__u16*)D = *S;
+          *(u16*)D = *S;
           i += SperD;
           w--;
           D = gfxs->Aop[0] + 2;
@@ -1574,7 +1574,7 @@
           i += SperD2;
      }
      if (w&1) {
-          *(__u16*)D = S[i>>16];
+          *(u16*)D = S[i>>16];
      }
 }
 
@@ -1582,16 +1582,16 @@
 {
      int   w     = gfxs->length;
      int   i     = 0;
-     __u8 *D     = gfxs->Aop[0];
-     __u8 *S     = gfxs->Bop[0];
+     u8   *D     = gfxs->Aop[0];
+     u8   *S     = gfxs->Bop[0];
      int   SperD = gfxs->SperD;
 
      while (w--) {
           int pixelstart = (i>>16)*3;
 
-          __u8 b = S[pixelstart+0] >> 2;
-          __u8 g = S[pixelstart+1] >> 2;
-          __u8 r = S[pixelstart+2] >> 2;
+          u8 b = S[pixelstart+0] >> 2;
+          u8 g = S[pixelstart+1] >> 2;
+          u8 r = S[pixelstart+2] >> 2;
           *D++ = b | (g << 6 );
           *D++ = ( g >> 2 ) |(r << 4 );
           *D++ = (r >> 4) | 0xfc;
@@ -1603,16 +1603,16 @@
 {
      int   w     = gfxs->length;
      int   i     = 0;
-     __u8 *D     = gfxs->Aop[0];
-     __u8 *S     = gfxs->Bop[0];
+     u8   *D     = gfxs->Aop[0];
+     u8   *S     = gfxs->Bop[0];
      int   SperD = gfxs->SperD;
 
      while (w--) {
           int pixelstart = (i>>16)*3;
 
-          __u8 b = S[pixelstart+0] >> 2;
-          __u8 g = S[pixelstart+1] >> 2;
-          __u8 r = S[pixelstart+2] >> 2;
+          u8 b = S[pixelstart+0] >> 2;
+          u8 g = S[pixelstart+1] >> 2;
+          u8 r = S[pixelstart+2] >> 2;
           *D++ = b | (g << 6 );
           *D++ = ( g >> 2 ) |(r << 4 );
           *D++ = (r >> 4) | 0x4;
@@ -1624,16 +1624,16 @@
 {
      int   w     = gfxs->length;
      int   i     = 0;
-     __u8 *D     = gfxs->Aop[0];
-     __u8 *S     = gfxs->Bop[0];
+     u8   *D     = gfxs->Aop[0];
+     u8   *S     = gfxs->Bop[0];
      int   SperD = gfxs->SperD;
 
      while (w--) {
           int pixelstart = (i>>16)*3;
 
-          __u8 b = S[pixelstart+0] >> 2;
-          __u8 g = S[pixelstart+1] >> 2;
-          __u8 r = S[pixelstart+2] >> 2;
+          u8 b = S[pixelstart+0] >> 2;
+          u8 g = S[pixelstart+1] >> 2;
+          u8 r = S[pixelstart+2] >> 2;
           *D++ = b | (g << 6 );
           *D++ = ( g >> 2 ) |(r << 4 );
           *D++ = (r >> 4) | 0xfc;
@@ -1646,8 +1646,8 @@
 {
      int   w     = gfxs->length;
      int   i     = gfxs->Xphase;
-     __u8 *D     = gfxs->Aop[0];
-     __u8 *S     = gfxs->Bop[0];
+     u8   *D     = gfxs->Aop[0];
+     u8   *S     = gfxs->Bop[0];
      int   SperD = gfxs->SperD;
 
      while (w--) {
@@ -1665,8 +1665,8 @@
 {
      int    w     = gfxs->length;
      int    i     = gfxs->Xphase;
-     __u32 *D     = gfxs->Aop[0];
-     __u32 *S     = gfxs->Bop[0];
+     u32   *D     = gfxs->Aop[0];
+     u32   *S     = gfxs->Bop[0];
      int    SperD = gfxs->SperD;
 
      while (w--) {
@@ -1681,8 +1681,8 @@
      int    l;
      int    w     = gfxs->length;
      int    i     = gfxs->Xphase;
-     __u16 *D     = gfxs->Aop[0];
-     __u16 *S     = gfxs->Bop[0];
+     u16   *D     = gfxs->Aop[0];
+     u16   *S     = gfxs->Bop[0];
      int    SperD = gfxs->SperD;
 
      if ((long)D & 2) {
@@ -1692,9 +1692,9 @@
      }
 
      for (l = w>>1; l--;) {
-          register __u32 d;
+          register u32 d;
 
-          d  = ((__u32*)S)[i>>17] & 0xff00ff00;
+          d  = ((u32*)S)[i>>17] & 0xff00ff00;
 #ifdef WORDS_BIGENDIAN
           d |= (S[i>>16]          & 0x00ff) << 16;
           d |= (S[(i+SperD)>>16]  & 0x00ff);
@@ -1702,7 +1702,7 @@
           d |= (S[i>>16]          & 0x00ff);
           d |= (S[(i+SperD)>>16]  & 0x00ff) << 16;
 #endif
-          *((__u32*)D) = d;
+          *((u32*)D) = d;
           D += 2;
 
           i += SperD << 1;
@@ -1716,8 +1716,8 @@
 {
      int   w     = gfxs->length;
      int   i     = gfxs->Xphase;
-     __u8 *D     = gfxs->Aop[0];
-     __u8 *S     = gfxs->Bop[0];
+     u8   *D     = gfxs->Aop[0];
+     u8   *S     = gfxs->Bop[0];
      int   SperD = gfxs->SperD;
 
      while (w--) {
@@ -1732,8 +1732,8 @@
      int    l;
      int    w     = gfxs->length;
      int    i     = gfxs->Xphase;
-     __u16 *D     = gfxs->Aop[0];
-     __u16 *S     = gfxs->Bop[0];
+     u16   *D     = gfxs->Aop[0];
+     u16   *S     = gfxs->Bop[0];
      int    SperD = gfxs->SperD;
 
      if ((long)D & 2) {
@@ -1743,9 +1743,9 @@
      }
 
      for (l = w>>1; l--;) {
-          register __u32 d;
+          register u32 d;
 
-          d  = ((__u32*)S)[i>>17] & 0x00ff00ff;
+          d  = ((u32*)S)[i>>17] & 0x00ff00ff;
 #ifdef WORDS_BIGENDIAN
           d |= (S[i>>16]          & 0xff00) << 16;
           d |= (S[(i+SperD)>>16]  & 0xff00);
@@ -1753,7 +1753,7 @@
           d |= (S[i>>16]          & 0xff00);
           d |= (S[(i+SperD)>>16]  & 0xff00) << 16;
 #endif
-          *((__u32*)D) = d;
+          *((u32*)D) = d;
           D += 2;
 
           i += SperD << 1;
@@ -1767,8 +1767,8 @@
 {
      int   w     = gfxs->length;
      int   i     = gfxs->Xphase;
-     __u8 *Dy    = gfxs->Aop[0];
-     __u8 *Sy    = gfxs->Bop[0];
+     u8   *Dy    = gfxs->Aop[0];
+     u8   *Sy    = gfxs->Bop[0];
      int   SperD = gfxs->SperD;
     
      while (w--) {
@@ -1778,10 +1778,10 @@
      }
      
      if (gfxs->AopY & 1) {
-          __u8 *Du = gfxs->Aop[1];
-          __u8 *Dv = gfxs->Aop[2]; 
-          __u8 *Su = gfxs->Bop[1];
-          __u8 *Sv = gfxs->Bop[2];  
+          u8 *Du = gfxs->Aop[1];
+          u8 *Dv = gfxs->Aop[2];
+          u8 *Su = gfxs->Bop[1];
+          u8 *Sv = gfxs->Bop[2];
     
           for (w = gfxs->length>>1, i = 0; w--;) {
                *Du++ = Su[i>>16];
@@ -1801,8 +1801,8 @@
 {
      int   w     = gfxs->length;
      int   i     = gfxs->Xphase;
-     __u8 *Dy    = gfxs->Aop[0];
-     __u8 *Sy    = gfxs->Bop[0];
+     u8   *Dy    = gfxs->Aop[0];
+     u8   *Sy    = gfxs->Bop[0];
      int   SperD = gfxs->SperD;
      
      while (w--) {
@@ -1812,8 +1812,8 @@
      }
           
      if (gfxs->dst_format == DSPF_NV16 || gfxs->AopY & 1) {
-          __u16 *Duv = gfxs->Aop[1];
-          __u16 *Suv = gfxs->Bop[1];
+          u16 *Duv = gfxs->Aop[1];
+          u16 *Suv = gfxs->Bop[1];
 
           for (w = gfxs->length>>1, i = 0; w--;) {
                *Duv++ = Suv[i>>16];
@@ -1857,13 +1857,13 @@
 {
      int    w     = gfxs->length;
      int    i     = 0;
-     __u16 *D     = gfxs->Aop[0];
-     __u16 *S     = gfxs->Bop[0];
-     __u32  Skey  = gfxs->Skey;
+     u16   *D     = gfxs->Aop[0];
+     u16   *S     = gfxs->Bop[0];
+     u32    Skey  = gfxs->Skey;
      int    SperD = gfxs->SperD;
 
      while (w--) {
-          __u16 s = S[i>>16];
+          u16 s = S[i>>16];
 
           if ((s & 0x7FFF) != Skey)
                *D = s;
@@ -1877,13 +1877,13 @@
 {
      int    w     = gfxs->length;
      int    i     = 0;
-     __u16 *D     = gfxs->Aop[0];
-     __u16 *S     = gfxs->Bop[0];
-     __u32  Skey  = gfxs->Skey;
+     u16   *D     = gfxs->Aop[0];
+     u16   *S     = gfxs->Bop[0];
+     u32    Skey  = gfxs->Skey;
      int    SperD = gfxs->SperD;
 
      while (w--) {
-          __u16 s = S[i>>16];
+          u16 s = S[i>>16];
 
           if (s != Skey)
                *D = s;
@@ -1897,18 +1897,18 @@
 {
      int   w     = gfxs->length;
      int   i     = 0;
-     __u8 *D     = gfxs->Aop[0];
-     __u8 *S     = gfxs->Bop[0];
-     __u32  Skey  = gfxs->Skey;
-     int    SperD = gfxs->SperD;
+     u8   *D     = gfxs->Aop[0];
+     u8   *S     = gfxs->Bop[0];
+     u32   Skey  = gfxs->Skey;
+     int   SperD = gfxs->SperD;
 
      while (w--) {
           int pixelstart = (i>>16)*3;
 
-          __u8 b = S[pixelstart+0];
-          __u8 g = S[pixelstart+1];
-          __u8 r = S[pixelstart+2];
-          if (Skey != (__u32)(r<<16 | g<<8 | b )) {
+          u8 b = S[pixelstart+0];
+          u8 g = S[pixelstart+1];
+          u8 r = S[pixelstart+2];
+          if (Skey != (u32)(r<<16 | g<<8 | b )) {
                b = b >> 2;
                g = g >> 2;
                r = r >> 2;
@@ -1924,18 +1924,18 @@
 {
      int   w     = gfxs->length;
      int   i     = 0;
-     __u8 *D     = gfxs->Aop[0];
-     __u8 *S     = gfxs->Bop[0];
-     __u32  Skey  = gfxs->Skey;
-     int    SperD = gfxs->SperD;
+     u8   *D     = gfxs->Aop[0];
+     u8   *S     = gfxs->Bop[0];
+     u32   Skey  = gfxs->Skey;
+     int   SperD = gfxs->SperD;
 
      while (w--) {
           int pixelstart = (i>>16)*3;
 
-          __u8 b = S[pixelstart+0];
-          __u8 g = S[pixelstart+1];
-          __u8 r = S[pixelstart+2];
-          if (Skey != (__u32)(r<<16 | g<<8 | b )) {
+          u8 b = S[pixelstart+0];
+          u8 g = S[pixelstart+1];
+          u8 r = S[pixelstart+2];
+          if (Skey != (u32)(r<<16 | g<<8 | b )) {
                b = b >> 2;
                g = g >> 2;
                r = r >> 2;
@@ -1951,18 +1951,18 @@
 {
      int   w     = gfxs->length;
      int   i     = 0;
-     __u8 *D     = gfxs->Aop[0];
-     __u8 *S     = gfxs->Bop[0];
-     __u32  Skey  = gfxs->Skey;
-     int    SperD = gfxs->SperD;
+     u8   *D     = gfxs->Aop[0];
+     u8   *S     = gfxs->Bop[0];
+     u32   Skey  = gfxs->Skey;
+     int   SperD = gfxs->SperD;
 
      while (w--) {
           int pixelstart = (i>>16)*3;
 
-          __u8 b = S[pixelstart+0];
-          __u8 g = S[pixelstart+1];
-          __u8 r = S[pixelstart+2];
-          if (Skey != (__u32)(r<<16 | g<<8 | b )) {
+          u8 b = S[pixelstart+0];
+          u8 g = S[pixelstart+1];
+          u8 r = S[pixelstart+2];
+          if (Skey != (u32)(r<<16 | g<<8 | b )) {
                b = b >> 2;
                g = g >> 2;
                r = r >> 2;
@@ -1978,19 +1978,19 @@
 {
      int    w     = gfxs->length;
      int    i     = 0;
-     __u8  *D     = gfxs->Aop[0];
-     __u8  *S     = gfxs->Bop[0];
-     __u32  Skey  = gfxs->Skey;
+     u8    *D     = gfxs->Aop[0];
+     u8    *S     = gfxs->Bop[0];
+     u32    Skey  = gfxs->Skey;
      int    SperD = gfxs->SperD;
 
      while (w--) {
           int pixelstart = (i>>16)*3;
 
-          __u8 b = S[pixelstart+0];
-          __u8 g = S[pixelstart+1];
-          __u8 r = S[pixelstart+2];
+          u8 b = S[pixelstart+0];
+          u8 g = S[pixelstart+1];
+          u8 r = S[pixelstart+2];
 
-          if (Skey != (__u32)(r<<16 | g<<8 | b )) {
+          if (Skey != (u32)(r<<16 | g<<8 | b )) {
                *D     = b;
                *(D+1) = g;
                *(D+2) = r;
@@ -2005,13 +2005,13 @@
 {
      int    w     = gfxs->length;
      int    i     = 0;
-     __u32 *D     = gfxs->Aop[0];
-     __u32 *S     = gfxs->Bop[0];
-     __u32  Skey  = gfxs->Skey;
+     u32   *D     = gfxs->Aop[0];
+     u32   *S     = gfxs->Bop[0];
+     u32    Skey  = gfxs->Skey;
      int    SperD = gfxs->SperD;
 
      while (w--) {
-          __u32 s = S[i>>16];
+          u32 s = S[i>>16];
 
           if ((s & 0xffffff) != Skey)
                *D = s;
@@ -2025,8 +2025,8 @@
 {
      int   w     = gfxs->length;
      int   i     = 0;
-     __u8 *D     = gfxs->Aop[0];
-     __u8 *S     = gfxs->Bop[0];
+     u8   *D     = gfxs->Aop[0];
+     u8   *S     = gfxs->Bop[0];
      int   SperD = gfxs->SperD;
 
      /* no color to key */
@@ -2042,20 +2042,20 @@
      int    l;
      int    w     = gfxs->length;
      int    i     = 0;
-     __u16 *D     = gfxs->Aop[0];
-     __u16 *S     = gfxs->Bop[0];
-     __u32  Skey  = gfxs->Skey;
+     u16   *D     = gfxs->Aop[0];
+     u16   *S     = gfxs->Bop[0];
+     u32    Skey  = gfxs->Skey;
 #ifdef WORDS_BIGENDIAN
-     __u16  Skey0 = gfxs->Skey >> 16;
-     __u16  Skey1 = gfxs->Skey & 0xffff;
+     u16    Skey0 = gfxs->Skey >> 16;
+     u16    Skey1 = gfxs->Skey & 0xffff;
 #else
-     __u16  Skey0 = gfxs->Skey & 0xffff;
-     __u16  Skey1 = gfxs->Skey >> 16;
+     u16    Skey0 = gfxs->Skey & 0xffff;
+     u16    Skey1 = gfxs->Skey >> 16;
 #endif
      int    SperD = gfxs->SperD;
 
      if ((long)D & 2) {
-          __u16 s = *S;
+          u16 s = *S;
           if (s != Skey0)
                *D = s;
           D++;
@@ -2064,9 +2064,9 @@
      }
 
      for (l = w>>1; l--;) {
-          register __u32 s;
+          register u32 s;
 
-          s  = ((__u32*)S)[i>>17] & 0xff00ff00;
+          s  = ((u32*)S)[i>>17] & 0xff00ff00;
 #ifdef WORDS_BIGENDIAN
           s |= (S[i>>16]          & 0x00ff) << 16;
           s |= (S[(i+SperD)>>16]  & 0x00ff);
@@ -2075,14 +2075,14 @@
           s |= (S[(i+SperD)>>16]  & 0x00ff) << 16;
 #endif
           if (s != Skey)
-               *((__u32*)D) = s;
+               *((u32*)D) = s;
           D += 2;
 
           i += SperD << 1;
      }
 
      if (w & 1) {
-          __u16 s = S[i>>16];
+          u16 s = S[i>>16];
           if (i & 0x20000) {
                if (s != Skey1)
                     *D = s;
@@ -2097,13 +2097,13 @@
 {
      int    w     = gfxs->length;
      int    i     = 0;
-     __u8  *D     = gfxs->Aop[0];
-     __u8  *S     = gfxs->Bop[0];
-     __u32  Skey  = gfxs->Skey;
+     u8    *D     = gfxs->Aop[0];
+     u8    *S     = gfxs->Bop[0];
+     u32    Skey  = gfxs->Skey;
      int    SperD = gfxs->SperD;
 
      while (w--) {
-          __u8 s = S[i>>16];
+          u8 s = S[i>>16];
 
           if (s != Skey)
                *D = s;
@@ -2118,20 +2118,20 @@
      int    l;
      int    w     = gfxs->length;
      int    i     = 0;
-     __u16 *D     = gfxs->Aop[0];
-     __u16 *S     = gfxs->Bop[0];
-     __u32  Skey  = gfxs->Skey;
+     u16   *D     = gfxs->Aop[0];
+     u16   *S     = gfxs->Bop[0];
+     u32    Skey  = gfxs->Skey;
 #ifdef WORDS_BIGENDIAN
-     __u16  Skey0 = gfxs->Skey >> 16;
-     __u16  Skey1 = gfxs->Skey & 0xffff;
+     u16    Skey0 = gfxs->Skey >> 16;
+     u16    Skey1 = gfxs->Skey & 0xffff;
 #else
-     __u16  Skey0 = gfxs->Skey & 0xffff;
-     __u16  Skey1 = gfxs->Skey >> 16;
+     u16    Skey0 = gfxs->Skey & 0xffff;
+     u16    Skey1 = gfxs->Skey >> 16;
 #endif
      int    SperD = gfxs->SperD;
 
      if ((long)D & 2) {
-          __u16 s = *S;
+          u16 s = *S;
           if (s != Skey0)
                *D = s;
           D++;
@@ -2140,9 +2140,9 @@
      }
 
      for (l = w>>1; l--;) {
-          register __u32 s;
+          register u32 s;
 
-          s  = ((__u32*)S)[i>>17] & 0x00ff00ff;
+          s  = ((u32*)S)[i>>17] & 0x00ff00ff;
 #ifdef WORDS_BIGENDIAN
           s |= (S[i>>16]          & 0xff00) << 16;
           s |= (S[(i+SperD)>>16]  & 0xff00);
@@ -2151,14 +2151,14 @@
           s |= (S[(i+SperD)>>16]  & 0xff00) << 16;
 #endif
           if (s != Skey)
-               *((__u32*)D) = s;
+               *((u32*)D) = s;
           D += 2;
 
           i += SperD << 1;
      }
 
      if (w & 1) {
-          __u16 s = S[i>>16];
+          u16 s = S[i>>16];
           if (i & 0x20000) {
                if (s != Skey1)
                     *D = s;
@@ -2173,13 +2173,13 @@
 {
      int    w     = gfxs->length;
      int    i     = 0;
-     __u8  *D     = gfxs->Aop[0];
-     __u8  *S     = gfxs->Bop[0];
-     __u32  Skey  = gfxs->Skey;
+     u8    *D     = gfxs->Aop[0];
+     u8    *S     = gfxs->Bop[0];
+     u32    Skey  = gfxs->Skey;
      int    SperD = gfxs->SperD;
 
      while (w--) {
-          __u8 s = S[i>>16];
+          u8 s = S[i>>16];
 
           if ((s & 0x0f) != Skey)
                *D = s;
@@ -2193,13 +2193,13 @@
 {
      int    w     = gfxs->length;
      int    i     = 0;
-     __u16 *D     = gfxs->Aop[0];
-     __u16 *S     = gfxs->Bop[0];
-     __u32  Skey  = gfxs->Skey;
+     u16   *D     = gfxs->Aop[0];
+     u16   *S     = gfxs->Bop[0];
+     u32    Skey  = gfxs->Skey;
      int    SperD = gfxs->SperD;
 
      while (w--) {
-          __u16 s = S[i>>16];
+          u16 s = S[i>>16];
 
           if ((s & 0x3FFF) != Skey)
                *D = s;
@@ -2213,13 +2213,13 @@
 {
      int    w     = gfxs->length;
      int    i     = 0;
-     __u16 *D     = gfxs->Aop[0];
-     __u16 *S     = gfxs->Bop[0];
-     __u32  Skey  = gfxs->Skey;
+     u16   *D     = gfxs->Aop[0];
+     u16   *S     = gfxs->Bop[0];
+     u32    Skey  = gfxs->Skey;
      int    SperD = gfxs->SperD;
 
      while (w--) {
-          __u16 s = S[i>>16];
+          u16 s = S[i>>16];
 
           if ((s & 0x0FFF) != Skey)
                *D = s;
@@ -2326,10 +2326,10 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D = gfxs->Dacc;
-     __u16             *S = gfxs->Sop[0];
+     u16               *S = gfxs->Sop[0];
 
      while (w--) {
-          __u16 s = S[i>>16];
+          u16 s = S[i>>16];
 
           D->RGB.a = (s & 0x8000) ? 0xff : 0;
           D->RGB.r = (s & 0x7C00) >> 7;
@@ -2349,10 +2349,10 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D = gfxs->Dacc;
-     __u16             *S = gfxs->Sop[0];
+     u16               *S = gfxs->Sop[0];
 
      while (w--) {
-          __u16 s = S[i>>16];
+          u16 s = S[i>>16];
 
           D->RGB.a = 0xFF;
           D->RGB.r = (s & 0xF800) >> 8;
@@ -2372,15 +2372,15 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D = gfxs->Dacc;
-     __u8              *S = gfxs->Sop[0];
+     u8                *S = gfxs->Sop[0];
 
      while (w--) {
           int pixelstart = (i>>16)*3;
 
-          __u8 b = (S[pixelstart+0] & 0x3F) << 2;
-          __u8 g = (((S[pixelstart+0] >> 6) & 0x3) | ((S[pixelstart+1] & 0xF) << 2)) << 2 ;
-          __u8 r = (((S[pixelstart+1] >> 4) & 0xF) | (S[pixelstart+2] & 0x3 << 4)) << 2 ;
-          __u8 a = (( (S[pixelstart+2] >> 2) & 0x3F)) << 2;
+          u8 b = (S[pixelstart+0] & 0x3F) << 2;
+          u8 g = (((S[pixelstart+0] >> 6) & 0x3) | ((S[pixelstart+1] & 0xF) << 2)) << 2 ;
+          u8 r = (((S[pixelstart+1] >> 4) & 0xF) | (S[pixelstart+2] & 0x3 << 4)) << 2 ;
+          u8 a = (( (S[pixelstart+2] >> 2) & 0x3F)) << 2;
 
           D->RGB.a = a;
           D->RGB.r = r;
@@ -2398,15 +2398,15 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D = gfxs->Dacc;
-     __u8              *S = gfxs->Sop[0];
+     u8                *S = gfxs->Sop[0];
 
      while (w--) {
           int pixelstart = (i>>16)*3;
 
-          __u8 b = (S[pixelstart+0] & 0x3F) << 2;
-          __u8 g = (((S[pixelstart+0] >> 6) & 0x3) | ((S[pixelstart+1] & 0xF) << 2)) << 2 ;
-          __u8 r = (((S[pixelstart+1] >> 4) & 0xF) | (S[pixelstart+2] & 0x3 << 4)) << 2 ;
-          __u8 a = (( (S[pixelstart+2] >> 2) & 0x3F)) << 2;
+          u8 b = (S[pixelstart+0] & 0x3F) << 2;
+          u8 g = (((S[pixelstart+0] >> 6) & 0x3) | ((S[pixelstart+1] & 0xF) << 2)) << 2 ;
+          u8 r = (((S[pixelstart+1] >> 4) & 0xF) | (S[pixelstart+2] & 0x3 << 4)) << 2 ;
+          u8 a = (( (S[pixelstart+2] >> 2) & 0x3F)) << 2;
           a = (a == 1) ? 0xFF: 0; 
 
           D->RGB.a = a;
@@ -2425,14 +2425,14 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D = gfxs->Dacc;
-     __u8              *S = gfxs->Sop[0];
+     u8                *S = gfxs->Sop[0];
 
      while (w--) {
           int pixelstart = (i>>16)*3;
 
-          __u8 b = (S[pixelstart+0] & 0x3F) << 2;
-          __u8 g = (((S[pixelstart+0] >> 6) & 0x3) | ((S[pixelstart+1] & 0xF) << 2)) << 2 ;
-          __u8 r = (((S[pixelstart+1] >> 4) & 0xF) | (S[pixelstart+2] & 0x3 << 4)) << 2 ;
+          u8 b = (S[pixelstart+0] & 0x3F) << 2;
+          u8 g = (((S[pixelstart+0] >> 6) & 0x3) | ((S[pixelstart+1] & 0xF) << 2)) << 2 ;
+          u8 r = (((S[pixelstart+1] >> 4) & 0xF) | (S[pixelstart+2] & 0x3 << 4)) << 2 ;
 
           D->RGB.a = 0xFF;
           D->RGB.r = r;
@@ -2450,7 +2450,7 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D = gfxs->Dacc;
-     __u8              *S = gfxs->Sop[0];
+     u8                *S = gfxs->Sop[0];
 
      while (w--) {
           int pixelstart = (i>>16)*3;
@@ -2473,10 +2473,10 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D = gfxs->Dacc;
-     __u32             *S = gfxs->Sop[0];
+     u32               *S = gfxs->Sop[0];
 
      while (w--) {
-          __u32 s = S[i>>16];
+          u32 s = S[i>>16];
 
           D->RGB.a = 0xFF;
           D->RGB.r = (s & 0x00FF0000) >> 16;
@@ -2496,10 +2496,10 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D = gfxs->Dacc;
-     __u32             *S = gfxs->Sop[0];
+     u32               *S = gfxs->Sop[0];
 
      while (w--) {
-          __u32 s = S[i>>16];
+          u32 s = S[i>>16];
 
           D->RGB.a = (s & 0xFF000000) >> 24;
           D->RGB.r = (s & 0x00FF0000) >> 16;
@@ -2519,10 +2519,10 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D = gfxs->Dacc;
-     __u32             *S = gfxs->Sop[0];
+     u32               *S = gfxs->Sop[0];
 
      while (w--) {
-          __u32 s = S[i>>16];
+          u32 s = S[i>>16];
 
           D->RGB.a = ((s & 0xFF000000) >> 24) ^ 0xff;
           D->RGB.r = (s & 0x00FF0000) >> 16;
@@ -2542,10 +2542,10 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D = gfxs->Dacc;
-     __u8              *S = gfxs->Sop[0];
+     u8                *S = gfxs->Sop[0];
 
      while (w--) {
-          __u8 s = S[i>>16];
+          u8 s = S[i>>16];
 
           D->RGB.a = s;
           D->RGB.r = 0xFF;
@@ -2565,10 +2565,10 @@
      int  SperD = gfxs->SperD;
 
      GenefxAccumulator *D = gfxs->Dacc;
-     __u32             *S = gfxs->Sop[0];
+     u32               *S = gfxs->Sop[0];
 
      while (w--) {
-          __u32 s = S[i>>17];
+          u32 s = S[i>>17];
 
           D[0].YUV.a = D[1].YUV.a = 0xFF;
 #ifdef WORDS_BIGENDIAN
@@ -2578,15 +2578,15 @@
           D[0].YUV.u = D[1].YUV.u = (s & 0x0000FF00) >>  8;
           D[0].YUV.v = D[1].YUV.v = (s & 0xFF000000) >> 24;
 #endif
-          D[0].YUV.y = ((__u16*)S)[i>>16]         & 0x00FF;
-          D[1].YUV.y = ((__u16*)S)[(i+SperD)>>16] & 0x00FF;
+          D[0].YUV.y = ((u16*)S)[i>>16]         & 0x00FF;
+          D[1].YUV.y = ((u16*)S)[(i+SperD)>>16] & 0x00FF;
 
           D += 2;
           i += SperD << 1;
      }
 
      if (gfxs->length & 1) {
-          __u16 s = ((__u16*)S)[i>>17];
+          u16 s = ((u16*)S)[i>>17];
 
           D->YUV.a = 0xFF;
           D->YUV.y = s & 0xFF;
@@ -2602,10 +2602,10 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D = gfxs->Dacc;
-     __u8              *S = gfxs->Sop[0];
+     u8                *S = gfxs->Sop[0];
 
      while (w--) {
-          __u8 s = S[i>>16];
+          u8 s = S[i>>16];
 
           D->RGB.a = 0xFF;
           D->RGB.r = EXPAND_3to8(s >> 5);
@@ -2625,10 +2625,10 @@
      int  SperD = gfxs->SperD;
 
      GenefxAccumulator *D = gfxs->Dacc;
-     __u32             *S = gfxs->Sop[0];
+     u32               *S = gfxs->Sop[0];
 
      while (w--) {
-          __u32 s = S[i>>17];
+          u32 s = S[i>>17];
 
           D[0].YUV.a = D[1].YUV.a = 0xFF;
 #ifdef WORDS_BIGENDIAN
@@ -2638,15 +2638,15 @@
           D[0].YUV.u = D[1].YUV.u = (s & 0x000000FF);
           D[0].YUV.v = D[1].YUV.v = (s & 0x00FF0000) >> 16;
 #endif
-          D[0].YUV.y = (((__u16*)S)[i>>16]         & 0xFF00) >> 8;
-          D[1].YUV.y = (((__u16*)S)[(i+SperD)>>16] & 0xFF00) >> 8;
+          D[0].YUV.y = (((u16*)S)[i>>16]         & 0xFF00) >> 8;
+          D[1].YUV.y = (((u16*)S)[(i+SperD)>>16] & 0xFF00) >> 8;
 
           D += 2;
           i += SperD << 1;
      }
 
      if (gfxs->length & 1) {
-          __u16 s = ((__u16*)S)[i>>16];
+          u16 s = ((u16*)S)[i>>16];
 
           D->YUV.a = 0xFF;
           D->YUV.y = s >> 8;
@@ -2662,12 +2662,12 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D = gfxs->Dacc;
-     __u8              *S = gfxs->Sop[0];
+     u8                *S = gfxs->Sop[0];
 
      DFBColor *entries = gfxs->Slut->entries;
 
      while (w--) {
-          __u8 s = S[i>>16];
+          u8 s = S[i>>16];
 
           D->RGB.a = entries[s].a;
           D->RGB.r = entries[s].r;
@@ -2687,12 +2687,12 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D = gfxs->Dacc;
-     __u8              *S = gfxs->Sop[0];
+     u8                *S = gfxs->Sop[0];
 
      DFBColor *entries = gfxs->Slut->entries;
 
      while (w--) {
-          __u8 s = S[i>>16];
+          u8 s = S[i>>16];
 
           D->RGB.a = s & 0xF0;
           s &= 0x0F;
@@ -2713,10 +2713,10 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D = gfxs->Dacc;
-     __u16             *S = gfxs->Sop[0];
+     u16               *S = gfxs->Sop[0];
 
      while (w--) {
-          __u16 s = S[i>>16];
+          u16 s = S[i>>16];
 
           D->RGB.a = EXPAND_2to8((s         ) >> 14);
           D->RGB.r = EXPAND_5to8((s & 0x3E00) >>  9);
@@ -2736,10 +2736,10 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D = gfxs->Dacc;
-     __u16             *S = gfxs->Sop[0];
+     u16               *S = gfxs->Sop[0];
 
      while (w--) {
-          __u16 s = S[i>>16];
+          u16 s = S[i>>16];
 
           D->RGB.a = EXPAND_4to8((s         ) >> 12);
           D->RGB.r = EXPAND_4to8((s & 0x0F00) >>  8);
@@ -2759,9 +2759,9 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D  = gfxs->Dacc;
-     __u8              *Sy = gfxs->Sop[0];
-     __u8              *Su = gfxs->Sop[1];
-     __u8              *Sv = gfxs->Sop[2];
+     u8                *Sy = gfxs->Sop[0];
+     u8                *Su = gfxs->Sop[1];
+     u8                *Sv = gfxs->Sop[2];
 
      while (w--) {
           D->YUV.a = 0xFF;
@@ -2782,8 +2782,8 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D   = gfxs->Dacc;
-     __u8              *Sy  = gfxs->Sop[0];
-     __u16             *Suv = gfxs->Sop[1];
+     u8                *Sy  = gfxs->Sop[0];
+     u16               *Suv = gfxs->Sop[1];
      
      while (w--) {
           D->YUV.a = 0xFF;
@@ -2804,8 +2804,8 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D   = gfxs->Dacc;
-     __u8              *Sy  = gfxs->Sop[0];
-     __u16             *Svu = gfxs->Sop[1];
+     u8                *Sy  = gfxs->Sop[0];
+     u16               *Svu = gfxs->Sop[1];
      
      while (w--) {
           D->YUV.a = 0xFF;
@@ -2826,10 +2826,10 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D = gfxs->Dacc;
-     __u32             *S = gfxs->Sop[0];
+     u32               *S = gfxs->Sop[0];
 
      while (w--) {
-          __u32 s = S[i>>16];
+          u32 s = S[i>>16];
           
           D->YUV.a = (s >> 24);
           D->YUV.y = (s >> 16) & 0xff;
@@ -2879,11 +2879,11 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D    = gfxs->Dacc;
-     __u16             *S    = gfxs->Sop[0];
-     __u32              Skey = gfxs->Skey;
+     u16               *S    = gfxs->Sop[0];
+     u32                Skey = gfxs->Skey;
 
      while (w--) {
-          __u16 s = S[i>>16];
+          u16 s = S[i>>16];
 
           if ((s & 0x7fff) != Skey) {
                D->RGB.a = (s & 0x8000) ? 0xff : 0;
@@ -2907,11 +2907,11 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D    = gfxs->Dacc;
-     __u16             *S    = gfxs->Sop[0];
-     __u32              Skey = gfxs->Skey;
+     u16               *S    = gfxs->Sop[0];
+     u32                Skey = gfxs->Skey;
 
      while (w--) {
-          __u16 s = S[i>>16];
+          u16 s = S[i>>16];
 
           if (s != Skey) {
                D->RGB.a = 0xFF;
@@ -2933,20 +2933,20 @@
      int w     = gfxs->length;
      int i     = 0;
      int SperD = gfxs->SperD;
-     __u32 Skey = gfxs->Skey;
+     u32 Skey = gfxs->Skey;
 
      GenefxAccumulator *D = gfxs->Dacc;
-     __u8              *S = gfxs->Sop[0];
+     u8                *S = gfxs->Sop[0];
 
      while (w--) {
           int pixelstart = (i>>16)*3;
 
-          __u8 b = (S[pixelstart+0] & 0x3F) << 2;
-          __u8 g = (((S[pixelstart+0] >> 6) & 0x3) | ((S[pixelstart+1] & 0xF) << 2)) << 2 ;
-          __u8 r = (((S[pixelstart+1] >> 4) & 0xF) | (S[pixelstart+2] & 0x3 << 4)) << 2 ;
-          __u8 a = (( (S[pixelstart+2] >> 2) & 0x3F)) << 2;
+          u8 b = (S[pixelstart+0] & 0x3F) << 2;
+          u8 g = (((S[pixelstart+0] >> 6) & 0x3) | ((S[pixelstart+1] & 0xF) << 2)) << 2 ;
+          u8 r = (((S[pixelstart+1] >> 4) & 0xF) | (S[pixelstart+2] & 0x3 << 4)) << 2 ;
+          u8 a = (( (S[pixelstart+2] >> 2) & 0x3F)) << 2;
 
-          if (Skey != (__u32)(r<<16 | g<<8 | b )) {
+          if (Skey != (u32)(r<<16 | g<<8 | b )) {
                D->RGB.a = a;
                D->RGB.r = r;
                D->RGB.g = g;
@@ -2967,18 +2967,18 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D = gfxs->Dacc;
-     __u8              *S = gfxs->Sop[0];
-     __u32 Skey = gfxs->Skey;
+     u8                *S = gfxs->Sop[0];
+     u32                Skey = gfxs->Skey;
 
      while (w--) {
           int pixelstart = (i>>16)*3;
 
-          __u8 b = (S[pixelstart+0] & 0x3F) << 2;
-          __u8 g = (((S[pixelstart+0] >> 6) & 0x3) | ((S[pixelstart+1] & 0xF) << 2)) << 2 ;
-          __u8 r = (((S[pixelstart+1] >> 4) & 0xF) | (S[pixelstart+2] & 0x3 << 4)) << 2 ;
-          __u8 a = (( (S[pixelstart+2] >> 2) & 0x3F)) << 2;
+          u8 b = (S[pixelstart+0] & 0x3F) << 2;
+          u8 g = (((S[pixelstart+0] >> 6) & 0x3) | ((S[pixelstart+1] & 0xF) << 2)) << 2 ;
+          u8 r = (((S[pixelstart+1] >> 4) & 0xF) | (S[pixelstart+2] & 0x3 << 4)) << 2 ;
+          u8 a = (( (S[pixelstart+2] >> 2) & 0x3F)) << 2;
           a = (a == 1) ? 0xFF: 0; 
-          if (Skey != (__u32)(r<<16 | g<<8 | b )) {
+          if (Skey != (u32)(r<<16 | g<<8 | b )) {
                D->RGB.a = 0xFF;
                D->RGB.r = r;
                D->RGB.g = g;
@@ -2996,18 +2996,18 @@
      int w     = gfxs->length;
      int i     = 0;
      int SperD = gfxs->SperD;
-     __u32 Skey = gfxs->Skey;
+     u32  Skey = gfxs->Skey;
 
      GenefxAccumulator *D = gfxs->Dacc;
-     __u8              *S = gfxs->Sop[0];
+     u8                *S = gfxs->Sop[0];
 
      while (w--) {
           int pixelstart = (i>>16)*3;
-          __u8 b = (S[pixelstart+0] & 0x3F) << 2;
-          __u8 g = (((S[pixelstart+0] >> 6) & 0x3) | ((S[pixelstart+1] & 0xF) << 2)) << 2 ;
-          __u8 r = (((S[pixelstart+1] >> 4) & 0xF) | (S[pixelstart+2] & 0x3 << 4)) << 2 ;
+          u8 b = (S[pixelstart+0] & 0x3F) << 2;
+          u8 g = (((S[pixelstart+0] >> 6) & 0x3) | ((S[pixelstart+1] & 0xF) << 2)) << 2 ;
+          u8 r = (((S[pixelstart+1] >> 4) & 0xF) | (S[pixelstart+2] & 0x3 << 4)) << 2 ;
 
-          if (Skey != (__u32)(r<<16 | g<<8 | b )) {
+          if (Skey != (u32)(r<<16 | g<<8 | b )) {
                D->RGB.a = 0xFF;
                D->RGB.r = r;
                D->RGB.g = g;
@@ -3028,17 +3028,17 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D    = gfxs->Dacc;
-     __u8              *S    = gfxs->Sop[0];
-     __u32              Skey = gfxs->Skey;
+     u8                *S    = gfxs->Sop[0];
+     u32                Skey = gfxs->Skey;
 
      while (w--) {
           int pixelstart = (i>>16)*3;
 
-          __u8 b = S[pixelstart+0];
-          __u8 g = S[pixelstart+1];
-          __u8 r = S[pixelstart+2];
+          u8 b = S[pixelstart+0];
+          u8 g = S[pixelstart+1];
+          u8 r = S[pixelstart+2];
 
-          if (Skey != (__u32)(r<<16 | g<<8 | b )) {
+          if (Skey != (u32)(r<<16 | g<<8 | b )) {
                D->RGB.a = 0xFF;
                D->RGB.r = r;
                D->RGB.g = g;
@@ -3060,11 +3060,11 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D    = gfxs->Dacc;
-     __u32             *S    = gfxs->Sop[0];
-     __u32              Skey = gfxs->Skey;
+     u32               *S    = gfxs->Sop[0];
+     u32                Skey = gfxs->Skey;
 
      while (w--) {
-          __u32 s = S[i>>16] & 0x00FFFFFF;
+          u32 s = S[i>>16] & 0x00FFFFFF;
 
           if (s != Skey) {
                D->RGB.a = 0xFF;
@@ -3089,11 +3089,11 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D    = gfxs->Dacc;
-     __u32             *S    = gfxs->Sop[0];
-     __u32              Skey = gfxs->Skey;
+     u32               *S    = gfxs->Sop[0];
+     u32                Skey = gfxs->Skey;
 
      while (w--) {
-          __u32 s = S[i>>16];
+          u32 s = S[i>>16];
 
           if ((s & 0xffffff) != Skey) {
                D->RGB.a = (s & 0xFF000000) >> 24;
@@ -3117,11 +3117,11 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D    = gfxs->Dacc;
-     __u32             *S    = gfxs->Sop[0];
-     __u32              Skey = gfxs->Skey;
+     u32               *S    = gfxs->Sop[0];
+     u32                Skey = gfxs->Skey;
 
      while (w--) {
-          __u32 s = S[i>>16];
+          u32 s = S[i>>16];
 
           if ((s & 0xffffff) != Skey) {
                D->RGB.a = ((s & 0xFF000000) >> 24) ^ 0xff;
@@ -3145,11 +3145,11 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D = gfxs->Dacc;
-     __u8              *S = gfxs->Sop[0];
+     u8                *S = gfxs->Sop[0];
 
      /* no color to key */
      while (w--) {
-          __u8 s = S[i>>16];
+          u8 s = S[i>>16];
 
           D->RGB.a = s;
           D->RGB.r = 0xFF;
@@ -3169,13 +3169,13 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D    = gfxs->Dacc;
-     __u8              *S    = gfxs->Sop[0];
-     __u32              Skey = gfxs->Skey;
+     u8                *S    = gfxs->Sop[0];
+     u32                Skey = gfxs->Skey;
 
      DFBColor *entries = gfxs->Slut->entries;
 
      while (w--) {
-          __u8 s = S[i>>16];
+          u8 s = S[i>>16];
 
           if (s != Skey) {
                D->RGB.a = entries[s].a;
@@ -3199,13 +3199,13 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D    = gfxs->Dacc;
-     __u8              *S    = gfxs->Sop[0];
-     __u32              Skey = gfxs->Skey;
+     u8                *S    = gfxs->Sop[0];
+     u32                Skey = gfxs->Skey;
 
      DFBColor *entries = gfxs->Slut->entries;
 
      while (w--) {
-          __u8 s = S[i>>16];
+          u8 s = S[i>>16];
 
           if ((s & 0x0F) != Skey) {
                D->RGB.a = ((s & 0xF0) >> 4) | (s & 0xF0);
@@ -3228,21 +3228,21 @@
      int   w     = gfxs->length>>1;
      int   i     = gfxs->Xphase;
      int   SperD = gfxs->SperD;
-     __u32 Ky    = (gfxs->Skey & 0x000000FF);
+     u32   Ky    = (gfxs->Skey & 0x000000FF);
 #ifdef WORDS_BIGENDIAN
-     __u32 Kcb   = (gfxs->Skey & 0xFF000000) >> 24;
-     __u32 Kcr   = (gfxs->Skey & 0x0000FF00) >>  8;
+     u32   Kcb   = (gfxs->Skey & 0xFF000000) >> 24;
+     u32   Kcr   = (gfxs->Skey & 0x0000FF00) >>  8;
 #else
-     __u32 Kcb   = (gfxs->Skey & 0x0000FF00) >>  8;
-     __u32 Kcr   = (gfxs->Skey & 0xFF000000) >> 24;
+     u32   Kcb   = (gfxs->Skey & 0x0000FF00) >>  8;
+     u32   Kcr   = (gfxs->Skey & 0xFF000000) >> 24;
 #endif
 
      GenefxAccumulator *D = gfxs->Dacc;
-     __u32             *S = gfxs->Sop[0];
+     u32               *S = gfxs->Sop[0];
 
      while (w--) {
-          __u32 s = S[i>>17];
-          __u32 y0, cb, y1, cr;
+          u32 s = S[i>>17];
+          u32 y0, cb, y1, cr;
 
 #ifdef WORDS_BIGENDIAN
           cb = (s & 0xFF000000) >> 24;
@@ -3251,8 +3251,8 @@
           cb = (s & 0x0000FF00) >>  8;
           cr = (s & 0xFF000000) >> 24;
 #endif
-          y0 = ((__u16*)S)[i>>16]         & 0x00FF;
-          y1 = ((__u16*)S)[(i+SperD)>>16] & 0x00FF;
+          y0 = ((u16*)S)[i>>16]         & 0x00FF;
+          y1 = ((u16*)S)[(i+SperD)>>16] & 0x00FF;
 
           if (y0 != Ky || cb != Kcb || cr != Kcr) {
                D[0].YUV.a = 0xFF;
@@ -3277,7 +3277,7 @@
      }
 
      if (gfxs->length & 1) {
-          __u16 s = ((__u16*)S)[i>>16];
+          u16 s = ((u16*)S)[i>>16];
 
           if (s != (Ky | (Kcb << 8))) {
                D->YUV.a = 0xFF;
@@ -3297,11 +3297,11 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D    = gfxs->Dacc;
-     __u8              *S    = gfxs->Sop[0];
-     __u8               Skey = gfxs->Skey;
+     u8                *S    = gfxs->Sop[0];
+     u8                 Skey = gfxs->Skey;
 
      while (w--) {
-          __u8 s = S[i>>16];
+          u8 s = S[i>>16];
 
           if (s != Skey) {
                D->RGB.a = 0xFF;
@@ -3323,21 +3323,21 @@
      int   w     = gfxs->length>>1;
      int   i     = gfxs->Xphase;
      int   SperD = gfxs->SperD;
-     __u32 Ky    = (gfxs->Skey & 0x0000FF00) >>  8;
+     u32 Ky      = (gfxs->Skey & 0x0000FF00) >>  8;
 #ifdef WORDS_BIGENDIAN
-     __u32 Kcb   = (gfxs->Skey & 0x00FF0000) >> 16;
-     __u32 Kcr   = (gfxs->Skey & 0x000000FF);
+     u32 Kcb     = (gfxs->Skey & 0x00FF0000) >> 16;
+     u32 Kcr     = (gfxs->Skey & 0x000000FF);
 #else
-     __u32 Kcb   = (gfxs->Skey & 0x000000FF);
-     __u32 Kcr   = (gfxs->Skey & 0x00FF0000) >> 16;
+     u32 Kcb     = (gfxs->Skey & 0x000000FF);
+     u32 Kcr     = (gfxs->Skey & 0x00FF0000) >> 16;
 #endif
 
      GenefxAccumulator *D = gfxs->Dacc;
-     __u32             *S = gfxs->Sop[0];
+     u32               *S = gfxs->Sop[0];
 
      while (w--) {
-          __u32 s = S[i>>17];
-          __u32 cb, y0, cr, y1;
+          u32 s = S[i>>17];
+          u32 cb, y0, cr, y1;
 
 #ifdef WORDS_BIGENDIAN
           cb = (s & 0x00FF0000) >> 16;
@@ -3346,8 +3346,8 @@
           cb = (s & 0x000000FF);
           cr = (s & 0x00FF0000) >> 16;
 #endif
-          y0 = (((__u16*)S)[i>>16]         & 0xFF00) >> 8;
-          y1 = (((__u16*)S)[(i+SperD)>>16] & 0xFF00) >> 8;
+          y0 = (((u16*)S)[i>>16]         & 0xFF00) >> 8;
+          y1 = (((u16*)S)[(i+SperD)>>16] & 0xFF00) >> 8;
 
           if (y0 != Ky || cb != Kcb || cr != Kcr) {
                D[0].YUV.a = 0xFF;
@@ -3372,7 +3372,7 @@
      }
 
      if (gfxs->length & 1) {
-          __u16 s = ((__u16*)S)[i>>16];
+          u16 s = ((u16*)S)[i>>16];
 
           if (s != (Kcb | (Ky << 8))) {
                D->YUV.a = 0xFF;
@@ -3392,11 +3392,11 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D    = gfxs->Dacc;
-     __u16             *S    = gfxs->Sop[0];
-     __u16              Skey = gfxs->Skey;
+     u16               *S    = gfxs->Sop[0];
+     u16                Skey = gfxs->Skey;
 
      while (w--) {
-          __u16 s = S[i>>16];
+          u16 s = S[i>>16];
 
           if ((s & 0x3FFF) != Skey) {
                D->RGB.a = EXPAND_2to8((s         ) >> 14);
@@ -3420,11 +3420,11 @@
      int SperD = gfxs->SperD;
 
      GenefxAccumulator *D    = gfxs->Dacc;
-     __u16             *S    = gfxs->Sop[0];
-     __u16              Skey = gfxs->Skey;
+     u16               *S    = gfxs->Sop[0];
+     u16                Skey = gfxs->Skey;
 
      while (w--) {
-          __u16 s = S[i>>16];
+          u16 s = S[i>>16];
 
           if ((s & 0x0FFF) != Skey) {
                D->RGB.a = EXPAND_4to8((s         ) >> 12);
@@ -3476,10 +3476,10 @@
      int                l;
      int                w = gfxs->length;
      GenefxAccumulator *D = gfxs->Dacc;
-     __u16             *S = gfxs->Sop[0];
+     u16               *S = gfxs->Sop[0];
 
      if (((long)S)&2) {
-          __u16 spixel = *S;
+          u16 spixel = *S;
 
           D->RGB.a = (spixel & 0x8000) ? 0xff : 0;
           D->RGB.r = (spixel & 0x7C00) >> 7;
@@ -3493,7 +3493,7 @@
 
      l = w >> 1;
      while (l) {
-          __u32 spixel2 = *((__u32*)S);
+          u32 spixel2 = *((u32*)S);
 
 #ifdef WORDS_BIGENDIAN
           D[0].RGB.a = (spixel2 & 0x80000000) ? 0xff : 0;
@@ -3524,7 +3524,7 @@
      }
 
      if (w&1) {
-          __u16 spixel = *S;
+          u16 spixel = *S;
 
           D->RGB.a = (spixel & 0x8000) ? 0xff : 0;
           D->RGB.r = (spixel & 0x7C00) >> 7;
@@ -3538,10 +3538,10 @@
      int                l;
      int                w = gfxs->length;
      GenefxAccumulator *D = gfxs->Dacc;
-     __u16             *S = gfxs->Sop[0];
+     u16               *S = gfxs->Sop[0];
 
      if (((long)S)&2) {
-          __u16 spixel = *S;
+          u16 spixel = *S;
 
           D->RGB.a = 0xFF;
           D->RGB.r = (spixel & 0xF800) >> 8;
@@ -3555,7 +3555,7 @@
 
      l = w >> 1;
      while (l) {
-          __u32 spixel2 = *((__u32*)S);
+          u32 spixel2 = *((u32*)S);
 
 #ifdef WORDS_BIGENDIAN
           D[0].RGB.a = 0xFF;
@@ -3586,7 +3586,7 @@
      }
 
      if (w&1) {
-          __u16 spixel = *S;
+          u16 spixel = *S;
 
           D->RGB.a = 0xFF;
           D->RGB.r = (spixel & 0xF800) >> 8;
@@ -3600,13 +3600,13 @@
      int w     = gfxs->length;
 
      GenefxAccumulator *D = gfxs->Dacc;
-     __u8              *S = gfxs->Sop[0];
+     u8                *S = gfxs->Sop[0];
 
      while (w--) {
-          __u8 b = (S[0] & 0x3F) << 2;
-          __u8 g = (((S[0] >> 6) & 0x3) | ((S[1] & 0xF) << 2)) << 2 ;
-          __u8 r = (((S[1] >> 4) & 0xF) | (S[2] & 0x3 << 4)) << 2 ;
-          __u8 a = (( (S[2] >> 2) & 0x3F)) << 2;
+          u8 b = (S[0] & 0x3F) << 2;
+          u8 g = (((S[0] >> 6) & 0x3) | ((S[1] & 0xF) << 2)) << 2 ;
+          u8 r = (((S[1] >> 4) & 0xF) | (S[2] & 0x3 << 4)) << 2 ;
+          u8 a = (( (S[2] >> 2) & 0x3F)) << 2;
 
           D->RGB.a = a;
           D->RGB.r = r;
@@ -3622,13 +3622,13 @@
      int w     = gfxs->length;
 
      GenefxAccumulator *D = gfxs->Dacc;
-     __u8              *S = gfxs->Sop[0];
+     u8                *S = gfxs->Sop[0];
 
      while (w--) {
-          __u8 b = (S[0] & 0x3F) << 2;
-          __u8 g = (((S[0] >> 6) & 0x3) | ((S[1] & 0xF) << 2)) << 2 ;
-          __u8 r = (((S[1] >> 4) & 0xF) | ( (S[2] & 0x3) << 4)) << 2 ;
-          __u8 a = (( (S[2] >> 2) & 0x3F)) << 2;
+          u8 b = (S[0] & 0x3F) << 2;
+          u8 g = (((S[0] >> 6) & 0x3) | ((S[1] & 0xF) << 2)) << 2 ;
+          u8 r = (((S[1] >> 4) & 0xF) | ( (S[2] & 0x3) << 4)) << 2 ;
+          u8 a = (( (S[2] >> 2) & 0x3F)) << 2;
           a = (a > 0 ) ? 0xFF: 0; 
 
           D->RGB.a = a;
@@ -3644,12 +3644,12 @@
 {
      int w     = gfxs->length;
      GenefxAccumulator *D = gfxs->Dacc;
-     __u8              *S = gfxs->Sop[0];
+     u8                *S = gfxs->Sop[0];
 
      while (w--) {
-          __u8 b = (S[0] & 0x3F) << 2;
-          __u8 g = (((S[0] >> 6) & 0x3) | ((S[1] & 0xF) << 2)) << 2 ;
-          __u8 r = (((S[1] >> 4) & 0xF) | (S[2] & 0x3 << 4)) << 2 ;
+          u8 b = (S[0] & 0x3F) << 2;
+          u8 g = (((S[0] >> 6) & 0x3) | ((S[1] & 0xF) << 2)) << 2 ;
+          u8 r = (((S[1] >> 4) & 0xF) | (S[2] & 0x3 << 4)) << 2 ;
 
           D->RGB.a = 0xFF;
           D->RGB.r = r;
@@ -3664,7 +3664,7 @@
 {
      int                w = gfxs->length;
      GenefxAccumulator *D = gfxs->Dacc;
-     __u8              *S = gfxs->Sop[0];
+     u8                *S = gfxs->Sop[0];
 
      while (w--) {
           D->RGB.a = 0xFF;
@@ -3680,7 +3680,7 @@
 {
      int                w = gfxs->length;
      GenefxAccumulator *D = gfxs->Dacc;
-     __u8              *S = gfxs->Sop[0];
+     u8                *S = gfxs->Sop[0];
 
      while (w--) {
           D->RGB.a = *S++;
@@ -3696,7 +3696,7 @@
 {
      int                i, n;
      GenefxAccumulator *D = gfxs->Dacc;
-     __u8              *S = gfxs->Sop[0];
+     u8                *S = gfxs->Sop[0];
 
      for (i=0, n=0; i<gfxs->length; i+=2, n++) {
           register int left  = S[n] & 0xF0;
@@ -3718,10 +3718,10 @@
 {
      int                w = gfxs->length;
      GenefxAccumulator *D = gfxs->Dacc;
-     __u32             *S = gfxs->Sop[0];
+     u32               *S = gfxs->Sop[0];
 
      while (w--) {
-          __u32 s = *S++;
+          u32 s = *S++;
 
           D->RGB.a = 0xFF;
           D->RGB.r = (s & 0xFF0000) >> 16;
@@ -3736,10 +3736,10 @@
 {
      int                w = gfxs->length;
      GenefxAccumulator *D = gfxs->Dacc;
-     __u32             *S = gfxs->Sop[0];
+     u32               *S = gfxs->Sop[0];
 
      while (w--) {
-          __u32 s = *S++;
+          u32 s = *S++;
 
           D->RGB.a = (s & 0xFF000000) >> 24;
           D->RGB.r = (s & 0x00FF0000) >> 16;
@@ -3754,10 +3754,10 @@
 {
      int                w = gfxs->length;
      GenefxAccumulator *D = gfxs->Dacc;
-     __u32             *S = gfxs->Sop[0];
+     u32               *S = gfxs->Sop[0];
 
      while (w--) {
-          __u32 s = *S++;
+          u32 s = *S++;
 
           D->RGB.a = ((s & 0xFF000000) >> 24) ^ 0xff;
           D->RGB.r = (s & 0x00FF0000) >> 16;
@@ -3772,10 +3772,10 @@
 {
      int                w = gfxs->length>>1;
      GenefxAccumulator *D = gfxs->Dacc;
-     __u32             *S = gfxs->Sop[0];
+     u32               *S = gfxs->Sop[0];
 
      while (w--) {
-          __u32 s = *S++;
+          u32 s = *S++;
 
           D[0].YUV.a = D[1].YUV.a = 0xFF;
 #ifdef WORDS_BIGENDIAN
@@ -3794,7 +3794,7 @@
      }
 
      if (gfxs->length & 1) {
-          __u16 s = *((__u16*)S);
+          u16 s = *((u16*)S);
 
           D->YUV.a = 0xFF;
           D->YUV.y = s & 0xFF;
@@ -3807,10 +3807,10 @@
 {
      int                w = gfxs->length;
      GenefxAccumulator *D = gfxs->Dacc;
-     __u8              *S = gfxs->Sop[0];
+     u8                *S = gfxs->Sop[0];
 
      while (w--) {
-          __u8 s = *S++;
+          u8 s = *S++;
 
           D->RGB.a = 0xFF;
           D->RGB.r = EXPAND_3to8(s >> 5);
@@ -3825,10 +3825,10 @@
 {
      int                w = gfxs->length>>1;
      GenefxAccumulator *D = gfxs->Dacc;
-     __u32             *S = gfxs->Sop[0];
+     u32               *S = gfxs->Sop[0];
 
      while (w--) {
-          __u32 s = *S++;
+          u32 s = *S++;
 
           D[0].YUV.a = D[1].YUV.a = 0xFF;
 #ifdef WORDS_BIGENDIAN
@@ -3847,7 +3847,7 @@
      }
 
      if (gfxs->length & 1) {
-          __u16 s = *((__u16*)S);
+          u16 s = *((u16*)S);
 
           D->YUV.a = 0xFF;
           D->YUV.y = s >> 8;
@@ -3860,12 +3860,12 @@
 {
      int                w = gfxs->length;
      GenefxAccumulator *D = gfxs->Dacc;
-     __u8              *S = gfxs->Sop[0];
+     u8                *S = gfxs->Sop[0];
 
      DFBColor *entries = gfxs->Slut->entries;
 
      while (w--) {
-          __u8 s = *S++;
+          u8 s = *S++;
 
           D->RGB.a = entries[s].a;
           D->RGB.r = entries[s].r;
@@ -3880,12 +3880,12 @@
 {
      int                w = gfxs->length;
      GenefxAccumulator *D = gfxs->Dacc;
-     __u8              *S = gfxs->Sop[0];
+     u8                *S = gfxs->Sop[0];
 
      DFBColor *entries = gfxs->Slut->entries;
 
      while (w--) {
-          __u8 s = *S++;
+          u8 s = *S++;
 
           D->RGB.a = s & 0xF0;
           s &= 0x0F;
@@ -3901,10 +3901,10 @@
 {
      int                w = gfxs->length;
      GenefxAccumulator *D = gfxs->Dacc;
-     __u16             *S = gfxs->Sop[0];
+     u16               *S = gfxs->Sop[0];
 
      while (w--) {
-          __u16 s = *S++;
+          u16 s = *S++;
 
           D->RGB.a = EXPAND_2to8((s         ) >> 14);
           D->RGB.r = EXPAND_5to8((s & 0x3E00) >>  9);
@@ -3919,10 +3919,10 @@
 {
      int                w = gfxs->length;
      GenefxAccumulator *D = gfxs->Dacc;
-     __u16             *S = gfxs->Sop[0];
+     u16               *S = gfxs->Sop[0];
 
      while (w--) {
-          __u16 s = *S++;
+          u16 s = *S++;
 
           D->RGB.a = EXPAND_4to8((s         ) >> 12);
           D->RGB.r = EXPAND_4to8((s & 0x0F00) >>  8);
@@ -3937,9 +3937,9 @@
 {
      int                w  = gfxs->length>>1;
      GenefxAccumulator *D  = gfxs->Dacc;
-     __u8              *Sy = gfxs->Sop[0];
-     __u8              *Su = gfxs->Sop[1];
-     __u8              *Sv = gfxs->Sop[2];
+     u8                *Sy = gfxs->Sop[0];
+     u8                *Su = gfxs->Sop[1];
+     u8                *Sv = gfxs->Sop[2];
      
      while (w--) {
           D[1].YUV.a = D[0].YUV.a = 0xFF;
@@ -3960,8 +3960,8 @@
 {
      int                w   = gfxs->length>>1;
      GenefxAccumulator *D   = gfxs->Dacc;
-     __u8              *Sy  = gfxs->Sop[0];
-     __u16             *Suv = gfxs->Sop[1];
+     u8                *Sy  = gfxs->Sop[0];
+     u16               *Suv = gfxs->Sop[1];
      
      while (w--) {  
           D[1].YUV.a = D[0].YUV.a = 0xFF;
@@ -3981,8 +3981,8 @@
 {
      int                w   = gfxs->length>>1;
      GenefxAccumulator *D   = gfxs->Dacc;
-     __u8              *Sy  = gfxs->Sop[0];
-     __u16             *Svu = gfxs->Sop[1];
+     u8                *Sy  = gfxs->Sop[0];
+     u16               *Svu = gfxs->Sop[1];
      
      while (w--) {  
           D[1].YUV.a = D[0].YUV.a = 0xFF;
@@ -4002,10 +4002,10 @@
 {
      int                w = gfxs->length;
      GenefxAccumulator *D = gfxs->Dacc;
-     __u32             *S = gfxs->Sop[0];
+     u32               *S = gfxs->Sop[0];
 
      while (w--) {
-          __u32 s = *S++;
+          u32 s = *S++;
 
           D->YUV.a = (s >> 24);
           D->YUV.y = (s >> 16) & 0xff;
@@ -4050,11 +4050,11 @@
 {
      int                w    = gfxs->length;
      GenefxAccumulator *D    = gfxs->Dacc;
-     __u16             *S    = gfxs->Sop[0];
-     __u32              Skey = gfxs->Skey;
+     u16               *S    = gfxs->Sop[0];
+     u32                Skey = gfxs->Skey;
 
      while (w--) {
-          __u16 s = *S++;
+          u16 s = *S++;
 
           if ((s & 0x7fff) != Skey) {
                D->RGB.a = (s & 0x8000) ? 0xff : 0;
@@ -4073,11 +4073,11 @@
 {
      int                w    = gfxs->length;
      GenefxAccumulator *D    = gfxs->Dacc;
-     __u16             *S    = gfxs->Sop[0];
-     __u32              Skey = gfxs->Skey;
+     u16               *S    = gfxs->Sop[0];
+     u32                Skey = gfxs->Skey;
 
      while (w--) {
-          __u16 s = *S++;
+          u16 s = *S++;
 
           if (s != Skey) {
                D->RGB.a = 0xFF;
@@ -4096,16 +4096,16 @@
 {
      int                w    = gfxs->length;
      GenefxAccumulator *D    = gfxs->Dacc;
-     __u8              *S    = gfxs->Sop[0];
-     __u32              Skey = gfxs->Skey;
+     u8                *S    = gfxs->Sop[0];
+     u32                Skey = gfxs->Skey;
 
      while (w--) {
-          __u8 b = (S[0] & 0x3F) << 2;
-          __u8 g = (((S[0] >> 6) & 0x3) | ((S[1] & 0xF) << 2)) << 2 ;
-          __u8 r = (((S[1] >> 4) & 0xF) | (S[2] & 0x3 << 4)) << 2 ;
-          __u8 a = (( (S[2] >> 2) & 0x3F)) << 2;
+          u8 b = (S[0] & 0x3F) << 2;
+          u8 g = (((S[0] >> 6) & 0x3) | ((S[1] & 0xF) << 2)) << 2 ;
+          u8 r = (((S[1] >> 4) & 0xF) | (S[2] & 0x3 << 4)) << 2 ;
+          u8 a = (( (S[2] >> 2) & 0x3F)) << 2;
 
-          if (Skey != (__u32)(r<<16 | g<<8 | b )) {
+          if (Skey != (u32)(r<<16 | g<<8 | b )) {
                D->RGB.a = a;
                D->RGB.r = r;
                D->RGB.g = g;
@@ -4122,16 +4122,16 @@
 {
      int                w    = gfxs->length;
      GenefxAccumulator *D    = gfxs->Dacc;
-     __u8              *S    = gfxs->Sop[0];
-     __u32              Skey = gfxs->Skey;
+     u8                *S    = gfxs->Sop[0];
+     u32                Skey = gfxs->Skey;
 
      while (w--) {
-          __u8 b = (S[0] & 0x3F) << 2;
-          __u8 g = (((S[0] >> 6) & 0x3) | ((S[1] & 0xF) << 2)) << 2 ;
-          __u8 r = (((S[1] >> 4) & 0xF) | (S[2] & 0x3 << 4)) << 2 ;
-          __u8 a = (( (S[2] >> 2) & 0x3F)) << 2;
+          u8 b = (S[0] & 0x3F) << 2;
+          u8 g = (((S[0] >> 6) & 0x3) | ((S[1] & 0xF) << 2)) << 2 ;
+          u8 r = (((S[1] >> 4) & 0xF) | (S[2] & 0x3 << 4)) << 2 ;
+          u8 a = (( (S[2] >> 2) & 0x3F)) << 2;
 
-          if (Skey != (__u32)(r<<16 | g<<8 | b )) {
+          if (Skey != (u32)(r<<16 | g<<8 | b )) {
                D->RGB.a = a;
                D->RGB.r = r;
                D->RGB.g = g;
@@ -4148,15 +4148,15 @@
 {
      int                w    = gfxs->length;
      GenefxAccumulator *D    = gfxs->Dacc;
-     __u8              *S    = gfxs->Sop[0];
-     __u32              Skey = gfxs->Skey;
+     u8                *S    = gfxs->Sop[0];
+     u32                Skey = gfxs->Skey;
 
      while (w--) {
-          __u8 b = (S[0] & 0x3F) << 2;
-          __u8 g = (((S[0] >> 6) & 0x3) | ((S[1] & 0xF) << 2)) << 2 ;
-          __u8 r = (((S[1] >> 4) & 0xF) | (S[2] & 0x3 << 4)) << 2 ;
+          u8 b = (S[0] & 0x3F) << 2;
+          u8 g = (((S[0] >> 6) & 0x3) | ((S[1] & 0xF) << 2)) << 2 ;
+          u8 r = (((S[1] >> 4) & 0xF) | (S[2] & 0x3 << 4)) << 2 ;
 
-          if (Skey != (__u32)(r<<16 | g<<8 | b )) {
+          if (Skey != (u32)(r<<16 | g<<8 | b )) {
                D->RGB.a = 0xFF;
                D->RGB.r = r;
                D->RGB.g = g;
@@ -4173,15 +4173,15 @@
 {
      int                w    = gfxs->length;
      GenefxAccumulator *D    = gfxs->Dacc;
-     __u8              *S    = gfxs->Sop[0];
-     __u32              Skey = gfxs->Skey;
+     u8                *S    = gfxs->Sop[0];
+     u32                Skey = gfxs->Skey;
 
      while (w--) {
-          __u8 b = *S++;
-          __u8 g = *S++;
-          __u8 r = *S++;
+          u8 b = *S++;
+          u8 g = *S++;
+          u8 r = *S++;
 
-          if (Skey != (__u32)(r<<16 | g<<8 | b )) {
+          if (Skey != (u32)(r<<16 | g<<8 | b )) {
                D->RGB.a = 0xFF;
                D->RGB.r = r;
                D->RGB.g = g;
@@ -4198,11 +4198,11 @@
 {
      int                w    = gfxs->length;
      GenefxAccumulator *D    = gfxs->Dacc;
-     __u32             *S    = gfxs->Sop[0];
-     __u32              Skey = gfxs->Skey;
+     u32               *S    = gfxs->Sop[0];
+     u32                Skey = gfxs->Skey;
 
      while (w--) {
-          __u32 s = *S++ & 0x00FFFFFF;
+          u32 s = *S++ & 0x00FFFFFF;
 
           if (s != Skey) {
                D->RGB.a = 0xFF;
@@ -4221,11 +4221,11 @@
 {
      int                w    = gfxs->length;
      GenefxAccumulator *D    = gfxs->Dacc;
-     __u32             *S    = gfxs->Sop[0];
-     __u32              Skey = gfxs->Skey;
+     u32               *S    = gfxs->Sop[0];
+     u32                Skey = gfxs->Skey;
 
      while (w--) {
-          __u32 s = *S++;
+          u32 s = *S++;
 
           if ((s & 0xFFFFFF) != Skey) {
                D->RGB.a = s >> 24;
@@ -4244,11 +4244,11 @@
 {
      int                w    = gfxs->length;
      GenefxAccumulator *D    = gfxs->Dacc;
-     __u32             *S    = gfxs->Sop[0];
-     __u32              Skey = gfxs->Skey;
+     u32               *S    = gfxs->Sop[0];
+     u32                Skey = gfxs->Skey;
 
      while (w--) {
-          __u32 s = *S++;
+          u32 s = *S++;
 
           if ((s & 0xFFFFFF) != Skey) {
                D->RGB.a = (s >> 24) ^ 0xff;
@@ -4267,7 +4267,7 @@
 {
      int                w = gfxs->length;
      GenefxAccumulator *D = gfxs->Dacc;
-     __u8              *S = gfxs->Sop[0];
+     u8                *S = gfxs->Sop[0];
 
      /* no color to key */
      while (w--) {
@@ -4284,10 +4284,10 @@
 {
      int                w     = gfxs->length>>1;
      GenefxAccumulator *D     = gfxs->Dacc;
-     __u32             *S     = gfxs->Sop[0];
-     __u32              Skey  = gfxs->Skey;
-     __u32              Skey0 = gfxs->Skey & 0xFF00FFFF;
-     __u32              Skey1 = gfxs->Skey & 0xFFFFFF00;
+     u32               *S     = gfxs->Sop[0];
+     u32                Skey  = gfxs->Skey;
+     u32                Skey0 = gfxs->Skey & 0xFF00FFFF;
+     u32                Skey1 = gfxs->Skey & 0xFFFFFF00;
 
 #ifdef WORDS_BIGENDIAN
 #define S0_MASK  0xFFFFFF00
@@ -4298,10 +4298,10 @@
 #endif
 
      while (w--) {
-          __u32 s = *S++;
+          u32 s = *S++;
 
           if (s != Skey) {
-               __u32 cb, cr;
+               u32 cb, cr;
 
 #ifdef WORDS_BIGENDIAN
                cb = (s & 0xFF000000) >> 24;
@@ -4342,7 +4342,7 @@
      }
 
      if (gfxs->length & 1) {
-          __u16 s = *((__u16*)S);
+          u16 s = *((u16*)S);
 
           if (s != Skey0) {
                D->YUV.a = 0xFF;
@@ -4361,11 +4361,11 @@
 {
      int                w    = gfxs->length;
      GenefxAccumulator *D    = gfxs->Dacc;
-     __u8              *S    = gfxs->Sop[0];
-     __u32              Skey = gfxs->Skey;
+     u8                *S    = gfxs->Sop[0];
+     u32                Skey = gfxs->Skey;
 
      while (w--) {
-          __u8 s = *S++;
+          u8 s = *S++;
 
           if (s != Skey) {
                D->RGB.a = 0xFF;
@@ -4384,10 +4384,10 @@
 {
      int                w     = gfxs->length>>1;
      GenefxAccumulator *D     = gfxs->Dacc;
-     __u32             *S     = gfxs->Sop[0];
-     __u32              Skey  = gfxs->Skey;
-     __u32              Skey0 = gfxs->Skey & 0x00FFFFFF;
-     __u32              Skey1 = gfxs->Skey & 0xFFFF00FF;
+     u32               *S     = gfxs->Sop[0];
+     u32                Skey  = gfxs->Skey;
+     u32                Skey0 = gfxs->Skey & 0x00FFFFFF;
+     u32                Skey1 = gfxs->Skey & 0xFFFF00FF;
 
 #ifdef WORDS_BIGENDIAN
 #define S0_MASK 0xFFFF00FF
@@ -4398,10 +4398,10 @@
 #endif
 
      while (w--) {
-          __u32 s = *S++;
+          u32 s = *S++;
 
           if (s != Skey) {
-               __u32 cb, cr;
+               u32 cb, cr;
 
 #ifdef WORDS_BIGENDIAN
                cb = (s & 0x00FF0000) >> 16;
@@ -4442,7 +4442,7 @@
      }
 
      if (gfxs->length & 1) {
-          __u16 s = *((__u16*)S);
+          u16 s = *((u16*)S);
 
           if (s != Skey0) {
                D->YUV.a = 0xFF;
@@ -4461,13 +4461,13 @@
 {
      int                w    = gfxs->length;
      GenefxAccumulator *D    = gfxs->Dacc;
-     __u8              *S    = gfxs->Sop[0];
-     __u32              Skey = gfxs->Skey;
+     u8                *S    = gfxs->Sop[0];
+     u32                Skey = gfxs->Skey;
 
      DFBColor *entries = gfxs->Slut->entries;
 
      while (w--) {
-          __u8 s = *S++;
+          u8 s = *S++;
 
           if (s != Skey) {
                D->RGB.a = entries[s].a;
@@ -4486,13 +4486,13 @@
 {
      int                w    = gfxs->length;
      GenefxAccumulator *D    = gfxs->Dacc;
-     __u8              *S    = gfxs->Sop[0];
-     __u32              Skey = gfxs->Skey;
+     u8                *S    = gfxs->Sop[0];
+     u32                Skey = gfxs->Skey;
 
      DFBColor *entries = gfxs->Slut->entries;
 
      while (w--) {
-          __u8 s = *S++;
+          u8 s = *S++;
 
           if ((s & 0x0F) != Skey) {
                D->RGB.a = ((s & 0xF0) >> 4) | (s & 0xF0);
@@ -4512,11 +4512,11 @@
 {
      int                w    = gfxs->length;
      GenefxAccumulator *D    = gfxs->Dacc;
-     __u16             *S    = gfxs->Sop[0];
-     __u16              Skey = gfxs->Skey;
+     u16               *S    = gfxs->Sop[0];
+     u16                Skey = gfxs->Skey;
 
      while (w--) {
-          __u16 s = *S++;
+          u16 s = *S++;
 
           if ((s & 0x3FFF) != Skey) {
                D->RGB.a = EXPAND_2to8((s         ) >> 14);
@@ -4535,11 +4535,11 @@
 {
      int                w    = gfxs->length;
      GenefxAccumulator *D    = gfxs->Dacc;
-     __u16             *S    = gfxs->Sop[0];
-     __u16              Skey = gfxs->Skey;
+     u16               *S    = gfxs->Sop[0];
+     u16                Skey = gfxs->Skey;
 
      while (w--) {
-          __u16 s = *S++;
+          u16 s = *S++;
 
           if ((s & 0x0FFF) != Skey) {
                D->RGB.a = EXPAND_4to8((s         ) >> 12);
@@ -4588,7 +4588,7 @@
 {
      int                w = gfxs->length;
      GenefxAccumulator *S = gfxs->Sacc;
-     __u16             *D = gfxs->Aop[0];
+     u16               *D = gfxs->Aop[0];
 
      while (w--) {
           if (!(S->RGB.a & 0xF000)) {
@@ -4608,7 +4608,7 @@
      int                l;
      int                w = gfxs->length;
      GenefxAccumulator *S = gfxs->Sacc;
-     __u16             *D = gfxs->Aop[0];
+     u16               *D = gfxs->Aop[0];
 
      if ((long) D & 2) {
           if (!(S->RGB.a & 0xF000)) {
@@ -4624,7 +4624,7 @@
 
      l = w >> 1;
      while (l) {
-          __u32 *D2 = (__u32*) D;
+          u32 *D2 = (u32*) D;
 
           if (!(S[0].RGB.a & 0xF000) && !(S[1].RGB.a & 0xF000)) {
 #ifdef WORDS_BIGENDIAN
@@ -4676,14 +4676,14 @@
 {
      int                w    = gfxs->length;
      GenefxAccumulator *S = gfxs->Sacc;
-     __u8              *D = gfxs->Aop[0];
+     u8                *D = gfxs->Aop[0];
 
      while (w--) {
           if (!(S->RGB.a & 0xF000)) {
-               __u8 b = ((S->RGB.b & 0xFF00) ? 0xFF : S->RGB.b)>>2 & 0x3F;
-               __u8 g = ((S->RGB.g & 0xFF00) ? 0xFF : S->RGB.g)>>2 & 0x3F;
-               __u8 r = ((S->RGB.r & 0xFF00) ? 0xFF : S->RGB.r)>>2 & 0x3F;
-               __u8 a = ((S->RGB.a & 0xFF00) ? 0xFF : S->RGB.b)>>2 & 0x3F;
+               u8 b = ((S->RGB.b & 0xFF00) ? 0xFF : S->RGB.b)>>2 & 0x3F;
+               u8 g = ((S->RGB.g & 0xFF00) ? 0xFF : S->RGB.g)>>2 & 0x3F;
+               u8 r = ((S->RGB.r & 0xFF00) ? 0xFF : S->RGB.r)>>2 & 0x3F;
+               u8 a = ((S->RGB.a & 0xFF00) ? 0xFF : S->RGB.b)>>2 & 0x3F;
 
                D[0] =  b | (g << 6 );
                D[1] = ( g >> 2 ) |(r << 4 );
@@ -4698,14 +4698,14 @@
 {
      int                w    = gfxs->length;
      GenefxAccumulator *S = gfxs->Sacc;
-     __u8              *D = gfxs->Aop[0];
+     u8                *D = gfxs->Aop[0];
 
      while (w--) {
           if (!(S->RGB.a & 0xF000)) {
-               __u8 b = ((S->RGB.b & 0xFF00) ? 0xFF : S->RGB.b)>>2 & 0x3F;
-               __u8 g = ((S->RGB.g & 0xFF00) ? 0xFF : S->RGB.g)>>2 & 0x3F;
-               __u8 r = ((S->RGB.r & 0xFF00) ? 0xFF : S->RGB.r)>>2 & 0x3F;
-               __u8 a = ((S->RGB.a & 0xFF00) ? 0xFF : S->RGB.b)>>2 & 0x3F;
+               u8 b = ((S->RGB.b & 0xFF00) ? 0xFF : S->RGB.b)>>2 & 0x3F;
+               u8 g = ((S->RGB.g & 0xFF00) ? 0xFF : S->RGB.g)>>2 & 0x3F;
+               u8 r = ((S->RGB.r & 0xFF00) ? 0xFF : S->RGB.r)>>2 & 0x3F;
+               u8 a = ((S->RGB.a & 0xFF00) ? 0xFF : S->RGB.b)>>2 & 0x3F;
                a = a > 0 ? 0x4:0;
 
                D[0] =  b | (g << 6 );
@@ -4721,13 +4721,13 @@
 {
      int                w    = gfxs->length;
      GenefxAccumulator *S = gfxs->Sacc;
-     __u8              *D = gfxs->Aop[0];
+     u8                *D = gfxs->Aop[0];
 
      while (w--) {
           if (!(S->RGB.a & 0xF000)) {
-               __u8 b = ((S->RGB.b & 0xFF00) ? 0xFF : S->RGB.b)>>2 & 0x3F;
-               __u8 g = ((S->RGB.g & 0xFF00) ? 0xFF : S->RGB.g)>>2 & 0x3F;
-               __u8 r = ((S->RGB.r & 0xFF00) ? 0xFF : S->RGB.r)>>2 & 0x3F;
+               u8 b = ((S->RGB.b & 0xFF00) ? 0xFF : S->RGB.b)>>2 & 0x3F;
+               u8 g = ((S->RGB.g & 0xFF00) ? 0xFF : S->RGB.g)>>2 & 0x3F;
+               u8 r = ((S->RGB.r & 0xFF00) ? 0xFF : S->RGB.r)>>2 & 0x3F;
 
                D[0] =  b | (g << 6 );
                D[1] = ( g >> 2 ) |(r << 4 );
@@ -4742,7 +4742,7 @@
 {
      int                w = gfxs->length;
      GenefxAccumulator *S = gfxs->Sacc;
-     __u8              *D = gfxs->Aop[0];
+     u8                *D = gfxs->Aop[0];
 
      while (w--) {
           if (!(S->RGB.a & 0xF000)) {
@@ -4761,7 +4761,7 @@
 {
      int                w = gfxs->length;
      GenefxAccumulator *S = gfxs->Sacc;
-     __u32             *D = gfxs->Aop[0];
+     u32               *D = gfxs->Aop[0];
 
      while (w--) {
           if (!(S->RGB.a & 0xF000)) {
@@ -4779,7 +4779,7 @@
 {
      int                w = gfxs->length;
      GenefxAccumulator *S = gfxs->Sacc;
-     __u32             *D = gfxs->Aop[0];
+     u32               *D = gfxs->Aop[0];
 
      while (w--) {
           if (!(S->RGB.a & 0xF000)) {
@@ -4798,7 +4798,7 @@
 {
      int                w = gfxs->length;
      GenefxAccumulator *S = gfxs->Sacc;
-     __u32             *D = gfxs->Aop[0];
+     u32               *D = gfxs->Aop[0];
 
      while (w--) {
           if (!(S->RGB.a & 0xF000)) {
@@ -4817,7 +4817,7 @@
 {
      int                w = gfxs->length;
      GenefxAccumulator *S = gfxs->Sacc;
-     __u8              *D = gfxs->Aop[0];
+     u8                *D = gfxs->Aop[0];
 
      while (w--) {
           if (!(S->RGB.a & 0xF000))
@@ -4833,7 +4833,7 @@
      int                l;
      int                w = gfxs->length;
      GenefxAccumulator *S = gfxs->Sacc;
-     __u16             *D = gfxs->Aop[0];
+     u16               *D = gfxs->Aop[0];
 
      if ((long)D & 2) {
           if (!(S->YUV.a & 0xF00)) {
@@ -4847,7 +4847,7 @@
 
      for (l = w>>1; l--;) {
           if (!(S[0].YUV.a & 0xF000) && !(S[1].YUV.a & 0xF000)) {
-               __u32 y0, cb, y1, cr;
+               u32 y0, cb, y1, cr;
 
                y0 = (S[0].YUV.y & 0xFF00) ? 0xFF : S[0].YUV.y;
                y1 = (S[1].YUV.y & 0xFF00) ? 0xFF : S[1].YUV.y;
@@ -4861,9 +4861,9 @@
                     cr = 0xFF;
 
 #ifdef WORDS_BIGENDIAN
-               *((__u32*)D) = y1 | (cr << 8) | (y0 << 16) | (cb << 24);
+               *((u32*)D) = y1 | (cr << 8) | (y0 << 16) | (cb << 24);
 #else
-               *((__u32*)D) = y0 | (cb << 8) | (y1 << 16) | (cr << 24);
+               *((u32*)D) = y0 | (cb << 8) | (y1 << 16) | (cr << 24);
 #endif
           }
           else if (!(S[0].YUV.a & 0xF000)) {
@@ -4891,7 +4891,7 @@
 {
      int                w = gfxs->length;
      GenefxAccumulator *S = gfxs->Sacc;
-     __u8              *D = gfxs->Aop[0];
+     u8                *D = gfxs->Aop[0];
 
      while (w--) {
           if (!(S->RGB.a & 0xF000)) {
@@ -4910,7 +4910,7 @@
      int                l;
      int                w = gfxs->length;
      GenefxAccumulator *S = gfxs->Sacc;
-     __u16             *D = gfxs->Aop[0];
+     u16               *D = gfxs->Aop[0];
 
      if ((long)D & 2) {
           if (!(S->YUV.a & 0xF00)) {
@@ -4924,7 +4924,7 @@
 
      for (l = w>>1; l--;) {
           if (!(S[0].YUV.a & 0xF000) && !(S[1].YUV.a & 0xF000)) {
-               __u32 cb, y0, cr, y1;
+               u32 cb, y0, cr, y1;
 
                y0 = (S[0].YUV.y & 0xFF00) ? 0xFF : S[0].YUV.y;
                y1 = (S[1].YUV.y & 0xFF00) ? 0xFF : S[1].YUV.y;
@@ -4938,9 +4938,9 @@
                     cr = 0xFF;
 
 #ifdef WORDS_BIGENDIAN
-               *((__u32*)D) = cr | (y1 << 8) | (cb << 16) | (y0 << 24);
+               *((u32*)D) = cr | (y1 << 8) | (cb << 16) | (y0 << 24);
 #else
-               *((__u32*)D) = cb | (y0 << 8) | (cr << 16) | (y1 << 24);
+               *((u32*)D) = cb | (y0 << 8) | (cr << 16) | (y1 << 24);
 #endif
           }
           else if (!(S[0].YUV.a & 0xF000)) {
@@ -4968,7 +4968,7 @@
 {
      int                w = gfxs->length;
      GenefxAccumulator *S = gfxs->Sacc;
-     __u8              *D = gfxs->Aop[0];
+     u8                *D = gfxs->Aop[0];
 
      while (w--) {
           if (!(S->RGB.a & 0xF000)) {
@@ -4988,7 +4988,7 @@
 {
      int                w = gfxs->length;
      GenefxAccumulator *S = gfxs->Sacc;
-     __u8              *D = gfxs->Aop[0];
+     u8                *D = gfxs->Aop[0];
 
      while (w--) {
           if (!(S->RGB.a & 0xF000)) {
@@ -5009,7 +5009,7 @@
 {
      int                w = gfxs->length;
      GenefxAccumulator *S = gfxs->Sacc;
-     __u16             *D = gfxs->Aop[0];
+     u16               *D = gfxs->Aop[0];
 
      while (w--) {
           if (!(S->RGB.a & 0xF000)) {
@@ -5028,7 +5028,7 @@
 {
      int                w = gfxs->length;
      GenefxAccumulator *S = gfxs->Sacc;
-     __u16             *D = gfxs->Aop[0];
+     u16               *D = gfxs->Aop[0];
 
      while (w--) {
           if (!(S->RGB.a & 0xF000)) {
@@ -5047,7 +5047,7 @@
 {
      int                w  = gfxs->length;
      GenefxAccumulator *S  = gfxs->Sacc;
-     __u8              *Dy = gfxs->Aop[0];
+     u8                *Dy = gfxs->Aop[0];
     
      while (w--) {
           if (!(S->YUV.a & 0xF000))
@@ -5058,15 +5058,15 @@
      }
           
      if (gfxs->AopY & 1) {
-          __u8 *Du = gfxs->Aop[1];
-          __u8 *Dv = gfxs->Aop[2];
+          u8 *Du = gfxs->Aop[1];
+          u8 *Dv = gfxs->Aop[2];
           
           w = gfxs->length>>1;
           S = gfxs->Sacc;
           
           while (w--) {
                if (!(S[0].YUV.a & 0xF000) && !(S[1].YUV.a & 0xF000)) {
-                    __u32 tmp;
+                    u32 tmp;
 
                     tmp = (S[0].YUV.u + S[1].YUV.u) >> 1;
                     if (tmp & 0xFF00)
@@ -5099,7 +5099,7 @@
 {
      int                w  = gfxs->length;
      GenefxAccumulator *S  = gfxs->Sacc;
-     __u8              *Dy = gfxs->Aop[0];
+     u8                *Dy = gfxs->Aop[0];
      
      while (w--) {
           if (!(S->YUV.a & 0xF000))
@@ -5110,13 +5110,13 @@
      }
           
      if (gfxs->dst_format == DSPF_NV16 || gfxs->AopY & 1) {
-          __u16 *Duv = gfxs->Aop[1];
+          u16 *Duv = gfxs->Aop[1];
           
           w = gfxs->length>>1;
           S = gfxs->Sacc;
           
           while (w--) {
-               __u32 cb, cr;
+               u32 cb, cr;
                
                if (!(S[0].YUV.a & 0xF000) && !(S[1].YUV.a & 0xF000)) {
                     cb = (S[0].YUV.u + S[1].YUV.u) >> 1;
@@ -5150,7 +5150,7 @@
 {
      int                w  = gfxs->length;
      GenefxAccumulator *S  = gfxs->Sacc;
-     __u8              *Dy = gfxs->Aop[0];
+     u8                *Dy = gfxs->Aop[0];
      
      while (w--) {
           if (!(S->YUV.a & 0xF000))
@@ -5161,13 +5161,13 @@
      }
           
      if (gfxs->AopY & 1) {
-          __u16 *Dvu = gfxs->Aop[1];
+          u16 *Dvu = gfxs->Aop[1];
           
           w = gfxs->length>>1;
           S = gfxs->Sacc;
           
           while (w--) {
-               __u32 cb, cr;
+               u32 cb, cr;
                
                if (!(S[0].YUV.a & 0xF000) && !(S[1].YUV.a & 0xF000)) {
                     cb = (S[0].YUV.u + S[1].YUV.u) >> 1;
@@ -5201,7 +5201,7 @@
 {
      int                w = gfxs->length;
      GenefxAccumulator *S = gfxs->Sacc;
-     __u32             *D = gfxs->Aop[0];
+     u32               *D = gfxs->Aop[0];
 
      while (w--) {
           if (!(S->YUV.a & 0xF000)) {
@@ -5220,7 +5220,7 @@
 {
      int                w = gfxs->length>>1;
      GenefxAccumulator *S = gfxs->Sacc;
-     __u8              *D = gfxs->Aop[0];
+     u8                *D = gfxs->Aop[0];
 
      while (w--) {
           if (!(S[0].RGB.a & 0xF000) && !(S[1].RGB.a & 0xF000)) {
@@ -5279,7 +5279,7 @@
      int                w     = gfxs->length;
      int                i     = gfxs->Xphase;
      GenefxAccumulator *Sacc  = gfxs->Sacc;
-     __u16             *D     = gfxs->Aop[0];
+     u16               *D     = gfxs->Aop[0];
      int                SperD = gfxs->SperD;
 
      while (w--) {
@@ -5303,7 +5303,7 @@
      int                w      = gfxs->length;
      int                i      = gfxs->Xphase;
      GenefxAccumulator *Sacc   = gfxs->Sacc;
-     __u16             *D      = gfxs->Aop[0];
+     u16               *D      = gfxs->Aop[0];
      int                SperD  = gfxs->SperD;
      int                SperD2 = gfxs->SperD << 1;
 
@@ -5323,7 +5323,7 @@
      while (l--) {
           GenefxAccumulator *S0 = &Sacc[i>>16];
           GenefxAccumulator *S1 = &Sacc[(i+SperD)>>16];
-          __u32             *D2 = (__u32*) D;
+          u32               *D2 = (u32*) D;
 
           if (!(S0->RGB.a & 0xF000) && !(S1->RGB.a & 0xF000)) {
 #ifdef WORDS_BIGENDIAN
@@ -5375,15 +5375,15 @@
      int                w    = gfxs->length;
      int                i     = 0;
      GenefxAccumulator *Sacc  = gfxs->Sacc;
-     __u8              *D     = gfxs->Aop[0];
+     u8                *D     = gfxs->Aop[0];
      int                SperD = gfxs->SperD;
 
      while (w--) {
           GenefxAccumulator *S = &Sacc[i>>16];
-          __u8 b = ((S->RGB.b & 0xFF00) ? 0xFF : S->RGB.b)>>2 & 0x3F;
-          __u8 g = ((S->RGB.g & 0xFF00) ? 0xFF : S->RGB.g)>>2 & 0x3F;
-          __u8 r = ((S->RGB.r & 0xFF00) ? 0xFF : S->RGB.r)>>2 & 0x3F;
-          __u8 a = ((S->RGB.a & 0xFF00) ? 0xFF : S->RGB.b)>>2 & 0x3F;
+          u8 b = ((S->RGB.b & 0xFF00) ? 0xFF : S->RGB.b)>>2 & 0x3F;
+          u8 g = ((S->RGB.g & 0xFF00) ? 0xFF : S->RGB.g)>>2 & 0x3F;
+          u8 r = ((S->RGB.r & 0xFF00) ? 0xFF : S->RGB.r)>>2 & 0x3F;
+          u8 a = ((S->RGB.a & 0xFF00) ? 0xFF : S->RGB.b)>>2 & 0x3F;
 
           if (!(S->RGB.a & 0xF000)) {
                D[0] =  b | (g << 6 );
@@ -5400,15 +5400,15 @@
      int                w    = gfxs->length;
      int                i     = 0;
      GenefxAccumulator *Sacc  = gfxs->Sacc;
-     __u8              *D     = gfxs->Aop[0];
+     u8                *D     = gfxs->Aop[0];
      int                SperD = gfxs->SperD;
 
      while (w--) {
           GenefxAccumulator *S = &Sacc[i>>16];
-          __u8 b = ((S->RGB.b & 0xFF00) ? 0xFF : S->RGB.b)>>2 & 0x3F;
-          __u8 g = ((S->RGB.g & 0xFF00) ? 0xFF : S->RGB.g)>>2 & 0x3F;
-          __u8 r = ((S->RGB.r & 0xFF00) ? 0xFF : S->RGB.r)>>2 & 0x3F;
-          __u8 a = ((S->RGB.a & 0xFF00) ? 0xFF : S->RGB.b)>>2 & 0x3F;
+          u8 b = ((S->RGB.b & 0xFF00) ? 0xFF : S->RGB.b)>>2 & 0x3F;
+          u8 g = ((S->RGB.g & 0xFF00) ? 0xFF : S->RGB.g)>>2 & 0x3F;
+          u8 r = ((S->RGB.r & 0xFF00) ? 0xFF : S->RGB.r)>>2 & 0x3F;
+          u8 a = ((S->RGB.a & 0xFF00) ? 0xFF : S->RGB.b)>>2 & 0x3F;
           a = a > 0 ? 0x4:0;
 
           if (!(S->RGB.a & 0xF000)) {
@@ -5426,14 +5426,14 @@
      int                w    = gfxs->length;
      int                i     = 0;
      GenefxAccumulator *Sacc  = gfxs->Sacc;
-     __u8              *D     = gfxs->Aop[0];
+     u8                *D     = gfxs->Aop[0];
      int                SperD = gfxs->SperD;
 
      while (w--) {
           GenefxAccumulator *S = &Sacc[i>>16];
-          __u8 b = ((S->RGB.b & 0xFF00) ? 0xFF : S->RGB.b)>>2 & 0x3F;
-          __u8 g = ((S->RGB.g & 0xFF00) ? 0xFF : S->RGB.g)>>2 & 0x3F;
-          __u8 r = ((S->RGB.r & 0xFF00) ? 0xFF : S->RGB.r)>>2 & 0x3F;
+          u8 b = ((S->RGB.b & 0xFF00) ? 0xFF : S->RGB.b)>>2 & 0x3F;
+          u8 g = ((S->RGB.g & 0xFF00) ? 0xFF : S->RGB.g)>>2 & 0x3F;
+          u8 r = ((S->RGB.r & 0xFF00) ? 0xFF : S->RGB.r)>>2 & 0x3F;
 
           if (!(S->RGB.a & 0xF000)) {
                D[0] =  b | (g << 6 );
@@ -5450,7 +5450,7 @@
      int                w     = gfxs->length;
      int                i     = gfxs->Xphase;
      GenefxAccumulator *Sacc  = gfxs->Sacc;
-     __u8              *D     = gfxs->Aop[0];
+     u8                *D     = gfxs->Aop[0];
      int                SperD = gfxs->SperD;
 
      while (w--) {
@@ -5473,7 +5473,7 @@
      int                w     = gfxs->length;
      int                i     = gfxs->Xphase;
      GenefxAccumulator *Sacc  = gfxs->Sacc;
-     __u32             *D     = gfxs->Aop[0];
+     u32               *D     = gfxs->Aop[0];
      int                SperD = gfxs->SperD;
 
      while (w--) {
@@ -5495,7 +5495,7 @@
      int                w     = gfxs->length;
      int                i     = gfxs->Xphase;
      GenefxAccumulator *Sacc  = gfxs->Sacc;
-     __u32             *D     = gfxs->Aop[0];
+     u32               *D     = gfxs->Aop[0];
      int                SperD = gfxs->SperD;
 
      while (w--) {
@@ -5518,7 +5518,7 @@
      int                w     = gfxs->length;
      int                i     = gfxs->Xphase;
      GenefxAccumulator *Sacc  = gfxs->Sacc;
-     __u32             *D     = gfxs->Aop[0];
+     u32               *D     = gfxs->Aop[0];
      int                SperD = gfxs->SperD;
 
      while (w--) {
@@ -5541,7 +5541,7 @@
      int                w     = gfxs->length;
      int                i     = gfxs->Xphase;
      GenefxAccumulator *Sacc  = gfxs->Sacc;
-     __u8              *D     = gfxs->Aop[0];
+     u8                *D     = gfxs->Aop[0];
      int                SperD = gfxs->SperD;
 
      while (w--) {
@@ -5561,7 +5561,7 @@
      int                w      = gfxs->length;
      int                i      = gfxs->Xphase;
      GenefxAccumulator *Sacc   = gfxs->Sacc;
-     __u16             *D      = gfxs->Aop[0];
+     u16               *D      = gfxs->Aop[0];
      int                SperD  = gfxs->SperD;
      int                SperD2 = gfxs->SperD << 1;
 
@@ -5581,7 +5581,7 @@
           GenefxAccumulator *S1 = &Sacc[(i+SperD)>>16];
 
           if (!(S0->YUV.a & 0xF000) && !(S1->YUV.a & 0xF000)) {
-               __u32 y0, cb, y1, cr;
+               u32 y0, cb, y1, cr;
 
                y0 = (S0->YUV.y & 0xFF00) ? 0xFF : S0->YUV.y;
                y1 = (S1->YUV.y & 0xFF00) ? 0xFF : S1->YUV.y;
@@ -5595,9 +5595,9 @@
                     cr = 0xFF;
 
 #ifdef WORDS_BIGENDIAN
-               *((__u32*)D) = y1 | (cr << 8) | (y0 << 16) | (cb << 24);
+               *((u32*)D) = y1 | (cr << 8) | (y0 << 16) | (cb << 24);
 #else
-               *((__u32*)D) = y0 | (cb << 8) | (y1 << 16) | (cr << 24);
+               *((u32*)D) = y0 | (cb << 8) | (y1 << 16) | (cr << 24);
 #endif
           }
           else if (!(S0->YUV.a & 0xF000)) {
@@ -5627,7 +5627,7 @@
      int                w     = gfxs->length;
      int                i     = gfxs->Xphase;
      GenefxAccumulator *Sacc  = gfxs->Sacc;
-     __u8              *D     = gfxs->Aop[0];
+     u8                *D     = gfxs->Aop[0];
      int                SperD = gfxs->SperD;
 
      while (w--) {
@@ -5650,7 +5650,7 @@
      int                w      = gfxs->length;
      int                i      = gfxs->Xphase;
      GenefxAccumulator *Sacc   = gfxs->Sacc;
-     __u16             *D      = gfxs->Aop[0];
+     u16               *D      = gfxs->Aop[0];
      int                SperD  = gfxs->SperD;
      int                SperD2 = gfxs->SperD << 1;
 
@@ -5670,7 +5670,7 @@
           GenefxAccumulator *S1 = &Sacc[(i+SperD)>>16];
 
           if (!(S0->YUV.a & 0xF000) && !(S1->YUV.a & 0xF000)) {
-               __u32 cb, y0, cr, y1;
+               u32 cb, y0, cr, y1;
 
                y0 = (S0->YUV.y & 0xFF00) ? 0xFF : S0->YUV.y;
                y1 = (S1->YUV.y & 0xFF00) ? 0xFF : S1->YUV.y;
@@ -5684,9 +5684,9 @@
                     cr = 0xFF;
 
 #ifdef WORDS_BIGENDIAN
-               *((__u32*)D) = cr | (y1 << 8) | (cb << 16) | (y0 << 24);
+               *((u32*)D) = cr | (y1 << 8) | (cb << 16) | (y0 << 24);
 #else
-               *((__u32*)D) = cb | (y0 << 8) | (cr << 16) | (y1 << 24);
+               *((u32*)D) = cb | (y0 << 8) | (cr << 16) | (y1 << 24);
 #endif
           }
           else if (!(S0->YUV.a & 0xF000)) {
@@ -5716,7 +5716,7 @@
      int                w     = gfxs->length;
      int                i     = gfxs->Xphase;
      GenefxAccumulator *Sacc  = gfxs->Sacc;
-     __u8              *D     = gfxs->Aop[0];
+     u8                *D     = gfxs->Aop[0];
      int                SperD = gfxs->SperD;
 
      while (w--) {
@@ -5740,7 +5740,7 @@
      int                w     = gfxs->length;
      int                i     = gfxs->Xphase;
      GenefxAccumulator *Sacc  = gfxs->Sacc;
-     __u8              *D     = gfxs->Aop[0];
+     u8                *D     = gfxs->Aop[0];
      int                SperD = gfxs->SperD;
 
      while (w--) {
@@ -5765,7 +5765,7 @@
      int                w     = gfxs->length;
      int                i     = gfxs->Xphase;
      GenefxAccumulator *Sacc  = gfxs->Sacc;
-     __u16             *D     = gfxs->Aop[0];
+     u16               *D     = gfxs->Aop[0];
      int                SperD = gfxs->SperD;
 
      while (w--) {
@@ -5788,7 +5788,7 @@
      int                w     = gfxs->length;
      int                i     = gfxs->Xphase;
      GenefxAccumulator *Sacc  = gfxs->Sacc;
-     __u16             *D     = gfxs->Aop[0];
+     u16               *D     = gfxs->Aop[0];
      int                SperD = gfxs->SperD;
 
      while (w--) {
@@ -5811,7 +5811,7 @@
      int                i      = gfxs->Xphase;
      int                w      = gfxs->length;
      GenefxAccumulator *Sacc   = gfxs->Sacc;
-     __u8              *Dy     = gfxs->Aop[0];
+     u8                *Dy     = gfxs->Aop[0];
      int                SperD  = gfxs->SperD;
      
      while (w--) {
@@ -5825,8 +5825,8 @@
      }
           
      if (gfxs->AopY & 1) {
-          __u8 *Du = gfxs->Aop[1];
-          __u8 *Dv = gfxs->Aop[2];
+          u8 *Du = gfxs->Aop[1];
+          u8 *Dv = gfxs->Aop[2];
           
           w = gfxs->length>>1;
           i = gfxs->Xphase>>1;
@@ -5836,7 +5836,7 @@
                GenefxAccumulator *S1 = &Sacc[(i+SperD)>>16];
                
                if (!(S0->YUV.a & 0xF000) && !(S1->YUV.a & 0xF000)) {
-                    __u32 tmp;
+                    u32 tmp;
 
                     tmp = (S0->YUV.u + S1->YUV.u) >> 1;
                     if (tmp & 0xFF00)
@@ -5870,7 +5870,7 @@
      int                i     = gfxs->Xphase;
      int                w     = gfxs->length;
      GenefxAccumulator *Sacc  = gfxs->Sacc;
-     __u8              *Dy    = gfxs->Aop[0];
+     u8                *Dy    = gfxs->Aop[0];
      int                SperD = gfxs->SperD;
      
      while (w--) {
@@ -5884,7 +5884,7 @@
      }
           
      if (gfxs->dst_format == DSPF_NV16 || gfxs->AopY & 1) {
-          __u16 *Duv = gfxs->Aop[1];
+          u16 *Duv = gfxs->Aop[1];
           
           w = gfxs->length>>1;
           i = gfxs->Xphase>>1;
@@ -5892,7 +5892,7 @@
           while (w--) {
                GenefxAccumulator *S0 = &Sacc[i>>16];
                GenefxAccumulator *S1 = &Sacc[(i+SperD)>>16];
-               __u32              cb, cr;
+               u32                cb, cr;
                
                if (!(S0->YUV.a & 0xF000) && !(S1->YUV.a & 0xF000)) {
                     cb = (S0->YUV.u + S1->YUV.u) >> 1;
@@ -5928,7 +5928,7 @@
      int                i     = gfxs->Xphase;
      int                w     = gfxs->length;
      GenefxAccumulator *Sacc  = gfxs->Sacc;
-     __u8              *Dy    = gfxs->Aop[0];
+     u8                *Dy    = gfxs->Aop[0];
      int                SperD = gfxs->SperD;
      
      while (w--) {
@@ -5942,7 +5942,7 @@
      }
           
      if (gfxs->dst_format == DSPF_NV16 || gfxs->AopY & 1) {
-          __u16 *Dvu = gfxs->Aop[1];
+          u16 *Dvu = gfxs->Aop[1];
           
           w = gfxs->length>>1;
           i = gfxs->Xphase>>1;
@@ -5950,7 +5950,7 @@
           while (w--) {
                GenefxAccumulator *S0 = &Sacc[i>>16];
                GenefxAccumulator *S1 = &Sacc[(i+SperD)>>16];
-               __u32              cb, cr;
+               u32                cb, cr;
                
                if (!(S0->YUV.a & 0xF000) && !(S1->YUV.a & 0xF000)) {
                     cb = (S0->YUV.u + S1->YUV.u) >> 1;
@@ -5986,7 +5986,7 @@
      int                w     = gfxs->length;
      int                i     = gfxs->Xphase;
      GenefxAccumulator *Sacc  = gfxs->Sacc;
-     __u32             *D     = gfxs->Aop[0];
+     u32               *D     = gfxs->Aop[0];
      int                SperD = gfxs->SperD;
 
      while (w--) {
@@ -6039,8 +6039,8 @@
 {
      int                w    = gfxs->length;
      GenefxAccumulator *S    = gfxs->Sacc;
-     __u16             *D    = gfxs->Aop[0];
-     __u32              Dkey = gfxs->Dkey;
+     u16               *D    = gfxs->Aop[0];
+     u32                Dkey = gfxs->Dkey;
 
      while (w--) {
           if (!(S->RGB.a & 0xF000) && ((*D & 0x7fff) == Dkey)) {
@@ -6059,8 +6059,8 @@
 {
      int                w    = gfxs->length;
      GenefxAccumulator *S    = gfxs->Sacc;
-     __u16             *D    = gfxs->Aop[0];
-     __u32              Dkey = gfxs->Dkey;
+     u16               *D    = gfxs->Aop[0];
+     u32                Dkey = gfxs->Dkey;
 
      while (w--) {
           if (!(S->RGB.a & 0xF000) && (*D == Dkey)) {
@@ -6078,10 +6078,10 @@
 {
      int                w = gfxs->length;
      GenefxAccumulator *S = gfxs->Sacc;
-     __u8              *D = gfxs->Aop[0];
-     __u8               r = (gfxs->Dkey >> 16);
-     __u8               g = (gfxs->Dkey >>  8) & 0xff;
-     __u8               b = (gfxs->Dkey      ) & 0xff;
+     u8                *D = gfxs->Aop[0];
+     u8                 r = (gfxs->Dkey >> 16);
+     u8                 g = (gfxs->Dkey >>  8) & 0xff;
+     u8                 b = (gfxs->Dkey      ) & 0xff;
 
      while (w--) {
 
@@ -6089,7 +6089,7 @@
                b = ((S->RGB.b & 0xFF00) ? 0xFF : S->RGB.b)>>2 & 0x3F;
                g = ((S->RGB.g & 0xFF00) ? 0xFF : S->RGB.g)>>2 & 0x3F;
                r = ((S->RGB.r & 0xFF00) ? 0xFF : S->RGB.r)>>2 & 0x3F;
-               __u8 a = ((S->RGB.a & 0xFF00) ? 0xFF : S->RGB.b)>>2 & 0x3F;
+               u8 a = ((S->RGB.a & 0xFF00) ? 0xFF : S->RGB.b)>>2 & 0x3F;
                D[0] =  b | (g << 6 );
                D[1] = ( g >> 2 ) |(r << 4 );
                D[2] = (r >> 4) | a;
@@ -6103,10 +6103,10 @@
 {
      int                w = gfxs->length;
      GenefxAccumulator *S = gfxs->Sacc;
-     __u8              *D = gfxs->Aop[0];
-     __u8               r = (gfxs->Dkey >> 16);
-     __u8               g = (gfxs->Dkey >>  8) & 0xff;
-     __u8               b = (gfxs->Dkey      ) & 0xff;
+     u8                *D = gfxs->Aop[0];
+     u8                 r = (gfxs->Dkey >> 16);
+     u8                 g = (gfxs->Dkey >>  8) & 0xff;
+     u8                 b = (gfxs->Dkey      ) & 0xff;
 
      while (w--) {
 
@@ -6114,7 +6114,7 @@
                b = ((S->RGB.b & 0xFF00) ? 0xFF : S->RGB.b)>>2 & 0x3F;
                g = ((S->RGB.g & 0xFF00) ? 0xFF : S->RGB.g)>>2 & 0x3F;
                r = ((S->RGB.r & 0xFF00) ? 0xFF : S->RGB.r)>>2 & 0x3F;
-               __u8 a = ((S->RGB.a & 0xFF00) ? 0xFF : S->RGB.b)>>2 & 0x3F;
+               u8 a = ((S->RGB.a & 0xFF00) ? 0xFF : S->RGB.b)>>2 & 0x3F;
                a = a > 0 ? 0x4:0;
                D[0] =  b | (g << 6 );
                D[1] = ( g >> 2 ) |(r << 4 );
@@ -6129,10 +6129,10 @@
 {
      int                w = gfxs->length;
      GenefxAccumulator *S = gfxs->Sacc;
-     __u8              *D = gfxs->Aop[0];
-     __u8               r = (gfxs->Dkey >> 16);
-     __u8               g = (gfxs->Dkey >>  8) & 0xff;
-     __u8               b = (gfxs->Dkey      ) & 0xff;
+     u8                *D = gfxs->Aop[0];
+     u8                 r = (gfxs->Dkey >> 16);
+     u8                 g = (gfxs->Dkey >>  8) & 0xff;
+     u8                 b = (gfxs->Dkey      ) & 0xff;
 
      while (w--) {
 
@@ -6153,10 +6153,10 @@
 {
      int                w = gfxs->length;
      GenefxAccumulator *S = gfxs->Sacc;
-     __u8              *D = gfxs->Aop[0];
-     __u8               r = (gfxs->Dkey >> 16);
-     __u8               g = (gfxs->Dkey >>  8) & 0xff;
-     __u8               b = (gfxs->Dkey      ) & 0xff;
+     u8                *D = gfxs->Aop[0];
+     u8                 r = (gfxs->Dkey >> 16);
+     u8                 g = (gfxs->Dkey >>  8) & 0xff;
+     u8                 b = (gfxs->Dkey      ) & 0xff;
 
      while (w--) {
           if (!(S->RGB.a & 0xF000) && D[0] == b && D[1] == g && D[2] == r) {
@@ -6175,8 +6175,8 @@
 {
      int                w    = gfxs->length;
      GenefxAccumulator *S    = gfxs->Sacc;
-     __u32             *D    = gfxs->Aop[0];
-     __u32              Dkey = gfxs->Dkey;
+     u32               *D    = gfxs->Aop[0];
+     u32                Dkey = gfxs->Dkey;
 
      while (w--) {
           if (!(S->RGB.a & 0xF000) && ((*D & 0xffffff) == Dkey)) {
@@ -6194,8 +6194,8 @@
 {
      int                w    = gfxs->length;
      GenefxAccumulator *S    = gfxs->Sacc;
-     __u32             *D    = gfxs->Aop[0];
-     __u32              Dkey = gfxs->Dkey;
+     u32               *D    = gfxs->Aop[0];
+     u32                Dkey = gfxs->Dkey;
 
      while (w--) {
           if (!(S->RGB.a & 0xF000) && ((*D & 0xffffff) == Dkey)) {
@@ -6214,8 +6214,8 @@
 {
      int                w    = gfxs->length;
      GenefxAccumulator *S    = gfxs->Sacc;
-     __u32             *D    = gfxs->Aop[0];
-     __u32              Dkey = gfxs->Dkey;
+     u32               *D    = gfxs->Aop[0];
+     u32                Dkey = gfxs->Dkey;
 
      while (w--) {
           if (!(S->RGB.a & 0xF000) && ((*D & 0xffffff) == Dkey)) {
@@ -6234,7 +6234,7 @@
 {
      int                w = gfxs->length;
      GenefxAccumulator *S = gfxs->Sacc;
-     __u8              *D = gfxs->Aop[0];
+     u8                *D = gfxs->Aop[0];
 
      /* FIXME: do all or do none? */
      while (w--) {
@@ -6251,14 +6251,14 @@
      int                l;
      int                w     = gfxs->length;
      GenefxAccumulator *S     = gfxs->Sacc;
-     __u16             *D     = gfxs->Aop[0];
-     __u32              Dkey  = gfxs->Dkey;
+     u16               *D     = gfxs->Aop[0];
+     u32                Dkey  = gfxs->Dkey;
 #ifdef WORDS_BIGENDIAN
-     __u16              Dkey0 = gfxs->Dkey >> 16;
-     __u16              Dkey1 = gfxs->Dkey & 0xFFFF;
+     u16                Dkey0 = gfxs->Dkey >> 16;
+     u16                Dkey1 = gfxs->Dkey & 0xFFFF;
 #else
-     __u16              Dkey0 = gfxs->Dkey & 0xFFFF;
-     __u16              Dkey1 = gfxs->Dkey >> 16;
+     u16                Dkey0 = gfxs->Dkey & 0xFFFF;
+     u16                Dkey1 = gfxs->Dkey >> 16;
 #endif
 
      if ((long)D & 2) {
@@ -6274,7 +6274,7 @@
      for (l = w>>1; l--;) {
           if (*D == Dkey) {
                if (!(S[0].YUV.a & 0xF000) && !(S[1].YUV.a & 0xF000)) {
-                    __u32 y0, cb, y1, cr;
+                    u32 y0, cb, y1, cr;
 
                     y0 = (S[0].YUV.y & 0xFF00) ? 0xFF : S[0].YUV.y;
                     y1 = (S[1].YUV.y & 0xFF00) ? 0xFF : S[1].YUV.y;
@@ -6288,9 +6288,9 @@
                          cr = 0xFF;
 
 #ifdef WORDS_BIGENDIAN
-                    *((__u32*)D) = y1 | (cr << 8) | (y0 << 16) | (cb << 24);
+                    *((u32*)D) = y1 | (cr << 8) | (y0 << 16) | (cb << 24);
 #else
-                    *((__u32*)D) = y0 | (cb << 8) | (y1 << 16) | (cr << 24);
+                    *((u32*)D) = y0 | (cb << 8) | (y1 << 16) | (cr << 24);
 #endif
                }
                else if (!(S[0].YUV.a & 0xF000)) {
@@ -6319,8 +6319,8 @@
 {
      int                w    = gfxs->length;
      GenefxAccumulator *S    = gfxs->Sacc;
-     __u8              *D    = gfxs->Aop[0];
-     __u32              Dkey = gfxs->Dkey;
+     u8                *D    = gfxs->Aop[0];
+     u32                Dkey = gfxs->Dkey;
 
      while (w--) {
           if (!(S->RGB.a & 0xF000) && (*D == Dkey)) {
@@ -6339,14 +6339,14 @@
      int                l;
      int                w     = gfxs->length;
      GenefxAccumulator *S     = gfxs->Sacc;
-     __u16             *D     = gfxs->Aop[0];
-     __u32              Dkey  = gfxs->Dkey;
+     u16               *D     = gfxs->Aop[0];
+     u32                Dkey  = gfxs->Dkey;
 #ifdef WORDS_BIGENDIAN
-     __u16              Dkey0 = gfxs->Dkey >> 16;
-     __u16              Dkey1 = gfxs->Dkey & 0xFFFF;
+     u16                Dkey0 = gfxs->Dkey >> 16;
+     u16                Dkey1 = gfxs->Dkey & 0xFFFF;
 #else
-     __u16              Dkey0 = gfxs->Dkey & 0xFFFF;
-     __u16              Dkey1 = gfxs->Dkey >> 16;
+     u16                Dkey0 = gfxs->Dkey & 0xFFFF;
+     u16                Dkey1 = gfxs->Dkey >> 16;
 #endif
 
      if ((long)D & 2) {
@@ -6362,7 +6362,7 @@
      for (l = w>>1; l--;) {
           if (*D == Dkey) {
                if (!(S[0].YUV.a & 0xF000) && !(S[1].YUV.a & 0xF000)) {
-                    __u32 cb, y0, cr, y1;
+                    u32 cb, y0, cr, y1;
 
                     y0 = (S[0].YUV.y & 0xFF00) ? 0xFF : S[0].YUV.y;
                     y1 = (S[1].YUV.y & 0xFF00) ? 0xFF : S[1].YUV.y;
@@ -6376,9 +6376,9 @@
                          cr = 0xFF;
 
 #ifdef WORDS_BIGENDIAN
-                    *((__u32*)D) = cr | (y1 << 8) | (cb << 16) | (y0 << 24);
+                    *((u32*)D) = cr | (y1 << 8) | (cb << 16) | (y0 << 24);
 #else
-                    *((__u32*)D) = cb | (y0 << 8) | (cr << 16) | (y1 << 24);
+                    *((u32*)D) = cb | (y0 << 8) | (cr << 16) | (y1 << 24);
 #endif
                }
                else if (!(S[0].YUV.a & 0xF000)) {
@@ -6407,8 +6407,8 @@
 {
      int                w    = gfxs->length;
      GenefxAccumulator *S    = gfxs->Sacc;
-     __u8              *D    = gfxs->Aop[0];
-     __u32              Dkey = gfxs->Dkey;
+     u8                *D    = gfxs->Aop[0];
+     u32                Dkey = gfxs->Dkey;
 
      while (w--) {
           if (!(S->RGB.a & 0xF000) && (*D == Dkey)) {
@@ -6428,8 +6428,8 @@
 {
      int                w    = gfxs->length;
      GenefxAccumulator *S    = gfxs->Sacc;
-     __u8              *D    = gfxs->Aop[0];
-     __u32              Dkey = gfxs->Dkey;
+     u8                *D    = gfxs->Aop[0];
+     u32                Dkey = gfxs->Dkey;
 
      while (w--) {
           if (!(S->RGB.a & 0xF000) && ((*D & 0x0F) == Dkey)) {
@@ -6450,8 +6450,8 @@
 {
      int                w    = gfxs->length;
      GenefxAccumulator *S    = gfxs->Sacc;
-     __u16             *D    = gfxs->Aop[0];
-     __u16              Dkey = gfxs->Dkey;
+     u16               *D    = gfxs->Aop[0];
+     u16                Dkey = gfxs->Dkey;
 
      while (w--) {
           if (!(S->RGB.a & 0xF000) && ((*D & 0x3FFF) == Dkey)) {
@@ -6470,8 +6470,8 @@
 {
      int                w    = gfxs->length;
      GenefxAccumulator *S    = gfxs->Sacc;
-     __u16             *D    = gfxs->Aop[0];
-     __u16              Dkey = gfxs->Dkey;
+     u16               *D    = gfxs->Aop[0];
+     u16                Dkey = gfxs->Dkey;
 
      while (w--) {
           if (!(S->RGB.a & 0xF000) && ((*D & 0x0FFF) == Dkey)) {
@@ -6554,20 +6554,20 @@
 static void Bop_a8_set_alphapixel_Aop_argb1555( GenefxState *gfxs )
 {
      int    w   = gfxs->length;
-     __u8  *S   = gfxs->Bop[0];
-     __u16 *D   = gfxs->Aop[0];
-     __u32  Cop = gfxs->Cop;
-     __u32  rb  = Cop & 0x7c1f;
-     __u32  g   = Cop & 0x03e0;
+     u8    *S   = gfxs->Bop[0];
+     u16   *D   = gfxs->Aop[0];
+     u32    Cop = gfxs->Cop;
+     u32    rb  = Cop & 0x7c1f;
+     u32    g   = Cop & 0x03e0;
 
 #define SET_PIXEL(d,a) \
      switch (a) {\
           case 0xff: d = Cop;\
           case 0: break;\
           default: {\
-               register __u32  s = (a>>3)+1;\
-               register __u32 t1 = (d & 0x7c1f);\
-               register __u32 t2 = (d & 0x03e0);\
+               register u32  s = (a>>3)+1;\
+               register u32 t1 = (d & 0x7c1f);\
+               register u32 t2 = (d & 0x03e0);\
                d = ((d) & 0x8000) | ((a & 0x80) << 8) | \
                    ((((rb-t1)*s+(t1<<5)) & 0x000f83e0) + \
                     ((( g-t2)*s+(t2<<5)) & 0x00007c00)) >> 5;\
@@ -6583,20 +6583,20 @@
 static void Bop_a8_set_alphapixel_Aop_rgb16( GenefxState *gfxs )
 {
      int    w   = gfxs->length;
-     __u8  *S   = gfxs->Bop[0];
-     __u16 *D   = gfxs->Aop[0];
-     __u32  Cop = gfxs->Cop;
-     __u32  rb  = Cop & 0xf81f;
-     __u32  g   = Cop & 0x07e0;
+     u8    *S   = gfxs->Bop[0];
+     u16   *D   = gfxs->Aop[0];
+     u32    Cop = gfxs->Cop;
+     u32    rb  = Cop & 0xf81f;
+     u32    g   = Cop & 0x07e0;
 
 #define SET_PIXEL(d,a)\
      switch (a) {\
           case 0xff: d = Cop;\
           case 0: break;\
           default: {\
-               register __u32  s = (a>>2)+1;\
-               register __u32 t1 = (d & 0xf81f);\
-               register __u32 t2 = (d & 0x07e0);\
+               register u32  s = (a>>2)+1;\
+               register u32 t1 = (d & 0xf81f);\
+               register u32 t2 = (d & 0x07e0);\
                d  = ((((rb-t1)*s+(t1<<6)) & 0x003e07c0) + \
                      ((( g-t2)*s+(t2<<6)) & 0x0001f800)) >> 6;\
           }\
@@ -6611,12 +6611,12 @@
 {
 
      int       w     = gfxs->length;
-     __u8     *S     = gfxs->Bop[0];
-     __u8     *D     = gfxs->Aop[0];
+     u8       *S     = gfxs->Bop[0];
+     u8       *D     = gfxs->Aop[0];
 
-     __u32  Cop = gfxs->Cop;
-     __u32  rb  = Cop & 0x3f03f;
-     __u32  g   = Cop & 0xfc0;
+     u32    Cop = gfxs->Cop;
+     u32    rb  = Cop & 0x3f03f;
+     u32    g   = Cop & 0xfc0;
 
 
 #define SET_PIXEL(d,a)\
@@ -6624,9 +6624,9 @@
           case 0xff: d = Cop;\
           case 0: break;\
           default: {\
-               register __u32  s = (a>>2)+1;\
-               register __u32 t1 = (d & 0x3f03f);\
-               register __u32 t2 = (d & 0xfc0);\
+               register u32  s = (a>>2)+1;\
+               register u32 t1 = (d & 0x3f03f);\
+               register u32 t2 = (d & 0xfc0);\
                d  = ((((rb-t1)*s+(t1<<6)) & 0xfc0fc0) + \
                      ((( g-t2)*s+(t2<<6)) & 0xfc000)) >> 6;\
           }\
@@ -6640,12 +6640,12 @@
 static void Bop_a8_set_alphapixel_Aop_argb1666( GenefxState *gfxs )
 {
      int       w     = gfxs->length;
-     __u8     *S     = gfxs->Bop[0];
-     __u8     *D     = gfxs->Aop[0];
+     u8       *S     = gfxs->Bop[0];
+     u8       *D     = gfxs->Aop[0];
 
-     __u32  Cop = gfxs->Cop;
-     __u32  rb  = Cop & 0x3f03f;
-     __u32  g   = Cop & 0xfc0;
+     u32    Cop = gfxs->Cop;
+     u32    rb  = Cop & 0x3f03f;
+     u32    g   = Cop & 0xfc0;
 
 
 #define SET_PIXEL(d,a)\
@@ -6653,9 +6653,9 @@
           case 0xff: d = Cop;\
           case 0: break;\
           default: {\
-               register __u32  s = (a>>2)+1;\
-               register __u32 t1 = (d & 0x3f03f);\
-               register __u32 t2 = (d & 0xfc0);\
+               register u32  s = (a>>2)+1;\
+               register u32 t1 = (d & 0x3f03f);\
+               register u32 t2 = (d & 0xfc0);\
                d  = ((((rb-t1)*s+(t1<<6)) & 0xfc0fc0) + \
                      ((( g-t2)*s+(t2<<6)) & 0xfc000)) >> 6;\
           }\
@@ -6668,12 +6668,12 @@
 static void Bop_a8_set_alphapixel_Aop_rgb18( GenefxState *gfxs )
 {
      int       w     = gfxs->length;
-     __u8     *S     = gfxs->Bop[0];
-     __u8     *D     = gfxs->Aop[0];
+     u8       *S     = gfxs->Bop[0];
+     u8       *D     = gfxs->Aop[0];
 
-     __u32  Cop = gfxs->Cop;
-     __u32  rb  = Cop & 0x3f03f;
-     __u32  g   = Cop & 0xfc0;
+     u32    Cop = gfxs->Cop;
+     u32    rb  = Cop & 0x3f03f;
+     u32    g   = Cop & 0xfc0;
 
 
 #define SET_PIXEL(d,a)\
@@ -6681,9 +6681,9 @@
           case 0xff: d = Cop;\
           case 0: break;\
           default: {\
-               register __u32  s = (a>>2)+1;\
-               register __u32 t1 = (d & 0x3f03f);\
-               register __u32 t2 = (d & 0xfc0);\
+               register u32  s = (a>>2)+1;\
+               register u32 t1 = (d & 0x3f03f);\
+               register u32 t2 = (d & 0xfc0);\
                d  = ((((rb-t1)*s+(t1<<6)) & 0xfc0fc0) + \
                      ((( g-t2)*s+(t2<<6)) & 0xfc000)) >> 6;\
           }\
@@ -6697,8 +6697,8 @@
 static void Bop_a8_set_alphapixel_Aop_rgb24( GenefxState *gfxs )
 {
      int       w     = gfxs->length;
-     __u8     *S     = gfxs->Bop[0];
-     __u8     *D     = gfxs->Aop[0];
+     u8       *S     = gfxs->Bop[0];
+     u8       *D     = gfxs->Aop[0];
      DFBColor  color = gfxs->color;
 
 #define SET_PIXEL(d,r,g,b,a)\
@@ -6709,7 +6709,7 @@
                d[2] = r;\
           case 0: break;\
           default: {\
-               register __u16 s = a+1;\
+               register u16 s = a+1;\
                d[0] = ((b-d[0]) * s + (d[0] << 8)) >> 8;\
                d[1] = ((g-d[1]) * s + (d[1] << 8)) >> 8;\
                d[2] = ((r-d[2]) * s + (d[2] << 8)) >> 8;\
@@ -6733,20 +6733,20 @@
 static void Bop_a8_set_alphapixel_Aop_rgb32( GenefxState *gfxs )
 {
      int    w   = gfxs->length;
-     __u8  *S   = gfxs->Bop[0];
-     __u32 *D   = gfxs->Aop[0];
-     __u32  Cop = gfxs->Cop;
-     __u32  rb  = Cop & 0xff00ff;
-     __u32  g   = Cop & 0x00ff00;
+     u8    *S   = gfxs->Bop[0];
+     u32   *D   = gfxs->Aop[0];
+     u32    Cop = gfxs->Cop;
+     u32    rb  = Cop & 0xff00ff;
+     u32    g   = Cop & 0x00ff00;
 
 #define SET_PIXEL(d,a)\
      switch (a) {\
           case 0xff: d = Cop;\
           case 0: break;\
           default: {\
-               register __u32  s = a+1;\
-               register __u32 t1 = (d & 0x00ff00ff);\
-               register __u32 t2 = (d & 0x0000ff00);\
+               register u32  s = a+1;\
+               register u32 t1 = (d & 0x00ff00ff);\
+               register u32 t2 = (d & 0x0000ff00);\
                d = ((((rb-t1)*s+(t1<<8)) & 0xff00ff00) + \
                     ((( g-t2)*s+(t2<<8)) & 0x00ff0000)) >> 8;\
           }\
@@ -6763,20 +6763,20 @@
 static void Bop_a8_set_alphapixel_Aop_argb( GenefxState *gfxs )
 {
      int    w   = gfxs->length;
-     __u8  *S   = gfxs->Bop[0];
-     __u32 *D   = gfxs->Aop[0];
-     __u32  Cop = gfxs->Cop | 0xff000000;
-     __u32  rb  = Cop & 0x00ff00ff;
-     __u32  g   = gfxs->color.g;
+     u8    *S   = gfxs->Bop[0];
+     u32   *D   = gfxs->Aop[0];
+     u32    Cop = gfxs->Cop | 0xff000000;
+     u32    rb  = Cop & 0x00ff00ff;
+     u32    g   = gfxs->color.g;
 
 #define SET_PIXEL(d,a)\
      switch (a) {\
           case 0xff: d = Cop;\
           case 0: break;\
           default: {\
-               register __u32  s = a+1;\
-               register __u32 s1 = 256-a;\
-               register __u32 sa = (((d >> 24) * s1) >> 8) + a;\
+               register u32  s = a+1;\
+               register u32 s1 = 256-a;\
+               register u32 sa = (((d >> 24) * s1) >> 8) + a;\
                d = (sa << 24) + \
                     (((((d & 0x00ff00ff)       * s1) + (rb  * s)) >> 8) & 0x00ff00ff) + \
                     (((((d & 0x0000ff00) >> 8) * s1) + ((g) * s))       & 0x0000ff00);  \
@@ -6791,20 +6791,20 @@
 static void Bop_a8_set_alphapixel_Aop_airgb( GenefxState *gfxs )
 {
      int    w   = gfxs->length;
-     __u8  *S   = gfxs->Bop[0];
-     __u32 *D   = gfxs->Aop[0];
-     __u32  Cop = gfxs->Cop;
-     __u32  rb  = Cop & 0x00ff00ff;
-     __u32  g   = gfxs->color.g;
+     u8    *S   = gfxs->Bop[0];
+     u32   *D   = gfxs->Aop[0];
+     u32    Cop = gfxs->Cop;
+     u32    rb  = Cop & 0x00ff00ff;
+     u32    g   = gfxs->color.g;
 
 #define SET_PIXEL(d,a)\
      switch (a) {\
           case 0xff: d = Cop;\
           case 0: break;\
           default: {\
-               register __u32  s = a+1;\
-               register __u32 s1 = 256-s;\
-               register __s32 sa = (d >> 24) - a;\
+               register u32  s = a+1;\
+               register u32 s1 = 256-s;\
+               register s32 sa = (d >> 24) - a;\
                if (sa < 0) sa = 0;\
                d = (sa << 24) + \
                     (((((d & 0x00ff00ff)       * s1) + (rb  * s)) >> 8) & 0x00ff00ff) + \
@@ -6820,15 +6820,15 @@
 static void Bop_a8_set_alphapixel_Aop_a8( GenefxState *gfxs )
 {
      int    w = gfxs->length;
-     __u8  *S = gfxs->Bop[0];
-     __u8  *D = gfxs->Aop[0];
+     u8    *S = gfxs->Bop[0];
+     u8    *D = gfxs->Aop[0];
 
 #define SET_PIXEL(d,a)\
      switch (a) {\
           case 0xff: d = 0xff;\
           case 0: break; \
           default: {\
-               register __u16 s1 = 255-a;\
+               register u16 s1 = 255-a;\
                d = ((d * s1) >> 8) + a;\
           }\
      }
@@ -6841,22 +6841,22 @@
 static void Bop_a8_set_alphapixel_Aop_yuy2( GenefxState *gfxs )
 {
      int    w    = gfxs->length;
-     __u8  *S    = gfxs->Bop[0];
-     __u16 *D    = gfxs->Aop[0];
-     __u32  y    = gfxs->YCop;
-     __u32  u    = gfxs->CbCop;
-     __u32  v    = gfxs->CrCop;
-     __u16  Cop0 = y | (u << 8);
-     __u16  Cop1 = y | (v << 8);
+     u8    *S    = gfxs->Bop[0];
+     u16   *D    = gfxs->Aop[0];
+     u32    y    = gfxs->YCop;
+     u32    u    = gfxs->CbCop;
+     u32    v    = gfxs->CrCop;
+     u16    Cop0 = y | (u << 8);
+     u16    Cop1 = y | (v << 8);
 
 #define SET_PIXEL(d,a)\
      switch (a) {\
           case 0xff: d = ((long)&(d) & 2) ? Cop1 : Cop0;\
           case 0x00: break;\
           default: {\
-               register __u32  s = a+1;\
-               register __u32 t1 = d & 0xff;\
-               register __u32 t2 = d >> 8;\
+               register u32  s = a+1;\
+               register u32 t1 = d & 0xff;\
+               register u32 t2 = d >> 8;\
                if ((long)&(d) & 2)\
                     d = (((y-t1)*s+(t1<<8)) >> 8) |\
                         (((v-t2)*s+(t2<<8)) & 0xff00);\
@@ -6874,19 +6874,19 @@
 static void Bop_a8_set_alphapixel_Aop_rgb332( GenefxState *gfxs )
 {
      int    w   = gfxs->length;
-     __u8  *S   = gfxs->Bop[0];
-     __u8  *D   = gfxs->Aop[0];
-     __u32  Cop = gfxs->Cop;
-     __u32  rgb = ((Cop & 0xe0) << 16) | ((Cop & 0x1c) << 8) | (Cop & 0x03);
+     u8    *S   = gfxs->Bop[0];
+     u8    *D   = gfxs->Aop[0];
+     u32    Cop = gfxs->Cop;
+     u32    rgb = ((Cop & 0xe0) << 16) | ((Cop & 0x1c) << 8) | (Cop & 0x03);
 
 #define SET_PIXEL(d,a) \
      switch (a) {\
           case 0xff: d = Cop;\
           case 0: break;\
           default: {\
-               register __u32 s = a + 1;\
-               register __u32 t = ((d & 0xe0) << 16) | ((d & 0x1c) << 8) | (d & 0x03);\
-               register __u32 c = ((rgb-t)*s + (t<<8)) & 0xe01c0300;\
+               register u32 s = a + 1;\
+               register u32 t = ((d & 0xe0) << 16) | ((d & 0x1c) << 8) | (d & 0x03);\
+               register u32 c = ((rgb-t)*s + (t<<8)) & 0xe01c0300;\
                d = (c >> 24) | ((c >> 16) & 0xff) | ((c >> 8) & 0xff);\
           }\
      }
@@ -6899,22 +6899,22 @@
 static void Bop_a8_set_alphapixel_Aop_uyvy( GenefxState *gfxs )
 {
      int    w    = gfxs->length;
-     __u8  *S    = gfxs->Bop[0];
-     __u16 *D    = gfxs->Aop[0];
-     __u32  y    = gfxs->YCop;
-     __u32  u    = gfxs->CbCop;
-     __u32  v    = gfxs->CrCop;
-     __u16  Cop0 = u | (y << 8);
-     __u16  Cop1 = v | (y << 8);
+     u8    *S    = gfxs->Bop[0];
+     u16   *D    = gfxs->Aop[0];
+     u32    y    = gfxs->YCop;
+     u32    u    = gfxs->CbCop;
+     u32    v    = gfxs->CrCop;
+     u16    Cop0 = u | (y << 8);
+     u16    Cop1 = v | (y << 8);
 
 #define SET_PIXEL(d,a)\
      switch (a) {\
           case 0xff: d = ((long)&(d) & 2) ? Cop1 : Cop0;\
           case 0x00: break;\
           default: {\
-               register __u32  s = a+1;\
-               register __u32 t1 = d & 0xff;\
-               register __u32 t2 = d >> 8;\
+               register u32  s = a+1;\
+               register u32 t1 = d & 0xff;\
+               register u32 t2 = d >> 8;\
                if ((long)&(d) & 2)\
                     d = (((v-t1)*s+(t1<<8)) >> 8) |\
                         (((y-t2)*s+(t2<<8)) & 0xff00);\
@@ -6932,9 +6932,9 @@
 static void Bop_a8_set_alphapixel_Aop_lut8( GenefxState *gfxs )
 {
      int    w   = gfxs->length;
-     __u8  *S   = gfxs->Bop[0];
-     __u8  *D   = gfxs->Aop[0];
-     __u32  Cop = gfxs->Cop;
+     u8    *S   = gfxs->Bop[0];
+     u8    *D   = gfxs->Aop[0];
+     u32    Cop = gfxs->Cop;
 
 #if 0
      DFBColor  color   = gfxs->color;
@@ -6945,9 +6945,9 @@
           case 0xff: d = Cop;\
           case 0: break; \
           default: {\
-               register __u16 s = alpha+1;\
+               register u16   s = alpha+1;\
                DFBColor      dc = entries[d];\
-               __u16         sa = alpha + dc.a;\
+               u16           sa = alpha + dc.a;\
                dc.r = ((color.r - dc.r) * s + (dc.r << 8)) >> 8;\
                dc.g = ((color.g - dc.g) * s + (dc.g << 8)) >> 8;\
                dc.b = ((color.b - dc.b) * s + (dc.b << 8)) >> 8;\
@@ -6969,9 +6969,9 @@
 static void Bop_a8_set_alphapixel_Aop_alut44( GenefxState *gfxs )
 {
      int    w   = gfxs->length;
-     __u8  *S   = gfxs->Bop[0];
-     __u8  *D   = gfxs->Aop[0];
-     __u32  Cop = gfxs->Cop;
+     u8    *S   = gfxs->Bop[0];
+     u8    *D   = gfxs->Aop[0];
+     u32    Cop = gfxs->Cop;
 
      DFBColor  color   = gfxs->color;
      DFBColor *entries = gfxs->Alut->entries;
@@ -6981,9 +6981,9 @@
           case 0xff: d = Cop;\
           case 0: break; \
           default: {\
-               register __u16 s = alpha+1;\
+               register u16   s = alpha+1;\
                DFBColor      dc = entries[d & 0x0f];\
-               __u16         sa = (d & 0xf0) + alpha;\
+               u16           sa = (d & 0xf0) + alpha;\
                dc.r = ((color.r - dc.r) * s + (dc.r << 8)) >> 8;\
                dc.g = ((color.g - dc.g) * s + (dc.g << 8)) >> 8;\
                dc.b = ((color.b - dc.b) * s + (dc.b << 8)) >> 8;\
@@ -7036,9 +7036,9 @@
 {
      int    i;
      int    w   = gfxs->length;
-     __u8  *S   = gfxs->Bop[0];
-     __u16 *D   = gfxs->Aop[0];
-     __u16  Cop = gfxs->Cop | 0x8000;
+     u8    *S   = gfxs->Bop[0];
+     u16   *D   = gfxs->Aop[0];
+     u16    Cop = gfxs->Cop | 0x8000;
 
      for (i=0; i<w; i++) {
           if (S[i>>3] & (0x80 >> (i&7)))
@@ -7051,9 +7051,9 @@
 {
      int    i;
      int    w   = gfxs->length;
-     __u8  *S   = gfxs->Bop[0];
-     __u16 *D   = gfxs->Aop[0];
-     __u16  Cop = gfxs->Cop;
+     u8    *S   = gfxs->Bop[0];
+     u16   *D   = gfxs->Aop[0];
+     u16    Cop = gfxs->Cop;
 
      for (i=0; i<w; i++) {
           if (S[i>>3] & (0x80 >> (i&7)))
@@ -7065,8 +7065,8 @@
 {
      int       i;
      int       w     = gfxs->length;
-     __u8     *S     = gfxs->Bop[0];
-     __u8     *D     = gfxs->Aop[0];
+     u8       *S     = gfxs->Bop[0];
+     u8       *D     = gfxs->Aop[0];
      DFBColor  color = gfxs->color;
 
      for (i=0; i<w; i++) {
@@ -7084,8 +7084,8 @@
 {
      int       i;
      int       w     = gfxs->length;
-     __u8     *S     = gfxs->Bop[0];
-     __u8     *D     = gfxs->Aop[0];
+     u8       *S     = gfxs->Bop[0];
+     u8       *D     = gfxs->Aop[0];
      DFBColor  color = gfxs->color;
 
      for (i=0; i<w; i++) {
@@ -7103,8 +7103,8 @@
 {
      int       i;
      int       w     = gfxs->length;
-     __u8     *S     = gfxs->Bop[0];
-     __u8     *D     = gfxs->Aop[0];
+     u8       *S     = gfxs->Bop[0];
+     u8       *D     = gfxs->Aop[0];
      DFBColor  color = gfxs->color;
 
      for (i=0; i<w; i++) {
@@ -7122,8 +7122,8 @@
 {
      int       i;
      int       w     = gfxs->length;
-     __u8     *S     = gfxs->Bop[0];
-     __u8     *D     = gfxs->Aop[0];
+     u8       *S     = gfxs->Bop[0];
+     u8       *D     = gfxs->Aop[0];
      DFBColor  color = gfxs->color;
 
      for (i=0; i<w; i++) {
@@ -7141,9 +7141,9 @@
 {
      int    i;
      int    w   = gfxs->length;
-     __u8  *S   = gfxs->Bop[0];
-     __u32 *D   = gfxs->Aop[0];
-     __u32  Cop = gfxs->Cop;
+     u8    *S   = gfxs->Bop[0];
+     u32   *D   = gfxs->Aop[0];
+     u32    Cop = gfxs->Cop;
 
      for (i=0; i<w; i++) {
           if (S[i>>3] & (0x80 >> (i&7)))
@@ -7155,9 +7155,9 @@
 {
      int    i;
      int    w   = gfxs->length;
-     __u8  *S   = gfxs->Bop[0];
-     __u32 *D   = gfxs->Aop[0];
-     __u32  Cop = gfxs->Cop | 0xFF000000;
+     u8    *S   = gfxs->Bop[0];
+     u32   *D   = gfxs->Aop[0];
+     u32    Cop = gfxs->Cop | 0xFF000000;
 
      for (i=0; i<w; i++) {
           if (S[i>>3] & (0x80 >> (i&7)))
@@ -7169,9 +7169,9 @@
 {
      int    i;
      int    w   = gfxs->length;
-     __u8  *S   = gfxs->Bop[0];
-     __u32 *D   = gfxs->Aop[0];
-     __u32  Cop = gfxs->Cop & 0x00FFFFFF;
+     u8    *S   = gfxs->Bop[0];
+     u32   *D   = gfxs->Aop[0];
+     u32    Cop = gfxs->Cop & 0x00FFFFFF;
 
      for (i=0; i<w; i++) {
           if (S[i>>3] & (0x80 >> (i&7)))
@@ -7183,8 +7183,8 @@
 {
      int   i;
      int   w = gfxs->length;
-     __u8 *S = gfxs->Bop[0];
-     __u8 *D = gfxs->Aop[0];
+     u8   *S = gfxs->Bop[0];
+     u8   *D = gfxs->Aop[0];
 
      for (i=0; i<w; i++) {
           if (S[i>>3] & (0x80 >> (i&7)))
@@ -7196,10 +7196,10 @@
 {
      int    i;
      int    w    = gfxs->length;
-     __u8  *S    = gfxs->Bop[0];
-     __u16 *D    = gfxs->Aop[0];
-     __u16  Cop0 = gfxs->YCop | (gfxs->CbCop << 8);
-     __u16  Cop1 = gfxs->YCop | (gfxs->CrCop << 8);
+     u8    *S    = gfxs->Bop[0];
+     u16   *D    = gfxs->Aop[0];
+     u16    Cop0 = gfxs->YCop | (gfxs->CbCop << 8);
+     u16    Cop1 = gfxs->YCop | (gfxs->CrCop << 8);
 
      for (i=0; i<w; i++) {
           if (S[i>>3] & (0x80 >> (i&7))) {
@@ -7212,9 +7212,9 @@
 {
      int   i;
      int   w   = gfxs->length;
-     __u8 *S   = gfxs->Bop[0];
-     __u8 *D   = gfxs->Aop[0];
-     __u8  Cop = gfxs->Cop;
+     u8   *S   = gfxs->Bop[0];
+     u8   *D   = gfxs->Aop[0];
+     u8    Cop = gfxs->Cop;
 
      for (i=0; i<w; i++) {
           if (S[i>>3] & (0x80 >> (i&7)))
@@ -7226,10 +7226,10 @@
 {
      int    i;
      int    w    = gfxs->length;
-     __u8  *S    = gfxs->Bop[0];
-     __u16 *D    = gfxs->Aop[0];
-     __u16  Cop0 = gfxs->CbCop | (gfxs->YCop << 8);
-     __u16  Cop1 = gfxs->CrCop | (gfxs->YCop << 8);
+     u8    *S    = gfxs->Bop[0];
+     u16   *D    = gfxs->Aop[0];
+     u16    Cop0 = gfxs->CbCop | (gfxs->YCop << 8);
+     u16    Cop1 = gfxs->CrCop | (gfxs->YCop << 8);
 
      for (i=0; i<w; i++) {
           if (S[i>>3] & (0x80 >> (i&7))) {
@@ -7242,9 +7242,9 @@
 {
      int   i;
      int   w   = gfxs->length;
-     __u8 *S   = gfxs->Bop[0];
-     __u8 *D   = gfxs->Aop[0];
-     __u8  Cop = gfxs->Cop;
+     u8   *S   = gfxs->Bop[0];
+     u8   *D   = gfxs->Aop[0];
+     u8    Cop = gfxs->Cop;
 
      for (i=0; i<w; i++) {
           if (S[i>>3] & (0x80 >> (i&7)))
@@ -7256,9 +7256,9 @@
 {
      int   i;
      int   w   = gfxs->length;
-     __u8 *S   = gfxs->Bop[0];
-     __u8 *D   = gfxs->Aop[0];
-     __u8  Cop = gfxs->Cop;
+     u8   *S   = gfxs->Bop[0];
+     u8   *D   = gfxs->Aop[0];
+     u8    Cop = gfxs->Cop;
 
      for (i=0; i<w; i++) {
           if (S[i>>3] & (0x80 >> (i&7)))
@@ -7270,9 +7270,9 @@
 {
      int    i;
      int    w   = gfxs->length;
-     __u8  *S   = gfxs->Bop[0];
-     __u16 *D   = gfxs->Aop[0];
-     __u16  Cop = gfxs->Cop | 0xC000;
+     u8    *S   = gfxs->Bop[0];
+     u16   *D   = gfxs->Aop[0];
+     u16    Cop = gfxs->Cop | 0xC000;
 
      for (i=0; i<w; i++) {
           if (S[i>>3] & (0x80 >> (i&7)))
@@ -7284,9 +7284,9 @@
 {
      int    i;
      int    w   = gfxs->length;
-     __u8  *S   = gfxs->Bop[0];
-     __u16 *D   = gfxs->Aop[0];
-     __u16  Cop = gfxs->Cop | 0xF000;
+     u8    *S   = gfxs->Bop[0];
+     u16   *D   = gfxs->Aop[0];
+     u16    Cop = gfxs->Cop | 0xF000;
 
      for (i=0; i<w; i++) {
           if (S[i>>3] & (0x80 >> (i&7)))
@@ -7432,7 +7432,7 @@
 
           while (w--) {
                if (!(X->RGB.a & 0xF000)) {
-                    register __u16 Sa = S->RGB.a + 1;
+                    register u16 Sa = S->RGB.a + 1;
 
                     X->RGB.r = (Sa * X->RGB.r) >> 8;
                     X->RGB.g = (Sa * X->RGB.g) >> 8;
@@ -7445,7 +7445,7 @@
           }
      }
      else {
-          register __u16 Sa = gfxs->color.a + 1;
+          register u16 Sa = gfxs->color.a + 1;
 
           while (w--) {
                if (!(X->RGB.a & 0xF000)) {
@@ -7470,7 +7470,7 @@
 
           while (w--) {
                if (!(X->RGB.a & 0xF000)) {
-                    register __u16 Sa = 0x100 - S->RGB.a;
+                    register u16 Sa = 0x100 - S->RGB.a;
 
                     X->RGB.r = (Sa * X->RGB.r) >> 8;
                     X->RGB.g = (Sa * X->RGB.g) >> 8;
@@ -7483,7 +7483,7 @@
           }
      }
      else {
-          register __u16 Sa = 0x100 - gfxs->color.a;
+          register u16 Sa = 0x100 - gfxs->color.a;
 
           while (w--) {
                if (!(X->RGB.a & 0xF000)) {
@@ -7506,7 +7506,7 @@
 
      while (w--) {
           if (!(X->RGB.a & 0xF000)) {
-               register __u16 Da = D->RGB.a + 1;
+               register u16 Da = D->RGB.a + 1;
 
                X->RGB.r = (Da * X->RGB.r) >> 8;
                X->RGB.g = (Da * X->RGB.g) >> 8;
@@ -7527,7 +7527,7 @@
 
      while (w--) {
           if (!(X->RGB.a & 0xF000)) {
-               register __u16 Da = 0x100 - D->RGB.a;
+               register u16 Da = 0x100 - D->RGB.a;
 
                X->RGB.r = (Da * X->RGB.r) >> 8;
                X->RGB.g = (Da * X->RGB.g) >> 8;
@@ -7589,7 +7589,7 @@
 
           while (w--) {
                if (!(X->RGB.a & 0xF000)) {
-                    register __u16 Sa = MIN( S->RGB.a + 1, 0x100 - D->RGB.a );
+                    register u16 Sa = MIN( S->RGB.a + 1, 0x100 - D->RGB.a );
 
                     X->RGB.r = (Sa * X->RGB.r) >> 8;
                     X->RGB.g = (Sa * X->RGB.g) >> 8;
@@ -7604,7 +7604,7 @@
      else {
           while (w--) {
                if (!(X->RGB.a & 0xF000)) {
-                    register __u16 Sa = MIN( gfxs->color.a + 1, 0x100 - D->RGB.a );
+                    register u16 Sa = MIN( gfxs->color.a + 1, 0x100 - D->RGB.a );
 
                     X->RGB.r = (Sa * X->RGB.r) >> 8;
                     X->RGB.g = (Sa * X->RGB.g) >> 8;
@@ -7737,7 +7737,7 @@
 
      while (w--) {
           if (!(D->RGB.a & 0xF000)) {
-               register __u16 Da = D->RGB.a + 1;
+               register u16 Da = D->RGB.a + 1;
 
                D->RGB.r = (Da * D->RGB.r) >> 8;
                D->RGB.g = (Da * D->RGB.g) >> 8;
@@ -7752,7 +7752,7 @@
 {
      int                w  = gfxs->length;
      GenefxAccumulator *D  = gfxs->Dacc;
-     register __u16     Ca = gfxs->Cacc.RGB.a;
+     register u16       Ca = gfxs->Cacc.RGB.a;
 
      while (w--) {
           if (!(D->RGB.a & 0xF000)) {
@@ -7772,7 +7772,7 @@
 
      while (w--) {
           if (!(D->RGB.a & 0xF000)) {
-               register __u16 Da = D->RGB.a + 1;
+               register u16 Da = D->RGB.a + 1;
 
                D->RGB.r = (D->RGB.r << 8) / Da;
                D->RGB.g = (D->RGB.g << 8) / Da;
@@ -7879,9 +7879,9 @@
      while (w--) {
           /* Actually DirectFB only supports 4:2:X formats */
           if (!(D[0].RGB.a & 0xF000) && !(D[1].RGB.a & 0xF000)) {
-               __u32 r0, g0, b0;
-               __u32 r1, g1, b1;
-               __u32 ey0, ey1;
+               u32 r0, g0, b0;
+               u32 r1, g1, b1;
+               u32 ey0, ey1;
 
                r0 = D[0].RGB.r; g0 = D[0].RGB.g; b0 = D[0].RGB.b;
                r1 = D[1].RGB.r; g1 = D[1].RGB.g; b1 = D[1].RGB.b;
@@ -7894,7 +7894,7 @@
                D[0].YUV.v = D[1].YUV.v = cr_from_rey[(r0-ey0+r1-ey1)>>1];
           }
           else if (!(D[0].RGB.a & 0xF000)) {
-               __u32 r, g, b, ey;
+               u32 r, g, b, ey;
 
                r = D[0].RGB.r; g = D[0].RGB.g; b = D[0].RGB.b;
                ey = (19595 * r + 38469 * g + 7471 * b) >> 16;
@@ -7904,7 +7904,7 @@
                D[0].YUV.v = cr_from_rey[r-ey];
           }
           else if (!(D[1].RGB.a & 0xF000)) {
-               __u32 r, g, b, ey;
+               u32 r, g, b, ey;
 
                r = D[1].RGB.r; g = D[1].RGB.g; b = D[1].RGB.b;
                ey = (19595 * r + 38469 * g + 7471 * b) >> 16;
@@ -7919,7 +7919,7 @@
 
      if (gfxs->length & 1) {
           if (!(D->RGB.a & 0xF000)) {
-               __u32 r, g, b, ey;
+               u32 r, g, b, ey;
 
                r = D->RGB.r; g = D->RGB.g; b = D->RGB.b;
                ey = (19595 * r + 38469 * g + 7471 * b) >> 16;
@@ -7959,8 +7959,8 @@
           /* Actually DirectFB only supports 4:2:X formats,
            * therefore D[0].YUV.u/v is equal to D[1].YUV.u/v */
           if (!(D[0].YUV.a & 0xF000) && !(D[1].YUV.a & 0xF000)) {
-               __s16 c0, c1, c2;
-               __s16 r, g, b;
+               s16 c0, c1, c2;
+               s16 r, g, b;
 
                c0 = cr_for_r[D[0].YUV.v];
                c1 = cr_for_g[D[0].YUV.v] + cb_for_g[D[0].YUV.u];
@@ -7981,8 +7981,8 @@
                D[1].RGB.b = (b < 0) ? 0 : b;
           }
           else if (!(D[0].YUV.a & 0xF000)) {
-               __u16 y, cb, cr;
-               __s16 r, g, b;
+               u16 y, cb, cr;
+               s16 r, g, b;
 
                y  = y_for_rgb[D[0].YUV.y];
                cb = D[0].YUV.u;
@@ -7996,8 +7996,8 @@
                D[0].RGB.b = (b < 0) ? 0 : b;
           }
           else if (!(D[1].YUV.a & 0xF000)) {
-               __u16 y, cb, cr;
-               __s16 r, g, b;
+               u16 y, cb, cr;
+               s16 r, g, b;
 
                y  = y_for_rgb[D[1].YUV.y];
                cb = D[1].YUV.u;
@@ -8016,8 +8016,8 @@
 
      if (gfxs->length & 1) {
           if (!(D->YUV.a & 0xF000)) {
-               __u16 y, cb, cr;
-               __s16 r, g, b;
+               u16 y, cb, cr;
+               s16 r, g, b;
 
                y  = y_for_rgb[D->YUV.y];
                cb = D->YUV.u;
@@ -8176,7 +8176,7 @@
 
      /* premultiply source (color) */
      if (DFB_DRAWING_FUNCTION(accel) && (state->drawingflags & DSDRAW_SRC_PREMULTIPLY)) {
-          __u16 ca = color.a + 1;
+          u16 ca = color.a + 1;
 
           color.r = (color.r * ca) >> 8;
           color.g = (color.g * ca) >> 8;
@@ -8466,7 +8466,7 @@
 
                     /* premultiply source (color) */
                     /*if (state->drawingflags & DSDRAW_SRC_PREMULTIPLY) {
-                         __u16 ca = color.a + 1;
+                         u16 ca = color.a + 1;
 
                          Cacc.r = (Cacc.r * ca) >> 8;
                          Cacc.g = (Cacc.g * ca) >> 8;
@@ -8494,7 +8494,7 @@
                                    SCacc.RGB.b = (Cacc.RGB.b * (0x100 - Cacc.RGB.b)) >> 8;
                                    break;
                               case DSBF_SRCALPHA: {
-                                        __u16 ca = color.a + 1;
+                                        u16 ca = color.a + 1;
 
                                         SCacc.RGB.a = (Cacc.RGB.a * ca) >> 8;
                                         SCacc.RGB.r = (Cacc.RGB.r * ca) >> 8;
@@ -8503,7 +8503,7 @@
                                         break;
                                    }
                               case DSBF_INVSRCALPHA: {
-                                        __u16 ca = 0x100 - color.a;
+                                        u16 ca = 0x100 - color.a;
 
                                         SCacc.RGB.a = (Cacc.RGB.a * ca) >> 8;
                                         SCacc.RGB.r = (Cacc.RGB.r * ca) >> 8;
Index: src/gfx/generic/generic.h
===================================================================
RCS file: /cvs/directfb/DirectFB/src/gfx/generic/generic.h,v
retrieving revision 1.26
diff -u -r1.26 generic.h
--- src/gfx/generic/generic.h	11 Sep 2006 15:40:24 -0000	1.26
+++ src/gfx/generic/generic.h	7 Oct 2006 19:54:50 -0000
@@ -39,16 +39,16 @@
 
 typedef union {
      struct {
-          __u16 b;
-          __u16 g;
-          __u16 r;
-          __u16 a;
+          u16 b;
+          u16 g;
+          u16 r;
+          u16 a;
      } RGB;
      struct {
-          __u16 u;
-          __u16 v;
-          __u16 y;
-          __u16 a;
+          u16 u;
+          u16 v;
+          u16 y;
+          u16 a;
      } YUV;
 } GenefxAccumulator;
 
@@ -97,11 +97,11 @@
       */
      void *Aop[3];
      void *Bop[3];
-     __u32 Cop;
+     u32   Cop;
 
-     __u8 YCop;
-     __u8 CbCop;
-     __u8 CrCop;
+     u8 YCop;
+     u8 CbCop;
+     u8 CrCop;
 
      int Aop_field;
      int Bop_field;
@@ -112,8 +112,8 @@
      /*
       * color keys
       */
-     __u32 Dkey;
-     __u32 Skey;
+     u32 Dkey;
+     u32 Skey;
 
      /*
       * color lookup tables
Index: src/gfx/generic/generic_64.h
===================================================================
RCS file: /cvs/directfb/DirectFB/src/gfx/generic/generic_64.h,v
retrieving revision 1.3
diff -u -r1.3 generic_64.h
--- src/gfx/generic/generic_64.h	1 Jan 2006 11:01:01 -0000	1.3
+++ src/gfx/generic/generic_64.h	7 Oct 2006 19:54:50 -0000
@@ -30,9 +30,9 @@
 static void Cop_to_Aop_32_64( GenefxState *gfxs )
 {
      int    w, l = gfxs->length;
-     __u32 *D    = gfxs->Aop[0];
-     __u32  Cop  = gfxs->Cop;
-     __u64  DCop = ((__u64)Cop << 32) | Cop;
+     u32   *D    = gfxs->Aop[0];
+     u32    Cop  = gfxs->Cop;
+     u64    DCop = ((u64)Cop << 32) | Cop;
      
      if ((long)D & 4) {
           *D++ = Cop;
@@ -40,7 +40,7 @@
      }
 
      for (w = l >> 1; w; w--) {
-          *((__u64*)D) = DCop;
+          *((u64*)D) = DCop;
           D += 2;
      }
      
@@ -51,10 +51,10 @@
 static void Bop_rgb32_Kto_Aop_64( GenefxState *gfxs )
 {
      int    w, l  = gfxs->length;
-     __u32 *D     = gfxs->Aop[0];
-     __u32 *S     = gfxs->Bop[0];
-     __u32  Skey  = gfxs->Skey;
-     __u64  DSkey = ((__u64)Skey << 32) | Skey;
+     u32   *D     = gfxs->Aop[0];
+     u32   *S     = gfxs->Bop[0];
+     u32    Skey  = gfxs->Skey;
+     u64    DSkey = ((u64)Skey << 32) | Skey;
      
      if ((long)D & 4) {
           if (*S != Skey)
@@ -65,28 +65,28 @@
      }               
 
      for (w = l >> 1; w; w--) {
-          __u64 s = *((__u64*)S);
+          u64 s = *((u64*)S);
 
           if (s != DSkey) {
                if ((s & 0x00ffffff00000000ull) != 
                     (DSkey & 0x00ffffff00000000ull)) {
                     if ((s & 0x0000000000ffffffull) != 
                          (DSkey & 0x0000000000ffffffull)) {
-                         *((__u64*)D) = s;
+                         *((u64*)D) = s;
                     }
                     else {
 #ifdef WORDS_BIGENDIAN
-                         D[0] = (__u32)(s >> 32);
+                         D[0] = (u32)(s >> 32);
 #else
-                         D[1] = (__u32)(s >> 32);
+                         D[1] = (u32)(s >> 32);
 #endif
                     }
                }
                else {
 #ifdef WORDS_BIGENDIAN
-                    D[1] = (__u32)s;
+                    D[1] = (u32)s;
 #else
-                    D[0] = (__u32)s;
+                    D[0] = (u32)s;
 #endif
                }
           }
@@ -103,10 +103,10 @@
 static void Bop_rgb32_toK_Aop_64( GenefxState *gfxs )
 {
      int    w, l  = gfxs->length;
-     __u32 *D     = gfxs->Aop[0];
-     __u32 *S     = gfxs->Bop[0];
-     __u32  Dkey  = gfxs->Dkey;
-     __u64  DDkey = ((__u64)Dkey << 32) | Dkey;
+     u32   *D     = gfxs->Aop[0];
+     u32   *S     = gfxs->Bop[0];
+     u32    Dkey  = gfxs->Dkey;
+     u64    DDkey = ((u64)Dkey << 32) | Dkey;
      
      if ((long)D & 4) {
           if (*D == Dkey)
@@ -117,14 +117,14 @@
      }               
 
      for (w = l >> 1; w; w--) {
-          __u64 d = *((__u64*)D);
+          u64 d = *((u64*)D);
 
           if (d != DDkey) {
                if ((d & 0x00ffffff00000000ull) ==
                     (DDkey & 0x00ffffff00000000ull)) {
                     if ((d & 0x0000000000ffffffull) ==
                          (DDkey & 0x0000000000ffffffull)) {
-                         *((__u64*)D) = *((__u64*)S);
+                         *((u64*)D) = *((u64*)S);
                     }
                     else {
 #ifdef WORDS_BIGENDIAN
@@ -156,8 +156,8 @@
 {
      int    w, l   = gfxs->length;
      int    i      = 0;
-     __u32 *D      = gfxs->Aop[0];
-     __u32 *S      = gfxs->Bop[0];
+     u32   *D      = gfxs->Aop[0];
+     u32   *S      = gfxs->Bop[0];
      int    SperD  = gfxs->SperD;
      int    SperD2 = SperD << 1;
      
@@ -169,9 +169,9 @@
      
      for (w = l >> 1; w; w--) {
 #ifdef WORDS_BIGENDIAN
-          *((__u64*)D) = ((__u64)S[i>>16] << 32) | S[(i+SperD)>>16];
+          *((u64*)D) = ((u64)S[i>>16] << 32) | S[(i+SperD)>>16];
 #else
-          *((__u64*)D) = ((__u64)S[(i+SperD)>>16] << 32) | S[i>>16];
+          *((u64*)D) = ((u64)S[(i+SperD)>>16] << 32) | S[i>>16];
 #endif
           D += 2;
           i += SperD2;
@@ -184,19 +184,19 @@
 static void Dacc_xor_64( GenefxState *gfxs )
 {
      int    w     = gfxs->length;
-     __u64 *D     = (__u64*)gfxs->Dacc;
-     __u64  color;
+     u64   *D     = (u64*)gfxs->Dacc;
+     u64    color;
 
 #ifdef WORDS_BIGENDIAN
-     color = ((__u64)gfxs->color.b << 48) |
-             ((__u64)gfxs->color.g << 32) |
-             ((__u64)gfxs->color.r << 16) |
-             ((__u64)gfxs->color.a);
-#else
-     color = ((__u64)gfxs->color.a << 48) |
-             ((__u64)gfxs->color.r << 32) |
-             ((__u64)gfxs->color.g << 16) |
-             ((__u64)gfxs->color.b);
+     color = ((u64)gfxs->color.b << 48) |
+             ((u64)gfxs->color.g << 32) |
+             ((u64)gfxs->color.r << 16) |
+             ((u64)gfxs->color.a);
+#else
+     color = ((u64)gfxs->color.a << 48) |
+             ((u64)gfxs->color.r << 32) |
+             ((u64)gfxs->color.g << 16) |
+             ((u64)gfxs->color.b);
 #endif
 
      for (; w; w--) {
Index: src/gfx/generic/generic_mmx.h
===================================================================
RCS file: /cvs/directfb/DirectFB/src/gfx/generic/generic_mmx.h,v
retrieving revision 1.13
diff -u -r1.13 generic_mmx.h
--- src/gfx/generic/generic_mmx.h	1 Jan 2006 11:01:01 -0000	1.13
+++ src/gfx/generic/generic_mmx.h	7 Oct 2006 19:54:50 -0000
@@ -92,9 +92,9 @@
 
 static void Sacc_to_Aop_rgb16_MMX( GenefxState *gfxs )
 {
-     static const __u32 preload[] = { 0xFF00FF00, 0x0000FF00 };
-     static const __u32 mask[]    = { 0x00FC00F8, 0x000000F8 };
-     static const __u32 pm[]      = { 0x01000004, 0x00000004 };
+     static const u32 preload[] = { 0xFF00FF00, 0x0000FF00 };
+     static const u32 mask[]    = { 0x00FC00F8, 0x000000F8 };
+     static const u32 pm[]      = { 0x01000004, 0x00000004 };
 
      __asm__ __volatile__ (
 	       "movq     %3, %%mm7\n\t"
@@ -129,9 +129,9 @@
 
 static void Sacc_to_Aop_rgb32_MMX( GenefxState *gfxs )
 {
-     static const __u32 preload[]  = { 0xFF00FF00, 0x0000FF00 };
-     static const __u32 postload[] = { 0x00FF00FF, 0x000000FF };
-     static const __u32 pm[]       = { 0x01000001, 0x00000001 };
+     static const u32 preload[]  = { 0xFF00FF00, 0x0000FF00 };
+     static const u32 postload[] = { 0x00FF00FF, 0x000000FF };
+     static const u32 pm[]       = { 0x01000001, 0x00000001 };
 
      __asm__ __volatile__ (
 	       "movq     %3, %%mm1\n\t"
@@ -165,7 +165,7 @@
 __attribute__((no_instrument_function))
 static void Sop_argb_Sto_Dacc_MMX( GenefxState *gfxs )
 {
-     static const __u32 zeros[]  = { 0, 0 };
+     static const u32 zeros[]  = { 0, 0 };
      int i = 0;
 
      __asm__ __volatile__ (
@@ -203,7 +203,7 @@
 
 static void Sop_argb_to_Dacc_MMX( GenefxState *gfxs )
 {
-     static const __u32 zeros[]  = { 0, 0 };
+     static const u32 zeros[]  = { 0, 0 };
 
      __asm__ __volatile__ (
 	       "movq     %3, %%mm0\n\t"
@@ -225,9 +225,9 @@
 
 static void Sop_rgb16_to_Dacc_MMX( GenefxState *gfxs )
 {
-     static const __u32 mask[]  = { 0x07E0001F, 0x0000F800 };
-     static const __u32 smul[]  = { 0x00200800, 0x00000001 };
-     static const __u32 alpha[] = { 0x00000000, 0x00FF0000 };
+     static const u32 mask[]  = { 0x07E0001F, 0x0000F800 };
+     static const u32 smul[]  = { 0x00200800, 0x00000001 };
+     static const u32 alpha[] = { 0x00000000, 0x00FF0000 };
 
      __asm__ __volatile__ (
 	       "movq     %3, %%mm4\n\t"
@@ -303,8 +303,8 @@
 
 static void Sop_rgb32_to_Dacc_MMX( GenefxState *gfxs )
 {
-     static const __u32 alpha[]  = { 0, 0x00FF0000 };
-     static const __u32 zeros[]  = { 0, 0 };
+     static const u32 alpha[]  = { 0, 0x00FF0000 };
+     static const u32 zeros[]  = { 0, 0 };
 
      __asm__ __volatile__ (
 	       "movq     %3, %%mm7\n\t"
@@ -328,8 +328,8 @@
 
 static void Xacc_blend_invsrcalpha_MMX( GenefxState *gfxs )
 {
-     static const __u32 einser[] = { 0x01000100, 0x01000100 };
-     static const __u32 zeros[]  = { 0, 0 };
+     static const u32 einser[] = { 0x01000100, 0x01000100 };
+     static const u32 zeros[]  = { 0, 0 };
 
      __asm__ __volatile__ (
 	       "movq     %3, %%mm7\n\t"
@@ -385,8 +385,8 @@
 
 static void Xacc_blend_srcalpha_MMX( GenefxState *gfxs )
 {
-     static const __u32 ones[]  = { 0x00010001, 0x00010001 };
-     static const __u32 zeros[] = { 0, 0 };
+     static const u32 ones[]  = { 0x00010001, 0x00010001 };
+     static const u32 zeros[] = { 0, 0 };
 
      __asm__ __volatile__ (
 	       "movq     %3, %%mm7\n\t"
@@ -440,9 +440,9 @@
 
 static void Dacc_YCbCr_to_RGB_MMX( GenefxState *gfxs )
 {  
-     static const __u16 __aligned(8) sub0[4] = {  16,  16,  16,  16 }; 
-     static const __u16 __aligned(8) sub1[4] = { 128, 128, 128, 128 };
-     static const __s16 __aligned(8) mul[20] = {
+     static const u16 __aligned(8) sub0[4] = {  16,  16,  16,  16 }; 
+     static const u16 __aligned(8) sub1[4] = { 128, 128, 128, 128 };
+     static const s16 __aligned(8) mul[20] = {
                      0x253F,  0x253F,  0x253F,  0x253F, // Y       Coeff.
                      0x3312,  0x3312,  0x3312,  0x3312, // V Red   Coeff.
                      0x4093,  0x4093,  0x4093,  0x4093, // U Blue  Coeff.
@@ -527,8 +527,8 @@
 
      while (w) {
           if (!(D->YUV.a & 0xF000)) {
-               __u16 y, cb, cr;
-               __s16 r, g, b;
+               u16 y, cb, cr;
+               s16 r, g, b;
 
                y  = y_for_rgb[D->YUV.y];
                cb = D->YUV.u;
@@ -549,9 +549,9 @@
 
 static void Dacc_RGB_to_YCbCr_MMX( GenefxState *gfxs )
 {
-     static const __u16 __aligned(8) add0[4] = { 128, 128, 128, 128 };
-     static const __u16 __aligned(8) add1[4] = {  16,  16,  16,  16 };
-     static const __u16 __aligned(8) mul[24] = {
+     static const u16 __aligned(8) add0[4] = { 128, 128, 128, 128 };
+     static const u16 __aligned(8) add1[4] = {  16,  16,  16,  16 };
+     static const u16 __aligned(8) mul[24] = {
                     0x03A5, 0x03A5, 0x03A5, 0x03A5, // Eb
                     0x12C8, 0x12C8, 0x12C8, 0x12C8, // Eg
                     0x0991, 0x0991, 0x0991, 0x0991, // Er
@@ -641,7 +641,7 @@
 
      while (w) {
           if (!(D->RGB.a & 0xF000)) {
-               __u32 r, g, b, ey;
+               u32 r, g, b, ey;
 
                r = D->RGB.r; g = D->RGB.g; b = D->RGB.b;
                ey = (19595 * r + 38469 * g + 7471 * b) >> 16;
Index: src/gfx/generic/yuvtbl-gen.c
===================================================================
RCS file: /cvs/directfb/DirectFB/src/gfx/generic/yuvtbl-gen.c,v
retrieving revision 1.3
diff -u -r1.3 yuvtbl-gen.c
--- src/gfx/generic/yuvtbl-gen.c	4 Jun 2006 20:34:04 -0000	1.3
+++ src/gfx/generic/yuvtbl-gen.c	7 Oct 2006 19:54:50 -0000
@@ -129,7 +129,7 @@
      
 /* YUV->RGB */
      /* luma */
-     gt.type      = "const __u16";
+     gt.type      = "const u16";
      gt.name      = "y_for_rgb";
      gt.range.max = 235;
      gt.sub       = 16;
@@ -138,7 +138,7 @@
      dump_table( &gt );
 
      /* chroma */
-     gt.type      = "const __s16";
+     gt.type      = "const s16";
      gt.range.max = 240;
      gt.sub       = 128;
 
@@ -166,7 +166,7 @@
      gt.sub       = 0;
      
      /* luma */
-     gt.type      = "const __u16";
+     gt.type      = "const u16";
      gt.name      = "y_from_ey";
      gt.clamp.max = 235;
      gt.mul       = 219.0/255.0;
@@ -181,13 +181,13 @@
      gt.add       = 128;
      
      /* cb */
-     gt.type = "const __u16";
+     gt.type = "const u16";
      gt.name = "cb_from_bey";
      gt.mul  = ECB_FACTOR * 224.0 / 255.0;
      dump_table( &gt );
 
      /* cr */
-     gt.type = "const __u16";
+     gt.type = "const u16";
      gt.name = "cr_from_rey";
      gt.mul  = ECR_FACTOR * 224.0 / 255.0;
      dump_table( &gt );
Index: src/gfx/generic/yuvtbl.h
===================================================================
RCS file: /cvs/directfb/DirectFB/src/gfx/generic/yuvtbl.h,v
retrieving revision 1.5
diff -u -r1.5 yuvtbl.h
--- src/gfx/generic/yuvtbl.h	4 Jun 2006 20:34:04 -0000	1.5
+++ src/gfx/generic/yuvtbl.h	7 Oct 2006 19:54:50 -0000
@@ -2,7 +2,7 @@
 #define __YUV_TABLES_H__
 
 
-const __u16 y_for_rgb[256] = {
+const u16 y_for_rgb[256] = {
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    1,    2,    3,
         4,    5,    6,    8,    9,   10,   11,   12,   13,   15,
@@ -32,7 +32,7 @@
 };
 
 
-const __s16 cr_for_r[256] = {
+const s16 cr_for_r[256] = {
      -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
      -178, -178, -178, -178, -178, -178, -178, -177, -175, -173,
      -172, -170, -169, -167, -165, -164, -162, -161, -159, -158,
@@ -62,7 +62,7 @@
 };
 
 
-const __s16 cr_for_g[256] = {
+const s16 cr_for_g[256] = {
        91,   91,   91,   91,   91,   91,   91,   91,   91,   91,
        91,   91,   91,   91,   91,   91,   91,   90,   89,   88,
        87,   86,   86,   85,   84,   83,   82,   82,   81,   80,
@@ -92,7 +92,7 @@
 };
 
 
-const __s16 cb_for_g[256] = {
+const s16 cb_for_g[256] = {
        43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
        43,   43,   43,   43,   43,   43,   43,   43,   43,   42,
        42,   41,   41,   41,   40,   40,   39,   39,   39,   38,
@@ -122,7 +122,7 @@
 };
 
 
-const __s16 cb_for_b[256] = {
+const s16 cb_for_b[256] = {
      -226, -226, -226, -226, -226, -226, -226, -226, -226, -226,
      -226, -226, -226, -226, -226, -226, -226, -223, -221, -219,
      -217, -215, -213, -211, -209, -207, -205, -203, -201, -199,
@@ -152,7 +152,7 @@
 };
 
 
-const __u16 y_from_ey[256] = {
+const u16 y_from_ey[256] = {
        16,   16,   17,   18,   19,   20,   21,   22,   22,   23,
        24,   25,   26,   27,   28,   28,   29,   30,   31,   32,
        33,   34,   34,   35,   36,   37,   38,   39,   40,   40,
@@ -182,7 +182,7 @@
 };
 
 
-const __u16 cb_from_bey[512] = {
+const u16 cb_from_bey[512] = {
        16,   16,   16,   16,   16,   16,   16,   16,   16,   16,
        16,   16,   16,   16,   16,   16,   16,   16,   16,   16,
        16,   16,   16,   16,   16,   16,   16,   16,   16,   16,
@@ -238,7 +238,7 @@
 };
 
 
-const __u16 cr_from_rey[512] = {
+const u16 cr_from_rey[512] = {
        16,   16,   16,   16,   16,   16,   16,   16,   16,   16,
        16,   16,   16,   16,   16,   16,   16,   16,   16,   16,
        16,   16,   16,   16,   16,   16,   16,   16,   16,   16,
Index: src/media/idirectfbfont.c
===================================================================
RCS file: /cvs/directfb/DirectFB/src/media/idirectfbfont.c,v
retrieving revision 1.37
diff -u -r1.37 idirectfbfont.c
--- src/media/idirectfbfont.c	30 Sep 2006 23:16:55 -0000	1.37
+++ src/media/idirectfbfont.c	7 Oct 2006 19:54:50 -0000
@@ -425,8 +425,8 @@
 {
      DFBResult      ret;
      CoreFont      *font;
-     const __u8    *string;
-     const __u8    *end;
+     const u8      *string;
+     const u8      *end;
      CoreGlyphData *glyph;
      int            kern_x;
      int            length = 0;
@@ -456,7 +456,7 @@
      }
 
      font   = data->font;
-     string = (const __u8*) text;
+     string = (const u8*) text;
      end    = string + bytes;
 
      dfb_font_lock( font );
Index: src/misc/conf.c
===================================================================
RCS file: /cvs/directfb/DirectFB/src/misc/conf.c,v
retrieving revision 1.115
diff -u -r1.115 conf.c
--- src/misc/conf.c	2 Oct 2006 06:38:06 -0000	1.115
+++ src/misc/conf.c	7 Oct 2006 19:54:50 -0000
@@ -916,7 +916,7 @@
      if (strcmp (name, "bg-color" ) == 0) {
           if (value) {
                char *error;
-               __u32 argb;
+               u32   argb;
 
                argb = strtoul( value, &error, 16 );
 
Index: src/misc/gfx_util.c
===================================================================
RCS file: /cvs/directfb/DirectFB/src/misc/gfx_util.c,v
retrieving revision 1.64
diff -u -r1.64 gfx_util.c
--- src/misc/gfx_util.c	20 Sep 2006 16:03:18 -0000	1.64
+++ src/misc/gfx_util.c	7 Oct 2006 19:54:51 -0000
@@ -74,18 +74,18 @@
 };
 
 
-static void write_argb_span (__u32 *src, __u8 *dst[], int len,
+static void write_argb_span (u32 *src, u8 *dst[], int len,
                               int dx, int dy, CoreSurface *dst_surface)
 {
      CorePalette *palette = dst_surface->palette;
-     __u8        *d       = dst[0];
-     __u8        *d1,*d2;
+     u8          *d       = dst[0];
+     u8          *d1,*d2;
      int          i, j;
 
      if (dst_surface->caps & DSCAPS_PREMULTIPLIED) {
           for (i = 0; i < len; i++) {
-               __u32 s = src[i];
-               __u32 a = (s >> 24) + 1; 
+               u32 s = src[i];
+               u32 a = (s >> 24) + 1;
                
                src[i] = ((((s & 0x00ff00ff) * a) >> 8) & 0x00ff00ff) |
                         ((((s & 0x0000ff00) * a) >> 8) & 0x0000ff00) |
@@ -120,30 +120,30 @@
 
           case DSPF_ARGB1555:
                for (i = 0; i < len; i++)
-                    ((__u16*)d)[i] = ARGB_TO_ARGB1555( src[i] );
+                    ((u16*)d)[i] = ARGB_TO_ARGB1555( src[i] );
                break;
 
           case DSPF_ARGB2554:
                for (i = 0; i < len; i++)
-                    ((__u16*)d)[i] = ARGB_TO_ARGB2554( src[i] );
+                    ((u16*)d)[i] = ARGB_TO_ARGB2554( src[i] );
                break;
 
           case DSPF_ARGB4444:
                for (i = 0; i < len; i++)
-                    ((__u16*)d)[i] = ARGB_TO_ARGB4444( src[i] );
+                    ((u16*)d)[i] = ARGB_TO_ARGB4444( src[i] );
                break;
                
           case DSPF_RGB16:
                for (i = 0; i < len; i++)
-                    ((__u16*)d)[i] = RGB32_TO_RGB16( src[i] );
+                    ((u16*)d)[i] = RGB32_TO_RGB16( src[i] );
                break;
 
           case DSPF_ARGB1666:
                for (i = 0; i < len; i++) {
-                    __u8 b = src[i] >> 2;
-                    __u8 g = src[i] >> 10;
-                    __u8 r = src[i] >> 18;
-                    __u8 a = (src[i] >> 26) != 0 ?1:0;
+                    u8 b = src[i] >> 2;
+                    u8 g = src[i] >> 10;
+                    u8 r = src[i] >> 18;
+                    u8 a = (src[i] >> 26) != 0 ?1:0;
 
                     *d++ =  b | (g << 6 );
                     *d++ = ( g >> 2 ) |(r << 4 );
@@ -153,10 +153,10 @@
 
           case DSPF_ARGB6666:
                for (i = 0; i < len; i++) {
-                    __u8 b = src[i] >> 2;
-                    __u8 g = src[i] >> 10;
-                    __u8 r = src[i] >> 18;
-                    __u8 a = src[i] >> 26;
+                    u8 b = src[i] >> 2;
+                    u8 g = src[i] >> 10;
+                    u8 r = src[i] >> 18;
+                    u8 a = src[i] >> 26;
 
                     *d++ =  b | (g << 6 );
                     *d++ = ( g >> 2 ) |(r << 4 );
@@ -166,9 +166,9 @@
 
           case DSPF_RGB18:
                for (i = 0; i < len; i++) {
-                    __u8 b = src[i] >> 2;
-                    __u8 g = src[i] >> 10;
-                    __u8 r = src[i] >> 18;
+                    u8 b = src[i] >> 2;
+                    u8 g = src[i] >> 10;
+                    u8 r = src[i] >> 18;
 
                     *d++ =  b | (g << 6 );
                     *d++ = ( g >> 2 ) |(r << 4 );
@@ -196,7 +196,7 @@
                
           case DSPF_AiRGB:
                for (i = 0; i < len; i++)
-                    ((__u32*)d)[i] = src[i] ^ 0xff000000;
+                    ((u32*)d)[i] = src[i] ^ 0xff000000;
                break;
 
           case DSPF_LUT8:
@@ -225,20 +225,20 @@
 
           case DSPF_YUY2:
                if (dx & 1) {
-                    __u32 y, u, v;
+                    u32 y, u, v;
                     
                     RGB_TO_YCBCR( (src[0] >> 16) & 0xff, 
                                   (src[0] >>  8) & 0xff,
                                   (src[0]      ) & 0xff, y, u, v );
-                    *((__u16*)d) = y | (v << 8);
+                    *((u16*)d) = y | (v << 8);
                     d += 2;
                     src++;
                     len--;
                }
                
                for (i = 0; i < (len&~1); i += 2) {
-                    __u32 y0, u, v;
-                    __u32 y1, u1, v1;
+                    u32 y0, u, v;
+                    u32 y1, u1, v1;
                     
                     RGB_TO_YCBCR( (src[i+0] >> 16) & 0xff, 
                                   (src[i+0] >>  8) & 0xff,
@@ -250,12 +250,12 @@
                     u = (u + u1) >> 1;
                     v = (v + v1) >> 1;
                                   
-                    ((__u16*)d)[i+0] = y0 | (u << 8);
-                    ((__u16*)d)[i+1] = y1 | (v << 8);
+                    ((u16*)d)[i+0] = y0 | (u << 8);
+                    ((u16*)d)[i+1] = y1 | (v << 8);
                }
                
                if (len & 1) {
-                    __u32 y, u, v;
+                    u32 y, u, v;
                     
                     src += len-1;
                     d   += (len-1)*2;
@@ -263,26 +263,26 @@
                     RGB_TO_YCBCR( (*src >> 16) & 0xff, 
                                   (*src >>  8) & 0xff,
                                   (*src      ) & 0xff, y, u, v );
-                    *((__u16*)d) = y | (u << 8);
+                    *((u16*)d) = y | (u << 8);
                }
                break;
 
           case DSPF_UYVY:
                if (dx & 1) {
-                    __u32 y, u, v;
+                    u32 y, u, v;
                     
                     RGB_TO_YCBCR( (src[0] >> 16) & 0xff, 
                                   (src[0] >>  8) & 0xff,
                                   (src[0]      ) & 0xff, y, u, v );
-                    *((__u16*)d) = v | (y << 8);
+                    *((u16*)d) = v | (y << 8);
                     d += 2;
                     src++;
                     len--;
                }
                
                for (i = 0; i < (len&~1); i += 2) {
-                    __u32 y0, u, v;
-                    __u32 y1, u1, v1;
+                    u32 y0, u, v;
+                    u32 y1, u1, v1;
                     
                     RGB_TO_YCBCR( (src[i+0] >> 16) & 0xff, 
                                   (src[i+0] >>  8) & 0xff,
@@ -294,12 +294,12 @@
                     u = (u + u1) >> 1;
                     v = (v + v1) >> 1;
                                   
-                    ((__u16*)d)[i+0] = u | (y0 << 8);
-                    ((__u16*)d)[i+1] = v | (y1 << 8);
+                    ((u16*)d)[i+0] = u | (y0 << 8);
+                    ((u16*)d)[i+1] = v | (y1 << 8);
                }
                
                if (len & 1) {
-                    __u32 y, u, v;
+                    u32 y, u, v;
                     
                     src += len-1;
                     d   += (len-1)*2;
@@ -307,20 +307,20 @@
                     RGB_TO_YCBCR( (*src >> 16) & 0xff, 
                                   (*src >>  8) & 0xff,
                                   (*src      ) & 0xff, y, u, v );
-                    *((__u16*)d) = u | (y << 8);
+                    *((u16*)d) = u | (y << 8);
                }
                break;
 
           case DSPF_AYUV:
                for (i = 0; i < len; i++) {
-                    __u32 a, y, u, v;
+                    u32 a, y, u, v;
 
                     RGB_TO_YCBCR( (src[i] >> 16) & 0xff,
                                   (src[i] >>  8) & 0xff,
                                   (src[i]      ) & 0xff, y, u, v );
                     a = (src[i] >> 24) & 0xff;
 
-                    ((__u32*)d)[i] = PIXEL_AYUV( a, y, u, v );
+                    ((u32*)d)[i] = PIXEL_AYUV( a, y, u, v );
                }
                break;
 
@@ -329,8 +329,8 @@
                d1 = dst[1];
                d2 = dst[2];
                for (i = 0; i < (len&~1); i += 2) {
-                    __u32 y0, u0, v0;
-                    __u32 y1, u1, v1;
+                    u32 y0, u0, v0;
+                    u32 y1, u1, v1;
                     
                     RGB_TO_YCBCR( (src[i+0] >> 16) & 0xff, 
                                   (src[i+0] >>  8) & 0xff,
@@ -353,8 +353,8 @@
           case DSPF_NV16:
                d1 = dst[1];
                for (i = 0; i < (len&~1); i += 2) {
-                    __u32 y0, u0, v0;
-                    __u32 y1, u1, v1;
+                    u32 y0, u0, v0;
+                    u32 y1, u1, v1;
                     
                     RGB_TO_YCBCR( (src[i+0] >> 16) & 0xff, 
                                   (src[i+0] >>  8) & 0xff,
@@ -367,7 +367,7 @@
                     d[i+1] = y1;
                                   
                     if (dst_surface->format == DSPF_NV16 || dy & 1) {
-                         ((__u16*)d1)[i>>1] =  ((u0 + u1) >> 1)     |
+                         ((u16*)d1)[i>>1] =    ((u0 + u1) >> 1)     |
                                               (((v0 + v1) >> 1) << 8);
                     }
                }
@@ -376,8 +376,8 @@
           case DSPF_NV21:
                d1 = dst[1];
                for (i = 0; i < (len&~1); i += 2) {
-                    __u32 y0, u0, v0;
-                    __u32 y1, u1, v1;
+                    u32 y0, u0, v0;
+                    u32 y1, u1, v1;
                     
                     RGB_TO_YCBCR( (src[i+0] >> 16) & 0xff, 
                                   (src[i+0] >>  8) & 0xff,
@@ -390,7 +390,7 @@
                     d[i+1] = y1;
                                   
                     if (dy & 1) {
-                         ((__u16*)d1)[i>>1] =  ((v0 + v1) >> 1)     |
+                         ((u16*)d1)[i>>1] =    ((v0 + v1) >> 1)     |
                                               (((u0 + u1) >> 1) << 8);
                     }
                }
@@ -404,10 +404,10 @@
 
 #define LINE_PTR(dst,caps,y,h,pitch) \
      ((caps & DSCAPS_SEPARATED) \
-          ? (((__u8*)(dst)) + (y)/2 * (pitch) + (((y)%2) ? (h)/2 * (pitch) : 0)) \
-          : (((__u8*)(dst)) + (y) * (pitch)))
+          ? (((u8*)(dst)) + (y)/2 * (pitch) + (((y)%2) ? (h)/2 * (pitch) : 0)) \
+          : (((u8*)(dst)) + (y) * (pitch)))
 
-void dfb_copy_buffer_32( __u32 *src,
+void dfb_copy_buffer_32( u32 *src,
                          void  *dst, int dpitch, DFBRectangle *drect,
                          CoreSurface *dst_surface, const DFBRegion *dst_clip )
 {
@@ -454,7 +454,7 @@
                }
                
                for (y = drect->y; y < drect->y + drect->h; y++) {
-                    __u8 *d[3];
+                    u8 *d[3];
                     
                     d[0] = LINE_PTR( dst, dst_surface->caps, y,
                                      dst_surface->height, dpitch ) + x;
@@ -474,7 +474,7 @@
                dst1 = dst + dpitch * dst_surface->height;
                
                for (y = drect->y; y < drect->y + drect->h; y++) {
-                    __u8 *d[2];
+                    u8 *d[2];
                     
                     d[0] = LINE_PTR( dst, dst_surface->caps, y,
                                      dst_surface->height, dpitch ) + x;
@@ -491,7 +491,7 @@
                dst1 = dst + dpitch * dst_surface->height;
                
                for (y = drect->y; y < drect->y + drect->h; y++) {
-                    __u8 *d[2];
+                    u8 *d[2];
                     
                     d[0] = LINE_PTR( dst, dst_surface->caps, y,
                                      dst_surface->height, dpitch ) + x;
@@ -506,7 +506,7 @@
 
           default:
                for (y = drect->y; y < drect->y + drect->h; y++) {
-                    __u8 *d[1];
+                    u8 *d[1];
                     
                     d[0] = LINE_PTR( dst, dst_surface->caps,
                                      y, dst_surface->height, dpitch ) +
@@ -636,17 +636,17 @@
 }
 
 static void scale_pixel( int *weights, int n_x, int n_y,
-                         __u32 *dst, __u32 **src, int x, int sw )
+                         u32 *dst, u32 **src, int x, int sw )
 {
-     __u32 r = 0, g = 0, b = 0, a = 0;
+     u32 r = 0, g = 0, b = 0, a = 0;
      int   i, j;
 
      for (i = 0; i < n_y; i++) {
           int *pixel_weights = weights + n_x * i;
 
           for (j = 0; j < n_x; j++) {
-               __u32  ta;
-               __u32 *q;
+               u32  ta;
+               u32 *q;
 
                if (x + j < 0)
                     q = src[i];
@@ -672,14 +672,14 @@
      *dst = (a << 24) | (r << 16) | (g << 8) | b;
 }
 
-static __u32* scale_line( int *weights, int n_x, int n_y, 
-                          __u32 *dst, __u32 *dst_end,
-                          __u32 **src, int x, int x_step, int sw )
+static u32* scale_line( int *weights, int n_x, int n_y,
+                        u32 *dst, u32 *dst_end,
+                        u32 **src, int x, int x_step, int sw )
 {
      int    i, j;
      int   *pixel_weights;
-     __u32 *q;
-     __u32  r, g, b, a;
+     u32   *q;
+     u32    r, g, b, a;
      int    x_scaled;
      int   *line_weights;
 
@@ -696,7 +696,7 @@
                q = src[i] + x_scaled;
 
                for (j = 0; j < n_x; j++) {
-                    __u32 ta;
+                    u32 ta;
 
                     ta = ((*q & 0xFF000000) >> 24) * line_weights[j];
 
@@ -722,7 +722,7 @@
      return dst;
 }
 
-void dfb_scale_linear_32( __u32 *src, int sw, int sh,
+void dfb_scale_linear_32( u32 *src, int sw, int sh,
                           void  *dst, int dpitch, DFBRectangle *drect,
                           CoreSurface *dst_surface, const DFBRegion *dst_clip )
 {
@@ -734,7 +734,7 @@
      int scaled_x_offset;
      PixopsFilter filter;
      void  *dst1 = NULL, *dst2 = NULL;
-     __u32 *buf;
+     u32 *buf;
 
      if (drect->w == sw && drect->h == sh) {
           dfb_copy_buffer_32( src, dst, dpitch, drect, dst_surface, dst_clip );
@@ -779,24 +779,24 @@
                break;
      }
      
-     buf = (__u32*) alloca( drect->w*4 );
+     buf = (u32*) alloca( drect->w*4 );
      
      for (i = drect->y; i < drect->y + drect->h; i++) {
           int     x_start;
           int     y_start;
           int    *run_weights;
-          __u32  *outbuf     = buf;
-          __u32  *outbuf_end = buf+drect->w;
-          __u32  *new_outbuf;
-          __u32 **line_bufs;
-          __u8   *d[3];
+          u32    *outbuf     = buf;
+          u32    *outbuf_end = buf+drect->w;
+          u32    *new_outbuf;
+          u32   **line_bufs;
+          u8     *d[3];
 
           y_start = sy >> SCALE_SHIFT;
 
           run_weights = filter.weights + ((sy >> (SCALE_SHIFT - SUBSAMPLE_BITS))
                                           & SUBSAMPLE_MASK) * filter.n_x * filter.n_y * SUBSAMPLE;
 
-          line_bufs = (__u32 **) alloca( filter.n_y * sizeof (void *) );
+          line_bufs = (u32 **) alloca( filter.n_y * sizeof (void *) );
 
           for (j = 0; j < filter.n_y; j++) {
                if (y_start <  0)
Index: src/misc/gfx_util.h
===================================================================
RCS file: /cvs/directfb/DirectFB/src/misc/gfx_util.h,v
retrieving revision 1.17
diff -u -r1.17 gfx_util.h
--- src/misc/gfx_util.h	12 Jul 2006 16:35:57 -0000	1.17
+++ src/misc/gfx_util.h	7 Oct 2006 19:54:51 -0000
@@ -35,11 +35,11 @@
 
 #include <core/coretypes.h>
 
-void dfb_copy_buffer_32( __u32 *src,
+void dfb_copy_buffer_32( u32 *src,
                          void  *dst, int dpitch, DFBRectangle *drect,
                          CoreSurface *dst_surface, const DFBRegion *dst_clip );
 
-void dfb_scale_linear_32( __u32 *src, int sw, int sh,
+void dfb_scale_linear_32( u32 *src, int sw, int sh,
                           void *dst, int dpitch, DFBRectangle *drect,
                           CoreSurface *dst_surface, const DFBRegion *dst_clip );
 
Index: src/windows/idirectfbwindow.c
===================================================================
RCS file: /cvs/directfb/DirectFB/src/windows/idirectfbwindow.c,v
retrieving revision 1.92
diff -u -r1.92 idirectfbwindow.c
--- src/windows/idirectfbwindow.c	5 Oct 2006 10:03:33 -0000	1.92
+++ src/windows/idirectfbwindow.c	7 Oct 2006 19:54:51 -0000
@@ -434,11 +434,11 @@
 
 static DFBResult
 IDirectFBWindow_SetColorKey( IDirectFBWindow *thiz,
-                             __u8             r,
-                             __u8             g,
-                             __u8             b )
+                             u8               r,
+                             u8               g,
+                             u8               b )
 {
-     __u32        key;
+     u32          key;
      CoreSurface *surface;
 
      DIRECT_INTERFACE_GET_DATA(IDirectFBWindow)
@@ -463,7 +463,7 @@
 IDirectFBWindow_SetColorKeyIndex( IDirectFBWindow *thiz,
                                   unsigned int     index )
 {
-     __u32 key = index;
+     u32 key = index;
 
      DIRECT_INTERFACE_GET_DATA(IDirectFBWindow)
 
@@ -500,7 +500,7 @@
 
 static DFBResult
 IDirectFBWindow_SetOpacity( IDirectFBWindow *thiz,
-                            __u8             opacity )
+                            u8               opacity )
 {
      DIRECT_INTERFACE_GET_DATA(IDirectFBWindow)
 
@@ -512,7 +512,7 @@
 
 static DFBResult
 IDirectFBWindow_GetOpacity( IDirectFBWindow *thiz,
-                            __u8            *opacity )
+                            u8              *opacity )
 {
      DIRECT_INTERFACE_GET_DATA(IDirectFBWindow)
 
Index: systems/fbdev/agp.c
===================================================================
RCS file: /cvs/directfb/DirectFB/systems/fbdev/agp.c,v
retrieving revision 1.5
diff -u -r1.5 agp.c
--- systems/fbdev/agp.c	17 Jul 2006 13:10:45 -0000	1.5
+++ systems/fbdev/agp.c	7 Oct 2006 19:54:51 -0000
@@ -80,7 +80,7 @@
 }
 
 static DFBResult
-dfb_agp_setup( __u32 mode )
+dfb_agp_setup( u32 mode )
 {
      agp_setup setup;
 
@@ -202,10 +202,10 @@
 
 /*****************************************************************************/
 
-static inline __u16
+static inline u16
 pci_read_word( int fd, int pos )
 {
-    __u8 b[2];
+    u8 b[2];
     
     if (pread( fd, b, 2, pos ) < 2)
          return 0;
@@ -213,10 +213,10 @@
     return b[0] | (b[1] << 8);
 }
 
-static inline __u8
+static inline u8
 pci_read_byte( int fd, int pos )
 {
-     __u8 b;
+     u8 b;
     
      if (pread( fd, &b, 1, pos ) < 1)
           return 0;
Index: systems/fbdev/fb.h
===================================================================
RCS file: /cvs/directfb/DirectFB/systems/fbdev/fb.h,v
retrieving revision 1.2
diff -u -r1.2 fb.h
--- systems/fbdev/fb.h	1 May 2006 19:11:14 -0000	1.2
+++ systems/fbdev/fb.h	7 Oct 2006 19:54:51 -0000
@@ -135,20 +135,20 @@
 	char id[16];			/* identification string eg "TT Builtin" */
 	unsigned long smem_start;	/* Start of frame buffer mem */
 					/* (physical address) */
-	__u32 smem_len;			/* Length of frame buffer mem */
-	__u32 type;			/* see FB_TYPE_*		*/
-	__u32 type_aux;			/* Interleave for interleaved Planes */
-	__u32 visual;			/* see FB_VISUAL_*		*/ 
-	__u16 xpanstep;			/* zero if no hardware panning  */
-	__u16 ypanstep;			/* zero if no hardware panning  */
-	__u16 ywrapstep;		/* zero if no hardware ywrap    */
-	__u32 line_length;		/* length of a line in bytes    */
+	u32 smem_len;			/* Length of frame buffer mem */
+	u32 type;			/* see FB_TYPE_*		*/
+	u32 type_aux;			/* Interleave for interleaved Planes */
+	u32 visual;			/* see FB_VISUAL_*		*/
+	u16 xpanstep;			/* zero if no hardware panning  */
+	u16 ypanstep;			/* zero if no hardware panning  */
+	u16 ywrapstep;			/* zero if no hardware ywrap    */
+	u32 line_length;		/* length of a line in bytes    */
 	unsigned long mmio_start;	/* Start of Memory Mapped I/O   */
 					/* (physical address) */
-	__u32 mmio_len;			/* Length of Memory Mapped I/O  */
-	__u32 accel;			/* Indicate to driver which	*/
+	u32 mmio_len;			/* Length of Memory Mapped I/O  */
+	u32 accel;			/* Indicate to driver which	*/
 					/*  specific chip/card we have	*/
-	__u16 reserved[3];		/* Reserved for future compatibility */
+	u16 reserved[3];		/* Reserved for future compatibility */
 };
 
 /* Interpretation of offset for color fields: All offsets are from the right,
@@ -158,9 +158,9 @@
  * big-endian byte order if bits_per_pixel is greater than 8.
  */
 struct fb_bitfield {
-	__u32 offset;			/* beginning of bitfield	*/
-	__u32 length;			/* length of bitfield		*/
-	__u32 msb_right;		/* != 0 : Most significant bit is */ 
+	u32 offset;			/* beginning of bitfield	*/
+	u32 length;			/* length of bitfield		*/
+	u32 msb_right;			/* != 0 : Most significant bit is */
 					/* right */ 
 };
 
@@ -209,56 +209,56 @@
 #define KHZ2PICOS(a) (1000000000UL/(a))
 
 struct fb_var_screeninfo {
-	__u32 xres;			/* visible resolution		*/
-	__u32 yres;
-	__u32 xres_virtual;		/* virtual resolution		*/
-	__u32 yres_virtual;
-	__u32 xoffset;			/* offset from virtual to visible */
-	__u32 yoffset;			/* resolution			*/
+	u32 xres;			/* visible resolution		*/
+	u32 yres;
+	u32 xres_virtual;		/* virtual resolution		*/
+	u32 yres_virtual;
+	u32 xoffset;			/* offset from virtual to visible */
+	u32 yoffset;			/* resolution			*/
 
-	__u32 bits_per_pixel;		/* guess what			*/
-	__u32 grayscale;		/* != 0 Graylevels instead of colors */
+	u32 bits_per_pixel;		/* guess what			*/
+	u32 grayscale;			/* != 0 Graylevels instead of colors */
 
 	struct fb_bitfield red;		/* bitfield in fb mem if true color, */
 	struct fb_bitfield green;	/* else only length is significant */
 	struct fb_bitfield blue;
 	struct fb_bitfield transp;	/* transparency			*/	
 
-	__u32 nonstd;			/* != 0 Non standard pixel format */
+	u32 nonstd;			/* != 0 Non standard pixel format */
 
-	__u32 activate;			/* see FB_ACTIVATE_*		*/
+	u32 activate;			/* see FB_ACTIVATE_*		*/
 
-	__u32 height;			/* height of picture in mm    */
-	__u32 width;			/* width of picture in mm     */
+	u32 height;			/* height of picture in mm    */
+	u32 width;			/* width of picture in mm     */
 
-	__u32 accel_flags;		/* (OBSOLETE) see fb_info.flags */
+	u32 accel_flags;		/* (OBSOLETE) see fb_info.flags */
 
 	/* Timing: All values in pixclocks, except pixclock (of course) */
-	__u32 pixclock;			/* pixel clock in ps (pico seconds) */
-	__u32 left_margin;		/* time from sync to picture	*/
-	__u32 right_margin;		/* time from picture to sync	*/
-	__u32 upper_margin;		/* time from sync to picture	*/
-	__u32 lower_margin;
-	__u32 hsync_len;		/* length of horizontal sync	*/
-	__u32 vsync_len;		/* length of vertical sync	*/
-	__u32 sync;			/* see FB_SYNC_*		*/
-	__u32 vmode;			/* see FB_VMODE_*		*/
-	__u32 rotate;			/* angle we rotate counter clockwise */
-	__u32 reserved[5];		/* Reserved for future compatibility */
+	u32 pixclock;			/* pixel clock in ps (pico seconds) */
+	u32 left_margin;		/* time from sync to picture	*/
+	u32 right_margin;		/* time from picture to sync	*/
+	u32 upper_margin;		/* time from sync to picture	*/
+	u32 lower_margin;
+	u32 hsync_len;			/* length of horizontal sync	*/
+	u32 vsync_len;			/* length of vertical sync	*/
+	u32 sync;			/* see FB_SYNC_*		*/
+	u32 vmode;			/* see FB_VMODE_*		*/
+	u32 rotate;			/* angle we rotate counter clockwise */
+	u32 reserved[5];		/* Reserved for future compatibility */
 };
 
 struct fb_cmap {
-	__u32 start;			/* First entry	*/
-	__u32 len;			/* Number of entries */
-	__u16 *red;			/* Red values	*/
-	__u16 *green;
-	__u16 *blue;
-	__u16 *transp;			/* transparency, can be NULL */
+	u32 start;			/* First entry	*/
+	u32 len;			/* Number of entries */
+	u16 *red;			/* Red values	*/
+	u16 *green;
+	u16 *blue;
+	u16 *transp;			/* transparency, can be NULL */
 };
 
 struct fb_con2fbmap {
-	__u32 console;
-	__u32 framebuffer;
+	u32 console;
+	u32 framebuffer;
 };
 
 /* VESA Blanking Levels */
@@ -296,11 +296,11 @@
 #define FB_VBLANK_HAVE_VSYNC	0x100	/* verical syncs can be detected */
 
 struct fb_vblank {
-	__u32 flags;			/* FB_VBLANK flags */
-	__u32 count;			/* counter of retraces since boot */
-	__u32 vcount;			/* current scanline position */
-	__u32 hcount;			/* current scandot position */
-	__u32 reserved[4];		/* reserved for future compatibility */
+	u32 flags;			/* FB_VBLANK flags */
+	u32 count;			/* counter of retraces since boot */
+	u32 vcount;			/* current scanline position */
+	u32 hcount;			/* current scandot position */
+	u32 reserved[4];		/* reserved for future compatibility */
 };
 
 /* Internal HW accel */
@@ -308,31 +308,31 @@
 #define ROP_XOR  1
 
 struct fb_copyarea {
-	__u32 dx;
-	__u32 dy;
-	__u32 width;
-	__u32 height;
-	__u32 sx;
-	__u32 sy;
+	u32 dx;
+	u32 dy;
+	u32 width;
+	u32 height;
+	u32 sx;
+	u32 sy;
 };
 
 struct fb_fillrect {
-	__u32 dx;	/* screen-relative */
-	__u32 dy;
-	__u32 width;
-	__u32 height;
-	__u32 color;
-	__u32 rop;
+	u32 dx;		/* screen-relative */
+	u32 dy;
+	u32 width;
+	u32 height;
+	u32 color;
+	u32 rop;
 };
 
 struct fb_image {
-	__u32 dx;		/* Where to place image */
-	__u32 dy;
-	__u32 width;		/* Size of image */
-	__u32 height;
-	__u32 fg_color;		/* Only used when a mono bitmap */
-	__u32 bg_color;
-	__u8  depth;		/* Depth of the image */
+	u32 dx;			/* Where to place image */
+	u32 dy;
+	u32 width;		/* Size of image */
+	u32 height;
+	u32 fg_color;		/* Only used when a mono bitmap */
+	u32 bg_color;
+	u8  depth;		/* Depth of the image */
 	const char *data;	/* Pointer to image data */
 	struct fb_cmap cmap;	/* color map info */
 };
@@ -350,13 +350,13 @@
 #define FB_CUR_SETALL   0xFF
 
 struct fbcurpos {
-	__u16 x, y;
+	u16 x, y;
 };
 
 struct fb_cursor {
-	__u16 set;		/* what to set */
-	__u16 enable;		/* cursor on/off */
-	__u16 rop;		/* bitop operation */
+	u16 set;		/* what to set */
+	u16 enable;		/* cursor on/off */
+	u16 rop;		/* bitop operation */
 	const char *mask;	/* cursor mask bits */
 	struct fbcurpos hot;	/* cursor hot spot */
 	struct fb_image	image;	/* Cursor image */
Index: systems/fbdev/fbdev.c
===================================================================
RCS file: /cvs/directfb/DirectFB/systems/fbdev/fbdev.c,v
retrieving revision 1.46
diff -u -r1.46 fbdev.c
--- systems/fbdev/fbdev.c	2 Oct 2006 12:18:39 -0000	1.46
+++ systems/fbdev/fbdev.c	7 Oct 2006 19:54:51 -0000
@@ -778,8 +778,8 @@
           return NULL;
      }
 
-     return(volatile void*) ((__u8*) addr + (dfb_fbdev->shared->fix.mmio_start &
-                                             dfb_fbdev->shared->page_mask));
+     return(volatile void*) ((u8*) addr + (dfb_fbdev->shared->fix.mmio_start &
+                                           dfb_fbdev->shared->page_mask));
 }
 
 static void
@@ -789,8 +789,8 @@
      if (length <= 0)
           length = dfb_fbdev->shared->fix.mmio_len;
 
-     if (munmap( (void*) ((__u8*) addr - (dfb_fbdev->shared->fix.mmio_start &
-                                          dfb_fbdev->shared->page_mask)), length ) < 0)
+     if (munmap( (void*) ((u8*) addr - (dfb_fbdev->shared->fix.mmio_start &
+                                        dfb_fbdev->shared->page_mask)), length ) < 0)
           D_PERROR( "DirectFB/FBDev: Could not unmap MMIO region "
                      "at %p (length %d)!\n", addr, length );
 }
@@ -868,7 +868,7 @@
 static void *
 system_video_memory_virtual( unsigned int offset )
 {
-     return(void*)((__u8*)(dfb_fbdev->framebuffer_base) + offset);
+     return(void*)((u8*)(dfb_fbdev->framebuffer_base) + offset);
 }
 
 static unsigned int
@@ -889,7 +889,7 @@
 system_aux_memory_virtual( unsigned int offset )
 {
      if (dfb_fbdev->agp)
-          return (void*)(__u8*)dfb_fbdev->agp->base + offset;
+          return (void*)(u8*)dfb_fbdev->agp->base + offset;
      return NULL;
 }
 
@@ -2115,7 +2115,7 @@
  * correct colors, the gamme ramp has to be initialized.
  */
 
-static __u16 dfb_fbdev_calc_gamma(int n, int max)
+static u16 dfb_fbdev_calc_gamma(int n, int max)
 {
      int ret = 65535.0 * ((float)((float)n/(max)));
      if (ret > 65535) ret = 65535;
@@ -2264,10 +2264,10 @@
 
      cmap.start  = 0;
      cmap.len    = 256;
-     cmap.red    = (__u16*)SHMALLOC( pool, 2 * 256 );
-     cmap.green  = (__u16*)SHMALLOC( pool, 2 * 256 );
-     cmap.blue   = (__u16*)SHMALLOC( pool, 2 * 256 );
-     cmap.transp = (__u16*)SHMALLOC( pool, 2 * 256 );
+     cmap.red    = (u16*)SHMALLOC( pool, 2 * 256 );
+     cmap.green  = (u16*)SHMALLOC( pool, 2 * 256 );
+     cmap.blue   = (u16*)SHMALLOC( pool, 2 * 256 );
+     cmap.transp = (u16*)SHMALLOC( pool, 2 * 256 );
 
 
      for (red_val = 0; red_val  < 8 ; red_val++) {
Index: tools/dfbg.c
===================================================================
RCS file: /cvs/directfb/DirectFB/tools/dfbg.c,v
retrieving revision 1.8
diff -u -r1.8 dfbg.c
--- tools/dfbg.c	5 Dec 2003 04:01:10 -0000	1.8
+++ tools/dfbg.c	7 Oct 2006 19:54:51 -0000
@@ -180,7 +180,7 @@
 {
      DFBResult  ret;
      char      *error;
-     __u32      argb;
+     u32        argb;
 
      if (*filename == '#')
           filename++;
Index: tools/dfbscreen.c
===================================================================
RCS file: /cvs/directfb/DirectFB/tools/dfbscreen.c,v
retrieving revision 1.7
diff -u -r1.7 dfbscreen.c
--- tools/dfbscreen.c	27 Nov 2004 03:47:04 -0000	1.7
+++ tools/dfbscreen.c	7 Oct 2006 19:54:52 -0000
@@ -410,7 +410,7 @@
 static bool
 parse_ids( const AnyOption *option, const char *arg )
 {
-     __u32  val  = 0;
+     u32    val  = 0;
      int    alen = strlen( arg );
      char  *abuf = alloca( alen + 1 );
 
@@ -455,7 +455,7 @@
                abuf++;
      }
 
-     *((__u32*)option->value) = val;
+     *((u32*)option->value) = val;
 
      return true;
 }
Index: tools/dfbsummon.c
===================================================================
RCS file: /cvs/directfb/DirectFB/tools/dfbsummon.c,v
retrieving revision 1.8
diff -u -r1.8 dfbsummon.c
--- tools/dfbsummon.c	28 Oct 2005 21:09:21 -0000	1.8
+++ tools/dfbsummon.c	7 Oct 2006 19:54:52 -0000
@@ -177,7 +177,7 @@
                 int            tolerations,
                 void          *ctx )
 {
-     __u8         r = 0, g = 0, b = 0;
+     u8           r = 0, g = 0, b = 0;
      unsigned int screen_length, screen_offset;
 
      if (buffer) {
Index: tools/directfb-csource.c
===================================================================
RCS file: /cvs/directfb/DirectFB/tools/directfb-csource.c,v
retrieving revision 1.31
diff -u -r1.31 directfb-csource.c
--- tools/directfb-csource.c	16 Jul 2006 21:06:50 -0000	1.31
+++ tools/directfb-csource.c	7 Oct 2006 19:54:52 -0000
@@ -406,27 +406,27 @@
           switch (dest_format) {
                case DSPF_RGB16:
                     for (s = data, d = dest; h; h--, s += pitch, d += d_pitch)
-                         dfb_argb_to_rgb16 ((__u32 *) s, (__u16 *) d, width);
+                         dfb_argb_to_rgb16 ((u32 *) s, (u16 *) d, width);
                     break;
                case DSPF_ARGB1555:
                     for (s = data, d = dest; h; h--, s += pitch, d += d_pitch)
-                         dfb_argb_to_argb1555 ((__u32 *) s, (__u16 *) d, width);
+                         dfb_argb_to_argb1555 ((u32 *) s, (u16 *) d, width);
                     break;
                case DSPF_ARGB2554:
                     for (s = data, d = dest; h; h--, s += pitch, d += d_pitch)
-                         dfb_argb_to_argb2554 ((__u32 *) s, (__u16 *) d, width);
+                         dfb_argb_to_argb2554 ((u32 *) s, (u16 *) d, width);
                     break;
                case DSPF_ARGB4444:
                     for (s = data, d = dest; h; h--, s += pitch, d += d_pitch)
-                         dfb_argb_to_argb4444 ((__u32 *) s, (__u16 *) d, width);
+                         dfb_argb_to_argb4444 ((u32 *) s, (u16 *) d, width);
                     break;
                case DSPF_RGB332:
                     for (s = data, d = dest; h; h--, s += pitch, d += d_pitch)
-                         dfb_argb_to_rgb332 ((__u32 *) s, (__u8 *) d, width);
+                         dfb_argb_to_rgb332 ((u32 *) s, (u8 *) d, width);
                     break;
                case DSPF_A8:
                     for (s = data, d = dest; h; h--, s += pitch, d += d_pitch)
-                         dfb_argb_to_a8 ((__u32 *) s, (__u8 *) d, width);
+                         dfb_argb_to_a8 ((u32 *) s, (u8 *) d, width);
                     break;
                default:
                     fprintf (stderr,
Index: tools/mkdfiff.c
===================================================================
RCS file: /cvs/directfb/DirectFB/tools/mkdfiff.c,v
retrieving revision 1.2
diff -u -r1.2 mkdfiff.c
--- tools/mkdfiff.c	11 Sep 2006 18:09:55 -0000	1.2
+++ tools/mkdfiff.c	7 Oct 2006 19:54:52 -0000
@@ -183,27 +183,27 @@
           switch (dest_format) {
                case DSPF_RGB16:
                     for (s = data, d = dest; h; h--, s += pitch, d += d_pitch)
-                         dfb_argb_to_rgb16 ((__u32 *) s, (__u16 *) d, width);
+                         dfb_argb_to_rgb16 ((u32 *) s, (u16 *) d, width);
                     break;
                case DSPF_ARGB1555:
                     for (s = data, d = dest; h; h--, s += pitch, d += d_pitch)
-                         dfb_argb_to_argb1555 ((__u32 *) s, (__u16 *) d, width);
+                         dfb_argb_to_argb1555 ((u32 *) s, (u16 *) d, width);
                     break;
                case DSPF_ARGB2554:
                     for (s = data, d = dest; h; h--, s += pitch, d += d_pitch)
-                         dfb_argb_to_argb2554 ((__u32 *) s, (__u16 *) d, width);
+                         dfb_argb_to_argb2554 ((u32 *) s, (u16 *) d, width);
                     break;
                case DSPF_ARGB4444:
                     for (s = data, d = dest; h; h--, s += pitch, d += d_pitch)
-                         dfb_argb_to_argb4444 ((__u32 *) s, (__u16 *) d, width);
+                         dfb_argb_to_argb4444 ((u32 *) s, (u16 *) d, width);
                     break;
                case DSPF_RGB332:
                     for (s = data, d = dest; h; h--, s += pitch, d += d_pitch)
-                         dfb_argb_to_rgb332 ((__u32 *) s, (__u8 *) d, width);
+                         dfb_argb_to_rgb332 ((u32 *) s, (u8 *) d, width);
                     break;
                case DSPF_A8:
                     for (s = data, d = dest; h; h--, s += pitch, d += d_pitch)
-                         dfb_argb_to_a8 ((__u32 *) s, (__u8 *) d, width);
+                         dfb_argb_to_a8 ((u32 *) s, (u8 *) d, width);
                     break;
                default:
                     fprintf (stderr,
Index: tools/raw32toraw24.c
===================================================================
RCS file: /cvs/directfb/DirectFB/tools/raw32toraw24.c,v
retrieving revision 1.12
diff -u -r1.12 raw32toraw24.c
--- tools/raw32toraw24.c	27 Feb 2004 10:43:20 -0000	1.12
+++ tools/raw32toraw24.c	7 Oct 2006 19:54:52 -0000
@@ -7,8 +7,8 @@
 
 int main()
 {
-     __u8  byt;
-     __u32 pixel32;
+     u8  byt;
+     u32 pixel32;
 
      do {
           fread (&pixel32, 4, 1, stdin);
Index: wm/default/default.c
===================================================================
RCS file: /cvs/directfb/DirectFB/wm/default/default.c,v
retrieving revision 1.38
diff -u -r1.38 default.c
--- wm/default/default.c	4 Oct 2006 10:05:40 -0000	1.38
+++ wm/default/default.c	7 Oct 2006 19:54:52 -0000
@@ -379,25 +379,25 @@
 
                               switch (surface->format) {
                                    case DSPF_AiRGB:
-                                        alpha = 0xff - (*(__u32*)(data + 4 * wx + pitch * wy) >> 24);
+                                        alpha = 0xff - (*(u32*)(data + 4 * wx + pitch * wy) >> 24);
                                         break;
                                    case DSPF_ARGB:
                                    case DSPF_AYUV:
-                                        alpha = *(__u32*)(data + 4 * wx + pitch * wy) >> 24;
+                                        alpha = *(u32*)(data + 4 * wx + pitch * wy) >> 24;
                                         break;
                                    case DSPF_ARGB1555:
                                    case DSPF_ARGB2554:
                                    case DSPF_ARGB4444:
-                                        alpha = *(__u16*)(data + 2 * wx + pitch * wy) & 0x8000;
+                                        alpha = *(u16*)(data + 2 * wx + pitch * wy) & 0x8000;
                                         alpha = alpha ? 0xff : 0x00;
                                         break;
                                    case DSPF_ALUT44:
-                                        alpha = *(__u8*)(data + wx + pitch * wy) & 0xf0;
+                                        alpha = *(u8*)(data + wx + pitch * wy) & 0xf0;
                                         alpha |= alpha >> 4;
                                         break;
                                    case DSPF_LUT8: {
                                         CorePalette *palette = surface->palette;
-                                        __u8         pix     = *((__u8*) data + wx + pitch * wy);
+                                        u8           pix     = *((u8*) data + wx + pitch * wy);
 
                                         if (palette && pix < palette->num_entries) {
                                              alpha = palette->entries[pix].a;
@@ -420,13 +420,13 @@
                          }
                          if (options & DWOP_COLORKEYING) {
                               int pixel = 0;
-                              __u8 *p;
+                              u8 *p;
                               switch (surface->format) {
                                    case DSPF_ARGB:
                                    case DSPF_AiRGB:
                                    case DSPF_RGB32:
-                                        pixel = *(__u32*)(data +
-                                                          4 * wx + pitch * wy)
+                                        pixel = *(u32*)(data +
+                                                        4 * wx + pitch * wy)
                                                 & 0x00ffffff;
                                         break;
 
@@ -440,25 +440,25 @@
                                         break;
 
                                    case DSPF_RGB16:
-                                        pixel = *(__u16*)(data + 2 * wx +
-                                                          pitch * wy);
+                                        pixel = *(u16*)(data + 2 * wx +
+                                                        pitch * wy);
                                         break;
 
                                    case DSPF_ARGB1555:
-                                        pixel = *(__u16*)(data + 2 * wx +
-                                                          pitch * wy)
+                                        pixel = *(u16*)(data + 2 * wx +
+                                                        pitch * wy)
                                                 & 0x7fff;
                                         break;
 
                                    case DSPF_RGB332:
                                    case DSPF_LUT8:
-                                        pixel = *(__u8*)(data +
-                                                         wx + pitch * wy);
+                                        pixel = *(u8*)(data +
+                                                       wx + pitch * wy);
                                         break;
 
                                    case DSPF_ALUT44:
-                                        pixel = *(__u8*)(data +
-                                                         wx + pitch * wy)
+                                        pixel = *(u8*)(data +
+                                                       wx + pitch * wy)
                                                 & 0x0f;
                                         break;
 
@@ -1716,9 +1716,9 @@
 static void
 set_opacity( CoreWindow *window,
              WindowData *window_data,
-             __u8        opacity )
+             u8          opacity )
 {
-     __u8             old;
+     u8               old;
      StackData       *data;
      CoreWindowStack *stack;
 
Index: wm/unique/internal.h
===================================================================
RCS file: /cvs/directfb/DirectFB/wm/unique/internal.h,v
retrieving revision 1.11
diff -u -r1.11 internal.h
--- wm/unique/internal.h	16 Jul 2006 10:15:29 -0000	1.11
+++ wm/unique/internal.h	7 Oct 2006 19:54:52 -0000
@@ -226,7 +226,7 @@
      DFBWindowOptions         options;       /* flags for appearance/behaviour */
      DFBWindowEventType       events;        /* mask of enabled events */
 
-     __u32                    color_key;     /* transparent pixel */
+     u32                      color_key;     /* transparent pixel */
      DFBRegion                opaque;        /* region of the window forced to be opaque */
 };
 
Index: wm/unique/test_color.c
===================================================================
RCS file: /cvs/directfb/DirectFB/wm/unique/test_color.c,v
retrieving revision 1.1
diff -u -r1.1 test_color.c
--- wm/unique/test_color.c	30 Oct 2004 20:02:47 -0000	1.1
+++ wm/unique/test_color.c	7 Oct 2006 19:54:52 -0000
@@ -195,7 +195,7 @@
 {
      DFBResult  ret;
      char      *error;
-     __u32      argb;
+     u32        argb;
      DFBColor   color;
 
      if (*filename == '#')
Index: wm/unique/window.c
===================================================================
RCS file: /cvs/directfb/DirectFB/wm/unique/window.c,v
retrieving revision 1.11
diff -u -r1.11 window.c
--- wm/unique/window.c	29 Oct 2005 00:41:01 -0000	1.11
+++ wm/unique/window.c	7 Oct 2006 19:54:53 -0000
@@ -107,7 +107,7 @@
 static void       update_flags    ( UniqueWindow  *window );
 
 static void       set_opacity     ( UniqueWindow  *window,
-                                    __u8           opacity );
+                                    u8             opacity );
 
 static DFBResult  move_window     ( UniqueWindow  *window,
                                     int            dx,
@@ -1250,9 +1250,9 @@
 
 static void
 set_opacity( UniqueWindow *window,
-             __u8          opacity )
+             u8            opacity )
 {
-     __u8           old;
+     u8             old;
      UniqueContext *context;
 
      D_MAGIC_ASSERT( window, UniqueWindow );