diff --git a/Geo/GModelIO_CGNS.cpp b/Geo/GModelIO_CGNS.cpp
index fd7cb21d6b9a21f92bf1abc9c343bab7a3d91ba7..fe8381b0cc8c2a6b635e90bc40e52b912c33ec32 100644
--- a/Geo/GModelIO_CGNS.cpp
+++ b/Geo/GModelIO_CGNS.cpp
@@ -17,8 +17,8 @@
 // 
 // Please report all bugs and problems to <gmsh@geuz.org>.
 
+#include <string.h>
 #include <iostream>  // DBG
-#include <cstring>
 #include <list>
 #include <map>
 #include <set>
@@ -33,7 +33,7 @@
 
 #if defined(HAVE_LIBCGNS)
 
-#include "cgnslib.h"
+#include <cgnslib.h>
 
 int cgnsErr(const int cgIndexFile = -1)
 {
diff --git a/Geo/GModelIO_MED.cpp b/Geo/GModelIO_MED.cpp
index 98742142f4b5c3a881d10e8724748f3e0c68f61b..dac75e751f283a622eb8d55781cd29a04431b1f1 100644
--- a/Geo/GModelIO_MED.cpp
+++ b/Geo/GModelIO_MED.cpp
@@ -1,4 +1,4 @@
-// $Id: GModelIO_MED.cpp,v 1.34 2008-05-04 08:31:13 geuzaine Exp $
+// $Id: GModelIO_MED.cpp,v 1.35 2008-06-05 18:25:18 geuzaine Exp $
 //
 // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
 //
@@ -25,10 +25,10 @@
 
 #if defined(HAVE_MED)
 
+#include <string.h>
 #include <map>
 #include <sstream>
 #include <vector>
-#include <cstring>
 #include "MElement.h"
 #include "MVertex.h"
 #include "discreteVertex.h"
@@ -562,21 +562,21 @@ int GModel::writeMED(const std::string &name, bool saveAll, double scalingFactor
 int GModel::readMED(const std::string &name)
 {
   Msg::Error("Gmsh has to be compiled with MED support to read '%s'",
-      name.c_str());
+	     name.c_str());
   return 0;
 }
 
 int GModel::readMED(const std::string &name, int meshIndex)
 {
   Msg::Error("Gmsh has to be compiled with MED support to read '%s'",
-      name.c_str());
+	     name.c_str());
   return 0;
 }
 
 int GModel::writeMED(const std::string &name, bool saveAll, double scalingFactor)
 {
   Msg::Error("Gmsh has to be compiled with MED support to write '%s'",
-      name.c_str());
+	     name.c_str());
   return 0;
 }
 
diff --git a/Geo/GaussLegendreSimplex.cpp b/Geo/GaussLegendreSimplex.cpp
index 65c2e6e1580eba813325cc636ada4176177fc026..cd9319a0dbd11b4cee75ca3731fc9ee4f8003e50 100644
--- a/Geo/GaussLegendreSimplex.cpp
+++ b/Geo/GaussLegendreSimplex.cpp
@@ -1,4 +1,4 @@
-#include <cmath>
+#include <math.h>
 #include "MElement.h"
 #include "GaussLegendreSimplex.h"
 #include "GaussLegendre1D.h"
diff --git a/Geo/gmshSurface.h b/Geo/gmshSurface.h
index a9e451360bd5a11a7d0d4df36609293909d27afa..7bab38f55c435592b8bfb896a39ef7ad32e62adf 100644
--- a/Geo/gmshSurface.h
+++ b/Geo/gmshSurface.h
@@ -20,7 +20,7 @@
 // 
 // Please report all bugs and problems to <gmsh@geuz.org>.
 
-#include <cmath>
+#include <math.h>
 #include <map>
 #include "Pair.h"
 #include "Range.h"
diff --git a/Numeric/FunctionSpace.cpp b/Numeric/FunctionSpace.cpp
index 285a0b4a70d1838914236f6b3f62dbec6ad957ab..d340f2b4833432f66f5a5d1812f2e0aac31fe9c4 100644
--- a/Numeric/FunctionSpace.cpp
+++ b/Numeric/FunctionSpace.cpp
@@ -1,4 +1,4 @@
-// $Id: FunctionSpace.cpp,v 1.4 2008-03-20 11:44:09 geuzaine Exp $
+// $Id: FunctionSpace.cpp,v 1.5 2008-06-05 18:25:18 geuzaine Exp $
 //
 // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
@@ -19,7 +19,6 @@
 // 
 // Please report all bugs and problems to <gmsh@geuz.org>.
 
-#include <cmath>
 #include "FunctionSpace.h"
 #include "GmshDefines.h"