diff --git a/Xext/bigreq.c b/Xext/bigreq.c
index fcd848a..565bfb2 100644
--- a/Xext/bigreq.c
+++ b/Xext/bigreq.c
@@ -72,14 +72,12 @@ BigReqExtensionInit(INITARGS)
 
 /*ARGSUSED*/
 static void
-BigReqResetProc (extEntry)
-    ExtensionEntry	*extEntry;
+BigReqResetProc (ExtensionEntry *extEntry)
 {
 }
 
 static int
-ProcBigReqDispatch (client)
-    register ClientPtr	client;
+ProcBigReqDispatch (register ClientPtr client)
 {
     REQUEST(xBigReqEnableReq);
     xBigReqEnableReply rep;
diff --git a/Xext/dpms.c b/Xext/dpms.c
index aced406..46ba917 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -92,14 +92,12 @@ DPMSExtensionInit(INITARGS)
 
 /*ARGSUSED*/
 static void
-DPMSResetProc (extEntry)
-    ExtensionEntry	*extEntry;
+DPMSResetProc (ExtensionEntry *extEntry)
 {
 }
 
 static int
-ProcDPMSGetVersion(client)
-    register ClientPtr client;
+ProcDPMSGetVersion(register ClientPtr client)
 {
     /* REQUEST(xDPMSGetVersionReq); */
     xDPMSGetVersionReply rep;
@@ -143,8 +141,7 @@ ProcDPMSCapable(register ClientPtr client)
 }
 
 static int
-ProcDPMSGetTimeouts(client)
-    register ClientPtr client;
+ProcDPMSGetTimeouts(register ClientPtr client)
 {
     /* REQUEST(xDPMSGetTimeoutsReq); */
     xDPMSGetTimeoutsReply rep;
@@ -170,8 +167,7 @@ ProcDPMSGetTimeouts(client)
 }
 
 static int
-ProcDPMSSetTimeouts(client)
-    register ClientPtr client;
+ProcDPMSSetTimeouts(register ClientPtr client)
 {
     REQUEST(xDPMSSetTimeoutsReq);
 
@@ -197,8 +193,7 @@ ProcDPMSSetTimeouts(client)
 }
 
 static int
-ProcDPMSEnable(client)
-    register ClientPtr client;
+ProcDPMSEnable(register ClientPtr client)
 {
     /* REQUEST(xDPMSEnableReq); */
 
@@ -211,8 +206,7 @@ ProcDPMSEnable(client)
 }
 
 static int
-ProcDPMSDisable(client)
-    register ClientPtr client;
+ProcDPMSDisable(register ClientPtr client)
 {
     /* REQUEST(xDPMSDisableReq); */
 
@@ -226,8 +220,7 @@ ProcDPMSDisable(client)
 }
 
 static int
-ProcDPMSForceLevel(client)
-    register ClientPtr client;
+ProcDPMSForceLevel(register ClientPtr client)
 {
     REQUEST(xDPMSForceLevelReq);
 
@@ -282,8 +275,7 @@ ProcDPMSInfo(register ClientPtr client)
 }
 
 static int
-ProcDPMSDispatch (client)
-    register ClientPtr	client;
+ProcDPMSDispatch (register ClientPtr client)
 {
     REQUEST(xReq);
 
@@ -311,8 +303,7 @@ ProcDPMSDispatch (client)
 }
 
 static int
-SProcDPMSGetVersion(client)
-    register ClientPtr	client;
+SProcDPMSGetVersion(register ClientPtr client)
 {
     register int n;
     REQUEST(xDPMSGetVersionReq);
@@ -337,8 +328,7 @@ SProcDPMSCapable(register ClientPtr client)
 }
 
 static int
-SProcDPMSGetTimeouts(client)
-    register ClientPtr client;
+SProcDPMSGetTimeouts(register ClientPtr client)
 {
     REQUEST(xDPMSGetTimeoutsReq);
     register int n;
@@ -350,8 +340,7 @@ SProcDPMSGetTimeouts(client)
 }
 
 static int
-SProcDPMSSetTimeouts(client)
-    register ClientPtr client;
+SProcDPMSSetTimeouts(register ClientPtr client)
 {
     REQUEST(xDPMSSetTimeoutsReq);
     register int n;
@@ -366,8 +355,7 @@ SProcDPMSSetTimeouts(client)
 }
 
 static int
-SProcDPMSEnable(client)
-    register ClientPtr client;
+SProcDPMSEnable(register ClientPtr client)
 {
     REQUEST(xDPMSEnableReq);
     register int n;
@@ -379,8 +367,7 @@ SProcDPMSEnable(client)
 }
 
 static int
-SProcDPMSDisable(client)
-    register ClientPtr client;
+SProcDPMSDisable(register ClientPtr client)
 {
     REQUEST(xDPMSDisableReq);
     register int n;
@@ -392,8 +379,7 @@ SProcDPMSDisable(client)
 }
 
 static int
-SProcDPMSForceLevel(client)
-    register ClientPtr client;
+SProcDPMSForceLevel(register ClientPtr client)
 {
     REQUEST(xDPMSForceLevelReq);
     register int n;
@@ -407,8 +393,7 @@ SProcDPMSForceLevel(client)
 }
 
 static int
-SProcDPMSInfo(client)
-    register ClientPtr client;
+SProcDPMSInfo(register ClientPtr client)
 {
     REQUEST(xDPMSInfoReq);
     register int n;
@@ -420,8 +405,7 @@ SProcDPMSInfo(client)
 }
 
 static int
-SProcDPMSDispatch (client)
-    register ClientPtr	client;
+SProcDPMSDispatch (register ClientPtr client)
 {
     REQUEST(xReq);
     switch (stuff->data)
diff --git a/Xext/mitmisc.c b/Xext/mitmisc.c
index 924b880..110e1fc 100644
--- a/Xext/mitmisc.c
+++ b/Xext/mitmisc.c
@@ -76,14 +76,12 @@ MITMiscExtensionInit(INITARGS)
 
 /*ARGSUSED*/
 static void
-MITResetProc (extEntry)
-ExtensionEntry	*extEntry;
+MITResetProc (ExtensionEntry *extEntry)
 {
 }
 
 static int
-ProcMITSetBugMode(client)
-    register ClientPtr client;
+ProcMITSetBugMode(register ClientPtr client)
 {
     REQUEST(xMITSetBugModeReq);
 
@@ -94,8 +92,7 @@ ProcMITSetBugMode(client)
 }
 
 static int
-ProcMITGetBugMode(client)
-    register ClientPtr client;
+ProcMITGetBugMode(register ClientPtr client)
 {
     xMITGetBugModeReply rep;
     register int n;
@@ -114,8 +111,7 @@ ProcMITGetBugMode(client)
 }
 
 static int
-ProcMITDispatch (client)
-    register ClientPtr	client;
+ProcMITDispatch (register ClientPtr client)
 {
     REQUEST(xReq);
     switch (stuff->data)
@@ -130,8 +126,7 @@ ProcMITDispatch (client)
 }
 
 static int
-SProcMITSetBugMode(client)
-    register ClientPtr	client;
+SProcMITSetBugMode(register ClientPtr client)
 {
     register int n;
     REQUEST(xMITSetBugModeReq);
@@ -141,8 +136,7 @@ SProcMITSetBugMode(client)
 }
 
 static int
-SProcMITGetBugMode(client)
-    register ClientPtr	client;
+SProcMITGetBugMode(register ClientPtr client)
 {
     register int n;
     REQUEST(xMITGetBugModeReq);
@@ -152,8 +146,7 @@ SProcMITGetBugMode(client)
 }
 
 static int
-SProcMITDispatch (client)
-    register ClientPtr	client;
+SProcMITDispatch (register ClientPtr client)
 {
     REQUEST(xReq);
     switch (stuff->data)
diff --git a/Xext/saver.c b/Xext/saver.c
index a9f1dd3..c71411d 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -282,14 +282,12 @@ ScreenSaverExtensionInit(INITARGS)
 
 /*ARGSUSED*/
 static void
-ScreenSaverResetProc (extEntry)
-ExtensionEntry	*extEntry;
+ScreenSaverResetProc (ExtensionEntry *extEntry)
 {
 }
 
 static void
-CheckScreenPrivate (pScreen)
-    ScreenPtr	pScreen;
+CheckScreenPrivate (ScreenPtr pScreen)
 {
     SetupScreen (pScreen);
 
@@ -305,8 +303,7 @@ CheckScreenPrivate (pScreen)
 }
 
 static ScreenSaverScreenPrivatePtr
-MakeScreenPrivate (pScreen)
-    ScreenPtr	pScreen;
+MakeScreenPrivate (ScreenPtr pScreen)
 {
     SetupScreen (pScreen);
 
@@ -325,9 +322,7 @@ MakeScreenPrivate (pScreen)
 }
 
 static unsigned long
-getEventMask (pScreen, client)
-    ScreenPtr	pScreen;
-    ClientPtr	client;
+getEventMask (ScreenPtr pScreen, ClientPtr client)
 {
     SetupScreen(pScreen);
     ScreenSaverEventPtr	pEv;
@@ -341,10 +336,7 @@ getEventMask (pScreen, client)
 }
 
 static Bool
-setEventMask (pScreen, client, mask)
-    ScreenPtr	pScreen;
-    ClientPtr	client;
-    unsigned long   mask;
+setEventMask (ScreenPtr pScreen, ClientPtr client, unsigned long mask)
 {
     SetupScreen(pScreen);
     ScreenSaverEventPtr	pEv, *pPrev;
@@ -391,8 +383,7 @@ setEventMask (pScreen, client, mask)
 }
 
 static void
-FreeAttrs (pAttr)
-    ScreenSaverAttrPtr	pAttr;
+FreeAttrs (ScreenSaverAttrPtr pAttr)
 {
     PixmapPtr	    pPixmap;
     CursorPtr	    pCursor;
@@ -406,8 +397,7 @@ FreeAttrs (pAttr)
 }
 
 static void
-FreeScreenAttr (pAttr)
-    ScreenSaverAttrPtr	pAttr;
+FreeScreenAttr (ScreenSaverAttrPtr pAttr)
 {
     FreeAttrs (pAttr);
     xfree (pAttr->values);
@@ -415,9 +405,7 @@ FreeScreenAttr (pAttr)
 }
 
 static int
-ScreenSaverFreeEvents (value, id)
-    pointer value;
-    XID id;
+ScreenSaverFreeEvents (pointer value, XID id)
 {
     ScreenSaverEventPtr	pOld = (ScreenSaverEventPtr)value;
     ScreenPtr pScreen = pOld->screen;
@@ -438,9 +426,7 @@ ScreenSaverFreeEvents (value, id)
 }
 
 static int
-ScreenSaverFreeAttr (value, id)
-    pointer value;
-    XID id;
+ScreenSaverFreeAttr (pointer value, XID id)
 {
     ScreenSaverAttrPtr	pOldAttr = (ScreenSaverAttrPtr)value;
     ScreenPtr	pScreen = pOldAttr->screen;
@@ -501,10 +487,7 @@ ScreenSaverFreeSuspend (pointer value, XID id)
 }
 
 static void
-SendScreenSaverNotify (pScreen, state, forced)
-    ScreenPtr			pScreen;
-    int	    state;
-    Bool    forced;
+SendScreenSaverNotify (ScreenPtr pScreen, int state, Bool forced)
 {
     ScreenSaverScreenPrivatePtr	pPriv;
     ScreenSaverEventPtr		pEv;
@@ -547,8 +530,7 @@ SendScreenSaverNotify (pScreen, state, forced)
 }
 
 static void
-SScreenSaverNotifyEvent (from, to)
-    xScreenSaverNotifyEvent *from, *to;
+SScreenSaverNotifyEvent (xScreenSaverNotifyEvent *from, xScreenSaverNotifyEvent *to)
 {
     to->type = from->type;
     to->state = from->state;
@@ -561,8 +543,7 @@ SScreenSaverNotifyEvent (from, to)
 }
 
 static void
-UninstallSaverColormap (pScreen)
-    ScreenPtr	pScreen;
+UninstallSaverColormap (ScreenPtr pScreen)
 {
     SetupScreen(pScreen);
     ColormapPtr			pCmap;
@@ -578,8 +559,7 @@ UninstallSaverColormap (pScreen)
 }
 
 static Bool
-CreateSaverWindow (pScreen)
-    ScreenPtr	pScreen;
+CreateSaverWindow (ScreenPtr pScreen)
 {
     SetupScreen (pScreen);
     ScreenSaverStuffPtr		pSaver;
@@ -698,8 +678,7 @@ CreateSaverWindow (pScreen)
 }
 
 static Bool
-DestroySaverWindow (pScreen)
-    ScreenPtr	pScreen;
+DestroySaverWindow (ScreenPtr pScreen)
 {
     SetupScreen(pScreen);
     ScreenSaverStuffPtr		pSaver;
@@ -720,10 +699,7 @@ DestroySaverWindow (pScreen)
 }
 
 static Bool
-ScreenSaverHandle (pScreen, xstate, force)
-    ScreenPtr	pScreen;
-    int		xstate;
-    Bool	force;
+ScreenSaverHandle (ScreenPtr pScreen, int xstate, Bool force)
 {
     int				state = 0;
     Bool			ret = FALSE;
@@ -754,8 +730,7 @@ ScreenSaverHandle (pScreen, xstate, force)
 }
 
 static int
-ProcScreenSaverQueryVersion (client)
-    register ClientPtr	client;
+ProcScreenSaverQueryVersion (register ClientPtr client)
 {
     xScreenSaverQueryVersionReply	rep;
     register int		n;
@@ -775,8 +750,7 @@ ProcScreenSaverQueryVersion (client)
 }
 
 static int
-ProcScreenSaverQueryInfo (client)
-    register ClientPtr	client;
+ProcScreenSaverQueryInfo (register ClientPtr client)
 {
     REQUEST(xScreenSaverQueryInfoReq);
     xScreenSaverQueryInfoReply	rep;
@@ -848,8 +822,7 @@ ProcScreenSaverQueryInfo (client)
 }
 
 static int
-ProcScreenSaverSelectInput (client)
-    register ClientPtr	client;
+ProcScreenSaverSelectInput (register ClientPtr client)
 {
     REQUEST(xScreenSaverSelectInputReq);
     DrawablePtr			pDraw;
@@ -1441,8 +1414,7 @@ static DISPATCH_PROC((*NormalVector[])) = {
 #define NUM_REQUESTS	((sizeof NormalVector) / (sizeof NormalVector[0]))
 
 static int
-ProcScreenSaverDispatch (client)
-    ClientPtr	client;
+ProcScreenSaverDispatch (ClientPtr client)
 {
     REQUEST(xReq);
 
@@ -1452,8 +1424,7 @@ ProcScreenSaverDispatch (client)
 }
 
 static int
-SProcScreenSaverQueryVersion (client)
-    ClientPtr	client;
+SProcScreenSaverQueryVersion (ClientPtr client)
 {
     REQUEST(xScreenSaverQueryVersionReq);
     int	    n;
@@ -1464,8 +1435,7 @@ SProcScreenSaverQueryVersion (client)
 }
 
 static int
-SProcScreenSaverQueryInfo (client)
-    ClientPtr	client;
+SProcScreenSaverQueryInfo (ClientPtr client)
 {
     REQUEST(xScreenSaverQueryInfoReq);
     int	    n;
@@ -1477,8 +1447,7 @@ SProcScreenSaverQueryInfo (client)
 }
 
 static int
-SProcScreenSaverSelectInput (client)
-    ClientPtr	client;
+SProcScreenSaverSelectInput (ClientPtr client)
 {
     REQUEST(xScreenSaverSelectInputReq);
     int	    n;
@@ -1491,8 +1460,7 @@ SProcScreenSaverSelectInput (client)
 }
 
 static int
-SProcScreenSaverSetAttributes (client)
-    ClientPtr	client;
+SProcScreenSaverSetAttributes (ClientPtr client)
 {
     REQUEST(xScreenSaverSetAttributesReq);
     int	    n;
@@ -1512,8 +1480,7 @@ SProcScreenSaverSetAttributes (client)
 }
 
 static int
-SProcScreenSaverUnsetAttributes (client)
-    ClientPtr	client;
+SProcScreenSaverUnsetAttributes (ClientPtr client)
 {
     REQUEST(xScreenSaverUnsetAttributesReq);
     int	    n;
@@ -1546,8 +1513,7 @@ static DISPATCH_PROC((*SwappedVector[])) = {
 };
 
 static int
-SProcScreenSaverDispatch (client)
-    ClientPtr	client;
+SProcScreenSaverDispatch (ClientPtr client)
 {
     REQUEST(xReq);
 
diff --git a/Xext/shape.c b/Xext/shape.c
index 928eeee..670d6bd 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -164,20 +164,14 @@ ShapeExtensionInit(void)
 
 /*ARGSUSED*/
 static void
-ShapeResetProc (extEntry)
-ExtensionEntry	*extEntry;
+ShapeResetProc (ExtensionEntry *extEntry)
 {
 }
 
 static int
-RegionOperate (client, pWin, kind, destRgnp, srcRgn, op, xoff, yoff, create)
-    ClientPtr	client;
-    WindowPtr	pWin;
-    int		kind;
-    RegionPtr	*destRgnp, srcRgn;
-    int		op;
-    int		xoff, yoff;
-    CreateDftPtr create;	/* creates a reasonable *destRgnp */
+RegionOperate (ClientPtr client, WindowPtr pWin, int kind, RegionPtr *destRgnp,
+    RegionPtr srcRgn, int op, int xoff, int yoff, 
+    CreateDftPtr create)		/* creates a reasonable *destRgnp */
 {
     ScreenPtr	pScreen = pWin->drawable.pScreen;
 
@@ -281,8 +275,7 @@ CreateClipShape (pWin)
 }
 
 static int
-ProcShapeQueryVersion (client)
-    register ClientPtr	client;
+ProcShapeQueryVersion (register ClientPtr client)
 {
     xShapeQueryVersionReply	rep;
     register int		n;
@@ -309,8 +302,7 @@ ProcShapeQueryVersion (client)
  *****************/
 
 static int
-ProcShapeRectangles (client)
-    register ClientPtr client;
+ProcShapeRectangles (register ClientPtr client)
 {
     WindowPtr		pWin;
     ScreenPtr		pScreen;
@@ -409,8 +401,7 @@ ProcPanoramiXShapeRectangles(
 
 
 static int
-ProcShapeMask (client)
-    register ClientPtr client;
+ProcShapeMask (register ClientPtr client)
 {
     WindowPtr		pWin;
     ScreenPtr		pScreen;
@@ -516,8 +507,7 @@ ProcPanoramiXShapeMask(
  ************/
 
 static int
-ProcShapeCombine (client)
-    register ClientPtr client;
+ProcShapeCombine (register ClientPtr client)
 {
     WindowPtr		pSrcWin, pDestWin;
     ScreenPtr		pScreen;
@@ -640,8 +630,7 @@ ProcPanoramiXShapeCombine(
  *************/
 
 static int
-ProcShapeOffset (client)
-    register ClientPtr client;
+ProcShapeOffset (register ClientPtr client)
 {
     WindowPtr		pWin;
     ScreenPtr		pScreen;
@@ -705,8 +694,7 @@ ProcPanoramiXShapeOffset(
 
 
 static int
-ProcShapeQueryExtents (client)
-    register ClientPtr	client;
+ProcShapeQueryExtents (register ClientPtr client)
 {
     REQUEST(xShapeQueryExtentsReq);
     WindowPtr		pWin;
@@ -770,9 +758,7 @@ ProcShapeQueryExtents (client)
 
 /*ARGSUSED*/
 static int
-ShapeFreeClient (data, id)
-    pointer	    data;
-    XID		    id;
+ShapeFreeClient (pointer data, XID id)
 {
     ShapeEventPtr   pShapeEvent;
     WindowPtr	    pWin;
@@ -799,9 +785,7 @@ ShapeFreeClient (data, id)
 
 /*ARGSUSED*/
 static int
-ShapeFreeEvents (data, id)
-    pointer	    data;
-    XID		    id;
+ShapeFreeEvents (pointer data, XID id)
 {
     ShapeEventPtr   *pHead, pCur, pNext;
 
@@ -816,8 +800,7 @@ ShapeFreeEvents (data, id)
 }
 
 static int
-ProcShapeSelectInput (client)
-    register ClientPtr	client;
+ProcShapeSelectInput (register ClientPtr client)
 {
     REQUEST(xShapeSelectInputReq);
     WindowPtr		pWin;
@@ -988,8 +971,7 @@ SendShapeNotify (pWin, which)
 }
 
 static int
-ProcShapeInputSelected (client)
-    register ClientPtr	client;
+ProcShapeInputSelected (register ClientPtr client)
 {
     REQUEST(xShapeInputSelectedReq);
     WindowPtr		pWin;
@@ -1029,8 +1011,7 @@ ProcShapeInputSelected (client)
 }
 
 static int
-ProcShapeGetRectangles (client)
-    register ClientPtr	client;
+ProcShapeGetRectangles (register ClientPtr client)
 {
     REQUEST(xShapeGetRectanglesReq);
     WindowPtr			pWin;
@@ -1115,8 +1096,7 @@ ProcShapeGetRectangles (client)
 }
 
 static int
-ProcShapeDispatch (client)
-    register ClientPtr	client;
+ProcShapeDispatch (register ClientPtr client)
 {
     REQUEST(xReq);
     switch (stuff->data) {
@@ -1164,8 +1144,7 @@ ProcShapeDispatch (client)
 }
 
 static void
-SShapeNotifyEvent(from, to)
-    xShapeNotifyEvent *from, *to;
+SShapeNotifyEvent(xShapeNotifyEvent *from, xShapeNotifyEvent *to)
 {
     to->type = from->type;
     to->kind = from->kind;
@@ -1180,8 +1159,7 @@ SShapeNotifyEvent(from, to)
 }
 
 static int
-SProcShapeQueryVersion (client)
-    register ClientPtr	client;
+SProcShapeQueryVersion (register ClientPtr client)
 {
     register int    n;
     REQUEST (xShapeQueryVersionReq);
@@ -1191,8 +1169,7 @@ SProcShapeQueryVersion (client)
 }
 
 static int
-SProcShapeRectangles (client)
-    register ClientPtr	client;
+SProcShapeRectangles (register ClientPtr client)
 {
     register char   n;
     REQUEST (xShapeRectanglesReq);
@@ -1207,8 +1184,7 @@ SProcShapeRectangles (client)
 }
 
 static int
-SProcShapeMask (client)
-    register ClientPtr	client;
+SProcShapeMask (register ClientPtr client)
 {
     register char   n;
     REQUEST (xShapeMaskReq);
@@ -1223,8 +1199,7 @@ SProcShapeMask (client)
 }
 
 static int
-SProcShapeCombine (client)
-    register ClientPtr	client;
+SProcShapeCombine (register ClientPtr client)
 {
     register char   n;
     REQUEST (xShapeCombineReq);
@@ -1239,8 +1214,7 @@ SProcShapeCombine (client)
 }
 
 static int
-SProcShapeOffset (client)
-    register ClientPtr	client;
+SProcShapeOffset (register ClientPtr client)
 {
     register char   n;
     REQUEST (xShapeOffsetReq);
@@ -1254,8 +1228,7 @@ SProcShapeOffset (client)
 }
 
 static int
-SProcShapeQueryExtents (client)
-    register ClientPtr	client;
+SProcShapeQueryExtents (register ClientPtr client)
 {
     register char   n;
     REQUEST (xShapeQueryExtentsReq);
@@ -1267,8 +1240,7 @@ SProcShapeQueryExtents (client)
 }
 
 static int
-SProcShapeSelectInput (client)
-    register ClientPtr	client;
+SProcShapeSelectInput (register ClientPtr client)
 {
     register char   n;
     REQUEST (xShapeSelectInputReq);
@@ -1280,8 +1252,7 @@ SProcShapeSelectInput (client)
 }
 
 static int
-SProcShapeInputSelected (client)
-    register ClientPtr	client;
+SProcShapeInputSelected (register ClientPtr client)
 {
     register int    n;
     REQUEST (xShapeInputSelectedReq);
@@ -1293,8 +1264,7 @@ SProcShapeInputSelected (client)
 }
 
 static int
-SProcShapeGetRectangles (client)
-    register ClientPtr	client;
+SProcShapeGetRectangles (register ClientPtr client)
 {
     REQUEST(xShapeGetRectanglesReq);
     register char   n;
@@ -1306,8 +1276,7 @@ SProcShapeGetRectangles (client)
 }
 
 static int
-SProcShapeDispatch (client)
-    register ClientPtr	client;
+SProcShapeDispatch (register ClientPtr client)
 {
     REQUEST(xReq);
     switch (stuff->data) {
diff --git a/Xext/shm.c b/Xext/shm.c
index ac587be..b12b08d 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -259,8 +259,7 @@ ShmExtensionInit(INITARGS)
 
 /*ARGSUSED*/
 static void
-ShmResetProc (extEntry)
-ExtensionEntry	*extEntry;
+ShmResetProc (ExtensionEntry *extEntry)
 {
     int i;
 
@@ -315,8 +314,7 @@ ShmRegisterFbFuncs(pScreen)
 }
 
 static int
-ProcShmQueryVersion(client)
-    register ClientPtr client;
+ProcShmQueryVersion(register ClientPtr client)
 {
     xShmQueryVersionReply rep;
     register int n;
@@ -385,8 +383,7 @@ shm_access(ClientPtr client, struct ipc_perm *perm, int readonly)
 }
 
 static int
-ProcShmAttach(client)
-    register ClientPtr client;
+ProcShmAttach(register ClientPtr client)
 {
     struct shmid_ds buf;
     ShmDescPtr shmdesc;
@@ -447,9 +444,9 @@ ProcShmAttach(client)
 
 /*ARGSUSED*/
 static int
-ShmDetachSegment(value, shmseg)
-    pointer value; /* must conform to DeleteType */
-    XID shmseg;
+ShmDetachSegment(
+    pointer value, /* must conform to DeleteType */
+    XID shmseg)
 {
     ShmDescPtr shmdesc = (ShmDescPtr)value;
     ShmDescPtr *prev;
@@ -465,8 +462,7 @@ ShmDetachSegment(value, shmseg)
 }
 
 static int
-ProcShmDetach(client)
-    register ClientPtr client;
+ProcShmDetach(register ClientPtr client)
 {
     ShmDescPtr shmdesc;
     REQUEST(xShmDetachReq);
@@ -478,12 +474,8 @@ ProcShmDetach(client)
 }
 
 static void
-miShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data)
-    DrawablePtr dst;
-    GCPtr	pGC;
-    int		depth, w, h, sx, sy, sw, sh, dx, dy;
-    unsigned int format;
-    char 	*data;
+miShmPutImage(DrawablePtr dst, GCPtr pGC, int depth, unsigned int format,
+    int w, int h, int sx, int sy, int sw, int sh, int dx, int dy, char *data)
 {
     PixmapPtr pmap;
     GCPtr putGC;
@@ -511,12 +503,8 @@ miShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data)
 }
 
 static void
-fbShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data)
-    DrawablePtr dst;
-    GCPtr	pGC;
-    int		depth, w, h, sx, sy, sw, sh, dx, dy;
-    unsigned int format;
-    char 	*data;
+fbShmPutImage(DrawablePtr dst, GCPtr pGC, int depth, unsigned int format,
+    int w, int h, int sx, int sy, int sw, int sh, int dx, int dy, char *data)
 {
     if ((format == ZPixmap) || (depth == 1))
     {
@@ -792,8 +780,7 @@ CreatePmap:
 #endif
 
 static int
-ProcShmPutImage(client)
-    register ClientPtr client;
+ProcShmPutImage(register ClientPtr client)
 {
     GCPtr pGC;
     DrawablePtr pDraw;
@@ -896,8 +883,7 @@ ProcShmPutImage(client)
 
 
 static int
-ProcShmGetImage(client)
-    register ClientPtr client;
+ProcShmGetImage(register ClientPtr client)
 {
     DrawablePtr		pDraw;
     long		lenPer = 0, length;
@@ -1009,12 +995,8 @@ ProcShmGetImage(client)
 }
 
 static PixmapPtr
-fbShmCreatePixmap (pScreen, width, height, depth, addr)
-    ScreenPtr	pScreen;
-    int		width;
-    int		height;
-    int		depth;
-    char	*addr;
+fbShmCreatePixmap (ScreenPtr pScreen, int width, int height, int depth,
+    char *addr)
 {
     register PixmapPtr pPixmap;
 
@@ -1031,8 +1013,7 @@ fbShmCreatePixmap (pScreen, width, height, depth, addr)
 }
 
 static int
-ProcShmCreatePixmap(client)
-    register ClientPtr client;
+ProcShmCreatePixmap(register ClientPtr client)
 {
     PixmapPtr pMap;
     DrawablePtr pDraw;
@@ -1089,8 +1070,7 @@ CreatePmap:
 }
 
 static int
-ProcShmDispatch (client)
-    register ClientPtr	client;
+ProcShmDispatch (register ClientPtr client)
 {
     REQUEST(xReq);
     switch (stuff->data)
@@ -1125,8 +1105,7 @@ ProcShmDispatch (client)
 }
 
 static void
-SShmCompletionEvent(from, to)
-    xShmCompletionEvent *from, *to;
+SShmCompletionEvent(xShmCompletionEvent *from, xShmCompletionEvent *to)
 {
     to->type = from->type;
     cpswaps(from->sequenceNumber, to->sequenceNumber);
@@ -1138,8 +1117,7 @@ SShmCompletionEvent(from, to)
 }
 
 static int
-SProcShmQueryVersion(client)
-    register ClientPtr	client;
+SProcShmQueryVersion(register ClientPtr client)
 {
     register int n;
     REQUEST(xShmQueryVersionReq);
@@ -1149,8 +1127,7 @@ SProcShmQueryVersion(client)
 }
 
 static int
-SProcShmAttach(client)
-    ClientPtr client;
+SProcShmAttach(ClientPtr client)
 {
     register int n;
     REQUEST(xShmAttachReq);
@@ -1162,8 +1139,7 @@ SProcShmAttach(client)
 }
 
 static int
-SProcShmDetach(client)
-    ClientPtr client;
+SProcShmDetach(ClientPtr client)
 {
     register int n;
     REQUEST(xShmDetachReq);
@@ -1174,8 +1150,7 @@ SProcShmDetach(client)
 }
 
 static int
-SProcShmPutImage(client)
-    ClientPtr client;
+SProcShmPutImage(ClientPtr client)
 {
     register int n;
     REQUEST(xShmPutImageReq);
@@ -1197,8 +1172,7 @@ SProcShmPutImage(client)
 }
 
 static int
-SProcShmGetImage(client)
-    ClientPtr client;
+SProcShmGetImage(ClientPtr client)
 {
     register int n;
     REQUEST(xShmGetImageReq);
@@ -1216,8 +1190,7 @@ SProcShmGetImage(client)
 }
 
 static int
-SProcShmCreatePixmap(client)
-    ClientPtr client;
+SProcShmCreatePixmap(ClientPtr client)
 {
     register int n;
     REQUEST(xShmCreatePixmapReq);
@@ -1233,8 +1206,7 @@ SProcShmCreatePixmap(client)
 }
 
 static int
-SProcShmDispatch (client)
-    register ClientPtr	client;
+SProcShmDispatch (register ClientPtr client)
 {
     REQUEST(xReq);
     switch (stuff->data)
diff --git a/Xext/sleepuntil.c b/Xext/sleepuntil.c
index f8cedbe..f429f5a 100644
--- a/Xext/sleepuntil.c
+++ b/Xext/sleepuntil.c
@@ -138,9 +138,7 @@ ClientSleepUntil (client, revive, notifyFunc, closure)
 }
 
 static void
-ClientAwaken (client, closure)
-    ClientPtr	client;
-    pointer	closure;
+ClientAwaken (ClientPtr client, pointer closure)
 {
     if (!client->clientGone)
 	AttendClient (client);
@@ -148,9 +146,7 @@ ClientAwaken (client, closure)
 
 
 static int
-SertafiedDelete (value, id)
-    pointer value;
-    XID id;
+SertafiedDelete (pointer value, XID id)
 {
     SertafiedPtr	pRequest = (SertafiedPtr)value;
     SertafiedPtr	pReq, pPrev;
@@ -172,10 +168,10 @@ SertafiedDelete (value, id)
 }
 
 static void
-SertafiedBlockHandler (data, wt, LastSelectMask)
-    pointer	    data;		/* unused */
-    OSTimePtr	    wt;			/* wait time */
-    pointer	    LastSelectMask;
+SertafiedBlockHandler (
+    pointer data,			/* unused */
+    OSTimePtr wt,			/* wait time */
+    pointer LastSelectMask)
 {
     SertafiedPtr	    pReq, pNext;
     unsigned long	    delay;
@@ -208,10 +204,7 @@ SertafiedBlockHandler (data, wt, LastSelectMask)
 }
 
 static void
-SertafiedWakeupHandler (data, i, LastSelectMask)
-    pointer	    data;
-    int		    i;
-    pointer	    LastSelectMask;
+SertafiedWakeupHandler (pointer data, int i, pointer LastSelectMask)
 {
     SertafiedPtr	pReq, pNext;
     TimeStamp		now;
diff --git a/Xext/sync.c b/Xext/sync.c
index c5441a1..d791648 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -296,8 +296,7 @@ static DISPATCH_PROC(SProcSyncSetPriority);
  *  delete and add triggers on this list.
  */
 static void
-SyncDeleteTriggerFromCounter(pTrigger)
-    SyncTrigger *pTrigger;
+SyncDeleteTriggerFromCounter(SyncTrigger *pTrigger)
 {
     SyncTriggerList *pCur;
     SyncTriggerList *pPrev;
@@ -333,8 +332,7 @@ SyncDeleteTriggerFromCounter(pTrigger)
 
 
 static int
-SyncAddTriggerToCounter(pTrigger)
-    SyncTrigger *pTrigger;
+SyncAddTriggerToCounter(SyncTrigger *pTrigger)
 {
     SyncTriggerList *pCur;
 
@@ -377,9 +375,7 @@ SyncAddTriggerToCounter(pTrigger)
  */
 
 static Bool
-SyncCheckTriggerPositiveComparison(pTrigger, oldval)
-    SyncTrigger *pTrigger;
-    CARD64	oldval;
+SyncCheckTriggerPositiveComparison(SyncTrigger *pTrigger, CARD64 oldval)
 {
     return (pTrigger->pCounter == NULL ||
 	    XSyncValueGreaterOrEqual(pTrigger->pCounter->value,
@@ -387,9 +383,7 @@ SyncCheckTriggerPositiveComparison(pTrigger, oldval)
 }
 
 static Bool
-SyncCheckTriggerNegativeComparison(pTrigger, oldval)
-    SyncTrigger *pTrigger;
-    CARD64	oldval;
+SyncCheckTriggerNegativeComparison(SyncTrigger *pTrigger, CARD64 oldval)
 {
     return (pTrigger->pCounter == NULL ||
 	    XSyncValueLessOrEqual(pTrigger->pCounter->value,
@@ -397,9 +391,7 @@ SyncCheckTriggerNegativeComparison(pTrigger, oldval)
 }
 
 static Bool
-SyncCheckTriggerPositiveTransition(pTrigger, oldval)
-    SyncTrigger *pTrigger;
-    CARD64	oldval;
+SyncCheckTriggerPositiveTransition(SyncTrigger *pTrigger, CARD64 oldval)
 {
     return (pTrigger->pCounter == NULL ||
 	    (XSyncValueLessThan(oldval, pTrigger->test_value) &&
@@ -408,9 +400,7 @@ SyncCheckTriggerPositiveTransition(pTrigger, oldval)
 }
 
 static Bool
-SyncCheckTriggerNegativeTransition(pTrigger, oldval)
-    SyncTrigger *pTrigger;
-    CARD64	oldval;
+SyncCheckTriggerNegativeTransition(SyncTrigger *pTrigger, CARD64 oldval)
 {
     return (pTrigger->pCounter == NULL ||
 	    (XSyncValueGreaterThan(oldval, pTrigger->test_value) &&
@@ -421,11 +411,11 @@ SyncCheckTriggerNegativeTransition(pTrigger, oldval)
 
 
 static int 
-SyncInitTrigger(client, pTrigger, counter, changes) 
-    ClientPtr	     client;    /* so we can set errorValue */
-    SyncTrigger      *pTrigger;
-    XSyncCounter     counter; 
-    Mask	     changes;
+SyncInitTrigger( 
+    ClientPtr client,    /* so we can set errorValue */
+    SyncTrigger *pTrigger,
+    XSyncCounter counter,
+    Mask changes)
 {
     SyncCounter *pCounter = pTrigger->pCounter;
     int		status;
@@ -537,8 +527,7 @@ SyncInitTrigger(client, pTrigger, counter, changes)
  *  clients.  The alarm maintains a list of clients interested in events.
  */
 static void
-SyncSendAlarmNotifyEvents(pAlarm)
-    SyncAlarm *pAlarm;
+SyncSendAlarmNotifyEvents(SyncAlarm *pAlarm)
 {
     SyncAlarmClientList *pcl;
     xSyncAlarmNotifyEvent ane;
@@ -585,10 +574,7 @@ SyncSendAlarmNotifyEvents(pAlarm)
  *  go only to the Awaiting client.
  */
 static void
-SyncSendCounterNotifyEvents(client, ppAwait, num_events)
-    ClientPtr client;
-    SyncAwait **ppAwait;
-    int num_events;
+SyncSendCounterNotifyEvents(ClientPtr client, SyncAwait **ppAwait, int num_events)
 {
     xSyncCounterNotifyEvent *pEvents, *pev;
     int i;
@@ -625,8 +611,7 @@ SyncSendCounterNotifyEvents(client, ppAwait, num_events)
  * It is plugged into pTrigger->CounterDestroyed (for alarm triggers).
  */
 void
-SyncAlarmCounterDestroyed(pTrigger)
-    SyncTrigger *pTrigger;
+SyncAlarmCounterDestroyed(SyncTrigger *pTrigger)
 {
     SyncAlarm *pAlarm = (SyncAlarm *)pTrigger;
 
@@ -640,8 +625,7 @@ SyncAlarmCounterDestroyed(pTrigger)
  *  It is plugged into pTrigger->TriggerFired (for alarm triggers).
  */
 static void
-SyncAlarmTriggerFired(pTrigger)
-    SyncTrigger *pTrigger;
+SyncAlarmTriggerFired(SyncTrigger *pTrigger)
 {
     SyncAlarm *pAlarm = (SyncAlarm *)pTrigger;
     CARD64 new_test_value;
@@ -716,8 +700,7 @@ SyncAlarmTriggerFired(pTrigger)
  *  (for Await triggers).
  */
 static void
-SyncAwaitTriggerFired(pTrigger)
-    SyncTrigger *pTrigger;
+SyncAwaitTriggerFired(SyncTrigger *pTrigger)
 {
     SyncAwait *pAwait = (SyncAwait *)pTrigger;
     int numwaits;
@@ -810,9 +793,7 @@ bail:
  *  any triggers depending on the counter will be checked.
  */
 void
-SyncChangeCounter(pCounter, newval)
-    SyncCounter    *pCounter;
-    CARD64         newval;
+SyncChangeCounter(SyncCounter *pCounter, CARD64 newval)
 {
     SyncTriggerList       *ptl, *pnext;
     CARD64 oldval;
@@ -837,10 +818,7 @@ SyncChangeCounter(pCounter, newval)
 
 /* loosely based on dix/events.c/EventSelectForWindow */
 static Bool
-SyncEventSelectForAlarm(pAlarm, client, wantevents)
-    SyncAlarm *pAlarm;
-    ClientPtr client;
-    Bool      wantevents;
+SyncEventSelectForAlarm(SyncAlarm *pAlarm, ClientPtr client, Bool wantevents)
 {
     SyncAlarmClientList *pClients;
 
@@ -909,11 +887,8 @@ SyncEventSelectForAlarm(pAlarm, client, wantevents)
  * ** SyncChangeAlarmAttributes ** This is used by CreateAlarm and ChangeAlarm
  */
 static int 
-SyncChangeAlarmAttributes(client, pAlarm, mask, values)
-    ClientPtr       client;
-    SyncAlarm      *pAlarm;
-    Mask	    mask;
-    CARD32	    *values;
+SyncChangeAlarmAttributes(ClientPtr client, SyncAlarm *pAlarm, Mask mask, 
+    CARD32 *values)
 {
     int		   status;
     XSyncCounter   counter;
@@ -1010,10 +985,7 @@ SyncChangeAlarmAttributes(client, pAlarm, mask, values)
 
 
 static SyncCounter *
-SyncCreateCounter(client, id, initialvalue)
-    ClientPtr	client;
-    XSyncCounter id;
-    CARD64      initialvalue;
+SyncCreateCounter(ClientPtr client, XSyncCounter id, CARD64 initialvalue)
 {
     SyncCounter *pCounter;
 
@@ -1104,17 +1076,14 @@ SyncCreateSystemCounter(name, initial, resolution, counterType,
 }
 
 void
-SyncDestroySystemCounter(pSysCounter)
-    pointer pSysCounter;
+SyncDestroySystemCounter(pointer pSysCounter)
 {
     SyncCounter *pCounter = (SyncCounter *)pSysCounter;
     FreeResource(pCounter->id, RT_NONE);
 }
 
 static void
-SyncComputeBracketValues(pCounter, startOver)
-    SyncCounter *pCounter;
-    Bool startOver;
+SyncComputeBracketValues(SyncCounter *pCounter, Bool startOver)
 {
     SyncTriggerList *pCur;
     SyncTrigger *pTrigger;
@@ -1201,9 +1170,7 @@ SyncComputeBracketValues(pCounter, startOver)
 
 /* ARGSUSED */
 static int
-FreeAlarm(addr, id)
-    pointer         addr;
-    XID             id;
+FreeAlarm(pointer addr, XID id)
 {
     SyncAlarm      *pAlarm = (SyncAlarm *) addr;
 
@@ -1228,9 +1195,7 @@ FreeAlarm(addr, id)
  */
 /* ARGSUSED */
 static int
-FreeCounter(env, id)
-    pointer         env;
-    XID             id;
+FreeCounter(pointer env, XID id)
 {
     SyncCounter     *pCounter = (SyncCounter *) env;
     SyncTriggerList *ptl, *pnext;
@@ -1280,9 +1245,7 @@ FreeCounter(env, id)
  */
 /* ARGSUSED */
 static int
-FreeAwait(addr, id)
-    pointer         addr;
-    XID             id;
+FreeAwait(pointer addr, XID id)
 {
     SyncAwaitUnion *pAwaitUnion = (SyncAwaitUnion *) addr;
     SyncAwait *pAwait;
@@ -1308,9 +1271,9 @@ FreeAwait(addr, id)
 
 /* loosely based on dix/events.c/OtherClientGone */
 static int
-FreeAlarmClient(value, id)
-    pointer value; /* must conform to DeleteType */
-    XID   id;
+FreeAlarmClient(
+    pointer value, /* must conform to DeleteType */
+    XID id)
 {
     SyncAlarm *pAlarm = (SyncAlarm *)value;
     SyncAlarmClientList *pCur, *pPrev;
@@ -1343,8 +1306,7 @@ FreeAlarmClient(value, id)
  * ** Initialize the extension
  */
 static int 
-ProcSyncInitialize(client)
-    ClientPtr       client;
+ProcSyncInitialize(ClientPtr client)
 {
     xSyncInitializeReply  rep;
     int   n;
@@ -1369,8 +1331,7 @@ ProcSyncInitialize(client)
  * ** Get list of system counters available through the extension
  */
 static int 
-ProcSyncListSystemCounters(client)
-    ClientPtr       client;
+ProcSyncListSystemCounters(ClientPtr client)
 {
     xSyncListSystemCountersReply  rep;
     int i, len;
@@ -1447,8 +1408,7 @@ ProcSyncListSystemCounters(client)
  * ** Set client Priority
  */
 static int 
-ProcSyncSetPriority(client)
-    ClientPtr       client;
+ProcSyncSetPriority(ClientPtr client)
 {
     REQUEST(xSyncSetPriorityReq);
     ClientPtr priorityclient;
@@ -1483,8 +1443,7 @@ ProcSyncSetPriority(client)
  * ** Get client Priority
  */
 static int 
-ProcSyncGetPriority(client)
-    ClientPtr       client;
+ProcSyncGetPriority(ClientPtr client)
 {
     REQUEST(xSyncGetPriorityReq);
     xSyncGetPriorityReply rep;
@@ -1523,8 +1482,7 @@ ProcSyncGetPriority(client)
  * ** Create a new counter
  */
 static int 
-ProcSyncCreateCounter(client)
-    ClientPtr       client;
+ProcSyncCreateCounter(ClientPtr client)
 {
     REQUEST(xSyncCreateCounterReq);
     CARD64          initial;
@@ -1544,8 +1502,7 @@ ProcSyncCreateCounter(client)
  * ** Set Counter value
  */
 static int 
-ProcSyncSetCounter(client)
-    ClientPtr       client;
+ProcSyncSetCounter(ClientPtr client)
 {
     REQUEST(xSyncSetCounterReq);
     SyncCounter    *pCounter;
@@ -1576,8 +1533,7 @@ ProcSyncSetCounter(client)
  * ** Change Counter value
  */
 static int 
-ProcSyncChangeCounter(client)
-    ClientPtr       client;
+ProcSyncChangeCounter(ClientPtr client)
 {
     REQUEST(xSyncChangeCounterReq);
     SyncCounter    *pCounter;
@@ -1616,8 +1572,7 @@ ProcSyncChangeCounter(client)
  * ** Destroy a counter
  */
 static int 
-ProcSyncDestroyCounter(client)
-    ClientPtr       client;
+ProcSyncDestroyCounter(ClientPtr client)
 {
     REQUEST(xSyncDestroyCounterReq);
     SyncCounter    *pCounter;
@@ -1645,8 +1600,7 @@ ProcSyncDestroyCounter(client)
  * ** Await
  */
 static int 
-ProcSyncAwait(client)
-    ClientPtr       client;
+ProcSyncAwait(ClientPtr client)
 {
     REQUEST(xSyncAwaitReq);
     int             len, items;
@@ -1761,8 +1715,7 @@ ProcSyncAwait(client)
  * ** Query a counter
  */
 static int 
-ProcSyncQueryCounter(client)
-    ClientPtr       client;
+ProcSyncQueryCounter(ClientPtr client)
 {
     REQUEST(xSyncQueryCounterReq);
     xSyncQueryCounterReply rep;
@@ -1809,8 +1762,7 @@ ProcSyncQueryCounter(client)
  * ** Create Alarm
  */
 static int 
-ProcSyncCreateAlarm(client)
-    ClientPtr       client;
+ProcSyncCreateAlarm(ClientPtr client)
 {
     REQUEST(xSyncCreateAlarmReq);
     SyncAlarm      *pAlarm;
@@ -1889,8 +1841,7 @@ ProcSyncCreateAlarm(client)
  * ** Change Alarm
  */
 static int 
-ProcSyncChangeAlarm(client)
-    ClientPtr       client;
+ProcSyncChangeAlarm(ClientPtr client)
 {
     REQUEST(xSyncChangeAlarmReq);
     SyncAlarm   *pAlarm;
@@ -1930,8 +1881,7 @@ ProcSyncChangeAlarm(client)
 }
 
 static int 
-ProcSyncQueryAlarm(client)
-    ClientPtr       client;
+ProcSyncQueryAlarm(ClientPtr client)
 {
     REQUEST(xSyncQueryAlarmReq);
     SyncAlarm      *pAlarm;
@@ -1993,8 +1943,7 @@ ProcSyncQueryAlarm(client)
 
 
 static int 
-ProcSyncDestroyAlarm(client)
-    ClientPtr       client;
+ProcSyncDestroyAlarm(ClientPtr client)
 {
     REQUEST(xSyncDestroyAlarmReq);
 
@@ -2015,8 +1964,7 @@ ProcSyncDestroyAlarm(client)
  * ** Given an extension request, call the appropriate request procedure
  */
 static int 
-ProcSyncDispatch(client)
-    ClientPtr       client;
+ProcSyncDispatch(ClientPtr client)
 {
     REQUEST(xReq);
 
@@ -2061,8 +2009,7 @@ ProcSyncDispatch(client)
  */
 
 static int 
-SProcSyncInitialize(client)
-    ClientPtr       client;
+SProcSyncInitialize(ClientPtr client)
 {
     REQUEST(xSyncInitializeReq);
     register char   n;
@@ -2074,8 +2021,7 @@ SProcSyncInitialize(client)
 }
 
 static int 
-SProcSyncListSystemCounters(client)
-    ClientPtr       client;
+SProcSyncListSystemCounters(ClientPtr client)
 {
     REQUEST(xSyncListSystemCountersReq);
     register char   n;
@@ -2087,8 +2033,7 @@ SProcSyncListSystemCounters(client)
 }
 
 static int 
-SProcSyncCreateCounter(client)
-    ClientPtr       client;
+SProcSyncCreateCounter(ClientPtr client)
 {
     REQUEST(xSyncCreateCounterReq);
     register char   n;
@@ -2103,8 +2048,7 @@ SProcSyncCreateCounter(client)
 }
 
 static int 
-SProcSyncSetCounter(client)
-    ClientPtr       client;
+SProcSyncSetCounter(ClientPtr client)
 {
     REQUEST(xSyncSetCounterReq);
     register char   n;
@@ -2119,8 +2063,7 @@ SProcSyncSetCounter(client)
 }
 
 static int 
-SProcSyncChangeCounter(client)
-    ClientPtr       client;
+SProcSyncChangeCounter(ClientPtr client)
 {
     REQUEST(xSyncChangeCounterReq);
     register char   n;
@@ -2135,8 +2078,7 @@ SProcSyncChangeCounter(client)
 }
 
 static int 
-SProcSyncQueryCounter(client)
-    ClientPtr       client;
+SProcSyncQueryCounter(ClientPtr client)
 {
     REQUEST(xSyncQueryCounterReq);
     register char   n;
@@ -2149,8 +2091,7 @@ SProcSyncQueryCounter(client)
 }
 
 static int 
-SProcSyncDestroyCounter(client)
-    ClientPtr       client;
+SProcSyncDestroyCounter(ClientPtr client)
 {
     REQUEST(xSyncDestroyCounterReq);
     register char   n;
@@ -2163,8 +2104,7 @@ SProcSyncDestroyCounter(client)
 }
 
 static int 
-SProcSyncAwait(client)
-    ClientPtr       client;
+SProcSyncAwait(ClientPtr client)
 {
     REQUEST(xSyncAwaitReq);
     register char   n;
@@ -2178,8 +2118,7 @@ SProcSyncAwait(client)
 
 
 static int 
-SProcSyncCreateAlarm(client)
-    ClientPtr       client;
+SProcSyncCreateAlarm(ClientPtr client)
 {
     REQUEST(xSyncCreateAlarmReq);
     register char   n;
@@ -2194,8 +2133,7 @@ SProcSyncCreateAlarm(client)
 }
 
 static int 
-SProcSyncChangeAlarm(client)
-    ClientPtr       client;
+SProcSyncChangeAlarm(ClientPtr client)
 {
     REQUEST(xSyncChangeAlarmReq);
     register char   n;
@@ -2209,8 +2147,7 @@ SProcSyncChangeAlarm(client)
 }
 
 static int 
-SProcSyncQueryAlarm(client)
-    ClientPtr       client;
+SProcSyncQueryAlarm(ClientPtr client)
 {
     REQUEST(xSyncQueryAlarmReq);
     register char   n;
@@ -2223,8 +2160,7 @@ SProcSyncQueryAlarm(client)
 }
 
 static int 
-SProcSyncDestroyAlarm(client)
-    ClientPtr       client;
+SProcSyncDestroyAlarm(ClientPtr client)
 {
     REQUEST(xSyncDestroyAlarmReq);
     register char   n;
@@ -2237,8 +2173,7 @@ SProcSyncDestroyAlarm(client)
 }
 
 static int 
-SProcSyncSetPriority(client)
-    ClientPtr       client;
+SProcSyncSetPriority(ClientPtr client)
 {
     REQUEST(xSyncSetPriorityReq);
     register char   n;
@@ -2252,8 +2187,7 @@ SProcSyncSetPriority(client)
 }
 
 static int 
-SProcSyncGetPriority(client)
-    ClientPtr       client;
+SProcSyncGetPriority(ClientPtr client)
 {
     REQUEST(xSyncGetPriorityReq);
     register char   n;
@@ -2267,8 +2201,7 @@ SProcSyncGetPriority(client)
 
 
 static int 
-SProcSyncDispatch(client)
-    ClientPtr       client;
+SProcSyncDispatch(ClientPtr client)
 {
     REQUEST(xReq);
 
@@ -2312,8 +2245,7 @@ SProcSyncDispatch(client)
  */
 
 static void 
-SCounterNotifyEvent(from, to)
-    xSyncCounterNotifyEvent *from, *to;
+SCounterNotifyEvent(xSyncCounterNotifyEvent *from, xSyncCounterNotifyEvent *to)
 {
     to->type = from->type;
     to->kind = from->kind;
@@ -2330,8 +2262,7 @@ SCounterNotifyEvent(from, to)
 
 
 static void 
-SAlarmNotifyEvent(from, to)
-    xSyncAlarmNotifyEvent *from, *to;
+SAlarmNotifyEvent(xSyncAlarmNotifyEvent *from, xSyncAlarmNotifyEvent *to)
 {
     to->type = from->type;
     to->kind = from->kind;
@@ -2350,8 +2281,7 @@ SAlarmNotifyEvent(from, to)
  */
 /* ARGSUSED */
 static void 
-SyncResetProc(extEntry)
-    ExtensionEntry *extEntry;
+SyncResetProc(ExtensionEntry *extEntry)
 {
     xfree(SysCounterList);
     SysCounterList = NULL;
@@ -2431,10 +2361,8 @@ static XSyncValue *pnext_time;
 *** code inspired by multibuffer extension
  */
 /*ARGSUSED*/
-static void ServertimeBlockHandler(env, wt, LastSelectMask)
-pointer env;
-struct timeval **wt;
-pointer LastSelectMask;
+static void ServertimeBlockHandler(pointer env, struct timeval **wt, 
+    pointer LastSelectMask)
 {
     XSyncValue delay;
     unsigned long timeout;
@@ -2462,10 +2390,7 @@ pointer LastSelectMask;
 *** Wakeup Handler
  */
 /*ARGSUSED*/
-static void ServertimeWakeupHandler(env, rc, LastSelectMask)
-pointer env;
-int rc;
-pointer LastSelectMask;
+static void ServertimeWakeupHandler(pointer env, int rc, pointer LastSelectMask)
 {
     if (pnext_time)
     {
@@ -2479,19 +2404,15 @@ pointer LastSelectMask;
 }
 
 static void
-ServertimeQueryValue(pCounter, pValue_return)
-    pointer pCounter;
-    CARD64 *pValue_return;
+ServertimeQueryValue(pointer pCounter, CARD64 *pValue_return)
 {
     GetTime();
     *pValue_return = Now;
 }
 
 static void
-ServertimeBracketValues(pCounter, pbracket_less, pbracket_greater)
-    pointer pCounter;
-    CARD64 *pbracket_less;
-    CARD64 *pbracket_greater;
+ServertimeBracketValues(pointer pCounter, CARD64 *pbracket_less,
+    CARD64 *pbracket_greater)
 {
     if (!pnext_time && pbracket_greater)
     {
diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c
index 8c7a86e..f6dc073 100644
--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@@ -86,14 +86,12 @@ XCMiscExtensionInit(INITARGS)
 
 /*ARGSUSED*/
 static void
-XCMiscResetProc (extEntry)
-    ExtensionEntry	*extEntry;
+XCMiscResetProc (ExtensionEntry *extEntry)
 {
 }
 
 static int
-ProcXCMiscGetVersion(client)
-    register ClientPtr client;
+ProcXCMiscGetVersion(register ClientPtr client)
 {
     xXCMiscGetVersionReply rep;
     register int n;
@@ -114,8 +112,7 @@ ProcXCMiscGetVersion(client)
 }
 
 static int
-ProcXCMiscGetXIDRange(client)
-    register ClientPtr client;
+ProcXCMiscGetXIDRange(register ClientPtr client)
 {
     xXCMiscGetXIDRangeReply rep;
     register int n;
@@ -138,8 +135,7 @@ ProcXCMiscGetXIDRange(client)
 }
 
 static int
-ProcXCMiscGetXIDList(client)
-    register ClientPtr client;
+ProcXCMiscGetXIDList(register ClientPtr client)
 {
     REQUEST(xXCMiscGetXIDListReq);
     xXCMiscGetXIDListReply rep;
@@ -178,8 +174,7 @@ ProcXCMiscGetXIDList(client)
 }
 
 static int
-ProcXCMiscDispatch (client)
-    register ClientPtr	client;
+ProcXCMiscDispatch (register ClientPtr client)
 {
     REQUEST(xReq);
     switch (stuff->data)
@@ -196,8 +191,7 @@ ProcXCMiscDispatch (client)
 }
 
 static int
-SProcXCMiscGetVersion(client)
-    register ClientPtr	client;
+SProcXCMiscGetVersion(register ClientPtr client)
 {
     register int n;
     REQUEST(xXCMiscGetVersionReq);
@@ -210,8 +204,7 @@ SProcXCMiscGetVersion(client)
 }
 
 static int
-SProcXCMiscGetXIDRange(client)
-    register ClientPtr	client;
+SProcXCMiscGetXIDRange(register ClientPtr client)
 {
     register int n;
     REQUEST(xReq);
@@ -221,8 +214,7 @@ SProcXCMiscGetXIDRange(client)
 }
 
 static int
-SProcXCMiscGetXIDList(client)
-    register ClientPtr	client;
+SProcXCMiscGetXIDList(register ClientPtr client)
 {
     register int n;
     REQUEST(xXCMiscGetXIDListReq);
@@ -233,8 +225,7 @@ SProcXCMiscGetXIDList(client)
 }
 
 static int
-SProcXCMiscDispatch (client)
-    register ClientPtr	client;
+SProcXCMiscDispatch (register ClientPtr client)
 {
     REQUEST(xReq);
     switch (stuff->data)
diff --git a/Xext/xtest.c b/Xext/xtest.c
index 94d8974..ba2fb27 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -105,14 +105,12 @@ XTestExtensionInit(INITARGS)
 
 /*ARGSUSED*/
 static void
-XTestResetProc (extEntry)
-ExtensionEntry	*extEntry;
+XTestResetProc (ExtensionEntry *extEntry)
 {
 }
 
 static int
-ProcXTestGetVersion(client)
-    register ClientPtr client;
+ProcXTestGetVersion(register ClientPtr client)
 {
     xXTestGetVersionReply rep;
     register int n;
@@ -132,8 +130,7 @@ ProcXTestGetVersion(client)
 }
 
 static int
-ProcXTestCompareCursor(client)
-    register ClientPtr client;
+ProcXTestCompareCursor(register ClientPtr client)
 {
     REQUEST(xXTestCompareCursorReq);
     xXTestCompareCursorReply rep;
@@ -169,8 +166,7 @@ ProcXTestCompareCursor(client)
 }
 
 static int
-ProcXTestFakeInput(client)
-    register ClientPtr client;
+ProcXTestFakeInput(register ClientPtr client)
 {
     REQUEST(xXTestFakeInputReq);
     int nev, n, type, rc;
@@ -465,8 +461,7 @@ ProcXTestFakeInput(client)
 }
 
 static int
-ProcXTestGrabControl(client)
-    register ClientPtr client;
+ProcXTestGrabControl(register ClientPtr client)
 {
     REQUEST(xXTestGrabControlReq);
 
@@ -484,8 +479,7 @@ ProcXTestGrabControl(client)
 }
 
 static int
-ProcXTestDispatch (client)
-    register ClientPtr	client;
+ProcXTestDispatch (register ClientPtr client)
 {
     REQUEST(xReq);
     switch (stuff->data)
@@ -504,8 +498,7 @@ ProcXTestDispatch (client)
 }
 
 static int
-SProcXTestGetVersion(client)
-    register ClientPtr	client;
+SProcXTestGetVersion(register ClientPtr client)
 {
     register int n;
     REQUEST(xXTestGetVersionReq);
@@ -517,8 +510,7 @@ SProcXTestGetVersion(client)
 }
 
 static int
-SProcXTestCompareCursor(client)
-    register ClientPtr	client;
+SProcXTestCompareCursor(register ClientPtr client)
 {
     register int n;
     REQUEST(xXTestCompareCursorReq);
@@ -531,9 +523,7 @@ SProcXTestCompareCursor(client)
 }
 
 static int
-XTestSwapFakeInput(client, req)
-    register ClientPtr	client;
-    xReq *req;
+XTestSwapFakeInput(register ClientPtr client, xReq *req)
 {
     register int nev;
     register xEvent *ev;
@@ -557,8 +547,7 @@ XTestSwapFakeInput(client, req)
 }
 
 static int
-SProcXTestFakeInput(client)
-    register ClientPtr	client;
+SProcXTestFakeInput(register ClientPtr client)
 {
     register int n;
     REQUEST(xReq);
@@ -571,8 +560,7 @@ SProcXTestFakeInput(client)
 }
 
 static int
-SProcXTestGrabControl(client)
-    register ClientPtr	client;
+SProcXTestGrabControl(register ClientPtr client)
 {
     register int n;
     REQUEST(xXTestGrabControlReq);
@@ -583,8 +571,7 @@ SProcXTestGrabControl(client)
 }
 
 static int
-SProcXTestDispatch (client)
-    register ClientPtr	client;
+SProcXTestDispatch (register ClientPtr client)
 {
     REQUEST(xReq);
     switch (stuff->data)
diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index ddf3d1d..49ef324 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -531,12 +531,7 @@ XvdiDestroyEncoding(pointer value, XID id)
 }
 
 static int
-XvdiSendVideoNotify(pPort, pDraw, reason)
-
-XvPortPtr pPort;
-DrawablePtr pDraw;
-int reason;
-
+XvdiSendVideoNotify(XvPortPtr pPort, DrawablePtr pDraw, int reason)
 {
   xvEvent event;
   XvVideoNotifyPtr pn;