Merge 97582ac0ce into d403cbd25c

Xext/dpmsproc.h

@@ -1,10 +1,10 @@
 /* Prototypes for functions that the DDX must provide */
 
-#include <dix-config.h>
-
 #ifndef _DPMSPROC_H_
 #define _DPMSPROC_H_
 
+#include <dix-config.h>
+
 #include "dixstruct.h"
 
 extern int DPMSSet(ClientPtr client, int level);

Xext/panoramiX.h

@@ -28,21 +28,21 @@ Equipment Corporation.
 
 /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */
 
-/*
- *	PanoramiX definitions
- */
-
-#include <dix-config.h>
-
 #ifndef _PANORAMIX_H_
 #define _PANORAMIX_H_
 
+#include <dix-config.h>
+
 #include <X11/Xmd.h>
 #include <X11/extensions/panoramiXproto.h>
 
 #include "gcstruct.h"
 #include "dixstruct.h"
 
+/*
+ *	PanoramiX definitions
+ */
+
 typedef struct _PanoramiXInfo {
     XID id;
 } PanoramiXInfo;

Xext/panoramiXsrv.h

@@ -1,9 +1,8 @@
-
-#include <dix-config.h>
-
 #ifndef _PANORAMIXSRV_H_
 #define _PANORAMIXSRV_H_
 
+#include <dix-config.h>
+
 #include "panoramiX.h"
 
 extern int PanoramiXNumScreens;

Xext/sleepuntil.h

@@ -24,11 +24,11 @@
  * XFree86 Project.
  */
 
-#include <dix-config.h>
-
 #ifndef _SLEEPUNTIL_H_
 #define _SLEEPUNTIL_H_ 1
 
