diff --git a/hw/xfree86/drivers/video/apm/src/apm.h b/hw/xfree86/drivers/video/apm/src/apm.h
index c94d26b440..c289d7796a 100644
--- a/hw/xfree86/drivers/video/apm/src/apm.h
+++ b/hw/xfree86/drivers/video/apm/src/apm.h
@@ -94,18 +94,18 @@ typedef struct {
     CARD32		LinAddress;
     unsigned long	LinMapSize;
     CARD32		FbMapSize;
-    pointer		LinMap;
-    pointer		FbBase;
+    void*		LinMap;
+    void*		FbBase;
     char		*VGAMap;
     char		*MemMap;
-    pointer		BltMap;
+    void*		BltMap;
     Bool		UnlockCalled;
     unsigned long	iobase, xport, xbase;
     unsigned char	savedSR10;
     CARD8		MiscOut;
     CARD8		c9, d9, db, Rush;
     unsigned int	saveCmd;
-    pointer		FontInfo;
+    void*		FontInfo;
     Bool		hwCursor;
     ApmRegStr		ModeReg, SavedReg;
     CloseScreenProcPtr	CloseScreen;
diff --git a/hw/xfree86/drivers/video/apm/src/apm_driver.c b/hw/xfree86/drivers/video/apm/src/apm_driver.c
index 1de80fcdc8..b451ebc133 100644
--- a/hw/xfree86/drivers/video/apm/src/apm_driver.c
+++ b/hw/xfree86/drivers/video/apm/src/apm_driver.c
@@ -154,8 +154,7 @@ static MODULESETUPPROTO(apmSetup);
  */
 _X_EXPORT XF86ModuleData apmModuleData = { &apmVersRec, apmSetup, NULL };
 
-static pointer
-apmSetup(pointer module, pointer opts, int *errmaj, int *errmain)
+static void* apmSetup(void* module, void* opts, int *errmaj, int *errmain)
 {
     static Bool setupDone = FALSE;
 
@@ -163,7 +162,7 @@ apmSetup(pointer module, pointer opts, int *errmaj, int *errmain)
 	setupDone = TRUE;
 	xf86AddDriver(&APM, module, 0);
 
-	return (pointer)1;
+	return (void*)1;
     }
     else {
 	if (errmaj) *errmaj = LDR_ONCEONLY;
@@ -747,9 +746,9 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
 	LinMap[0xFFECD9] = d9;
 	/*pciWriteLong(pApm->PciTag, PCI_CMD_STAT_REG, save);*/
 #ifndef XSERVER_LIBPCIACCESS
-	xf86UnMapVidMem(pScrn->scrnIndex, (pointer)LinMap, pApm->LinMapSize);
+	xf86UnMapVidMem(pScrn->scrnIndex, LinMap, pApm->LinMapSize);
 #else
-	pci_device_unmap_range(pApm->PciInfo, (pointer)LinMap, pApm->LinMapSize);
+	pci_device_unmap_range(pApm->PciInfo, LinMap, pApm->LinMapSize);
 #endif
 	from = X_PROBED;
     }
@@ -1120,17 +1119,17 @@ ApmUnmapMem(ScrnInfoPtr pScrn)
 	}
 	WRXB(0xC9, pApm->c9);
 #ifndef XSERVER_LIBPCIACCESS
-	xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pApm->LinMap, pApm->LinMapSize);
+	xf86UnMapVidMem(pScrn->scrnIndex, pApm->LinMap, pApm->LinMapSize);
 #else
-	pci_device_unmap_range(pApm->PciInfo, (pointer)pApm->LinMap, pApm->LinMapSize);
+	pci_device_unmap_range(pApm->PciInfo, pApm->LinMap, pApm->LinMapSize);
 #endif
 	pApm->LinMap = NULL;
     }
     else if (pApm->FbBase)
 #ifndef XSERVER_LIBPCIACCESS
-	xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pApm->LinMap, 0x10000);
+	xf86UnMapVidMem(pScrn->scrnIndex, pApm->LinMap, 0x10000);
 #else
-	pci_device_unmap_range(pApm->PciInfo, (pointer)pApm->LinMap, 0x10000);
+	pci_device_unmap_range(pApm->PciInfo, pApm->LinMap, 0x10000);
 #endif
 
     return TRUE;