diff --git a/Geo/GModelIO_UNV.cpp b/Geo/GModelIO_UNV.cpp
index b2d615f87e7d23383a77ed3d1e74a16a94476a5b..03bb8e1323cf947a297608601d9c23a3f9297713 100644
--- a/Geo/GModelIO_UNV.cpp
+++ b/Geo/GModelIO_UNV.cpp
@@ -7,7 +7,7 @@
 #include <string.h>
 #include "GModel.h"
 #include "OS.h"
-#include "IO.h"
+#include "GmshIO.h"
 
 #include "MLine.h"
 #include "MTriangle.h"
@@ -92,9 +92,9 @@ int GModel::readUNV(const std::string &name)
           std::vector<MVertex*> vertices(numNodes);
           for(int i = 0; i < numNodes; i++){
             int n;
-            if(!gmshgets(buffer, 11, fp)){ gmshclose(fp); return 0; } 
+            if(!gmshgets(buffer, 11, fp)){ gmshclose(fp); return 0; }
             if(strlen(buffer) < 10)
-                if(!gmshgets(buffer, 11, fp)){ gmshclose(fp); return 0; } 
+                if(!gmshgets(buffer, 11, fp)){ gmshclose(fp); return 0; }
             if(!sscanf(buffer, "%d", &n)){ gmshclose(fp); return 0; }
             vertices[i] = getMeshVertexByTag(n);
             if(!vertices[i]){
diff --git a/Parser/Gmsh.l b/Parser/Gmsh.l
index 276abf9e751bbac8258042db5dce2e3745a963ba..29d34073e3705e385f5ab205667ce83770d5cff3 100644
--- a/Parser/Gmsh.l
+++ b/Parser/Gmsh.l
@@ -12,7 +12,7 @@
 #include "GmshMessage.h"
 #include "Geo.h"
 #include "Gmsh.tab.hpp"
-#include "IO.h"
+#include "GmshIO.h"
 
 void   parsestring(char endchar);
 char  *strsave(char *ptr);
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index 94325fda20181ad065b65682262c53e1bae7a3ac..f3ef8da728032eada9a6beffeffe7a8619e32f8e 100644
--- a/Parser/Gmsh.yy.cpp
+++ b/Parser/Gmsh.yy.cpp
@@ -1023,7 +1023,7 @@ char *gmsh_yytext;
 #include "GmshMessage.h"
 #include "Geo.h"
 #include "Gmsh.tab.hpp"
-#include "IO.h"
+#include "GmshIO.h"
 
 void   parsestring(char endchar);
 char  *strsave(char *ptr);
diff --git a/Parser/Parser.h b/Parser/Parser.h
index b5308eb55ee24fd718111fc1ca368c8c54c8410e..9c26d517462d776c58efc27a5b2864862ff29583 100644
--- a/Parser/Parser.h
+++ b/Parser/Parser.h
@@ -10,7 +10,7 @@
 #include <string>
 #include <vector>
 
-#include "IO.h"
+#include "GmshIO.h"
 
 int gmsh_yyparse();
 int gmsh_yylex();