hw: add/fix include guards where missing/broken

Skipped headers designed for multiple or non-trivial inclusion:
* hw/xfree86/dri2/pci_ids/i810_pci_ids.h
* hw/xfree86/dri2/pci_ids/i915_pci_ids.h
* hw/xfree86/dri2/pci_ids/i965_pci_ids.h
* hw/xfree86/dri2/pci_ids/r200_pci_ids.h
* hw/xfree86/dri2/pci_ids/r300_pci_ids.h
* hw/xfree86/dri2/pci_ids/r600_pci_ids.h
* hw/xfree86/dri2/pci_ids/radeon_pci_ids.h
* hw/xfree86/dri2/pci_ids/radeonsi_pci_ids.h
* hw/xfree86/dri2/pci_ids/virtio_gpu_pci_ids.h
* hw/xfree86/dri2/pci_ids/vmwgfx_pci_ids.h

Signed-off-by: Mike Gelfand <mikedld@mikedld.com>

hw/kdrive/ephyr/ephyr_glamor.h

@@ -21,6 +21,9 @@
  * IN THE SOFTWARE.
  */
 
+#ifndef XSERVER_KDRIVE_EPHYR_GLAMOR_H
+#define XSERVER_KDRIVE_EPHYR_GLAMOR_H
+
 #include <xcb/xcb.h>
 #include "dix-config.h"
 
@@ -63,3 +66,5 @@ ephyr_glamor_damage_redisplay(struct ephyr_glamor *glamor,
 }
 
 #endif /* !GLAMOR */
+
+#endif /* XSERVER_KDRIVE_EPHYR_GLAMOR_H */

hw/xfree86/common/xf86VGAarbiterPriv.h

@@ -24,6 +24,9 @@
  *
  */
 
+#ifndef XSERVER_XFREE86_XF86VGAARBITERPRIV_H
+#define XSERVER_XFREE86_XF86VGAARBITERPRIV_H
+
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
@@ -273,3 +276,5 @@ static void VGAarbiterGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
 static void VGAarbiterCompositeRects(CARD8 op, PicturePtr pDst,
                                      xRenderColor * color, int nRect,
                                      xRectangle *rects);
+
+#endif /* XSERVER_XFREE86_XF86VGAARBITERPRIV_H */

hw/xfree86/dri2/dri2int.h

@@ -23,4 +23,9 @@
  * Author: Daniel Stone <daniel@fooishbar.org>
  */
 
+#ifndef XSERVER_XFREE86_DRI2INT_H
+#define XSERVER_XFREE86_DRI2INT_H
+
 extern Bool DRI2ModuleSetup(void);
+
+#endif /* XSERVER_XFREE86_DRI2INT_H */

hw/xfree86/drivers/modesetting/driver.h

@@ -29,6 +29,9 @@
  *   Aaron Plattner <aplattner@nvidia.com>
  */
 
+#ifndef XSERVER_XFREE86_DRIVER_H
+#define XSERVER_XFREE86_DRIVER_H
+
 #include <errno.h>
 #include <drm.h>
 #include <xf86drm.h>
@@ -261,3 +264,5 @@ void ms_drain_drm_events(ScreenPtr screen);
 Bool ms_window_has_variable_refresh(modesettingPtr ms, WindowPtr win);
 void ms_present_set_screen_vrr(ScrnInfoPtr scrn, Bool vrr_enabled);
 Bool ms_tearfree_is_active_on_crtc(xf86CrtcPtr crtc);
+
+#endif /* XSERVER_XFREE86_DRIVER_H */

hw/xfree86/int10/vbeModes.h

@@ -29,6 +29,7 @@
  */
 
 #ifndef _VBE_MODES_H
+#define _VBE_MODES_H
 
 /*
  * This is intended to be stored in the DisplayModeRec's private area.

hw/xfree86/parser/configProcs.h

@@ -29,6 +29,9 @@
 
 /* exported functions are/were used by the X Server */
 
