diff --git a/dix/devices.c b/dix/devices.c
index b2a8f069c..4e7897194 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -625,7 +625,7 @@ InitCoreDevices(void)
  * @return Success or error code on failure.
  */
 int
-InitAndStartDevices()
+InitAndStartDevices(void)
 {
     DeviceIntPtr dev, next;
 
@@ -930,7 +930,7 @@ CloseDownDevices(void)
  * resources are freed or any device is deleted.
  */
 void
-UndisplayDevices()
+UndisplayDevices(void)
 {
     DeviceIntPtr dev;
     ScreenPtr screen = screenInfo.screens[0];
@@ -1621,10 +1621,8 @@ BadDeviceMap(BYTE *buff, int length, unsigned low, unsigned high, XID *errval)
 }
 
 Bool
-AllModifierKeysAreUp(dev, map1, per1, map2, per2)
-    DeviceIntPtr dev;
-    CARD8 *map1, *map2;
-    int per1, per2;
+AllModifierKeysAreUp(DeviceIntPtr dev, CARD8 *map1, int per1,
+                     CARD8 *map2, int per2)
 {
     int i, j, k;
     CARD8 *down = dev->key->down;
diff --git a/dix/events.c b/dix/events.c
index c1ca4e0d2..ba90ff1ea 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -3964,8 +3964,7 @@ ProcessPointerEvent (xEvent *xE, DeviceIntPtr mouse, int count)
  * Traverses to siblings and parents of the window.
  */
 void
-RecalculateDeliverableEvents(pWin)
-    WindowPtr pWin;
+RecalculateDeliverableEvents(WindowPtr pWin)
 {
     OtherClients *others;
     WindowPtr pChild;
@@ -4478,8 +4477,7 @@ SetInputFocus(
  * Sets the input focus for the virtual core keyboard.
  */
 int
-ProcSetInputFocus(client)
-    ClientPtr client;
+ProcSetInputFocus(ClientPtr client)
 {
     DeviceIntPtr kbd = PickKeyboard(client);
     REQUEST(xSetInputFocusReq);
diff --git a/dix/swaprep.c b/dix/swaprep.c
index af82f82ef..493def57d 100644
--- a/dix/swaprep.c
+++ b/dix/swaprep.c
@@ -524,10 +524,7 @@ SListInstalledColormapsReply(ClientPtr pClient, int size,
 }
 
 void
-SAllocColorReply(pClient, size, pRep)
-    ClientPtr		pClient;
-    int			size;
-    xAllocColorReply	*pRep;
+SAllocColorReply(ClientPtr pClient, int size, xAllocColorReply *pRep)
 {
     char n;