Fix regal and nacl conflict in headers.

7 files changed, 7 insertions, 7 deletions

diff --git a/src/render/mobileopengl2graphics.cpp b/src/render/mobileopengl2graphics.cpp
index 1037ebe70..208d17236 100644
--- a/src/render/mobileopengl2graphics.cpp
+++ b/src/render/mobileopengl2graphics.cpp
@@ -28,10 +28,10 @@
 #include "graphicsvertexes.h"
 #include "logger.h"
 
+#include "render/opengl/mgl.h"
 #ifdef __native_client__
 #include "render/opengl/naclglfunctions.h"
 #endif
-#include "render/opengl/mgl.h"
 
 #include "render/shaders/shaderprogram.h"
 #include "render/shaders/shadersmanager.h"
diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp
index 922068527..7dfa44f20 100644
--- a/src/render/mobileopenglgraphics.cpp
+++ b/src/render/mobileopenglgraphics.cpp
@@ -27,10 +27,10 @@
 #include "graphicsvertexes.h"
 #include "logger.h"
 
+#include "render/opengl/mgl.h"
 #ifdef __native_client__
 #include "render/opengl/naclglfunctions.h"
 #endif
-#include "render/opengl/mgl.h"
 
 #include "resources/image.h"
 #include "resources/imagerect.h"
diff --git a/src/render/modernopenglgraphics.cpp b/src/render/modernopenglgraphics.cpp
index ea28bec4d..61dec9b03 100644
--- a/src/render/modernopenglgraphics.cpp
+++ b/src/render/modernopenglgraphics.cpp
@@ -29,10 +29,10 @@
 #include "graphicsvertexes.h"
 #include "logger.h"
 
+#include "render/opengl/mgl.h"
 #ifdef __native_client__
 #include "render/opengl/naclglfunctions.h"
 #endif
-#include "render/opengl/mgl.h"
 
 #include "render/shaders/shaderprogram.h"
 #include "render/shaders/shadersmanager.h"
diff --git a/src/render/shaders/shaderprogram.cpp b/src/render/shaders/shaderprogram.cpp
index e239a3eb7..1583ceee9 100644
--- a/src/render/shaders/shaderprogram.cpp
+++ b/src/render/shaders/shaderprogram.cpp
@@ -22,10 +22,10 @@
 
 #include "render/shaders/shaderprogram.h"
 
+#include "render/opengl/mgl.h"
 #ifdef __native_client__
 #include "render/opengl/naclglfunctions.h"
 #endif
-#include "render/opengl/mgl.h"
 
 #include "render/shaders/shader.h"
 
diff --git a/src/render/shaders/shadersmanager.cpp b/src/render/shaders/shadersmanager.cpp
index 724327b07..70f635ee8 100644
--- a/src/render/shaders/shadersmanager.cpp
+++ b/src/render/shaders/shadersmanager.cpp
@@ -25,10 +25,10 @@
 #include "configuration.h"
 #include "logger.h"
 
+#include "render/opengl/mgl.h"
 #ifdef __native_client__
 #include "render/opengl/naclglfunctions.h"
 #endif
-#include "render/opengl/mgl.h"
 
 #include "render/shaders/shader.h"
 #include "render/shaders/shaderprogram.h"
diff --git a/src/resources/mobileopenglscreenshothelper.cpp b/src/resources/mobileopenglscreenshothelper.cpp
index 7efb0f3b9..9e18a0d7e 100644
--- a/src/resources/mobileopenglscreenshothelper.cpp
+++ b/src/resources/mobileopenglscreenshothelper.cpp
@@ -27,10 +27,10 @@
 #include "configuration.h"
 #include "graphicsmanager.h"
 
+#include "render/opengl/mgl.h"
 #ifdef __native_client__
 #include "render/opengl/naclglfunctions.h"
 #endif
-#include "render/opengl/mgl.h"
 
 #include "debug.h"
 
diff --git a/src/resources/openglscreenshothelper.cpp b/src/resources/openglscreenshothelper.cpp
index 648ec6942..5f5bec2dd 100644
--- a/src/resources/openglscreenshothelper.cpp
+++ b/src/resources/openglscreenshothelper.cpp
@@ -27,10 +27,10 @@
 #include "configuration.h"
 #include "graphicsmanager.h"
 
+#include "render/opengl/mgl.h"
 #ifdef __native_client__
 #include "render/opengl/naclglfunctions.h"
 #endif
-#include "render/opengl/mgl.h"
 
 #include "debug.h"