Removed X_DISPLAY_MISSING.
diff --git a/include/ts_xf86dga.h b/include/ts_xf86dga.h
index 8a48f54..39efc01 100644
--- a/include/ts_xf86dga.h
+++ b/include/ts_xf86dga.h
@@ -11,8 +11,6 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
-
#ifdef HAVE_LIBXXF86DGA
#include <X11/Xlib.h>
@@ -30,6 +28,4 @@
#endif /* defined(HAVE_LIBXXF86DGA) */
-#endif /* !defined(X_DISPLAY_MISSING) */
-
#endif /* __WINE_TS_XF86DGA_H */
diff --git a/include/ts_xf86dga2.h b/include/ts_xf86dga2.h
index a901e8a..3c74687 100644
--- a/include/ts_xf86dga2.h
+++ b/include/ts_xf86dga2.h
@@ -11,8 +11,6 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
-
#ifdef HAVE_LIBXXF86DGA2
#include <X11/Xlib.h>
@@ -39,6 +37,4 @@
#endif /* defined(HAVE_LIBXXF86DGA2) */
-#endif /* !defined(X_DISPLAY_MISSING) */
-
#endif /* __WINE_TS_XF86DGA2_H */
diff --git a/include/ts_xf86vmode.h b/include/ts_xf86vmode.h
index 77911f5..65d7264 100644
--- a/include/ts_xf86vmode.h
+++ b/include/ts_xf86vmode.h
@@ -11,8 +11,6 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
-
#include "windef.h"
#ifdef HAVE_LIBXXF86VM
#define XMD_H
@@ -38,6 +36,4 @@
#endif /* defined(HAVE_LIBXXF86VM) */
-#endif /* !defined(X_DISPLAY_MISSING) */
-
#endif /* __WINE_TS_XF86VMODE_H */
diff --git a/include/ts_xlib.h b/include/ts_xlib.h
index b3fb97c..a520830 100644
--- a/include/ts_xlib.h
+++ b/include/ts_xlib.h
@@ -11,8 +11,6 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
-
#include <X11/Xlib.h>
@@ -143,6 +141,4 @@
extern void TS_XInitImageFuncPtrs(XImage *);
-#endif /* !defined(X_DISPLAY_MISSING) */
-
#endif /* __WINE_TS_XLIB_H */
diff --git a/include/ts_xpm.h b/include/ts_xpm.h
index 2a1380b..a12eb67 100644
--- a/include/ts_xpm.h
+++ b/include/ts_xpm.h
@@ -11,8 +11,6 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
-
#ifdef HAVE_LIBXXPM
#include <X11/xpm.h>
@@ -22,6 +20,4 @@
#endif /* defined(HAVE_LIBXXPM) */
-#endif /* !defined(X_DISPLAY_MISSING) */
-
#endif /* __WINE_TS_XPM_H */
diff --git a/include/ts_xresource.h b/include/ts_xresource.h
index 394b9f5..73953f2 100644
--- a/include/ts_xresource.h
+++ b/include/ts_xresource.h
@@ -11,8 +11,6 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
-
#include <X11/Xlib.h>
#include <X11/Xresource.h>
@@ -25,6 +23,4 @@
extern void TSXrmParseCommand(XrmDatabase*, XrmOptionDescList, int, const char*, int*, char**);
-#endif /* !defined(X_DISPLAY_MISSING) */
-
#endif /* __WINE_TS_XRESOURCE_H */
diff --git a/include/ts_xshm.h b/include/ts_xshm.h
index 9058d86..f1b0219 100644
--- a/include/ts_xshm.h
+++ b/include/ts_xshm.h
@@ -11,8 +11,6 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
-
#ifdef HAVE_LIBXXSHM
#include <X11/Xlib.h>
@@ -30,6 +28,4 @@
#endif /* defined(HAVE_LIBXXSHM) */
-#endif /* !defined(X_DISPLAY_MISSING) */
-
#endif /* __WINE_TS_XSHM_H */
diff --git a/include/ts_xutil.h b/include/ts_xutil.h
index af3434a..007b2b2 100644
--- a/include/ts_xutil.h
+++ b/include/ts_xutil.h
@@ -11,8 +11,6 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
-
#include <X11/Xlib.h>
#include <X11/Xresource.h>
@@ -54,6 +52,4 @@
extern XContext TSXUniqueContext(void);
-#endif /* !defined(X_DISPLAY_MISSING) */
-
#endif /* __WINE_TS_XUTIL_H */
diff --git a/include/x11drv.h b/include/x11drv.h
index f3c3793..26e48a6 100644
--- a/include/x11drv.h
+++ b/include/x11drv.h
@@ -7,18 +7,18 @@
#include "config.h"
-#ifndef X_DISPLAY_MISSING
#include <X11/Xlib.h>
#include <X11/Xresource.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
-#endif /* !defined(X_DISPLAY_MISSING) */
+#ifdef HAVE_LIBXXSHM
+# include <X11/extensions/XShm.h>
+#endif /* defined(HAVE_LIBXXSHM) */
#include "gdi.h"
#include "winbase.h"
#include "windef.h"
-#include <X11/extensions/XShm.h>
struct tagBITMAPOBJ;
struct tagCLASS;
