diff --git a/Geo/Makefile b/Geo/Makefile
index 46122811f13a95220f70d4ed56abdc454907de55..a612fd0d282b2b8325fba0a4b390dc2ae1d5771b 100644
--- a/Geo/Makefile
+++ b/Geo/Makefile
@@ -434,7 +434,7 @@ CellComplex${OBJEXT}: CellComplex.cpp CellComplex.h ../Common/GmshConfig.h \
   ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h ../Numeric/Gauss.h \
   MPoint.h MLine.h MTriangle.h MTetrahedron.h GModel.h GVertex.h \
   GEntity.h Range.h SBoundingBox3d.h SOrientedBoundingBox.h Pair.h \
-  GPoint.h GEdge.h GFace.h GEdgeLoop.h GRegion.h
+  GPoint.h GEdge.h GFace.h GEdgeLoop.h GRegion.h ../Common/OS.h
 ChainComplex${OBJEXT}: ChainComplex.cpp ChainComplex.h ../Common/GmshConfig.h \
   MElement.h ../Common/GmshDefines.h MVertex.h SPoint2.h SPoint3.h \
   MEdge.h SVector3.h MFace.h ../Common/GmshMessage.h \
diff --git a/Plugin/Makefile b/Plugin/Makefile
index ae4d7572847257ce5fbf6ceb95a6236ea18b0f44..50881823c9f000582d1a01d388113a6506e60adf 100644
--- a/Plugin/Makefile
+++ b/Plugin/Makefile
@@ -73,8 +73,7 @@ PluginManager${OBJEXT}: PluginManager.cpp ../Common/GmshConfig.h \
   ../Post/PViewDataList.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
   ../Geo/SPoint3.h ../Numeric/GmshMatrix.h PluginManager.h CutMap.h \
   Levelset.h CutGrid.h StreamLines.h CutPlane.h CutParametric.h \
-  CutSphere.h Skin.h ../Common/TreeUtils.h ../Common/avl.h \
-  ../Common/ListUtils.h Extract.h ExtractElements.h ExtractEdges.h \
+  CutSphere.h Skin.h Extract.h ExtractElements.h ExtractEdges.h \
   HarmonicToTime.h ModulusPhase.h Integrate.h Gradient.h Curl.h \
   Divergence.h Annotate.h Remove.h MakeSimplex.h Smooth.h Transform.h \
   LongitudeLatitude.h Triangulate.h Warp.h SphericalRaise.h \
@@ -194,9 +193,7 @@ Skin${OBJEXT}: Skin.cpp Skin.h Plugin.h ../Common/Options.h ../Post/ColorTable.h
   ../Common/GmshMessage.h ../Post/PView.h ../Geo/SPoint3.h \
   ../Post/PViewDataList.h ../Post/PViewData.h ../Geo/SBoundingBox3d.h \
   ../Geo/SPoint3.h ../Numeric/GmshMatrix.h ../Common/GmshConfig.h \
-  ../Common/TreeUtils.h ../Common/avl.h ../Common/ListUtils.h \
-  ../Common/MallocUtils.h ../Common/Context.h ../Geo/CGNSOptions.h \
-  ../Mesh/meshPartitionOptions.h
+  ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h
 GSHHS${OBJEXT}: GSHHS.cpp ../Mesh/Field.h ../Common/GmshConfig.h \
   ../Geo/STensor3.h ../Geo/SVector3.h ../Geo/SPoint3.h \
   ../Numeric/GmshMatrix.h ../Common/GmshMessage.h ../Numeric/Numeric.h \