diff --git a/src/xgi_dri.c b/src/xgi_dri.c
index ad37cd5..5525538 100644
--- a/src/xgi_dri.c
+++ b/src/xgi_dri.c
@@ -141,7 +141,7 @@ Bool XGIDRIScreenInit(ScreenPtr pScreen)
     pDRIInfo->ddxDriverMajorVersion = PACKAGE_VERSION_MAJOR;
     pDRIInfo->ddxDriverMinorVersion = PACKAGE_VERSION_MINOR;
     pDRIInfo->ddxDriverPatchVersion = PACKAGE_VERSION_PATCHLEVEL;
-    pDRIInfo->frameBufferPhysicalAddress = (pointer) pXGI->FbAddress;
+    pDRIInfo->frameBufferPhysicalAddress = pXGI->FbAddress;
     pDRIInfo->frameBufferSize = pXGI->FbMapSize;
 
   /* ?? */
diff --git a/src/xgi_driver.c b/src/xgi_driver.c
index 2e0046e..cc32261 100644
--- a/src/xgi_driver.c
+++ b/src/xgi_driver.c
@@ -316,15 +316,15 @@ static bool XGICheckModeByDDC(DisplayModePtr pMode, xf86MonPtr pMonitorDDC);
 /* Jong 12/05/2007; filter mode list by monitor DDC */
 static void XGIFilterModeByDDC(DisplayModePtr pModeList, xf86MonPtr pMonitorDDC);
 
-static pointer
-xgiSetup(pointer module, pointer opts, int *errmaj, int *errmin)
+static void*
+xgiSetup(void *module, void *opts, int *errmaj, int *errmin)
 {
     static Bool setupDone = FALSE;
 
     if (!setupDone) {
         setupDone = TRUE;
         xf86AddDriver(&XGI, module, HaveDriverFuncs);
-        return (pointer) TRUE;
+        return (void*) TRUE;
     }
 
     if (errmaj)
@@ -2424,7 +2424,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
                                   );
 #endif
 
-    pXGI->xgi_HwDevExt.pjIOAddress = (pointer)((XGIIOADDRESS) (pXGI->RelIO + 0x30));
+    pXGI->xgi_HwDevExt.pjIOAddress = ((XGIIOADDRESS) (pXGI->RelIO + 0x30));
     xf86DrvMsg(pScrn->scrnIndex, from, "Relocated IO registers at 0x%lX\n",
                (unsigned long) pXGI->RelIO);
     ErrorF("xgi_driver.c-pXGI->xgi_HwDevExt.pjIOAddress=0x%lx...\n", pXGI->xgi_HwDevExt.pjIOAddress);
@@ -3802,7 +3802,7 @@ XGIRestore(ScrnInfoPtr pScrn)
 
 /* Our generic BlockHandler for Xv */
 static void
-XGIBlockHandler(ScreenPtr pScreen, pointer pTimeout)
+XGIBlockHandler(ScreenPtr pScreen, void *pTimeout)
 {
     ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     XGIPtr pXGI = XGIPTR(pScrn);
diff --git a/src/xgi_setup.c b/src/xgi_setup.c
index 5b5fbd4..edc0a02 100644
--- a/src/xgi_setup.c
+++ b/src/xgi_setup.c
@@ -570,7 +570,7 @@ XGI_InitHwDevInfo(ScrnInfoPtr pScrn)
     PDEBUG(ErrorF("pXGI->FbBase = 0x%08lx\n",(ULONG)(pXGI->FbBase))) ;
     PDEBUG(ErrorF("pHwDevInfo->pjVideoMemoryAddress = 0x%08lx\n",(ULONG)(pHwDevInfo->pjVideoMemoryAddress))) ;
     pHwDevInfo->ulVideoMemorySize = pXGI->FbMapSize ;
-    pHwDevInfo->pjIOAddress = (pointer)(pXGI->RelIO + 0x30);
+    pHwDevInfo->pjIOAddress = (pXGI->RelIO + 0x30);
 
     switch (pXGI->Chipset) {
     case PCI_CHIP_XGIXG40:
diff --git a/src/xgi_video.c b/src/xgi_video.c
index 7eec2bc..1c283b7 100644
--- a/src/xgi_video.c
+++ b/src/xgi_video.c
@@ -87,23 +87,23 @@
 # endif //VC
 
 static XF86VideoAdaptorPtr XGISetupImageVideo(ScreenPtr);
-static int XGISetPortAttribute(ScrnInfoPtr, Atom, INT32, pointer);
-static int XGIGetPortAttribute(ScrnInfoPtr, Atom ,INT32 *, pointer);
+static int XGISetPortAttribute(ScrnInfoPtr, Atom, INT32, void*);
+static int XGIGetPortAttribute(ScrnInfoPtr, Atom ,INT32 *, void*);
 static void XGIQueryBestSize(ScrnInfoPtr, Bool,
-        short, short, short, short, unsigned int *, unsigned int *, pointer);
+        short, short, short, short, unsigned int *, unsigned int *, void*);
 static int XGIPutImage( ScrnInfoPtr,
         short, short, short, short, short, short, short, short,
-        int, unsigned char*, short, short, Bool, RegionPtr, pointer, DrawablePtr);
+        int, unsigned char*, short, short, Bool, RegionPtr, void*, DrawablePtr);
 static int XGIQueryImageAttributes(ScrnInfoPtr,
         int, unsigned short *, unsigned short *,  int *, int *);
 
