diff --git a/Makefile.am b/Makefile.am
index 14e7ff1..32b1295 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,8 +20,8 @@ xext_HEADERS = \
 	shmproto.h \
 	sync.h \
 	syncstr.h \
-	Xag.h \
-	Xagstr.h \
+	ag.h \
+	agproto.h \
 	Xcup.h \
 	Xcupstr.h \
 	Xdbe.h \
diff --git a/Xag.h b/ag.h
similarity index 52%
rename from Xag.h
rename to ag.h
index 815f2b9..b6dcd7d 100644
--- a/Xag.h
+++ b/ag.h
@@ -26,18 +26,18 @@ from The Open Group.
 */
 /* $Xorg: Xag.h,v 1.5 2001/02/09 02:03:24 xorgcvs Exp $ */
 
-#ifndef _XAG_H_
-#define _XAG_H_
+#ifndef _AG_H_
+#define _AG_H_
 
-#include <X11/Xfuncproto.h>
+#define XAGNAME "XC-APPGROUP"
 
-#define X_XagQueryVersion		0
-#define X_XagCreate			1
-#define X_XagDestroy			2
-#define X_XagGetAttr			3
-#define X_XagQuery			4
-#define X_XagCreateAssoc		5
-#define X_XagDestroyAssoc		6
+#define XAG_MAJOR_VERSION	1	/* current version numbers */
+#define XAG_MINOR_VERSION	0
+
+#define XagWindowTypeX11	0
+#define XagWindowTypeMacintosh	1
+#define XagWindowTypeWin32	2
+#define XagWindowTypeWin16	3
 
 #define XagBadAppGroup			0
 #define XagNumberErrors			(XagBadAppGroup + 1)
@@ -50,65 +50,5 @@ from The Open Group.
 #define XagNwhitePixel			5
 #define XagNappGroupLeader		6
 
-#ifndef _XAG_SERVER_
-
-#include <stdarg.h>
-
-_XFUNCPROTOBEGIN
-
-typedef XID XAppGroup;
-
-Bool XagQueryVersion(
-    Display*			/* dpy */,
-    int*			/* major_version */,
-    int*			/* minor_version */
-);
-
-Status XagCreateEmbeddedApplicationGroup(
-    Display*			/* dpy */,
-    VisualID			/* root_visual */,
-    Colormap			/* default_colormap */,
-    unsigned long		/* black_pixel */,
-    unsigned long		/* white_pixel */,
-    XAppGroup*			/* app_group_return */
-);
-
-Status XagCreateNonembeddedApplicationGroup(
-    Display*			/* dpy */,
-    XAppGroup*			/* app_group_return */
-);
-
-Status XagDestroyApplicationGroup(
-    Display*			/* dpy */,
-    XAppGroup			/* app_group */
-);
-
-Status XagGetApplicationGroupAttributes(
-    Display*			/* dpy */,
-    XAppGroup			/* app_group */,
-    ...
-);
-
-Status XagQueryApplicationGroup(
-    Display*			/* dpy */,
-    XID				/* resource_base */,
-    XAppGroup*			/* app_group_ret */
-);
-
-Status XagCreateAssociation(
-    Display*			/* dpy */,
-    Window*			/* window_ret */,
-    void*			/* system_window */
-);
-
-Status XagDestroyAssociation(
-    Display*			/* dpy */,
-    Window			/* window */
-);
-
-_XFUNCPROTOEND
-
-#endif /* _XAG_SERVER_ */
-
-#endif /* _XAG_H_ */
+#endif /* _AG_H_ */
 
diff --git a/Xagstr.h b/agproto.h
similarity index 93%
rename from Xagstr.h
rename to agproto.h
index ffb5527..95442da 100644
--- a/Xagstr.h
+++ b/agproto.h
@@ -26,34 +26,32 @@ from The Open Group.
 */
 /* $Xorg: Xagstr.h,v 1.6 2001/02/09 02:03:24 xorgcvs Exp $ */
 
-#ifndef _XAGSTR_H_ /* { */
-#define _XAGSTR_H_
+#ifndef _AGPROTO_H_ /* { */
+#define _AGPROTO_H_
 
-#include <X11/extensions/Xag.h>
+#include <X11/extensions/ag.h>
+
+#define X_XagQueryVersion		0
+#define X_XagCreate			1
+#define X_XagDestroy			2
+#define X_XagGetAttr			3
+#define X_XagQuery			4
+#define X_XagCreateAssoc		5
+#define X_XagDestroyAssoc		6
 
 #define XAppGroup CARD32
 
-#define XAGNAME "XC-APPGROUP"
-
-#define XAG_MAJOR_VERSION	1	/* current version numbers */
-#define XAG_MINOR_VERSION	0
-
-#define XagWindowTypeX11	0
-#define XagWindowTypeMacintosh	1
-#define XagWindowTypeWin32	2
-#define XagWindowTypeWin16	3
-
 /*
 * Redefine some basic types used by structures defined herein.  This allows
 * both the library and server to view communicated data as 32-bit entities,
 * thus preventing problems on 64-bit architectures where libXext sees this
 * data as 64 bits and the server sees it as 32 bits.
 */
- 
+
 #define Colormap CARD32
 #define VisualID CARD32
 #define Window CARD32
- 
+
 typedef struct _XagQueryVersion {
     CARD8	reqType;	/* always XagReqCode */
     CARD8	xagReqType;	/* always X_XagQueryVersion */
@@ -178,5 +176,5 @@ typedef struct _XagDestroyAssoc {
 #undef Colormap
 #undef VisualID
 
-#endif /* } _XAGSTR_H_ */
+#endif /* } _AGPROTO_H_ */