diff --git a/Common/Options.cpp b/Common/Options.cpp
index 301ad737357bf33f416cbe7de33441e52472caeb..f2d0f19ac03cc18e0fb90f57cd5f55a97aaf7f31 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -1,4 +1,4 @@
-// $Id: Options.cpp,v 1.382 2008-02-17 08:47:56 geuzaine Exp $
+// $Id: Options.cpp,v 1.383 2008-02-22 07:59:00 geuzaine Exp $
 //
 // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
@@ -19,6 +19,7 @@
 // 
 // Please report all bugs and problems to <gmsh@geuz.org>.
 
+#include <string.h>
 #include "GmshUI.h"
 #include "GmshDefines.h"
 #include "Message.h"
diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index 7ee9299ad3e2b46ceb2553529136e3c2b471b934..a7d41741007b29e6545a2f4b05a31281fdcf4886 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.562 2008-02-17 08:47:56 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.563 2008-02-22 07:59:00 geuzaine Exp $
 //
 // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
@@ -19,6 +19,7 @@
 // 
 // Please report all bugs and problems to <gmsh@geuz.org>.
 
+#include <string.h>
 #include <signal.h>
 #include <time.h>
 #include <map>
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index ddd00f87efafcbcf23601301be841cf507939de4..228bb9689360750bbf7bb8f7bbff86853f46aacc 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.655 2008-02-17 10:17:02 geuzaine Exp $
+// $Id: GUI.cpp,v 1.656 2008-02-22 07:59:00 geuzaine Exp $
 //
 // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
@@ -19,6 +19,7 @@
 // 
 // Please report all bugs and problems to <gmsh@geuz.org>.
 
+#include <string.h>
 #include "GmshUI.h"
 #include "GmshDefines.h"
 #include "Message.h"
diff --git a/Fltk/Main.cpp b/Fltk/Main.cpp
index 671f986b92c2668fedd06a6e3e7f7c7d26fff511..07a4dd95222c1772c6ab87cd9630dc47567a9e43 100644
--- a/Fltk/Main.cpp
+++ b/Fltk/Main.cpp
@@ -1,4 +1,4 @@
-// $Id: Main.cpp,v 1.116 2008-02-17 08:47:57 geuzaine Exp $
+// $Id: Main.cpp,v 1.117 2008-02-22 07:59:00 geuzaine Exp $
 //
 // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
@@ -19,6 +19,7 @@
 // 
 // Please report all bugs and problems to <gmsh@geuz.org>.
 
+#include <string.h>
 #include <signal.h>
 #include <time.h>
 #include "GUI.h"
diff --git a/Fltk/Message.cpp b/Fltk/Message.cpp
index e59d8aa2e65eb3164d48763d6ce1b26738a6e9b6..97523f01019dca10adde3780ffa768a9496a42ca 100644
--- a/Fltk/Message.cpp
+++ b/Fltk/Message.cpp
@@ -1,4 +1,4 @@
-// $Id: Message.cpp,v 1.83 2008-02-17 08:47:57 geuzaine Exp $
+// $Id: Message.cpp,v 1.84 2008-02-22 07:59:00 geuzaine Exp $
 //
 // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
@@ -19,6 +19,7 @@
 // 
 // Please report all bugs and problems to <gmsh@geuz.org>.
 
+#include <string.h>
 #include <signal.h>
 #include "Message.h"
 #include "GmshUI.h"
diff --git a/Fltk/Opengl.cpp b/Fltk/Opengl.cpp
index 99aae6d6e8e4608c76279c071fa5d47f013725b3..baa7060ef4deb2c4a4ad1703d58856a8393db1cc 100644
--- a/Fltk/Opengl.cpp
+++ b/Fltk/Opengl.cpp
@@ -1,4 +1,4 @@
-// $Id: Opengl.cpp,v 1.76 2008-02-17 08:47:57 geuzaine Exp $
+// $Id: Opengl.cpp,v 1.77 2008-02-22 07:59:00 geuzaine Exp $
 //
 // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
@@ -19,6 +19,7 @@
 // 
 // Please report all bugs and problems to <gmsh@geuz.org>.
 
+#include <string.h>
 #include "GmshUI.h"
 #include "GmshDefines.h"
 #include "Numeric.h"
