diff --git a/src/cairo-xcb-private.h b/src/cairo-xcb-private.h
index 6aca5b9b8..92898b84d 100644
--- a/src/cairo-xcb-private.h
+++ b/src/cairo-xcb-private.h
@@ -237,7 +237,6 @@ enum {
     CAIRO_XCB_RENDER_HAS_EXTENDED_REPEAT	= 0x0100,
     CAIRO_XCB_RENDER_HAS_GRADIENTS		= 0x0200,
 
-    CAIRO_XCB_HAS_DRI2				= 0x40000000,
     CAIRO_XCB_HAS_SHM				= 0x80000000
 };
 
diff --git a/src/cairo-xcb-surface-private.h b/src/cairo-xcb-surface-private.h
deleted file mode 100644
index 88eee287e..000000000
--- a/src/cairo-xcb-surface-private.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Cairo - a vector graphics library with display and print output
- *
- * Copyright © 2009 Intel Corporation
- *
- * This library is free software; you can redistribute it and/or
- * modify it either under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * (the "LGPL") or, at your option, under the terms of the Mozilla
- * Public License Version 1.1 (the "MPL"). If you do not alter this
- * notice, a recipient may use your version of this file under either
- * the MPL or the LGPL.
- *
- * You should have received a copy of the LGPL along with this library
- * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
- * You should have received a copy of the MPL along with this library
- * in the file COPYING-MPL-1.1
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
- * OF ANY KIND, either express or implied. See the LGPL or the MPL for
- * the specific language governing rights and limitations.
- *
- * Contributors(s):
- *	Chris Wilson <chris@chris-wilson.co.uk>
- */
-
-#ifndef CAIRO_XCB_SURFACE_PRIVATE_H
-#define CAIRO_XCB_SURFACE_PRIVATE_H
-
-#include "cairo-xcb-private.h"
-
-#endif
diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c
index 92b596e4f..157c8fb4f 100644
--- a/src/cairo-xcb-surface.c
+++ b/src/cairo-xcb-surface.c
@@ -45,8 +45,6 @@
 
 #include "cairo-default-context-private.h"
 
-#define AllPlanes ((unsigned) -1)
-#define CAIRO_ASSUME_PIXMAP 20
 #define XLIB_COORD_MAX 32767
 
 #if CAIRO_HAS_XLIB_XCB_FUNCTIONS