diff --git a/hw/xfree86/common/xf86Bus.h b/hw/xfree86/common/xf86Bus.h
index 5072cb9ec..79b40a193 100644
--- a/hw/xfree86/common/xf86Bus.h
+++ b/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"
diff --git a/hw/xfree86/common/xf86Config.h b/hw/xfree86/common/xf86Config.h
index a14913eb2..f467f55e5 100644
--- a/hw/xfree86/common/xf86Config.h
+++ b/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"
diff --git a/hw/xfree86/common/xf86InPriv.h b/hw/xfree86/common/xf86InPriv.h
index b8229d2c1..3a84a5d79 100644
--- a/hw/xfree86/common/xf86InPriv.h
+++ b/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;
diff --git a/hw/xfree86/common/xf86pciBus.h b/hw/xfree86/common/xf86pciBus.h
index 14ae9760e..41557c09b 100644
--- a/hw/xfree86/common/xf86pciBus.h
+++ b/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);
diff --git a/hw/xfree86/dri/dri.h b/hw/xfree86/dri/dri.h
index 6ca55405d..23c501e8b 100644
--- a/hw/xfree86/dri/dri.h
+++ b/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
diff --git a/hw/xfree86/fbdevhw/fbpriv.h b/hw/xfree86/fbdevhw/fbpriv.h
index 8d224ae02..47c3764a5 100644
--- a/hw/xfree86/fbdevhw/fbpriv.h
+++ b/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						*/
diff --git a/hw/xfree86/int10/xf86x86emu.h b/hw/xfree86/int10/xf86x86emu.h
index 4af2dafb7..973d852e1 100644
--- a/hw/xfree86/int10/xf86x86emu.h
+++ b/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
diff --git a/hw/xfree86/loader/loader.h b/hw/xfree86/loader/loader.h
index 4e83730a2..98164c1cc 100644
--- a/hw/xfree86/loader/loader.h
+++ b/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>
diff --git a/hw/xfree86/loader/loaderProcs.h b/hw/xfree86/loader/loaderProcs.h
index 8b16cb7ea..fb7aa544f 100644
--- a/hw/xfree86/loader/loaderProcs.h
+++ b/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 {
diff --git a/hw/xfree86/os-support/bsd/memrange.h b/hw/xfree86/os-support/bsd/memrange.h
index 49d5627f1..ce1edc06d 100644
--- a/hw/xfree86/os-support/bsd/memrange.h
+++ b/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"
diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h
index 5e11cf3df..c344ca198 100644
--- a/hw/xfree86/os-support/bus/Pci.h
+++ b/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"
diff --git a/hw/xfree86/os-support/bus/xf86Sbus.h b/hw/xfree86/os-support/bus/xf86Sbus.h
index d702e4e6c..91d2376e0 100644
--- a/hw/xfree86/os-support/bus/xf86Sbus.h
+++ b/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>
diff --git a/hw/xfree86/os-support/int10Defines.h b/hw/xfree86/os-support/int10Defines.h
index d942fbdad..e6d214be7 100644
--- a/hw/xfree86/os-support/int10Defines.h
+++ b/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>
diff --git a/hw/xfree86/parser/Configint.h b/hw/xfree86/parser/Configint.h
index 0a8e4feee..12b36effd 100644
--- a/hw/xfree86/parser/Configint.h
+++ b/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>
diff --git a/hw/xfree86/parser/xf86Optrec.h b/hw/xfree86/parser/xf86Optrec.h
index dfa907989..9e9855558 100644
--- a/hw/xfree86/parser/xf86Optrec.h
+++ b/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"
diff --git a/hw/xfree86/parser/xf86Parser.h b/hw/xfree86/parser/xf86Parser.h
index b9240af12..1822a4d61 100644
--- a/hw/xfree86/parser/xf86Parser.h
+++ b/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"
diff --git a/hw/xfree86/parser/xf86tokens.h b/hw/xfree86/parser/xf86tokens.h
index 11d0fa041..4176536ca 100644
--- a/hw/xfree86/parser/xf86tokens.h
+++ b/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.
diff --git a/hw/xfree86/ramdac/xf86CursorPriv.h b/hw/xfree86/ramdac/xf86CursorPriv.h
index cb8669733..268ccc5a9 100644
--- a/hw/xfree86/ramdac/xf86CursorPriv.h
+++ b/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"
 
diff --git a/hw/xwin/ddraw.h b/hw/xwin/ddraw.h
index 720fa5a9c..dc1f3cac5 100644
--- a/hw/xwin/ddraw.h
+++ b/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>