simplify includes

contrib/mobile/drawContext.cpp

-#if !defined(BUILD_ANDROID)
-#define BUILD_IOS 1
-#endif
-
 #include <map>
 
-#if defined(BUILD_IOS)
-#include <OpenGLES/ES1/gl.h>
-#include <OpenGLES/ES1/glext.h>
-
-#include <Gmsh/Gmsh.h>
-#include <Gmsh/OpenFile.h>
-#include <Gmsh/GModel.h>
-#include <Gmsh/MElement.h>
-#include <Gmsh/VertexArray.h>
-#include <Gmsh/onelab.h>
-#include <Gmsh/onelabUtils.h>
-#include <Gmsh/PView.h>
-#include <Gmsh/PViewOptions.h>
-#include <Gmsh/PViewData.h>
-#include <Gmsh/Context.h>
-#include <Gmsh/StringUtils.h>
-
-#include <GetDP/GetDP.h>
-#endif
-
-#if defined(BUILD_ANDROID)
-#include <GLES/gl.h>
-#include <GLES/glext.h>
-
 #include <gmsh/Gmsh.h>
 #include <gmsh/OpenFile.h>
 #include <gmsh/GModel.h>
@@ -40,10 +12,15 @@
 #include <gmsh/PViewData.h>
 #include <gmsh/Context.h>
 #include <gmsh/StringUtils.h>
-
 #include <getdp/GetDP.h>
 
+#if defined(BUILD_ANDROID)
+#include <GLES/gl.h>
+#include <GLES/glext.h>
 #include "androidGModel.h"
+#else // iOS
+#include <OpenGLES/ES1/gl.h>
+#include <OpenGLES/ES1/glext.h>
 #endif
 
 #include "drawContext.h"

contrib/mobile/drawContext.h

 #ifndef _DRAW_GMODEL_H_
 #define _DRAW_GMODEL_H_
 
-#ifndef __cplusplus
-#error You need a Cpp compiler!
-#endif
-
-#if !defined(BUILD_ANDROID)
-#define BUILD_IOS 1
-#endif
-
 #include <string>
 
-#if defined(BUILD_IOS)
-#include <Gmsh/PView.h>
-#include <Gmsh/PViewOptions.h>
-#include <Gmsh/Context.h>
-#endif
+#include <gmsh/PView.h>
+#include <gmsh/PViewOptions.h>
 
 #include "movePosition.h"
 

contrib/mobile/drawGeom.cpp

 #include <stdlib.h>
-#if !defined(BUILD_ANDROID)
-#define BUILD_IOS 1
-#endif
-
-#if defined(BUILD_IOS)
-#include <OpenGLES/ES1/gl.h>
-#include <OpenGLES/ES1/glext.h>
-
-#include <Gmsh/Gmsh.h>
-#include <Gmsh/GModel.h>
-#endif
 
 #if defined(BUILD_ANDROID)
 #include <GLES/gl.h>
 #include <GLES/glext.h>
+#else
+#include <OpenGLES/ES1/gl.h>
+#include <OpenGLES/ES1/glext.h>
+#endif
 
 #include <gmsh/Gmsh.h>
 #include <gmsh/GModel.h>
-#include <gmsh/PView.h>
 #include <gmsh/Context.h>
-#endif
 
 #include "drawContext.h"
 

contrib/mobile/drawMesh.cpp

-#if !defined(BUILD_ANDROID)
-#define BUILD_IOS 1
-#endif
-
-#if defined(BUILD_IOS)
-#include <OpenGLES/ES1/gl.h>
-#include <OpenGLES/ES1/glext.h>
-
-#include <Gmsh/Gmsh.h>
-#include <Gmsh/GModel.h>
-#include <Gmsh/GEdgeCompound.h>
-#include <Gmsh/GFaceCompound.h>
-#include <Gmsh/PView.h>
-#include <Gmsh/PViewData.h>
-#endif
-
 #if defined(BUILD_ANDROID)
 #include <GLES/gl.h>
 #include <GLES/glext.h>
+#else
+#include <OpenGLES/ES1/gl.h>
+#include <OpenGLES/ES1/glext.h>
+#endif
 
 #include <gmsh/Gmsh.h>
 #include <gmsh/GModel.h>
@@ -25,7 +13,6 @@
 #include <gmsh/PView.h>
 #include <gmsh/PViewData.h>
 #include <gmsh/Context.h>
-#endif
 
 #include "drawContext.h"
 

contrib/mobile/drawString.cpp

-#if !defined(BUILD_ANDROID)
-#define BUILD_IOS 1
-#endif
-
-#if defined(BUILD_IOS)
-#include <OpenGLES/ES1/gl.h>
-#include <OpenGLES/ES1/glext.h>
-#endif
-
 #if defined(BUILD_ANDROID)
 #include <GLES/gl.h>
 #include <GLES/glext.h>
+#else
+#include <OpenGLES/ES1/gl.h>
+#include <OpenGLES/ES1/glext.h>
 #endif
 
 #include "drawString.h"

contrib/mobile/drawString.h

 #include <string>
 
-#if !defined(BUILD_ANDROID)
-#define BUILD_IOS 1
-#endif
-
-#if defined(BUILD_IOS)
-#include "iosGModel.h"
-#endif
-
 #if defined(BUILD_ANDROID)
 #include "androidGModel.h"
+#else
+#include "iosGModel.h"
 #endif
 
 class drawString