From 4735dcc5c783477fa3a24749e11c9bcc49271f82 Mon Sep 17 00:00:00 2001
From: Alan Pearson <alanp@sonzea.com>
Date: Thu, 27 Oct 2011 10:29:16 -0700
Subject: [PATCH] Reorder header files. X11 headers need to be before
 freerdp/types.h otherwise we get warnings about redefinition of True and
 False

---
 client/X11/xf_event.c | 3 +++
 client/X11/xf_gdi.c   | 5 ++++-
 client/X11/xf_gdi.h   | 2 --
 client/X11/xf_rail.c  | 3 +++
 client/X11/xfreerdp.h | 2 --
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/client/X11/xf_event.c b/client/X11/xf_event.c
index b8122bf64..8e5a06907 100644
--- a/client/X11/xf_event.c
+++ b/client/X11/xf_event.c
@@ -17,6 +17,9 @@
  * limitations under the License.
  */
 
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
 #include <freerdp/kbd/kbd.h>
 #include <freerdp/kbd/vkcodes.h>
 
diff --git a/client/X11/xf_gdi.c b/client/X11/xf_gdi.c
index b18ca9bff..3310dbb56 100644
--- a/client/X11/xf_gdi.c
+++ b/client/X11/xf_gdi.c
@@ -17,6 +17,9 @@
  * limitations under the License.
  */
 
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
 #include <freerdp/gdi/gdi.h>
 #include <freerdp/codec/rfx.h>
 #include <freerdp/codec/nsc.h>
@@ -563,7 +566,7 @@ void xf_gdi_polyline(rdpUpdate* update, POLYLINE_ORDER* polyline)
 
 			x = (x2 < x1) ? x2 : x1;
 			width = (x2 > x1) ? x2 - x1 : x1 - x2;
-		
+
 			y = (y2 < y1) ? y2 : y1;
 			height = (y2 > y1) ? y2 - y1 : y1 - y2;
 
diff --git a/client/X11/xf_gdi.h b/client/X11/xf_gdi.h
index 2d22775db..635e5335d 100644
--- a/client/X11/xf_gdi.h
+++ b/client/X11/xf_gdi.h
@@ -20,8 +20,6 @@
 #ifndef __XF_GDI_H
 #define __XF_GDI_H
 
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
 #include <freerdp/gdi/gdi.h>
 
 #include "xfreerdp.h"
diff --git a/client/X11/xf_rail.c b/client/X11/xf_rail.c
index 4f2eda8a1..4ce17f535 100644
--- a/client/X11/xf_rail.c
+++ b/client/X11/xf_rail.c
@@ -17,6 +17,9 @@
  * limitations under the License.
  */
 
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
 #include <freerdp/utils/event.h>
 #include <freerdp/utils/hexdump.h>
 #include <freerdp/utils/rail.h>
diff --git a/client/X11/xfreerdp.h b/client/X11/xfreerdp.h
index 44bef6f97..7d7178bea 100644
--- a/client/X11/xfreerdp.h
+++ b/client/X11/xfreerdp.h
@@ -20,8 +20,6 @@
 #ifndef __XFREERDP_H
 #define __XFREERDP_H
 
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
 #include <freerdp/freerdp.h>
 #include <freerdp/channels/channels.h>
 #include <freerdp/gdi/gdi.h>