diff -uNr a/src/vivante_fbdev/vivante_dri.c b/src/vivante_fbdev/vivante_dri.c
--- a/src/vivante_fbdev/vivante_dri.c	2013-02-21 11:25:34.000000000 +0100
+++ b/src/vivante_fbdev/vivante_dri.c	2013-02-21 11:19:51.000000000 +0100
@@ -78,7 +78,7 @@
     return;
 }
 
-Bool VivDRIScreenInit(ScreenPtr pScreen) {
+Bool VivDRIScreenInit(SCREEN_INIT_ARGS_DECL) {
     ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     DRIInfoPtr pDRIInfo;
     VivPtr pViv = GET_VIV_PTR(pScrn);
@@ -173,7 +173,7 @@
                         version->version_major,
                         version->version_minor,
                         version->version_patchlevel);
-                VivDRICloseScreen(pScreen);
+                VivDRICloseScreen(CLOSE_SCREEN_ARGS);
                 drmFreeVersion(version);
                 return FALSE;
             }
@@ -184,7 +184,7 @@
     return TRUE;
 }
 
-void VivDRICloseScreen(ScreenPtr pScreen) {
+void VivDRICloseScreen(CLOSE_SCREEN_ARGS_DECL) {
     ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     VivPtr pViv = GET_VIV_PTR(pScrn);
 
diff -uNr a/src/vivante_fbdev/vivante_dri.h b/src/vivante_fbdev/vivante_dri.h
--- a/src/vivante_fbdev/vivante_dri.h	2013-02-21 11:25:34.000000000 +0100
+++ b/src/vivante_fbdev/vivante_dri.h	2013-02-21 11:21:09.000000000 +0100
@@ -66,7 +66,7 @@
     screenConfig ScrnConf;
 } vvtDeviceInfo;
 
-Bool VivDRIScreenInit(ScreenPtr pScreen);
+Bool VivDRIScreenInit(SCREEN_INIT_ARGS_DECL);
 void VivDRICloseScreen(CLOSE_SCREEN_ARGS_DECL);
 Bool VivDRIFinishScreenInit(ScreenPtr pScreen);
 
diff -uNr a/src/vivante_util/compat-api.h b/src/vivante_util/compat-api.h
--- a/src/vivante_util/compat-api.h	2013-02-21 11:25:34.000000000 +0100
+++ b/src/vivante_util/compat-api.h	2013-02-21 11:15:47.000000000 +0100
@@ -46,7 +46,7 @@
 #define SCREEN_ARG_TYPE int
 #define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
 
-#define SCREEN_INIT_ARGS_DECL int index, ScreenPtr pScreen, int argc, char **argv
+#define SCREEN_INIT_ARGS_DECL int scrnIndex, ScreenPtr pScreen, int argc, char **argv
 
 #define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
 #define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask