diff --git a/Makefile.am b/Makefile.am
index d57ff93..4a6c38b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,8 +7,8 @@ xext_HEADERS = \
         geproto.h \
         Xge.h \
 	lbxstr.h \
-	MITMisc.h \
-	mitmiscstr.h \
+	mitmisc.h \
+	mitmiscproto.h \
 	multibuf.h \
 	multibufst.h \
 	security.h \
diff --git a/MITMisc.h b/mitmisc.h
similarity index 76%
rename from MITMisc.h
rename to mitmisc.h
index 975700e..55863ef 100644
--- a/MITMisc.h
+++ b/mitmisc.h
@@ -28,39 +28,12 @@ in this Software without prior written authorization from The Open Group.
 
 /* $Xorg: MITMisc.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */
 
-#ifndef _XMITMISC_H_
-#define _XMITMISC_H_
-
-#include <X11/Xfuncproto.h>
-
-#define X_MITSetBugMode			0
-#define X_MITGetBugMode			1
+#ifndef _MITMISC_H_
+#define _MITMISC_H_
 
 #define MITMiscNumberEvents		0
-
 #define MITMiscNumberErrors		0
 
-#ifndef _MITMISC_SERVER_
-
-_XFUNCPROTOBEGIN
-
-Bool XMITMiscQueryExtension(
-    Display*		/* dpy */,
-    int*		/* event_basep */,
-    int*		/* error_basep */
-);
-
-Status XMITMiscSetBugMode(
-    Display*		/* dpy */,
-    Bool		/* onOff */
-);
-
-Bool XMITMiscGetBugMode(
-    Display*		/* dpy */
-);
-
-_XFUNCPROTOEND
-
-#endif
+#define MITMISCNAME "MIT-SUNDRY-NONSTANDARD"
 
 #endif
diff --git a/mitmiscstr.h b/mitmiscproto.h
similarity index 92%
rename from mitmiscstr.h
rename to mitmiscproto.h
index 32cae26..7de9d26 100644
--- a/mitmiscstr.h
+++ b/mitmiscproto.h
@@ -29,12 +29,13 @@ in this Software without prior written authorization from The Open Group.
 
 /* $Xorg: mitmiscstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
 
-#ifndef _MITMISCSTR_H_
-#define _MITMISCSTR_H_
+#ifndef _MITMISCPROTO_H_
+#define _MITMISCPROTO_H_
 
-#include "MITMisc.h"
+#include <X11/extensions/mitmisc.h>
 
-#define MITMISCNAME "MIT-SUNDRY-NONSTANDARD"
+#define X_MITSetBugMode			0
+#define X_MITGetBugMode			1
 
 typedef struct _SetBugMode {
     CARD8	reqType;	/* always MITReqCode */
@@ -67,4 +68,4 @@ typedef struct {
 } xMITGetBugModeReply;
 #define sz_xMITGetBugModeReply	32
 
-#endif /* _MITMISCSTR_H_ */
+#endif /* _MITMISCPROTO_H_ */