diff --git a/Makefile.am b/Makefile.am
index 32b1295..c94052d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,8 +22,8 @@ xext_HEADERS = \
 	syncstr.h \
 	ag.h \
 	agproto.h \
-	Xcup.h \
-	Xcupstr.h \
+	cup.h \
+	cupproto.h \
 	Xdbe.h \
 	Xdbeproto.h \
 	EVI.h \
diff --git a/Xcup.h b/cup.h
similarity index 65%
rename from Xcup.h
rename to cup.h
index b1df039..6622451 100644
--- a/Xcup.h
+++ b/cup.h
@@ -26,44 +26,15 @@ in this Software without prior written authorization from The Open Group.
 */
 /* $XFree86$ */
 
-#ifndef _XCUP_H_
-#define _XCUP_H_
+#ifndef _CUP_H_
+#define _CUP_H_
 
-#include <X11/Xfuncproto.h>
+#define XCUPNAME "TOG-CUP"
 
-#define X_XcupQueryVersion			0
-#define X_XcupGetReservedColormapEntries	1
-#define X_XcupStoreColors			2
+#define XCUP_MAJOR_VERSION	1	/* current version numbers */
+#define XCUP_MINOR_VERSION	0
 
 #define XcupNumberErrors			0
 
-#ifndef _XCUP_SERVER_
-
-_XFUNCPROTOBEGIN
-
-Bool XcupQueryVersion(
-    Display*			/* dpy */,
-    int*			/* major_version */,
-    int*			/* minor_version */
-);
-
-Status XcupGetReservedColormapEntries(
-    Display*			/* dpy */,
-    int				/* screen */,
-    XColor**			/* colors_out */,
-    int*			/* ncolors */
-);
-
-Status XcupStoreColors(
-    Display*			/* dpy */,
-    Colormap			/* colormap */,
-    XColor*			/* colors */,
-    int				/* ncolors */
-);
-
-_XFUNCPROTOEND
-
-#endif /* _XCUP_SERVER_ */
-
-#endif /* _XCUP_H_ */
+#endif /* _CUP_H_ */
 
diff --git a/Xcupstr.h b/cupproto.h
similarity index 93%
rename from Xcupstr.h
rename to cupproto.h
index f521c33..8d2f7af 100644
--- a/Xcupstr.h
+++ b/cupproto.h
@@ -27,15 +27,14 @@ in this Software without prior written authorization from The Open Group.
 */
 /* $XFree86: xc/include/extensions/Xcupstr.h,v 3.5 2001/08/01 00:44:35 tsi Exp $ */
 
-#ifndef _XCUPSTR_H_ /* { */
-#define _XCUPSTR_H_
+#ifndef _XCUPPROTO_H_ /* { */
+#define _XCUPPROTO_H_
 
-#include <X11/extensions/Xcup.h>
+#include <X11/extensions/cup.h>
 
-#define XCUPNAME "TOG-CUP"
-
-#define XCUP_MAJOR_VERSION	1	/* current version numbers */
-#define XCUP_MINOR_VERSION	0
+#define X_XcupQueryVersion			0
+#define X_XcupGetReservedColormapEntries	1
+#define X_XcupStoreColors			2
 
 typedef struct _XcupQueryVersion {
     CARD8	reqType;	/* always XcupReqCode */
@@ -105,5 +104,5 @@ typedef struct {
 } xXcupStoreColorsReply;
 #define sz_xXcupStoreColorsReply	32
 
-#endif /* } _XCUPSTR_H_ */
+#endif /* } _XCUPPROTO_H_ */