diff --git a/src/compat-api.h b/src/compat-api.h
index def6d3e4..45b78d4d 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -26,18 +26,7 @@
 #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
-
-#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2)
-#define current_primary current_master
-#define primary_pixmap master_pixmap
-#define secondary_dst slave_dst
-#endif
 
 #endif