diff --git a/src/Makefile.am b/src/Makefile.am
index c99bc28..84e84e7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,7 +31,6 @@ nv_drv_ladir = @moduledir@/drivers
 nv_drv_la_SOURCES = $(nv_sources) $(riva_sources) $(g80_sources)
 
 nv_sources = \
-         compat-api.h \
          pci_ids.h \
          nv_const.h \
          nv_cursor.c \
diff --git a/src/compat-api.h b/src/compat-api.h
deleted file mode 100644
index 368ddf8..0000000
--- a/src/compat-api.h
+++ /dev/null
@@ -1,39 +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>
- */
-
-/* this file provides API compat between server post 1.13 and pre it,
-   it should be reused inside as many drivers as possible */
-#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 /* COMPAT_API_H */
diff --git a/src/g80_driver.c b/src/g80_driver.c
index fe0e733..a570f63 100644
--- a/src/g80_driver.c
+++ b/src/g80_driver.c
@@ -465,7 +465,7 @@ G80CloseScreen(ScreenPtr pScreen)
 }
 
 static void
-G80BlockHandler(BLOCKHANDLER_ARGS_DECL)
+G80BlockHandler(ScreenPtr pScreen, pointer pTimeout)
 {
     ScrnInfoPtr pScrnInfo = xf86ScreenToScrn(pScreen);
     G80Ptr pNv = G80PTR(pScrnInfo);
@@ -476,7 +476,7 @@ G80BlockHandler(BLOCKHANDLER_ARGS_DECL)
     G80OutputResetCachedStatus(pScrnInfo);
 
     pScreen->BlockHandler = pNv->BlockHandler;
-    (*pScreen->BlockHandler) (BLOCKHANDLER_ARGS);
+    (*pScreen->BlockHandler) (pScreen, pTimeout);
     pScreen->BlockHandler = G80BlockHandler;
 }
 
diff --git a/src/g80_type.h b/src/g80_type.h
index d0e0d00..8adbc46 100644
--- a/src/g80_type.h
+++ b/src/g80_type.h
@@ -6,7 +6,6 @@
 #include <xf86Crtc.h>
 
 #include <xf86fbman.h>
-#include "compat-api.h"
 #define G80_NUM_I2C_PORTS 10
 
 typedef enum Head {
diff --git a/src/nv_driver.c b/src/nv_driver.c
index b894f83..c23905f 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -1026,7 +1026,7 @@ NVLeaveVTVBE(ScrnInfoPtr pScrn)
 }
 
 static void
-NVBlockHandler (BLOCKHANDLER_ARGS_DECL)
+NVBlockHandler (ScreenPtr pScreen, pointer pTimeout)
 {
     ScrnInfoPtr   pScrnInfo = xf86ScreenToScrn(pScreen);
     NVPtr         pNv = NVPTR(pScrnInfo);
@@ -1035,7 +1035,7 @@ NVBlockHandler (BLOCKHANDLER_ARGS_DECL)
         (*pNv->DMAKickoffCallback)(pScrnInfo);
 
     pScreen->BlockHandler = pNv->BlockHandler;
-    (*pScreen->BlockHandler) (BLOCKHANDLER_ARGS);
+    (*pScreen->BlockHandler) (pScreen, pTimeout);
     pScreen->BlockHandler = NVBlockHandler;
 
     if (pNv->VideoTimerCallback)
diff --git a/src/nv_include.h b/src/nv_include.h
index 45ae701..38555e2 100644
--- a/src/nv_include.h
+++ b/src/nv_include.h
@@ -52,7 +52,6 @@
 #include <X11/extensions/randr.h>
 #endif
 
-#include "compat-api.h"
 #include "nv_local.h"
 #include "nv_type.h"
 #include "nv_proto.h"
diff --git a/src/riva_include.h b/src/riva_include.h
index fd6a681..1804d42 100644
--- a/src/riva_include.h
+++ b/src/riva_include.h
@@ -46,7 +46,6 @@
 
 #include "regionstr.h"
 
-#include "compat-api.h"
 #include "riva_local.h"
 #include "riva_type.h"
 #include "riva_proto.h"