diff -up inputproto-1.4.3/XI.h.jx inputproto-1.4.3/XI.h
--- inputproto-1.4.3/XI.h.jx	2008-03-05 22:05:38.000000000 -0500
+++ inputproto-1.4.3/XI.h	2008-04-01 15:53:46.000000000 -0400
@@ -52,8 +52,6 @@ SOFTWARE.
 #ifndef _XI_H_
 #define _XI_H_
 
-#include <X11/Xmd.h> /* CARD32 */
-
 #define sz_xGetExtensionVersionReq		8
 #define sz_xGetExtensionVersionReply		32
 #define sz_xListInputDevicesReq			4
@@ -268,7 +266,7 @@ SOFTWARE.
  * See the top of X.h for more _XSERVER64 magic.
  */
 #ifdef _XSERVER64
-typedef	CARD32		XEventClass;
+typedef	unsigned int	XEventClass;
 #else
 typedef	unsigned long	XEventClass;
 #endif