diff --git a/.cvsignore b/.cvsignore
index dcac74e..48ee973 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,5 @@
 bigreqsproto-1.0.2.tar.bz2
+compositeproto-0.4.tar.bz2
 damageproto-1.1.0.tar.bz2
 dmxproto-2.2.2.tar.bz2
 evieext-1.0.2.tar.bz2
@@ -26,4 +27,3 @@ xf86vidmodeproto-2.2.2.tar.bz2
 xineramaproto-1.1.2.tar.bz2
 xproto-7.0.10.tar.bz2
 xproxymanagementprotocol-1.0.2.tar.bz2
-compositeproto-0.4.tar.bz2
diff --git a/inputproto-1.4.2-horrible-header-hack.patch b/inputproto-1.4.2-horrible-header-hack.patch
deleted file mode 100644
index e2e29ef..0000000
--- a/inputproto-1.4.2-horrible-header-hack.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up xorg-x11-proto-devel-7.2/inputproto-1.4.2/XI.h.jx xorg-x11-proto-devel-7.2/inputproto-1.4.2/XI.h
---- xorg-x11-proto-devel-7.2/inputproto-1.4.2/XI.h.jx	2007-04-24 08:40:11.000000000 -0400
-+++ xorg-x11-proto-devel-7.2/inputproto-1.4.2/XI.h	2007-07-11 13:19:40.000000000 -0400
-@@ -215,6 +215,12 @@ SOFTWARE.
- #define Relative                0
- #define Absolute                1
- 
-+/* XXX these don't belong here, they're not part of the protocol */
-+#define TS_Raw                                 57
-+#define TS_Scaled                              58
-+#define SendCoreEvents                 59
-+#define DontSendCoreEvents             60
-+
- #define ProximityState          (1L << 1)
- #define InProximity             (0L << 1)
- #define OutOfProximity          (1L << 1)
diff --git a/sources b/sources
index 31c8e9b..3e034f7 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,5 @@
 95c29d9d10bf2868996c0c47a3b9a8dc  bigreqsproto-1.0.2.tar.bz2
+6281344d656d4e0c8e9db4918efe3d1d  compositeproto-0.4.tar.bz2
 33ee591e0b1ca5ad7902934541db7d24  damageproto-1.1.0.tar.bz2
 d80acad88411e7944b9b085463d53302  dmxproto-2.2.2.tar.bz2
 2507b5d0f4b2848147fbddd155aa6cfe  evieext-1.0.2.tar.bz2
@@ -26,4 +27,3 @@ f00844a63d6e76b69eb0eb5e41eed843  xf86vidmodeproto-2.2.2.tar.bz2
 1cc292c562962ad0ad3a253cae68c632  xineramaproto-1.1.2.tar.bz2
 2ed80e90992e7455eaac4c3e977ebd01  xproto-7.0.10.tar.bz2
 d28007a50976204960fc1fc07b4ca093  xproxymanagementprotocol-1.0.2.tar.bz2
-6281344d656d4e0c8e9db4918efe3d1d  compositeproto-0.4.tar.bz2
diff --git a/xorg-x11-proto-devel.spec b/xorg-x11-proto-devel.spec
index 5b449d1..4fcdd69 100644
--- a/xorg-x11-proto-devel.spec
+++ b/xorg-x11-proto-devel.spec
@@ -10,7 +10,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.2
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -57,8 +57,6 @@ Source29: ftp://ftp.x.org/pub/individual/proto/xproto-7.0.10.tar.bz2
 Provides: xproto = 7.0.10
 Source30: ftp://ftp.x.org/pub/individual/proto/xproxymanagementprotocol-1.0.2.tar.bz2
 
-Patch0: inputproto-1.4.2-horrible-header-hack.patch
-
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros >= 1.0.2-1
 
@@ -80,8 +78,6 @@ X.Org X11 Protocol headers
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30
 
-%patch0 -p1 -b .hhh
-
 %build
 
 # Proceed through each proto package directory, building them all
@@ -292,6 +288,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Wed Aug 29 2007 Adam Jackson <ajax@redhat.com> 7.2-13
+- Remove the horrible header hack, in favor of proper fix in xserver itself.
+
 * Tue Jul 24 2007 Adam Jackson <ajax@redhat.com> 7.2-12
 - Remove dri_interface.h.  It's not protocol, it belongs in Mesa.