diff --git a/DataStr/Makefile b/DataStr/Makefile
index c0e6a51532e3fe5aa081d0acf4dff2deeabe783a..be4db757b6664ed993db2b2c56dc1a4c86943ec3 100644
--- a/DataStr/Makefile
+++ b/DataStr/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.47 2008-04-23 23:00:39 geuzaine Exp $
+# $Id: Makefile,v 1.48 2008-06-05 13:57:47 samtech Exp $
 #
 # Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 #
@@ -27,7 +27,7 @@ INC = ${DASH}I../Common
 
 CFLAGS  = ${OPTIM} ${FLAGS} ${INC} ${SYSINCLUDE}
 
-SRC = List.cpp \
+SRC = gmshList.cpp \
       Malloc.cpp \
       SafeIO.cpp \
       Tree.cpp \
diff --git a/DataStr/Tools.h b/DataStr/Tools.h
index 4756b8fb794738c6f8ffed15607363edc6be4e5c..1e11979ed051e86acf6609d87090ecfe78523af0 100644
--- a/DataStr/Tools.h
+++ b/DataStr/Tools.h
@@ -20,7 +20,7 @@
 // 
 // Please report all bugs and problems to <gmsh@geuz.org>.
 
-#include "List.h"
+#include "gmshList.h"
 #include "Tree.h"
 
 int fcmp_int(const void *a, const void *b);
diff --git a/DataStr/List.cpp b/DataStr/gmshList.cpp
similarity index 99%
rename from DataStr/List.cpp
rename to DataStr/gmshList.cpp
index 0d7d4c7ca1a12bafb42369d518bd4fec96a175b3..40893953fc512974508b8767dcaa298a5e33cc14 100644
--- a/DataStr/List.cpp
+++ b/DataStr/gmshList.cpp
@@ -1,4 +1,4 @@
-// $Id: List.cpp,v 1.45 2008-05-04 08:31:11 geuzaine Exp $
+// $Id: gmshList.cpp,v 1.1 2008-06-05 13:57:47 samtech Exp $
 //
 // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
@@ -29,7 +29,7 @@
 #include <sys/types.h>
 
 #include "Malloc.h"
-#include "List.h"
+#include "gmshList.h"
 #include "Message.h"
 #include "SafeIO.h"
 
diff --git a/DataStr/List.h b/DataStr/gmshList.h
similarity index 100%
rename from DataStr/List.h
rename to DataStr/gmshList.h
diff --git a/Geo/Geo.h b/Geo/Geo.h
index d753c0136371beaeaf815489e485d9f0ec1fb1b0..d27e1ae5ed67adc305a33ddf3e5d6db25dbe99bd 100644
--- a/Geo/Geo.h
+++ b/Geo/Geo.h
@@ -24,7 +24,7 @@
 #include <math.h>
 #include "GmshDefines.h"
 #include "gmshSurface.h"
-#include "List.h"
+#include "gmshList.h"
 #include "Tree.h"
 #include "SPoint2.h"
 #include "ExtrudeParams.h"
diff --git a/Geo/GeoStringInterface.h b/Geo/GeoStringInterface.h
index c6c2ae76115870b9f39ca5121b7d42e7b62e1622..cf820c675089a49f614419f6ed9b0f2f18956088 100644
--- a/Geo/GeoStringInterface.h
+++ b/Geo/GeoStringInterface.h
@@ -20,7 +20,7 @@
 // 
 // Please report all bugs and problems to <gmsh@geuz.org>.
 
-#include "List.h"
+#include "gmshList.h"
 
 double evaluate_scalarfunction(const char *var, double val, const char *funct);
 
diff --git a/Geo/findLinks.cpp b/Geo/findLinks.cpp
index eefd6f1c25fc8f8db4ad7f07e14e7a3d08963748..02ed3e7030f5944a574f3bfa560078d9caddba2a 100644
--- a/Geo/findLinks.cpp
+++ b/Geo/findLinks.cpp
@@ -1,4 +1,4 @@
-// $Id: findLinks.cpp,v 1.9 2008-06-05 11:52:49 samtech Exp $
+// $Id: findLinks.cpp,v 1.10 2008-06-05 13:57:47 samtech Exp $
 //
 // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
@@ -23,7 +23,7 @@
 #include "Message.h"
 #include "GModel.h"
 #include "Tree.h"
