From 9e3635a6fdb0e71301a66a7561830013754645fa Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 16 Jun 2016 20:08:39 +0300
Subject: Fix some more wrong includes.

---
 src/utils/sdlhelper.cpp | 4 ++--
 src/utils/xml/libxml.h  | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/utils/sdlhelper.cpp b/src/utils/sdlhelper.cpp
index bdb6dbd4e..2e0b51e54 100644
--- a/src/utils/sdlhelper.cpp
+++ b/src/utils/sdlhelper.cpp
@@ -26,9 +26,9 @@
 
 #include "utils/stringutils.h"
 
-#ifdef USE_X11
+#if defined(USE_X11) && defined(USE_OPENGL)
 #include "utils/glxhelper.h"
-#endif  // USE_X11
+#endif  // defined(USE_X11) && defined(USE_OPENGL)
 
 #include <SDL_syswm.h>
 #include <SDL_video.h>
diff --git a/src/utils/xml/libxml.h b/src/utils/xml/libxml.h
index e808bc3e2..ca8c99639 100644
--- a/src/utils/xml/libxml.h
+++ b/src/utils/xml/libxml.h
@@ -32,7 +32,9 @@
 
 #include "utils/xml/libxml.inc"
 
+#ifndef _GLIBCXX_STRING
 #include <string>
+#endif  // _GLIBCXX_STRING
 
 #include "localconsts.h"
 
-- 
cgit v1.2.3-60-g2f50