From c73eb5f814d1096cd398fbec3084f816ba8a7269 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 20 Sep 2015 16:58:18 -0500
Subject: [PATCH] Fix FTBFS due to Xlib defined keywords This resolves Bug 2530

---
 kcontrol/displayconfig/displayconfig.h | 3 ++-
 kcontrol/randr/tderandrtray.h          | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/kcontrol/displayconfig/displayconfig.h b/kcontrol/displayconfig/displayconfig.h
index dce061003..78b033f14 100644
--- a/kcontrol/displayconfig/displayconfig.h
+++ b/kcontrol/displayconfig/displayconfig.h
@@ -34,13 +34,14 @@
 
 #include <dcopobject.h>
 
-#include <libtderandr/libtderandr.h>
 #ifdef __TDE_HAVE_TDEHWLIB
 #include <tdehardwaredevices.h>
 #else
 #define TDEGenericDevice void
 #endif
 
+#include <libtderandr/libtderandr.h>
+
 #include "monitorworkspace.h"
 #include "displayconfigbase.h"
 
diff --git a/kcontrol/randr/tderandrtray.h b/kcontrol/randr/tderandrtray.h
index 8f382922f..334e1ef31 100644
--- a/kcontrol/randr/tderandrtray.h
+++ b/kcontrol/randr/tderandrtray.h
@@ -24,13 +24,14 @@
 #include <ksystemtray.h>
 #include <kglobalaccel.h>
 
-#include <libtderandr/libtderandr.h>
 #ifdef __TDE_HAVE_TDEHWLIB
 #include <tdehardwaredevices.h>
 #else
 #define TDEGenericDevice void
 #endif
 
+#include <libtderandr/libtderandr.h>
+
 class KHelpMenu;
 class TDEPopupMenu;