diff --git a/Box/Makefile b/Box/Makefile
index a41fad49ef51694f0f1d10a8794783700fac9ccf..51ab765a663b56ff1d28d047f6add33837fa4922 100644
--- a/Box/Makefile
+++ b/Box/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.47 2008-02-21 12:42:40 geuzaine Exp $
+# $Id: Makefile,v 1.48 2008-04-23 20:49:42 geuzaine Exp $
 #
 # Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 #
@@ -62,18 +62,15 @@ Box.o: Box.cpp ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \
   ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/GFace.h ../Geo/GEntity.h \
   ../Geo/GPoint.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h \
   ../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h \
-  ../Geo/SBoundingBox3d.h ../Common/Message.h ../Common/OS.h \
-  ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Mesh/Generator.h \
-  ../Parser/Parser.h ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h \
-  ../Common/Context.h ../Common/Options.h ../Post/ColorTable.h \
-  ../Parser/OpenFile.h ../Common/CommandLine.h ../Parser/CreateFile.h \
-  ../Parallel/ParUtil.h ../Plugin/PluginManager.h ../Plugin/Plugin.h \
-  ../Post/PView.h ../Post/PViewData.h ../Post/PViewOptions.h \
-  ../Post/ColorTable.h ../Post/PViewDataList.h ../Post/PViewData.h \
-  ../Post/AdaptiveViews.h ../Common/GmshMatrix.h ../Mesh/Field.h \
-  ../contrib/ANN/include/ANN/ANN.h ../Geo/Geo.h ../Common/GmshDefines.h \
+  ../Geo/SBoundingBox3d.h ../Common/Gmsh.h ../Common/Message.h \
+  ../Mesh/Generator.h ../Parser/Parser.h ../DataStr/List.h \
+  ../DataStr/Tree.h ../DataStr/avl.h ../Common/Context.h \
+  ../Common/Options.h ../Post/ColorTable.h ../Parser/OpenFile.h \
+  ../Common/CommandLine.h ../Parser/CreateFile.h ../Parallel/ParUtil.h \
+  ../Mesh/Field.h ../Geo/Geo.h ../Common/GmshDefines.h \
   ../Geo/gmshSurface.h ../Geo/Pair.h ../Geo/Range.h ../Geo/SPoint2.h \
   ../Geo/SPoint3.h ../Geo/SVector3.h ../Geo/SBoundingBox3d.h \
-  ../Geo/SPoint2.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \
-  ../Post/OctreePost.h ../Common/Octree.h ../Common/OctreeInternals.h \
+  ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h ../Geo/SPoint2.h \
+  ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Post/PView.h \
+  ../Post/PViewData.h ../Post/PViewOptions.h ../Post/ColorTable.h \
   ../Mesh/BackgroundMesh.h
diff --git a/configure b/configure
index 2ce7b34e4ca46c1019b32cd1a86f7ff287771794..0bae233ea2d2a1331d4bf2226496c757d4c42324 100755
--- a/configure
+++ b/configure
@@ -4092,7 +4092,7 @@ else
 
   GMSH_DIRS="${GMSH_DIRS} Box"
   GMSH_LIBS="-Llib Box/Main.o -lGmshBox -lGmshParser -lGmshPlugin"
-  GMSH_LIBS="${GMSH_LIBS} -lGmshMesh -lGmshGeo -lGmshPost -lGmshCommon"
+  GMSH_LIBS="${GMSH_LIBS} -lGmshGeo -lGmshMesh -lGmshPost -lGmshCommon"
   GMSH_LIBS="${GMSH_LIBS} -lGmshDataStr -lGmshNumeric -lGmshParallel"
 
     ZLIB=""
diff --git a/configure.in b/configure.in
index 52b9109675bcf88f4da55300460735a461c99524..008462e5625e1bedfd0969ae700c60027c10ad3b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.152 2008-04-16 15:39:25 geuzaine Exp $
+dnl $Id: configure.in,v 1.153 2008-04-23 20:49:41 geuzaine Exp $
 dnl
 dnl Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 dnl
@@ -336,7 +336,7 @@ else
 
   GMSH_DIRS="${GMSH_DIRS} Box"
   GMSH_LIBS="-Llib Box/Main.o -lGmshBox -lGmshParser -lGmshPlugin"
-  GMSH_LIBS="${GMSH_LIBS} -lGmshMesh -lGmshGeo -lGmshPost -lGmshCommon"
+  GMSH_LIBS="${GMSH_LIBS} -lGmshGeo -lGmshMesh -lGmshPost -lGmshCommon"
   GMSH_LIBS="${GMSH_LIBS} -lGmshDataStr -lGmshNumeric -lGmshParallel"
 
   dnl Check for libz