diff --git a/src/Makefile.am b/src/Makefile.am
index 0541b34..4179e17 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,7 +29,6 @@ xgi_drv_la_LDFLAGS = -module -avoid-version
 xgi_drv_ladir = @moduledir@/drivers
 
 xgi_drv_la_SOURCES = \
-	compat-api.h\
 	init.c \
 	init.h \
 	osdef.h \
diff --git a/src/compat-api.h b/src/compat-api.h
deleted file mode 100644
index f4e7524..0000000
--- a/src/compat-api.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2012 Red Hat, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Author: Dave Airlie <airlied@redhat.com>
- */
-
-#ifndef COMPAT_API_H
-#define COMPAT_API_H
-
-#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
-#define BLOCKHANDLER_ARGS_DECL ScreenPtr pScreen, pointer pTimeout
-#define BLOCKHANDLER_ARGS pScreen, pTimeout
-#else
-#define BLOCKHANDLER_ARGS_DECL ScreenPtr pScreen, pointer pTimeout, pointer pReadmask
-#define BLOCKHANDLER_ARGS pScreen, pTimeout, pReadmask
-#endif
-
-#endif
diff --git a/src/xgi.h b/src/xgi.h
index 34b97da..daf3967 100644
--- a/src/xgi.h
+++ b/src/xgi.h
@@ -154,8 +154,6 @@ extern Bool g_bRunTimeDebug;
 #include "vgatypes.h"
 #include "vb_struct.h"
 
-#include "compat-api.h"
-
 #include "xf86drm.h"
 #include "sarea.h"
 
diff --git a/src/xgi_driver.c b/src/xgi_driver.c
index ce1879c..2e0046e 100644
--- a/src/xgi_driver.c
+++ b/src/xgi_driver.c
@@ -3802,13 +3802,13 @@ XGIRestore(ScrnInfoPtr pScrn)
 
 /* Our generic BlockHandler for Xv */
 static void
-XGIBlockHandler(BLOCKHANDLER_ARGS_DECL)
+XGIBlockHandler(ScreenPtr pScreen, pointer pTimeout)
 {
     ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
     XGIPtr pXGI = XGIPTR(pScrn);
 
     pScreen->BlockHandler = pXGI->BlockHandler;
-    (*pScreen->BlockHandler) (BLOCKHANDLER_ARGS);
+    (*pScreen->BlockHandler) (pScreen, pTimeout);
     pScreen->BlockHandler = XGIBlockHandler;
 
     if (pXGI->VideoTimerCallback) {