diff --git a/wrappers/java/WrapGmsh.i b/wrappers/java/WrapGmsh.i
index f8563031cf07a981495d9db009435ee1ad8d25c0..a8d235cd6e9eb01da8bfb42b90f50f6826a72fed 100644
--- a/wrappers/java/WrapGmsh.i
+++ b/wrappers/java/WrapGmsh.i
@@ -21,7 +21,6 @@
 #include "MTriangle.h"
 #include "MFace.h"
 #include "MTetrahedron.h"
-#include "GModelIO_Mesh.cpp"
 
  %}
 
@@ -33,11 +32,11 @@ enum meshGenerationStatus {PENDING, DONE, FAILED};
 //these fonctions/classes must be wrapped
 %include "std_string.i"
 %include "MElement.h"
-%include "MPoint.h" 
-%include "MLine.h"  
-%include "MFace.h" 
-%include "MTriangle.h" 
-%include "MTetrahedron.h" 
+%include "MPoint.h"
+%include "MLine.h"
+%include "MFace.h"
+%include "MTriangle.h"
+%include "MTetrahedron.h"
 %include "GEntity.h"
 %include "GModel.h"
 %include "Geo.h"
@@ -47,14 +46,13 @@ enum meshGenerationStatus {PENDING, DONE, FAILED};
 %include "GEdge.h"
 %include "GFace.h"
 %include "GRegion.h"
-%include "MVertex.h"    
+%include "MVertex.h"
 %include "GEntity.h"
 %include "ListUtils.h"
-extern int GModel::getNumElementsMSH(GModel *m, bool saveAll, int saveSinglePartition);
 extern int GModel::indexMeshVertices(bool all, int singlePartition);
 extern int GmshInitialize(int argc, char **argv);
 extern int GmshFinalize();
-extern Vertex *Create_Vertex(int Num, double X, double Y, double Z, double lc, double u); 
+extern Vertex *Create_Vertex(int Num, double X, double Y, double Z, double lc, double u);
 extern void add_physical(std::string type, List_T *list, std::string fileName);
 
 //use the Vector object defined in Java language to wrap the std vector.
@@ -72,39 +70,39 @@ namespace std {
    %template(MLineVector) std::vector<MLine*>;
    %template(MTriangleVector) std::vector<MTriangle*>;
    %template(MTetrahedrVector) std::vector<MTetrahedron*>;
-   %template(IntVector) std::vector<int>; 
-}; 
+   %template(IntVector) std::vector<int>;
+};
 
 
 //wrap Set from std
-%include "setWrapperGmsh.h" 
+%include "setWrapperGmsh.h"
 
-%template (GVertexSetWrapper) SetWrapperGmsh<GVertex*, GEntityLessThan>; 
+%template (GVertexSetWrapper) SetWrapperGmsh<GVertex*, GEntityLessThan>;
 %template (GVertexSetIterator) SetIteratorGmsh<GVertex*, GEntityLessThan>;
 
-%template (GEdgeSetWrapper) SetWrapperGmsh<GEdge*, GEntityLessThan>; 
+%template (GEdgeSetWrapper) SetWrapperGmsh<GEdge*, GEntityLessThan>;
 %template (GEdgeSetIterator) SetIteratorGmsh<GEdge*, GEntityLessThan>;
 
-%template (GFaceSetWrapper) SetWrapperGmsh<GFace*, GEntityLessThan>; 
+%template (GFaceSetWrapper) SetWrapperGmsh<GFace*, GEntityLessThan>;
 %template (GFaceSetIterator) SetIteratorGmsh<GFace*, GEntityLessThan>;
 
-%template (GRegionSetWrapper) SetWrapperGmsh<GRegion*, GEntityLessThan>; 
+%template (GRegionSetWrapper) SetWrapperGmsh<GRegion*, GEntityLessThan>;
 %template (GRegionSetIterator) SetIteratorGmsh<GRegion*, GEntityLessThan>;
 
 
 //wrap List from std
-%include "listWrapperGmsh.h" 
+%include "listWrapperGmsh.h"
 
-%template (GVertexListWrapper) ListWrapperGmsh<GVertex*>; 
+%template (GVertexListWrapper) ListWrapperGmsh<GVertex*>;
 %template (GVertexListIterator) ListIteratorGmsh<GVertex*>;
 
-%template (GEdgeListWrapper) ListWrapperGmsh<GEdge*>; 
+%template (GEdgeListWrapper) ListWrapperGmsh<GEdge*>;
 %template (GEdgeListIterator) ListIteratorGmsh<GEdge*>;
 
-%template (GFaceListWrapper) ListWrapperGmsh<GFace*>; 
+%template (GFaceListWrapper) ListWrapperGmsh<GFace*>;
 %template (GFaceListIterator) ListIteratorGmsh<GFace*>;
 
-%template (GRegionListWrapper) ListWrapperGmsh<GRegion*>; 
+%template (GRegionListWrapper) ListWrapperGmsh<GRegion*>;
 %template (GRegionListIterator) ListIteratorGmsh<GRegion*>;