+#ifndef XSERVER_XFREE86_CONFIGPROCS_H
+#define XSERVER_XFREE86_CONFIGPROCS_H
+
 #include <X11/Xfuncproto.h>
 
 /* Device.c */
@@ -146,3 +149,5 @@ xf86freeExtensions(XF86ConfExtensionsPtr ptr);
 void
 ErrorF(const char *f, ...);
 #endif
+
+#endif /* XSERVER_XFREE86_CONFIGPROCS_H */

hw/xquartz/NSUserDefaults+XQuartzDefaults.h

@@ -6,6 +6,9 @@
 //  Copyright (c) 2021 Apple Inc. All rights reserved.
 //
 
+#ifndef XSERVER_XQUARTZ_NSUSERDEFAULTS_XQUARTZDEFAULTS_H
+#define XSERVER_XQUARTZ_NSUSERDEFAULTS_XQUARTZDEFAULTS_H
+
 #import <Foundation/Foundation.h>
 
 extern NSString * const XQuartzPrefKeyAppsMenu;
@@ -47,3 +50,5 @@ extern NSString * const XQuartzPrefKeySyncPrimaryOnSelect;
 + (NSUserDefaults *)xquartzDefaults;
 
 @end
+
+#endif /* XSERVER_XQUARTZ_NSUSERDEFAULTS_XQUARTZDEFAULTS_H */

hw/xquartz/xpr/driWrap.h

@@ -28,6 +28,8 @@
  */
 
 #ifndef DRIWRAP_H
+#define DRIWRAP_H
+
 #include "scrnintstr.h"
 
 Bool

hw/xwin/glx/winpriv.h

@@ -4,9 +4,14 @@
  * Authors: Alexander Gottwald
  */
 
+#ifndef XSERVER_XWIN_WINPRIV_H
+#define XSERVER_XWIN_WINPRIV_H
+
 #include <X11/Xwindows.h>
 #include <windowstr.h>
 
 HWND winGetWindowInfo(WindowPtr pWin);
 Bool winCheckScreenAiglxIsSupported(ScreenPtr pScreen);
 void winSetScreenAiglxIsActive(ScreenPtr pScreen);
+
+#endif /* XSERVER_XWIN_WINPRIV_H */

hw/xwin/winauth.h

@@ -19,8 +19,13 @@
  * IN THE SOFTWARE.
  */
 
+#ifndef XSERVER_XWIN_WINAUTH_H
+#define XSERVER_XWIN_WINAUTH_H
+
 #include <xcb/xcb.h>
 #include <X11/Xmd.h> // for BOOL
 
 BOOL winGenerateAuthorization(void);
 xcb_auth_info_t * winGetXcbAuthInfo(void);
+
+#endif /* XSERVER_XWIN_WINAUTH_H */

hw/xwin/winlayouts.h

@@ -27,6 +27,9 @@
  * XKB settings.
  */
 
+#ifndef XSERVER_XWIN_WINLAYOUTS_H
+#define XSERVER_XWIN_WINLAYOUTS_H
+
 typedef struct {
     unsigned int winlayout;
     int winkbtype;
@@ -98,3 +101,5 @@ WinKBLayoutRec winKBLayouts[] = {
   See http://technet.microsoft.com/en-us/library/cc766503%28WS.10%29.aspx
   for a listing of input locale (keyboard layout) codes
 */
+
+#endif /* XSERVER_XWIN_WINLAYOUTS_H */

hw/xwin/winmonitors.h

@@ -27,6 +27,9 @@ from The Open Group.
 
 */
 
+#ifndef XSERVER_XWIN_WINMONITORS_H
+#define XSERVER_XWIN_WINMONITORS_H
+
 /* data returned for monitor information */
 struct GetMonitorInfoData {
     int requestedMonitor;
@@ -41,3 +44,5 @@ struct GetMonitorInfoData {
 };
 
 Bool QueryMonitor(int i, struct GetMonitorInfoData *data);
+
+#endif /* XSERVER_XWIN_WINMONITORS_H */