-#include "List.h"
+#include "gmshList.h"
 #include "Tools.h"
 
 typedef struct{
diff --git a/Geo/findLinks.h b/Geo/findLinks.h
index 02614b5d36885cf00d47e0ec60d9a5d79a60ef43..314d2f4bdc2f4c1e9776e7bfa1af73cc65ab6e93 100644
--- a/Geo/findLinks.h
+++ b/Geo/findLinks.h
@@ -20,7 +20,7 @@
 // 
 // Please report all bugs and problems to <gmsh@geuz.org>.
 
-#include "List.h"
+#include "gmshList.h"
 
 int allEdgesLinked(int ed, List_T *edges);
 int allFacesLinked(int fac, List_T *faces);
diff --git a/Mesh/meshGEdge.cpp b/Mesh/meshGEdge.cpp
index d4e2938830a600c2dc5f29057197c97cda913585..66285167b99bc2d8993ecb1454637190c25e1972 100644
--- a/Mesh/meshGEdge.cpp
+++ b/Mesh/meshGEdge.cpp
@@ -1,4 +1,4 @@
-// $Id: meshGEdge.cpp,v 1.62 2008-06-05 11:52:49 samtech Exp $
+// $Id: meshGEdge.cpp,v 1.63 2008-06-05 13:57:47 samtech Exp $
 //
 // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
@@ -26,7 +26,7 @@
 #include "BackgroundMesh.h"
 #include "Numeric.h"
 #include "Message.h"
-#include "List.h"
+#include "gmshList.h"
 #include "Context.h"
 #include "GModel.h"
 
diff --git a/Parser/Parser.h b/Parser/Parser.h
index 744f7f600e70da38aa7d08ce965188440c13a53e..4bf3f3b973d6c5a700136b5193de7e19150eb68e 100644
--- a/Parser/Parser.h
+++ b/Parser/Parser.h
@@ -20,7 +20,7 @@
 // 
 // Please report all bugs and problems to <gmsh@geuz.org>.
 
-#include "List.h"
+#include "gmshList.h"
 #include "Tree.h"
 
 typedef struct {
diff --git a/Plugin/CutPlane.cpp b/Plugin/CutPlane.cpp
index 792c27b2d32763521e5f920cd779f82712efa734..f2b8684eeb15d534c6d7e6b4d271e0fae4e27d0d 100644
--- a/Plugin/CutPlane.cpp
+++ b/Plugin/CutPlane.cpp
@@ -1,4 +1,4 @@
-// $Id: CutPlane.cpp,v 1.57 2008-04-05 17:49:23 geuzaine Exp $
+// $Id: CutPlane.cpp,v 1.58 2008-06-05 13:57:47 samtech Exp $
 //
 // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
@@ -20,7 +20,6 @@
 // Please report all bugs and problems to <gmsh@geuz.org>.
 
 #include "CutPlane.h"
-#include "List.h"
 #include "Context.h"
 
 #if defined(HAVE_FLTK)
diff --git a/Plugin/CutSphere.cpp b/Plugin/CutSphere.cpp
index ea203df8bac07c158cc9d8dbf403c9f6aa96500e..f40870c5c0a319bc010f44b56a92c657b3a699e0 100644
--- a/Plugin/CutSphere.cpp
+++ b/Plugin/CutSphere.cpp
@@ -1,4 +1,4 @@
-// $Id: CutSphere.cpp,v 1.51 2008-04-05 17:49:23 geuzaine Exp $
+// $Id: CutSphere.cpp,v 1.52 2008-06-05 13:57:47 samtech Exp $
 //
 // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
@@ -21,7 +21,6 @@
 
 #include <string.h>
 #include "CutSphere.h"
-#include "List.h"
 #include "Context.h"
 
 #if defined(HAVE_FLTK)
diff --git a/Plugin/Levelset.cpp b/Plugin/Levelset.cpp
index 23d97fdf25a56ee8d6c87649a7c9493e1eba2a93..f05fae5eb131c58bb80e68d9ee2a30ec073a52f2 100644
--- a/Plugin/Levelset.cpp
+++ b/Plugin/Levelset.cpp
@@ -1,4 +1,4 @@
-// $Id: Levelset.cpp,v 1.47 2008-05-04 08:31:23 geuzaine Exp $
+// $Id: Levelset.cpp,v 1.48 2008-06-05 13:57:47 samtech Exp $
 //
 // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
@@ -21,7 +21,7 @@
 
 #include "Levelset.h"
 #include "MakeSimplex.h"
-#include "List.h"
+#include "gmshList.h"
 #include "Numeric.h"
 #include "adaptiveData.h"
 
diff --git a/Plugin/Skin.h b/Plugin/Skin.h
index ba4436cefc686d3bbc78d2e8b41f1833152dbb52..332bfd0f11d258a4af6c452c5bbf8c97c4630755 100644
--- a/Plugin/Skin.h
+++ b/Plugin/Skin.h
@@ -21,7 +21,7 @@
 // Please report all bugs and problems to <gmsh@geuz.org>.
 
 #include "Plugin.h"
-#include "List.h"
+#include "gmshList.h"
 #include "Tree.h"
 
 extern "C"
diff --git a/Post/OctreePost.cpp b/Post/OctreePost.cpp
index eb535de3b9272b71f33b2cf855e2ca9159b3c847..f08bf5327fd575c43abd8df9bdc939cd9630cafd 100644
--- a/Post/OctreePost.cpp
+++ b/Post/OctreePost.cpp
@@ -1,4 +1,4 @@
-// $Id: OctreePost.cpp,v 1.13 2008-05-12 20:24:06 geuzaine Exp $
+// $Id: OctreePost.cpp,v 1.14 2008-06-05 13:57:47 samtech Exp $
 //
 // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
@@ -21,7 +21,7 @@
 
 #include "Octree.h"
 #include "OctreePost.h"
-#include "List.h"
+#include "gmshList.h"
 #include "PView.h"
 #include "PViewDataList.h"
 #include "PViewDataGModel.h"
diff --git a/Post/adaptiveData.h b/Post/adaptiveData.h
index 8019be84ca19bc4073e45a1233173c516f01c906..04a2de2dcedc753c069e30740d2bf8a116dc32c2 100644
--- a/Post/adaptiveData.h
+++ b/Post/adaptiveData.h
@@ -22,7 +22,7 @@
 
 #include <list>
 #include <set>
-#include "List.h"
+#include "gmshList.h"
 #include "GmshMatrix.h"
 
 class PViewData;