Xnest: canonicalize includes: <X11/Xdefs.h>

For cleaner code, make sure every source needing something from Xdefs.h
does explicitly include it (not relying on indirect including)

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1394>

hw/xnest/Args.c

@@ -17,7 +17,9 @@ is" without express or implied warranty.
 #endif
 
 #include <X11/X.h>
+#include <X11/Xdefs.h>
 #include <X11/Xproto.h>
+
 #include "screenint.h"
 #include "input.h"
 #include "misc.h"

hw/xnest/Args.h

@@ -15,6 +15,8 @@ is" without express or implied warranty.
 #ifndef XNESTARGS_H
 #define XNESTARGS_H
 
+#include <X11/Xdefs.h>
+
 extern char *xnestDisplayName;
 extern Bool xnestSynchronize;
 extern Bool xnestFullGeneration;

hw/xnest/Color.c

@@ -17,7 +17,9 @@ is" without express or implied warranty.
 #endif
 
 #include <X11/X.h>
+#include <X11/Xdefs.h>
 #include <X11/Xproto.h>
+
 #include "scrnintstr.h"
 #include "window.h"
 #include "windowstr.h"

hw/xnest/Color.h

@@ -15,6 +15,8 @@ is" without express or implied warranty.
 #ifndef XNESTCOLOR_H
 #define XNESTCOLOR_H
 
+#include <X11/Xdefs.h>
+
 #define DUMB_WINDOW_MANAGERS
 
 #define MAXCMAPS 1

hw/xnest/Cursor.c

@@ -17,7 +17,9 @@ is" without express or implied warranty.
 #endif
 
 #include <X11/X.h>
+#include <X11/Xdefs.h>
 #include <X11/Xproto.h>
+
 #include "screenint.h"
 #include "input.h"
 #include "misc.h"

hw/xnest/Events.c

@@ -17,7 +17,9 @@ is" without express or implied warranty.
 #endif
 
 #include <X11/X.h>
+#include <X11/Xdefs.h>
 #include <X11/Xproto.h>
+
 #include "screenint.h"
 #include "input.h"
 #include "misc.h"

hw/xnest/Font.c

@@ -18,11 +18,13 @@ is" without express or implied warranty.
 
 #include <X11/X.h>
 #include <X11/Xatom.h>
+#include <X11/Xdefs.h>
 #include <X11/Xproto.h>
-#include "misc.h"
-#include "regionstr.h"
 #include <X11/fonts/font.h>
 #include <X11/fonts/fontstruct.h>
+
+#include "misc.h"
+#include "regionstr.h"
 #include "dixfontstr.h"
 #include "scrnintstr.h"
 

hw/xnest/GC.c

@@ -17,7 +17,9 @@ is" without express or implied warranty.
 #endif
 
 #include <X11/X.h>
+#include <X11/Xdefs.h>
 #include <X11/Xproto.h>
+
 #include "gcstruct.h"
 #include "windowstr.h"
 #include "pixmapstr.h"

hw/xnest/GCOps.c

@@ -17,9 +17,11 @@ is" without express or implied warranty.
 #endif
 
 #include <X11/X.h>
+#include <X11/Xdefs.h>
 #include <X11/Xproto.h>
-#include "regionstr.h"
 #include <X11/fonts/fontstruct.h>
+
+#include "regionstr.h"
 #include "gcstruct.h"
 #include "scrnintstr.h"
 #include "windowstr.h"

hw/xnest/Init.c

@@ -17,7 +17,9 @@ is" without express or implied warranty.
 #endif
 
 #include <X11/X.h>
+#include <X11/Xdefs.h>
 #include <X11/Xproto.h>
+#include <X11/fonts/fontstruct.h>
 
 #include "dix/screenint_priv.h"
 
@@ -28,7 +30,6 @@ is" without express or implied warranty.
 #include "windowstr.h"
 #include "servermd.h"
 #include "mi.h"
-#include <X11/fonts/fontstruct.h>
 #include "dixfontstr.h"
 
 #include "Xnest.h"

hw/xnest/Init.h

@@ -15,6 +15,8 @@ is" without express or implied warranty.
 #ifndef XNESTINIT_H
 #define XNESTINIT_H
 
+#include <X11/Xdefs.h>
+
 extern Bool xnestDoFullGeneration;
 
 #endif                          /* XNESTINIT_H */

hw/xnest/Keyboard.c

@@ -21,8 +21,10 @@ is" without express or implied warranty.
 #endif
 
 #include <X11/X.h>
+#include <X11/Xdefs.h>
 #include <X11/Xproto.h>
 #include <X11/keysym.h>
+
 #include "screenint.h"
 #include "inputstr.h"
 #include "misc.h"

hw/xnest/Pixmap.c

@@ -17,7 +17,9 @@ is" without express or implied warranty.
 #endif
 
 #include <X11/X.h>
+#include <X11/Xdefs.h>
 #include <X11/Xproto.h>
+
 #include "regionstr.h"
 #include "pixmapstr.h"
 #include "scrnintstr.h"

hw/xnest/Screen.c

@@ -17,7 +17,9 @@ is" without express or implied warranty.
 #endif
 
 #include <X11/X.h>
+#include <X11/Xdefs.h>
 #include <X11/Xproto.h>
+
 #include "scrnintstr.h"
 #include "dix.h"
 #include "mi.h"

hw/xnest/Screen.h

@@ -15,6 +15,8 @@ is" without express or implied warranty.
 #ifndef XNESTSCREEN_H
 #define XNESTSCREEN_H
 
+#include <X11/Xdefs.h>
+
 extern Window xnestDefaultWindows[MAXSCREENS];
 extern Window xnestScreenSaverWindows[MAXSCREENS];
 

hw/xnest/Window.c

@@ -17,7 +17,9 @@ is" without express or implied warranty.
 #endif
 
 #include <X11/X.h>
+#include <X11/Xdefs.h>
 #include <X11/Xproto.h>
+
 #include "gcstruct.h"
 #include "window.h"
 #include "windowstr.h"

hw/xnest/XNCursor.h

@@ -15,6 +15,8 @@ is" without express or implied warranty.
 #ifndef XNESTCURSOR_H
 #define XNESTCURSOR_H
 
+#include <X11/Xdefs.h>
+
 #include "mipointrst.h"
 
 typedef struct {

hw/xnest/XNFont.h

@@ -15,6 +15,8 @@ is" without express or implied warranty.
 #ifndef XNESTFONT_H
 #define XNESTFONT_H
 
+#include <X11/Xdefs.h>
+
 typedef struct {
     XFontStruct *font_struct;
 } xnestPrivFont;

hw/xnest/XNGC.h

@@ -15,6 +15,8 @@ is" without express or implied warranty.
 #ifndef XNESTGC_H
 #define XNESTGC_H
 
+#include <X11/Xdefs.h>
+
 /* This file uses the GC definition form Xlib.h as XlibGC. */
 
 typedef struct {

hw/xnest/XNPixmap.h

@@ -15,6 +15,8 @@ is" without express or implied warranty.
 #ifndef XNESTPIXMAP_H
 #define XNESTPIXMAP_H
 
+#include <X11/Xdefs.h>
+
 extern DevPrivateKeyRec xnestPixmapPrivateKeyRec;
 
 #define xnestPixmapPrivateKey (&xnestPixmapPrivateKeyRec)

hw/xnest/XNWindow.h

@@ -15,6 +15,8 @@ is" without express or implied warranty.
 #ifndef XNESTWINDOW_H
 #define XNESTWINDOW_H
 
+#include <X11/Xdefs.h>
+
 typedef struct {
     Window window;
     Window parent;