-static void XGIStopVideo(ScrnInfoPtr, pointer, Bool);
+static void XGIStopVideo(ScrnInfoPtr, void*, Bool);
 /* static void XGIFreeOverlayMemory(ScrnInfoPtr pScrn); */
 
 #ifdef VC
 static int XGIPutVideo( ScrnInfoPtr,
     short, short, short, short, short, short, short, short,
-    RegionPtr, pointer); 
+    RegionPtr, void*);
     
 static struct v4l2_input XGIToV4lInput(XGIPortPrivPtr pPriv, int encoding);
 static struct v4l2_standard XGIToV4lStandard(XGIPortPrivPtr pPriv, int encoding);
@@ -392,7 +392,7 @@ XGISetupImageVideo(ScreenPtr pScreen)
 
     pPriv = (XGIPortPrivPtr)(&adapt->pPortPrivates[1]);
 
-    adapt->pPortPrivates[0].ptr = (pointer)(pPriv);
+    adapt->pPortPrivates[0].ptr = pPriv;
     adapt->pAttributes = XGIAttributes;
     adapt->nAttributes = NUM_ATTRIBUTES;
 	adapt->nImages = NUM_IMAGES;
@@ -499,7 +499,7 @@ XGISetPortAttribute(
   ScrnInfoPtr pScrn,
   Atom attribute,
   INT32 value,
-  pointer data
+  void *data
 ){
   XGIPortPrivPtr pPriv = (XGIPortPrivPtr)data;
   XGIPtr pXGI = XGIPTR(pScrn);
@@ -607,7 +607,7 @@ XGIGetPortAttribute(
   ScrnInfoPtr pScrn,
   Atom attribute,
   INT32 *value,
-  pointer data
+  void *data
 ){
   XGIPortPrivPtr pPriv = (XGIPortPrivPtr)data;
   XGIPtr pXGI = XGIPTR(pScrn);
@@ -657,7 +657,7 @@ XGIQueryBestSize(
   short vid_w, short vid_h,
   short drw_w, short drw_h,
   unsigned int *p_w, unsigned int *p_h,
-  pointer data
+  void *data
 ){
   *p_w = drw_w;
   *p_h = drw_h;
@@ -989,7 +989,7 @@ XGIDisplayVideo(ScrnInfoPtr pScrn, XGIPortPrivPtr pPriv)
 
 
 static void
-XGIStopVideo(ScrnInfoPtr pScrn, pointer data, Bool exit)
+XGIStopVideo(ScrnInfoPtr pScrn, void *data, Bool exit)
 {
   XGIPortPrivPtr pPriv = (XGIPortPrivPtr)data;
   XGIPtr pXGI = XGIPTR(pScrn);
@@ -1036,7 +1036,7 @@ XGIPutImage(
   int id, unsigned char* buf,
   short width, short height,
   Bool sync,
-  RegionPtr clipBoxes, pointer data,
+  RegionPtr clipBoxes, void *data,
   DrawablePtr pDraw
 ){	
    XGIPtr pXGI = XGIPTR(pScrn);
@@ -1590,7 +1590,7 @@ XGIPutVideo(
     short drw_x, short drw_y,
     short src_w, short src_h,
     short drw_w, short drw_h,
-    RegionPtr clipBoxes, pointer data)
+    RegionPtr clipBoxes, void *data)
 {
    XGIPortPrivPtr pPriv = (XGIPortPrivPtr)data;