diff --git a/component/gcc/buildout.cfg b/component/gcc/buildout.cfg
index b2f4a09a06f44e7eeca66ee9b41f2b180323055d..f8645445a9ac78a0bd67a0a451a4d2f21538e429 100644
--- a/component/gcc/buildout.cfg
+++ b/component/gcc/buildout.cfg
@@ -2,10 +2,8 @@
 # Mostly required to support languages different than C or C++
 [buildout]
 extends =
-  ../m4/buildout.cfg
   ../gmp/buildout.cfg
   ../xz-utils/buildout.cfg
-  ../zip/buildout.cfg
 
 parts =
   gcc
diff --git a/component/ghostscript/buildout.cfg b/component/ghostscript/buildout.cfg
index fc545e0090dd717fd3ceb47a4ea8b8044f87e758..d1e41c621079a3fa3e9b64505f58edb0d3bab114 100644
--- a/component/ghostscript/buildout.cfg
+++ b/component/ghostscript/buildout.cfg
@@ -2,7 +2,6 @@
 extends =
   ../fontconfig/buildout.cfg
   ../freetype/buildout.cfg
-  ../libjpeg/buildout.cfg
   ../libtiff/buildout.cfg
   ../libxml2/buildout.cfg
   ../pkgconfig/buildout.cfg
diff --git a/component/graphviz/buildout.cfg b/component/graphviz/buildout.cfg
index 8f7f1476e1046870752c65178d07bd85f911d4d6..3fefdc30f711c8e4a3d8bc6358f3193aba222cc4 100644
--- a/component/graphviz/buildout.cfg
+++ b/component/graphviz/buildout.cfg
@@ -6,13 +6,8 @@ parts =
   graphviz
 extends =
   ../bzip2/buildout.cfg
-  ../fontconfig/buildout.cfg
-  ../freetype/buildout.cfg
-  ../libpng/buildout.cfg
-  ../glib/buildout.cfg
   ../gtk-2/buildout.cfg
   ../pkgconfig/buildout.cfg
-  ../xorg/buildout.cfg
   ../zlib/buildout.cfg
 
 [graphviz]
diff --git a/component/gtk-2/buildout.cfg b/component/gtk-2/buildout.cfg
index e210ceb0bf83f7fb354dbb876ca96dcbdf87acaf..0e63cb148e47acf2dc809434603874291cf81855 100644
--- a/component/gtk-2/buildout.cfg
+++ b/component/gtk-2/buildout.cfg
@@ -1,7 +1,6 @@
 [buildout]
 extends =
   ../autoconf/buildout.cfg
-  ../libtool/buildout.cfg
   ../automake/buildout.cfg
   ../bzip2/buildout.cfg
   ../fontconfig/buildout.cfg
@@ -12,7 +11,7 @@ extends =
   ../libjpeg/buildout.cfg
   ../libpng/buildout.cfg
   ../libtiff/buildout.cfg
-  ../libxml2/buildout.cfg
+  ../libtool/buildout.cfg
   ../perl/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../xorg/buildout.cfg
diff --git a/component/gtkmm/buildout.cfg b/component/gtkmm/buildout.cfg
index 4325595466730e346f8e218aec040f362b970442..9b30ed36334c32929260ccdc5419f06eff142660 100644
--- a/component/gtkmm/buildout.cfg
+++ b/component/gtkmm/buildout.cfg
@@ -1,16 +1,14 @@
 [buildout]
 extends =
   ../bzip2/buildout.cfg
-  ../fontconfig/buildout.cfg
   ../freetype/buildout.cfg
   ../glibmm/buildout.cfg
   ../gtk-2/buildout.cfg
-  ../libpng/buildout.cfg
-  ../libxml2/buildout.cfg
   ../perl/buildout.cfg
   ../xorg/buildout.cfg
   ../xz-utils/buildout.cfg
   ../zlib/buildout.cfg
+
 parts =
   gtkmm
 
diff --git a/component/inkscape/buildout.cfg b/component/inkscape/buildout.cfg
index 61b95a56087b84ef4bb4078f88d75e802bf451bd..9025ad7fc84459ad91b367e4db585ab49368583a 100644
--- a/component/inkscape/buildout.cfg
+++ b/component/inkscape/buildout.cfg
@@ -5,7 +5,6 @@ extends =
   ../bzip2/buildout.cfg
   ../freetype/buildout.cfg
   ../garbage-collector/buildout.cfg
-  ../gcc/buildout.cfg
   ../gettext/buildout.cfg
   ../glibmm/buildout.cfg
   ../gtk-2/buildout.cfg
diff --git a/component/libdmtx/buildout.cfg b/component/libdmtx/buildout.cfg
index f4cc1ac6d0232c3589bc8fef5be275cb2d2889f2..f2e33fe3af1826fed6bdaf49e672f973d23dcc06 100644
--- a/component/libdmtx/buildout.cfg
+++ b/component/libdmtx/buildout.cfg
@@ -6,7 +6,6 @@ extends =
   ../bzip2/buildout.cfg
   ../imagemagick/buildout.cfg
   ../jbigkit/buildout.cfg
-  ../libpng/buildout.cfg
   ../zlib/buildout.cfg
 parts =
   libdmtx
diff --git a/component/librsvg/buildout.cfg b/component/librsvg/buildout.cfg
index d4b2b04f5170c1dd94b3750b4f4088a73169e014..178220e363b2a5e6e480adffc5339e979534c465 100644
--- a/component/librsvg/buildout.cfg
+++ b/component/librsvg/buildout.cfg
@@ -2,13 +2,11 @@
 parts = librsvg
 extends =
   ../bzip2/buildout.cfg
-  ../pkgconfig/buildout.cfg
-  ../libpng/buildout.cfg
-  ../libxml2/buildout.cfg
-  ../zlib/buildout.cfg
   ../gtk-2/buildout.cfg
-  ../xorg/buildout.cfg
+  ../libxml2/buildout.cfg
+  ../pkgconfig/buildout.cfg
   ../xz-utils/buildout.cfg
+  ../zlib/buildout.cfg
 
 [libcroco]
 recipe = slapos.recipe.cmmi
diff --git a/component/make/buildout.cfg b/component/make/buildout.cfg
index 77d4cd44e583c442b72015dee1773fc63f6cab18..43d7bc11667e25525a70ec9e8982b26535933796 100644
--- a/component/make/buildout.cfg
+++ b/component/make/buildout.cfg
@@ -1,7 +1,6 @@
 [buildout]
-extends =
-  ../autoconf/buildout.cfg
-  ../automake/buildout.cfg
+parts =
+  make
 
 [make]
 # make 3.82 breaks too many things. Stick with 3.81.
diff --git a/component/poppler/buildout.cfg b/component/poppler/buildout.cfg
index 727810b56d0af4c0f2c9d7c79a3c72bdb0326cb6..b64aa73d947dd075fb6476def548cd5dc8191098 100644
--- a/component/poppler/buildout.cfg
+++ b/component/poppler/buildout.cfg
@@ -3,12 +3,10 @@ parts = poppler
 extends =
   ../bzip2/buildout.cfg
   ../fontconfig/buildout.cfg
-  ../freetype/buildout.cfg
   ../jbigkit/buildout.cfg
   ../libjpeg/buildout.cfg
   ../libpng/buildout.cfg
   ../libtiff/buildout.cfg
-  ../libxml2/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../xz-utils/buildout.cfg
   ../zlib/buildout.cfg