diff --git a/Xext/saver.c b/Xext/saver.c
index 296de0dac..0d3d21110 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -63,30 +63,13 @@ in this Software without prior written authorization from the X Consortium.
 
 static int ScreenSaverEventBase = 0;
 
-static Bool ScreenSaverHandle(ScreenPtr /* pScreen */ ,
-                              int /* xstate */ ,
-                              Bool      /* force */
-    );
-
-static Bool
- CreateSaverWindow(ScreenPtr    /* pScreen */
-    );
-
-static Bool
- DestroySaverWindow(ScreenPtr   /* pScreen */
-    );
-
-static void
- UninstallSaverColormap(ScreenPtr       /* pScreen */
-    );
-
-static void
- CheckScreenPrivate(ScreenPtr   /* pScreen */
-    );
-
-static void SScreenSaverNotifyEvent(xScreenSaverNotifyEvent * /* from */ ,
-                                    xScreenSaverNotifyEvent *   /* to */
-    );
+static Bool ScreenSaverHandle(ScreenPtr pScreen, int xstate, Bool force);
+static Bool CreateSaverWindow(ScreenPtr pScreen);
+static Bool DestroySaverWindow(ScreenPtr pScreen);
+static void UninstallSaverColormap(ScreenPtr pScreen);
+static void CheckScreenPrivate(ScreenPtr pScreen);
+static void SScreenSaverNotifyEvent(xScreenSaverNotifyEvent *from,
+                                    xScreenSaverNotifyEvent *to);
 
 static RESTYPE SuspendType;     /* resource type for suspension records */