diff --git a/Fltk/Solvers.cpp b/Fltk/Solvers.cpp
index 9fe011e3838360bb4c9c6fcc4d261ae7b97ffb0b..4db85bc842d41610a3d2c5307393237bec661e02 100644
--- a/Fltk/Solvers.cpp
+++ b/Fltk/Solvers.cpp
@@ -1,4 +1,4 @@
-// $Id: Solvers.cpp,v 1.59 2008-02-17 08:47:57 geuzaine Exp $
+// $Id: Solvers.cpp,v 1.60 2008-02-22 07:59:00 geuzaine Exp $
 //
 // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
@@ -19,6 +19,7 @@
 // 
 // Please report all bugs and problems to <gmsh@geuz.org>.
 
+#include <string.h>
 #include "Message.h"
 #include "Solvers.h"
 #include "GmshServer.h"
diff --git a/Geo/GModelIO_Mesh.cpp b/Geo/GModelIO_Mesh.cpp
index 7f4ac0d273dd3410b726b1e2dca66489d1d3dbba..ff1f870c972c64375bf2790615a425cf63ff3d60 100644
--- a/Geo/GModelIO_Mesh.cpp
+++ b/Geo/GModelIO_Mesh.cpp
@@ -1,4 +1,4 @@
-// $Id: GModelIO_Mesh.cpp,v 1.35 2008-02-22 07:49:38 geuzaine Exp $
+// $Id: GModelIO_Mesh.cpp,v 1.36 2008-02-22 07:59:00 geuzaine Exp $
 //
 // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
@@ -19,10 +19,9 @@
 // 
 // Please report all bugs and problems to <gmsh@geuz.org>.
 
+#include <string.h>
 #include <map>
-#include <cstring>
 #include <string>
-
 #include "GModel.h"
 #include "GmshDefines.h"
 #include "MElement.h"
diff --git a/Geo/GVertex.cpp b/Geo/GVertex.cpp
index eb7deb01dee8d975f7de47c2444cf97ce8bea54b..9b701cfb95ad8205d8fb179cc5360533d4ea3243 100644
--- a/Geo/GVertex.cpp
+++ b/Geo/GVertex.cpp
@@ -1,4 +1,4 @@
-// $Id: GVertex.cpp,v 1.19 2008-02-17 08:47:58 geuzaine Exp $
+// $Id: GVertex.cpp,v 1.20 2008-02-22 07:59:00 geuzaine Exp $
 //
 // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
@@ -19,8 +19,8 @@
 // 
 // Please report all bugs and problems to <gmsh@geuz.org>.
 
+#include <string.h>
 #include <algorithm>
-#include <cstring>
 #include "GVertex.h"
 #include "GFace.h"
 #include "MVertex.h"
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index ee4c1c5644ec3411b3d40953c570641d07b0f93d..8476effd275717315d9d87b195975b09fee56663 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -1,5 +1,5 @@
 %{
-// $Id: Gmsh.y,v 1.299 2008-02-20 09:20:46 geuzaine Exp $
+// $Id: Gmsh.y,v 1.300 2008-02-22 07:59:00 geuzaine Exp $
 //
 // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
@@ -20,6 +20,7 @@
 // 
 // Please report all bugs and problems to <gmsh@geuz.org>.
 
+#include <string.h>
 #include <stdarg.h>
 #include <time.h>
 #include "Message.h"
diff --git a/Parser/OpenFile.cpp b/Parser/OpenFile.cpp
index 9dc47ce2bb0736b1b8fb3082545cbc297cdc3905..008b6be6ca4c994f607138153539e268635aebf4 100644
--- a/Parser/OpenFile.cpp
+++ b/Parser/OpenFile.cpp
@@ -1,4 +1,4 @@
-// $Id: OpenFile.cpp,v 1.175 2008-02-17 08:48:05 geuzaine Exp $
+// $Id: OpenFile.cpp,v 1.176 2008-02-22 07:59:00 geuzaine Exp $
 //
 // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
@@ -23,6 +23,7 @@
 #include <sys/cygwin.h>
 #endif
 
+#include <string.h>
 #include "Message.h"
 #include "Geo.h"
 #include "GModel.h"