+#include <dix-config.h>
+
 #include "dix.h"
 
 extern int ClientSleepUntil(ClientPtr client,

Xi/allowev.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef ALLOWEV_H
+#define ALLOWEV_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef ALLOWEV_H
-#define ALLOWEV_H 1
-
 int SProcXAllowDeviceEvents(ClientPtr   /* client */
     );
 

Xi/chgdctl.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef CHGDCTL_H
+#define CHGDCTL_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef CHGDCTL_H
-#define CHGDCTL_H 1
-
 int SProcXChangeDeviceControl(ClientPtr /* client */
     );
 

Xi/chgfctl.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef CHGFCTL_H
+#define CHGFCTL_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef CHGFCTL_H
-#define CHGFCTL_H 1
-
 int SProcXChangeFeedbackControl(ClientPtr       /* client */
     );
 

Xi/chgkbd.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef CHGKBD_H
+#define CHGKBD_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef CHGKBD_H
-#define CHGKBD_H 1
-
 int ProcXChangeKeyboardDevice(ClientPtr /* client */
     );
 

Xi/chgkmap.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef CHGKMAP_H
+#define CHGKMAP_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef CHGKMAP_H
-#define CHGKMAP_H 1
-
 int SProcXChangeDeviceKeyMapping(ClientPtr      /* client */
     );
 

Xi/chgprop.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef CHGPROP_H
+#define CHGPROP_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef CHGPROP_H
-#define CHGPROP_H 1
-
 int SProcXChangeDeviceDontPropagateList(ClientPtr       /* client */
     );
 

Xi/chgptr.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef CHGPTR_H
+#define CHGPTR_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef CHGPTR_H
-#define CHGPTR_H 1
-
 int ProcXChangePointerDevice(ClientPtr  /* client */
     );
 

Xi/closedev.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef CLOSEDEV_H
+#define CLOSEDEV_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef CLOSEDEV_H
-#define CLOSEDEV_H 1
-
 int ProcXCloseDevice(ClientPtr  /* client */
     );
 

Xi/devbell.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef DEVBELL_H
+#define DEVBELL_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef DEVBELL_H
-#define DEVBELL_H 1
-
 int ProcXDeviceBell(ClientPtr   /* client */
     );
 

Xi/exglobals.h

@@ -23,19 +23,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
-/*****************************************************************
+#ifndef EXGLOBALS_H
- *
+#define EXGLOBALS_H 1
- * Globals referenced elsewhere in the server.
+
- *
- */
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 #include "privates.h"
 
-#ifndef EXGLOBALS_H
+/*****************************************************************
-#define EXGLOBALS_H 1
+ *
-
+ * Globals referenced elsewhere in the server.
+ *
+ */
 extern int IEventBase;
 extern int BadDevice;
 extern int BadMode;

Xi/getbmap.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef GETBMAP_H
+#define GETBMAP_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef GETBMAP_H
-#define GETBMAP_H 1
-
 int ProcXGetDeviceButtonMapping(ClientPtr       /* client */
     );
 

Xi/getdctl.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef GETDCTL_H
+#define GETDCTL_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef GETDCTL_H
-#define GETDCTL_H 1
-
 int SProcXGetDeviceControl(ClientPtr    /* client */
     );
 

Xi/getfctl.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef GETFCTL_H
+#define GETFCTL_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef GETFCTL_H
-#define GETFCTL_H 1
-
 int ProcXGetFeedbackControl(ClientPtr   /* client */
     );
 

Xi/getfocus.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef GETFOCUS_H
+#define GETFOCUS_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef GETFOCUS_H
-#define GETFOCUS_H 1
-
 int ProcXGetDeviceFocus(ClientPtr       /* client */
     );
 

Xi/getkmap.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef GETKMAP_H
+#define GETKMAP_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef GETKMAP_H
-#define GETKMAP_H 1
-
 int ProcXGetDeviceKeyMapping(ClientPtr  /* client */
     );
 

Xi/getmmap.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef GETMMAP_H
+#define GETMMAP_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef GETMMAP_H
-#define GETMMAP_H 1
-
 int ProcXGetDeviceModifierMapping(ClientPtr     /* client */
     );
 

Xi/getprop.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef GETPROP_H
+#define GETPROP_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef GETPROP_H
-#define GETPROP_H 1
-
 int SProcXGetDeviceDontPropagateList(ClientPtr  /* client */
     );
 

Xi/getselev.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef GETSELEV_H
+#define GETSELEV_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef GETSELEV_H
-#define GETSELEV_H 1
-
 int SProcXGetSelectedExtensionEvents(ClientPtr  /* client */
     );
 

Xi/getvers.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef GETVERS_H
+#define GETVERS_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef GETVERS_H
-#define GETVERS_H 1
-
 int SProcXGetExtensionVersion(ClientPtr /* client */
     );
 

Xi/grabdev.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef GRABDEV_H
+#define GRABDEV_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef GRABDEV_H
-#define GRABDEV_H 1
-
 int SProcXGrabDevice(ClientPtr  /* client */
     );
 

Xi/grabdevb.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef GRABDEVB_H
+#define GRABDEVB_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef GRABDEVB_H
-#define GRABDEVB_H 1
-
 int SProcXGrabDeviceButton(ClientPtr    /* client */
     );
 

Xi/grabdevk.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef GRABDEVK_H
+#define GRABDEVK_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef GRABDEVK_H
-#define GRABDEVK_H 1
-
 int SProcXGrabDeviceKey(ClientPtr       /* client */
     );
 

Xi/gtmotion.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef GTMOTION_H
+#define GTMOTION_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef GTMOTION_H
-#define GTMOTION_H 1
-
 int SProcXGetDeviceMotionEvents(ClientPtr       /* client */
     );
 

Xi/listdev.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef LISTDEV_H
+#define LISTDEV_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef LISTDEV_H
-#define LISTDEV_H 1
-
 #define VPC	20              /* Max # valuators per chunk */
 
 int ProcXListInputDevices(ClientPtr     /* client */

Xi/opendev.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef OPENDEV_H
+#define OPENDEV_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef OPENDEV_H
-#define OPENDEV_H 1
-
 int ProcXOpenDevice(ClientPtr   /* client */
     );
 

Xi/queryst.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef QUERYST_H
+#define QUERYST_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef QUERYST_H
-#define QUERYST_H 1
-
 int ProcXQueryDeviceState(ClientPtr     /* client */
     );
 

Xi/selectev.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef SELECTEV_H
+#define SELECTEV_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef SELECTEV_H
-#define SELECTEV_H 1
-
 int SProcXSelectExtensionEvent(ClientPtr        /* client */
     );
 

Xi/sendexev.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef SENDEXEV_H
+#define SENDEXEV_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef SENDEXEV_H
-#define SENDEXEV_H 1
-
 int SProcXSendExtensionEvent(ClientPtr  /* client */
     );
 

Xi/setbmap.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef SETBMAP_H
+#define SETBMAP_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef SETBMAP_H
-#define SETBMAP_H 1
-
 int ProcXSetDeviceButtonMapping(ClientPtr       /* client */
     );
 

Xi/setdval.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef SETDVAL_H
+#define SETDVAL_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef SETDVAL_H
-#define SETDVAL_H 1
-
 int ProcXSetDeviceValuators(ClientPtr   /* client */
     );
 

Xi/setfocus.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef SETFOCUS_H
+#define SETFOCUS_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef SETFOCUS_H
-#define SETFOCUS_H 1
-
 int SProcXSetDeviceFocus(ClientPtr      /* client */
     );
 

Xi/setmmap.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef SETMMAP_H
+#define SETMMAP_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef SETMMAP_H
-#define SETMMAP_H 1
-
 int ProcXSetDeviceModifierMapping(ClientPtr     /* client */
     );
 

Xi/setmode.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef SETMODE_H
+#define SETMODE_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef SETMODE_H
-#define SETMODE_H 1
-
 int ProcXSetDeviceMode(ClientPtr        /* client */
     );
 

Xi/ungrdev.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef UNGRDEV_H
+#define UNGRDEV_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef UNGRDEV_H
-#define UNGRDEV_H 1
-
 int SProcXUngrabDevice(ClientPtr        /* client */
     );
 

Xi/ungrdevb.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef UNGRDEVB_H
+#define UNGRDEVB_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef UNGRDEVB_H
-#define UNGRDEVB_H 1
-
 int SProcXUngrabDeviceButton(ClientPtr  /* client */
     );
 

Xi/ungrdevk.h

@@ -23,13 +23,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef UNGRDEVK_H
+#define UNGRDEVK_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef UNGRDEVK_H
-#define UNGRDEVK_H 1
-
 int SProcXUngrabDeviceKey(ClientPtr     /* client */
     );
 

Xi/xiallowev.h

@@ -23,13 +23,13 @@
  * Author: Peter Hutterer
  */
 
+#ifndef XIALLOWEV_H
+#define XIALLOWEV_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef XIALLOWEV_H
-#define XIALLOWEV_H 1
-
 int ProcXIAllowEvents(ClientPtr client);
 int SProcXIAllowEvents(ClientPtr client);
 

Xi/xibarriers.h

@@ -1,11 +1,10 @@
+#ifndef _XIBARRIERS_H_
+#define _XIBARRIERS_H_
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef _XIBARRIERS_H_
-#define _XIBARRIERS_H_
-
 #include "resource.h"
 
 extern RESTYPE PointerBarrierType;

Xi/xichangecursor.h

@@ -23,13 +23,13 @@
  * Author: Peter Hutterer, University of South Australia, NICTA
  */
 
+#ifndef CHDEVCUR_H
+#define CHDEVCUR_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef CHDEVCUR_H
-#define CHDEVCUR_H 1
-
 int SProcXIChangeCursor(ClientPtr /* client */ );
 int ProcXIChangeCursor(ClientPtr /* client */ );
 

Xi/xichangehierarchy.h

@@ -23,19 +23,19 @@
  * Author: Peter Hutterer, University of South Australia, NICTA
  */
 
+#ifndef CHDEVHIER_H
+#define CHDEVHIER_H 1
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 /***********************************************************************
  *
  * Request change in the device hierarchy.
  *
  */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#ifndef CHDEVHIER_H
-#define CHDEVHIER_H 1
-
 int ProcXIChangeHierarchy(ClientPtr /* client */ );
 
 void XISendDeviceHierarchyEvent(int flags[MAXDEVICES]);

Xi/xigetclientpointer.h

@@ -23,13 +23,13 @@
  * Author: Peter Hutterer, University of South Australia, NICTA
  */
 
+#ifndef GETCPTR_H
+#define GETCPTR_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef GETCPTR_H
-#define GETCPTR_H 1
-
 int SProcXIGetClientPointer(ClientPtr /* client */ );
 int ProcXIGetClientPointer(ClientPtr /* client */ );
 

Xi/xigrabdev.h

@@ -23,13 +23,13 @@
  * Author: Peter Hutterer
  */
 
+#ifndef XIGRABDEV_H
+#define XIGRABDEV_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef XIGRABDEV_H
-#define XIGRABDEV_H 1
-
 int ProcXIGrabDevice(ClientPtr client);
 int SProcXIGrabDevice(ClientPtr client);
 

Xi/xipassivegrab.h

@@ -23,13 +23,13 @@
  * Author: Peter Hutterer
  */
 
+#ifndef XIPASSIVEGRAB_H
+#define XIPASSIVEGRAB_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef XIPASSIVEGRAB_H
-#define XIPASSIVEGRAB_H 1
-
 int SProcXIPassiveUngrabDevice(ClientPtr client);
 int ProcXIPassiveUngrabDevice(ClientPtr client);
 int ProcXIPassiveGrabDevice(ClientPtr client);

Xi/xiproperty.h

@@ -23,13 +23,13 @@
  * Author: Peter Hutterer
  */
 
+#ifndef XIPROPERTY_H
+#define XIPROPERTY_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef XIPROPERTY_H
-#define XIPROPERTY_H 1
-
 int ProcXListDeviceProperties(ClientPtr client);
 int ProcXChangeDeviceProperty(ClientPtr client);
 int ProcXDeleteDeviceProperty(ClientPtr client);

Xi/xiquerydevice.h

@@ -24,13 +24,13 @@
  *
  */
 
+#ifndef QUERYDEV_H
+#define QUERYDEV_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef QUERYDEV_H
-#define QUERYDEV_H 1
-
 #include <X11/extensions/XI2proto.h>
 
 int SProcXIQueryDevice(ClientPtr client);

Xi/xiquerypointer.h

@@ -23,13 +23,13 @@
  * Author: Peter Hutterer, University of South Australia, NICTA
  */
 
+#ifndef QUERYDP_H
+#define QUERYDP_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef QUERYDP_H
-#define QUERYDP_H 1
-
 int SProcXIQueryPointer(ClientPtr /* client */ );
 int ProcXIQueryPointer(ClientPtr /* client */ );
 

Xi/xiqueryversion.h

@@ -24,15 +24,15 @@
  *
  */
 
+#ifndef QUERYVERSION_H
+#define QUERYVERSION_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
 #include <X11/extensions/XI2proto.h>
 
-#ifndef QUERYVERSION_H
-#define QUERYVERSION_H 1
-
 int SProcXIQueryVersion(ClientPtr client);
 int ProcXIQueryVersion(ClientPtr client);
 

Xi/xiselectev.h

@@ -23,13 +23,13 @@
  * Author: Peter Hutterer
  */
 
+#ifndef XISELECTEVENTS_H
+#define XISELECTEVENTS_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef XISELECTEVENTS_H
-#define XISELECTEVENTS_H 1
-
 int SProcXISelectEvents(ClientPtr client);
 int ProcXISelectEvents(ClientPtr client);
 int SProcXIGetSelectedEvents(ClientPtr client);

Xi/xisetclientpointer.h

@@ -23,13 +23,13 @@
  * Author: Peter Hutterer, University of South Australia, NICTA
  */
 
+#ifndef SETCPTR_H
+#define SETCPTR_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef SETCPTR_H
-#define SETCPTR_H 1
-
 int SProcXISetClientPointer(ClientPtr /* client */ );
 int ProcXISetClientPointer(ClientPtr /* client */ );
 

Xi/xisetdevfocus.h

@@ -23,13 +23,13 @@
  * Author: Peter Hutterer
  */
 
+#ifndef XISETDEVFOCUS_H
+#define XISETDEVFOCUS_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef XISETDEVFOCUS_H
-#define XISETDEVFOCUS_H 1
-
 int SProcXISetFocus(ClientPtr client);
 int ProcXISetFocus(ClientPtr client);
 

Xi/xiwarppointer.h

@@ -23,13 +23,13 @@
  * Author: Peter Hutterer, University of South Australia, NICTA
  */
 
+#ifndef WARPDEVP_H
+#define WARPDEVP_H 1
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef WARPDEVP_H
-#define WARPDEVP_H 1
-
 int SProcXIWarpPointer(ClientPtr /* client */ );
 int ProcXIWarpPointer(ClientPtr /* client */ );
 

composite/compint.h

@@ -41,13 +41,13 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifndef _COMPINT_H_
+#define _COMPINT_H_
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef _COMPINT_H_
-#define _COMPINT_H_
-
 #include "dix/screen_hooks_priv.h"
 
 #include "misc.h"

composite/compositeext.h

@@ -21,13 +21,13 @@
  * SOFTWARE.
  */
 
+#ifndef _COMPOSITEEXT_H_
+#define _COMPOSITEEXT_H_
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef _COMPOSITEEXT_H_
-#define _COMPOSITEEXT_H_
-
 #include "misc.h"
 #include "scrnintstr.h"
 

damageext/damageextint.h

@@ -20,13 +20,13 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifndef _DAMAGEEXTINT_H_
+#define _DAMAGEEXTINT_H_
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef _DAMAGEEXTINT_H_
-#define _DAMAGEEXTINT_H_
-
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/extensions/damageproto.h>

dbe/midbe.h

@@ -29,13 +29,13 @@
  *
  *****************************************************************************/
 
+#ifndef MIDBE_H
+#define MIDBE_H
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef MIDBE_H
-#define MIDBE_H
-
 #include "dix/screen_hooks_priv.h"
 #include "include/privates.h"
 

dix/dispatch.h

@@ -23,17 +23,17 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifndef DISPATCH_H
+#define DISPATCH_H 1
+
+#include <dix-config.h>
+
 /*
  * This prototypes the dispatch.c module (except for functions declared in
  * global headers), plus related dispatch procedures from devices.c, events.c,
  * extension.c, property.c.
  */
 
-#include <dix-config.h>
-
-#ifndef DISPATCH_H
-#define DISPATCH_H 1
-
 int ProcAllocColor(ClientPtr /* client */ );
 int ProcAllocColorCells(ClientPtr /* client */ );
 int ProcAllocColorPlanes(ClientPtr /* client */ );

dix/enterleave.h

@@ -24,11 +24,11 @@
  *
  */
 
-#include <dix-config.h>
-
 #ifndef ENTERLEAVE_H
 #define ENTERLEAVE_H
 
+#include <dix-config.h>
+
 #include <dix.h> /* DoFocusEvents() */
 
 extern void DoEnterLeaveEvents(DeviceIntPtr pDev,

fb/fbpict.h

@@ -21,13 +21,13 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifndef _FBPICT_H_
+#define _FBPICT_H_
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef _FBPICT_H_
-#define _FBPICT_H_
-
 #include "fb.h"
 
 /* fbpict.c */

glamor/glamor_utils.h

@@ -25,13 +25,13 @@
  *
  */
 
+#ifndef __GLAMOR_UTILS_H__
+#define __GLAMOR_UTILS_H__
+
 #ifndef GLAMOR_PRIV_H
 #error This file can only be included by glamor_priv.h
 #endif
 
-#ifndef __GLAMOR_UTILS_H__
-#define __GLAMOR_UTILS_H__
-
 #include "os/bug_priv.h"
 
 #include "glamor_prepare.h"

glx/glxcontext.h

@@ -1,10 +1,3 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#ifndef _GLX_context_h_
-#define _GLX_context_h_
-
 /*
  * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
  * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
@@ -35,6 +28,13 @@
  * Silicon Graphics, Inc.
  */
 
+#ifndef _GLX_context_h_
+#define _GLX_context_h_
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 struct __GLXcontext {
     void (*destroy) (__GLXcontext * context);
     int (*makeCurrent) (__GLXcontext * context);

glx/glxdrawable.h

@@ -1,10 +1,3 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#ifndef _GLX_drawable_h_
-#define _GLX_drawable_h_
-
 /*
  * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
  * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
@@ -35,6 +28,13 @@
  * Silicon Graphics, Inc.
  */
 
+#ifndef _GLX_drawable_h_
+#define _GLX_drawable_h_
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 /* We just need to avoid clashing with DRAWABLE_{WINDOW,PIXMAP} */
 enum {
     GLX_DRAWABLE_WINDOW,

glx/glxext.h

@@ -1,10 +1,3 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#ifndef _glxext_h_
-#define _glxext_h_
-
 /*
  * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
  * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
@@ -35,6 +28,13 @@
  * Silicon Graphics, Inc.
  */
 
+#ifndef _glxext_h_
+#define _glxext_h_
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 /* doing #include <GL/glx.h> & #include <GL/glxext.h> could cause problems
  * with overlapping definitions, so let's use the easy way
  */

glx/glxscreens.h

@@ -1,10 +1,3 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#ifndef _GLX_screens_h_
-#define _GLX_screens_h_
-
 /*
  * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
  * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
@@ -35,6 +28,13 @@
  * Silicon Graphics, Inc.
  */
 
+#ifndef _GLX_screens_h_
+#define _GLX_screens_h_
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "extension_string.h"
 #include "glxvndabi.h"
 

glx/glxserver.h

@@ -1,10 +1,3 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#ifndef _GLX_server_h_
-#define _GLX_server_h_
-
 /*
  * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
  * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
@@ -35,6 +28,13 @@
  * Silicon Graphics, Inc.
  */
 
+#ifndef _GLX_server_h_
+#define _GLX_server_h_
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/Xmd.h>

glx/glxutil.h

@@ -1,10 +1,3 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#ifndef _glxcmds_h_
-#define _glxcmds_h_
-
 /*
  * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
  * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
@@ -35,6 +28,13 @@
  * Silicon Graphics, Inc.
  */
 
+#ifndef _glxcmds_h_
+#define _glxcmds_h_
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 extern GLboolean __glXDrawableInit(__GLXdrawable * drawable,
                                    __GLXscreen * screen,
                                    DrawablePtr pDraw, int type, XID drawID,

glx/singlesize.h

@@ -1,10 +1,3 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#ifndef _singlesize_h_
-#define _singlesize_h_
-
 /*
  * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
  * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
@@ -35,6 +28,13 @@
  * Silicon Graphics, Inc.
  */
 
+#ifndef _singlesize_h_
+#define _singlesize_h_
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "indirect_size.h"
 
 extern GLint __glReadPixels_size(GLenum format, GLenum type,

glx/unpack.h

@@ -1,10 +1,3 @@
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#ifndef __GLX_unpack_h__
-#define __GLX_unpack_h__
-
 /*
  * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
  * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
@@ -35,6 +28,13 @@
  * Silicon Graphics, Inc.
  */
 
+#ifndef __GLX_unpack_h__
+#define __GLX_unpack_h__
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #define __GLX_PAD(s) (((s)+3) & (GLuint)~3)
 
 /*

hw/xfree86/common/xf86Bus.h

@@ -31,13 +31,13 @@
  * video drivers must not include this file.
  */
 
+#ifndef _XF86_BUS_H
+#define _XF86_BUS_H
+
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
 
-#ifndef _XF86_BUS_H
-#define _XF86_BUS_H
-
 #include "xf86pciBus.h"
 #if defined(__sparc__) || defined(__sparc)
 #include "xf86sbusBus.h"

hw/xfree86/common/xf86Config.h

@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1997-2000 by The XFree86 Project, Inc.
  *
@@ -26,13 +25,13 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifndef _xf86_config_h
+#define _xf86_config_h
+
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
 
-#ifndef _xf86_config_h
-#define _xf86_config_h
-
 #include "xf86Optrec.h"
 #include "xf86Parser.h"
 #include "xf86str.h"

hw/xfree86/common/xf86InPriv.h

@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1999 by The XFree86 Project, Inc.
  *
@@ -26,13 +25,13 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifndef _xf86InPriv_h
+#define _xf86InPriv_h
+
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
 
-#ifndef _xf86InPriv_h
-#define _xf86InPriv_h
-
 /* xf86Globals.c */
 extern InputDriverPtr *xf86InputDriverList;
 extern int xf86NumInputDrivers;

hw/xfree86/common/xf86pciBus.h

@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1999-2003 by The XFree86 Project, Inc.
  *
@@ -26,13 +25,13 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifndef _XF86_PCI_BUS_H
+#define _XF86_PCI_BUS_H
+
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
 
-#ifndef _XF86_PCI_BUS_H
-#define _XF86_PCI_BUS_H
-
 #include "xf86MatchDrivers.h"
 
 void xf86PciProbe(void);

hw/xfree86/dri/dri.h

@@ -31,15 +31,16 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
 
-/* Prototypes for DRI functions */
-
 #ifndef _DRI_H_
+#define _DRI_H_
 
 #include <pciaccess.h>
 
 #include "scrnintstr.h"
 #include "xf86dri.h"
 
+/* Prototypes for DRI functions */
+
 typedef int DRISyncType;
 
 #define DRI_NO_SYNC 0
@@ -333,6 +334,4 @@ extern _X_EXPORT void DRIGetTexOffsetFuncs(ScreenPtr pScreen,
                                            DRITexOffsetFinishProcPtr *
                                            texOffsetFinishFunc);
 
-#define _DRI_H_
-
 #endif

hw/xfree86/fbdevhw/fbpriv.h

@@ -3,13 +3,13 @@
  * removed internal stuff (#ifdef __KERNEL__)
  */
 
+#ifndef _LINUX_FB_H
+#define _LINUX_FB_H
+
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
 
-#ifndef _LINUX_FB_H
-#define _LINUX_FB_H
-
 #include <asm/types.h>
 
 /* Definitions of frame buffers						*/

hw/xfree86/int10/xf86x86emu.h

@@ -3,12 +3,14 @@
  *   execute BIOS int 10h calls in x86 real mode environment
  *                 Copyright 1999 Egbert Eich
  */
+
+#ifndef XF86X86EMU_H_
+#define XF86X86EMU_H_
+
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
 
-#ifndef XF86X86EMU_H_
-#define XF86X86EMU_H_
 #include <x86emu.h>
 
 #define M _X86EMU_env

hw/xfree86/loader/loader.h

@@ -46,13 +46,13 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifndef _LOADER_H
+#define _LOADER_H
+
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
 
-#ifndef _LOADER_H
-#define _LOADER_H
-
 #include <X11/Xosdefs.h>
 #include <X11/Xfuncproto.h>
 #include <X11/Xmd.h>

hw/xfree86/loader/loaderProcs.h

@@ -46,13 +46,13 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifndef _LOADERPROCS_H
+#define _LOADERPROCS_H
+
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
 
-#ifndef _LOADERPROCS_H
-#define _LOADERPROCS_H
-
 #include "xf86Module.h"
 
 typedef struct module_desc {

hw/xfree86/os-support/bsd/memrange.h

@@ -2,13 +2,13 @@
  * Memory range attribute operations, performed on /dev/mem
  */
 
+#ifndef _MEMRANGE_H
+#define _MEMRANGE_H
+
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
 
-#ifndef _MEMRANGE_H
-#define _MEMRANGE_H
-
 /* Memory range attributes */
 #define MDF_UNCACHEABLE		(1<<0)  /* region not cached */
 #define MDF_WRITECOMBINE	(1<<1)  /* region supports "write combine"

hw/xfree86/os-support/bus/Pci.h

@@ -99,13 +99,14 @@
  * This file has the private Pci definitions.  The public ones are imported
  * from xf86Pci.h.  Drivers should not use this file.
  */
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
 
 #ifndef _PCI_H
 #define _PCI_H 1
 
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
 #include <X11/Xdefs.h>
 
 #include "xf86Pci.h"

hw/xfree86/os-support/bus/xf86Sbus.h

@@ -21,13 +21,13 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#ifndef _XF86_SBUS_H
+#define _XF86_SBUS_H
+
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
 
-#ifndef _XF86_SBUS_H
-#define _XF86_SBUS_H
-
 #if defined(__linux__)
 #include <asm/types.h>
 #include <linux/fb.h>

hw/xfree86/os-support/int10Defines.h

@@ -25,13 +25,13 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifndef _INT10DEFINES_H_
+#define _INT10DEFINES_H_ 1
+
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
 
-#ifndef _INT10DEFINES_H_
-#define _INT10DEFINES_H_ 1
-
 #ifdef _VM86_LINUX
 
 #include <asm/vm86.h>

hw/xfree86/parser/Configint.h

@@ -57,13 +57,13 @@
  * they should not be visible outside of the parser.
  */
 
+#ifndef _Configint_h_
+#define _Configint_h_
+
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
 
-#ifndef _Configint_h_
-#define _Configint_h_
-
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>

hw/xfree86/parser/xf86Optrec.h

@@ -56,12 +56,14 @@
  * This file contains the Option Record that is passed between the Parser,
  * and Module setup procs.
  */
+
+#ifndef _xf86Optrec_h_
+#define _xf86Optrec_h_
+
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
 
-#ifndef _xf86Optrec_h_
-#define _xf86Optrec_h_
 #include <stdio.h>
 #include <string.h>
 #include "xf86Optionstr.h"

hw/xfree86/parser/xf86Parser.h

@@ -56,13 +56,14 @@
  * This file contains the external interfaces for the XFree86 configuration
  * file parser.
  */
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
 
 #ifndef _xf86Parser_h_
 #define _xf86Parser_h_
 
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
 #include <X11/Xdefs.h>
 #include "xf86Optrec.h"
 #include "list.h"

hw/xfree86/parser/xf86tokens.h

@@ -52,13 +52,13 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifndef _xf86_tokens_h
+#define _xf86_tokens_h
+
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
 
-#ifndef _xf86_tokens_h
-#define _xf86_tokens_h
-
 /*
  * Each token should have a unique value regardless of the section
  * it is used in.

hw/xfree86/ramdac/xf86CursorPriv.h

@@ -1,11 +1,10 @@
+#ifndef _XF86CURSORPRIV_H
+#define _XF86CURSORPRIV_H
 
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
 
-#ifndef _XF86CURSORPRIV_H
-#define _XF86CURSORPRIV_H
-
 #include "xf86Cursor.h"
 #include "mipointrst.h"
 

hw/xwin/ddraw.h

@@ -1,9 +1,10 @@
+#ifndef __XWIN_DDRAW_H
+#define __XWIN_DDRAW_H
+
 #ifdef __MINGW64_VERSION_MAJOR
 #include_next <ddraw.h>
 #define __XWIN_DDRAW_H
 #endif
-#ifndef __XWIN_DDRAW_H
-#define __XWIN_DDRAW_H
 
 #include <winnt.h>
 #include <wingdi.h>

include/displaymode.h

@@ -1,10 +1,10 @@
+#ifndef _DISMODEPROC_H_
+#define _DISMODEPROC_H_
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef _DISMODEPROC_H_
-#define _DISMODEPROC_H_
-
 #include "scrnintstr.h"
 
 #define MAXCLOCKS   128

include/inpututils.h

@@ -22,13 +22,13 @@
  *
  */
 
+#ifndef INPUTUTILS_H
+#define INPUTUTILS_H
+
 #ifdef HAVE_DIX_CONFIG_H
 #include "dix-config.h"
 #endif
 
-#ifndef INPUTUTILS_H
-#define INPUTUTILS_H
-
 #include "input.h"
 #include "eventstr.h"
 #include <X11/extensions/XI2proto.h>

include/vidmodestr.h

@@ -1,10 +1,10 @@
+#ifndef _VIDMODEPROC_H_
+#define _VIDMODEPROC_H_
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef _VIDMODEPROC_H_
-#define _VIDMODEPROC_H_
-
 #include "displaymode.h"
 
 typedef enum {

mi/miinitext.h

@@ -71,13 +71,13 @@ SOFTWARE.
  * authorization from the copyright holder(s) and author(s).
  */
 
+#ifndef MIINITEXT_H
+#define MIINITEXT_H
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef MIINITEXT_H
-#define MIINITEXT_H
-
 void ListStaticExtensions(void);
 
 #endif /* MIINITEXT_H */

mi/mioverlay.h

@@ -1,11 +1,10 @@
+#ifndef __MIOVERLAY_H
+#define __MIOVERLAY_H
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef __MIOVERLAY_H
-#define __MIOVERLAY_H
-
 typedef void (*miOverlayTransFunc) (ScreenPtr, int, BoxPtr);
 typedef Bool (*miOverlayInOverlayFunc) (WindowPtr);
 

mi/miscanfill.h

@@ -26,12 +26,13 @@ from The Open Group.
 
 */
 
+#ifndef SCANFILLINCLUDED
+#define SCANFILLINCLUDED
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef SCANFILLINCLUDED
-#define SCANFILLINCLUDED
 /*
  *     scanfill.h
  *

mi/mivalidate.h

@@ -26,13 +26,13 @@ from The Open Group.
 
 */
 
+#ifndef MIVALIDATE_H
+#define MIVALIDATE_H
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef MIVALIDATE_H
-#define MIVALIDATE_H
-
 #include "regionstr.h"
 
 typedef union _Validate {

miext/damage/damage.h

@@ -20,13 +20,13 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifndef _DAMAGE_H_
+#define _DAMAGE_H_
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef _DAMAGE_H_
-#define _DAMAGE_H_
-
 typedef struct _damage *DamagePtr;
 
 typedef enum _damageReportLevel {

miext/damage/damagestr.h

@@ -20,13 +20,13 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifndef _DAMAGESTR_H_
+#define _DAMAGESTR_H_
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef _DAMAGESTR_H_
-#define _DAMAGESTR_H_
-
 #include "damage.h"
 #include "gcstruct.h"
 #include "privates.h"

miext/rootless/rootless.h

@@ -28,13 +28,13 @@
  * use or other dealings in this Software without prior written authorization.
  */
 
+#ifndef _ROOTLESS_H
+#define _ROOTLESS_H
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef _ROOTLESS_H
-#define _ROOTLESS_H
-
 #include "rootlessConfig.h"
 #include "mi.h"
 #include "gcstruct.h"