From b468fcfc1733feb014ef976fef29939f9f1dfc98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Fri, 13 Sep 2013 14:52:13 -0700
Subject: [PATCH 24/38] xwayland: Don't include xorg-server.h

xorg-config.h now has the XORG_WAYLAND define.
---
 hw/xfree86/xwayland/xwayland-cursor.c | 1 -
 hw/xfree86/xwayland/xwayland-output.c | 1 -
 hw/xfree86/xwayland/xwayland-window.c | 1 -
 hw/xfree86/xwayland/xwayland.c        | 1 -
 4 files changed, 4 deletions(-)

diff --git a/hw/xfree86/xwayland/xwayland-cursor.c b/hw/xfree86/xwayland/xwayland-cursor.c
index f8860bd..1cd6457 100644
--- a/hw/xfree86/xwayland/xwayland-cursor.c
+++ b/hw/xfree86/xwayland/xwayland-cursor.c
@@ -32,7 +32,6 @@
 #include <sys/mman.h>
 #include <wayland-client.h>
 
-#include <xorg-server.h>
 #include <cursorstr.h>
 #include <xf86Crtc.h>
 #include <mipointrst.h>
diff --git a/hw/xfree86/xwayland/xwayland-output.c b/hw/xfree86/xwayland/xwayland-output.c
index 691b5f0..7004b9b 100644
--- a/hw/xfree86/xwayland/xwayland-output.c
+++ b/hw/xfree86/xwayland/xwayland-output.c
@@ -32,7 +32,6 @@
 #include <sys/mman.h>
 #include <wayland-client.h>
 
-#include <xorg-server.h>
 #include <cursorstr.h>
 #include <xf86Crtc.h>
 #include <mipointrst.h>
diff --git a/hw/xfree86/xwayland/xwayland-window.c b/hw/xfree86/xwayland/xwayland-window.c
index d56e0d0..88f57ce 100644
--- a/hw/xfree86/xwayland/xwayland-window.c
+++ b/hw/xfree86/xwayland/xwayland-window.c
@@ -33,7 +33,6 @@
 #include <wayland-client.h>
 #include <X11/extensions/compositeproto.h>
 
-#include <xorg-server.h>
 #include <xf86Crtc.h>
 #include <selection.h>
 #include <compositeext.h>
diff --git a/hw/xfree86/xwayland/xwayland.c b/hw/xfree86/xwayland/xwayland.c
index e8c58fd..c70a52d 100644
--- a/hw/xfree86/xwayland/xwayland.c
+++ b/hw/xfree86/xwayland/xwayland.c
@@ -34,7 +34,6 @@
 #include <wayland-util.h>
 #include <wayland-client.h>
 
-#include <xorg-server.h>
 #include <extinit.h>
 
 #include <xf86Xinput.h>
-- 
1.8.4.2