diff --git a/srcpkgs/MesaLib/MesaLib-devel.template b/srcpkgs/MesaLib/MesaLib-devel.template
index 55722ef012..ed968b7cc5 100644
--- a/srcpkgs/MesaLib/MesaLib-devel.template
+++ b/srcpkgs/MesaLib/MesaLib-devel.template
@@ -5,6 +5,23 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run pkg-config
+Add_dependency run glproto
+Add_dependency run dri2proto	">=2.1"
+Add_dependency run makedepend
+Add_dependency run libdrm-devel	">=2.4.15"
+Add_dependency run expat-devel
+Add_dependency run libICE-devel
+Add_dependency run libSM-devel
+Add_dependency run libX11-devel
+Add_dependency run libxcb-devel
+Add_dependency run libXdamage-devel
+Add_dependency run libXext-devel
+Add_dependency run libXfixes-devel
+Add_dependency run libXt-devel
+Add_dependency run libXxf86vm-devel
 Add_dependency run MesaLib
 
 do_install()
diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template
index 65434a07d4..d02c98dded 100644
--- a/srcpkgs/MesaLib/template
+++ b/srcpkgs/MesaLib/template
@@ -21,22 +21,34 @@ long_desc="
  compatible replacement for OpenGL or associated with Silicon Graphics, Inc."
 
 subpackages="$pkgname-devel glx-utils"
+Add_dependency run glibc
+Add_dependency run libdrm	">=2.4.15"
+Add_dependency run expat
+Add_dependency run libICE
+Add_dependency run libSM
+Add_dependency run libstdc++
+Add_dependency run libX11
+Add_dependency run libxcb
+Add_dependency run libXdamage
+Add_dependency run libXext
+Add_dependency run libXfixes
+Add_dependency run libXt
+Add_dependency run libXxf86vm
 Add_dependency build pkg-config
 Add_dependency build glproto
 Add_dependency build dri2proto	">=2.1"
 Add_dependency build makedepend
-Add_dependency full glibc
-Add_dependency full expat
-Add_dependency full libdrm	">=2.4.15"
-Add_dependency full libX11
-Add_dependency full libXext
-Add_dependency full libXt
-Add_dependency full libXmu
-Add_dependency full libXi
-Add_dependency full libXfixes
-Add_dependency full libXdamage
-Add_dependency full libXxf86vm
-Add_dependency run  libstdc++
+Add_dependency build libdrm-devel	">=2.4.15"
+Add_dependency build expat-devel
+Add_dependency build libICE-devel
+Add_dependency build libSM-devel
+Add_dependency build libX11-devel
+Add_dependency build libxcb-devel
+Add_dependency build libXdamage-devel
+Add_dependency build libXext-devel
+Add_dependency build libXfixes-devel
+Add_dependency build libXt-devel
+Add_dependency build libXxf86vm-devel
 
 post_install()
 {
diff --git a/srcpkgs/atk/atk-devel.template b/srcpkgs/atk/atk-devel.template
index c49147e02e..99408b2266 100644
--- a/srcpkgs/atk/atk-devel.template
+++ b/srcpkgs/atk/atk-devel.template
@@ -5,6 +5,9 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run glib-devel
 Add_dependency run atk
 
 do_install()
diff --git a/srcpkgs/atk/template b/srcpkgs/atk/template
index 90ef826627..9695e9f8f8 100644
--- a/srcpkgs/atk/template
+++ b/srcpkgs/atk/template
@@ -20,5 +20,6 @@ long_desc="
 
 subpackages="$pkgname-devel"
 Add_dependency build pkg-config
-Add_dependency full glibc
-Add_dependency full glib
+Add_dependency build glib-devel
+Add_dependency run glibc
+Add_dependency run glib
diff --git a/srcpkgs/cairo/cairo-devel.template b/srcpkgs/cairo/cairo-devel.template
index 16d9f4e46d..38b3f33a6c 100644
--- a/srcpkgs/cairo/cairo-devel.template
+++ b/srcpkgs/cairo/cairo-devel.template
@@ -5,6 +5,17 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run fontconfig-devel
+Add_dependency run freetype-devel
+Add_dependency run glitz-devel
+Add_dependency run pixman-devel
+Add_dependency run libpng-devel
+Add_dependency run libX11-devel
+Add_dependency run xcb-util-devel
+Add_dependency run libXrender-devel
+Add_dependency run zlib-devel
 Add_dependency run cairo
 
 do_install()
diff --git a/srcpkgs/cairo/template b/srcpkgs/cairo/template
index 25bb20656c..11a5e1a7b1 100644
--- a/srcpkgs/cairo/template
+++ b/srcpkgs/cairo/template
@@ -23,14 +23,23 @@ long_desc="
  antialiased text rendering."
 
 subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run fontconfig
+Add_dependency run freetype
+Add_dependency run glitz
+Add_dependency run pixman
+Add_dependency run libpng
+Add_dependency run libX11
+Add_dependency run xcb-util
+Add_dependency run libXrender
+Add_dependency run zlib
 Add_dependency build pkg-config
-Add_dependency full glibc
-Add_dependency full zlib
-Add_dependency full libpng
-Add_dependency full fontconfig
-Add_dependency full freetype
-Add_dependency full pixman
-Add_dependency full glitz
-Add_dependency full xcb-util
-Add_dependency full libX11
-Add_dependency full libXrender
+Add_dependency build fontconfig-devel
+Add_dependency build freetype-devel
+Add_dependency build glitz-devel
+Add_dependency build pixman-devel
+Add_dependency build libpng-devel
+Add_dependency build libX11-devel
+Add_dependency build xcb-util-devel
+Add_dependency build libXrender-devel
+Add_dependency build zlib-devel
diff --git a/srcpkgs/glib/glib-devel.template b/srcpkgs/glib/glib-devel.template
index eeda973248..e06c43a5c4 100644
--- a/srcpkgs/glib/glib-devel.template
+++ b/srcpkgs/glib/glib-devel.template
@@ -5,6 +5,9 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run pcre-devel
 Add_dependency run glib
 
 do_install()
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 75620a97ba..40f435a35c 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -13,7 +13,8 @@ long_desc="
  C library used by projects such as GTK+, GIMP and GNOME."
 
 subpackages="glib-devel"
-Add_dependency full glibc
-Add_dependency full pcre
+Add_dependency run glibc
+Add_dependency run pcre
 Add_dependency build gettext
 Add_dependency build pkg-config
+Add_dependency build pcre-devel
diff --git a/srcpkgs/gtk+/gtk+-devel.template b/srcpkgs/gtk+/gtk+-devel.template
index 8d2e409ad1..76b2028a51 100644
--- a/srcpkgs/gtk+/gtk+-devel.template
+++ b/srcpkgs/gtk+/gtk+-devel.template
@@ -5,6 +5,27 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run atk-devel
+Add_dependency run cairo-devel
+Add_dependency run fontconfig-devel
+Add_dependency run freetype-devel
+Add_dependency run glib-devel
+Add_dependency run jpeg-devel
+Add_dependency run pango-devel
+Add_dependency run libpng-devel
+Add_dependency run tiff-devel
+Add_dependency run libX11-devel
+Add_dependency run libXcomposite-devel
+Add_dependency run libXcursor-devel
+Add_dependency run libXdamage-devel
+Add_dependency run libXext-devel
+Add_dependency run libXfixes-devel
+Add_dependency run libXinerama-devel
+Add_dependency run libXi-devel
+Add_dependency run libXrandr-devel
+Add_dependency run libXrender-devel
 Add_dependency run gtk+
 Add_dependency run python
 
diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 1f777a2873..e9c90577e8 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,6 +1,7 @@
 # Template build file for 'gtk+'.
 pkgname=gtk+
 version=2.18.3
+revision=1
 distfiles="${GNOME_SITE}/gtk+/2.18/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-cups --with-xinput"
@@ -20,31 +21,48 @@ long_desc="
 
 conf_files="/etc/gtk-2.0/im-multipress.conf"
 triggers="gtk-pixbuf-loaders gtk-immodules"
-
 subpackages="$pkgname-devel"
+
+Add_dependency run atk
+Add_dependency run cairo
+Add_dependency run glibc
+Add_dependency run fontconfig
+Add_dependency run freetype
+Add_dependency run glib
+Add_dependency run jpeg
+Add_dependency run pango
+Add_dependency run libpng
+Add_dependency run tiff
+Add_dependency run shared-mime-info
+Add_dependency run libX11
+Add_dependency run libXcomposite
+Add_dependency run libXcursor
+Add_dependency run libXdamage
+Add_dependency run libXext
+Add_dependency run libXfixes
+Add_dependency run libXinerama
+Add_dependency run libXi
+Add_dependency run libXrandr
+Add_dependency run libXrender
+
 Add_dependency build pkg-config
 Add_dependency build perl
-Add_dependency full glibc
-Add_dependency full expat
-Add_dependency full glib
-Add_dependency full atk
-Add_dependency full pango
-Add_dependency full fontconfig
-Add_dependency full freetype
-Add_dependency full jpeg
-Add_dependency full libpng
-Add_dependency full tiff
-Add_dependency full jasper
-Add_dependency full shared-mime-info
-Add_dependency full pixman
-Add_dependency full libX11
-Add_dependency full libXcursor
-Add_dependency full libXft
-Add_dependency full libXfixes
-Add_dependency full libXinerama
-Add_dependency full libXi
-Add_dependency full libXrandr
-Add_dependency full libXrender
-Add_dependency full libXt
-Add_dependency full libXext
-Add_dependency full libXcomposite
+Add_dependency build atk-devel
+Add_dependency build cairo-devel
+Add_dependency build fontconfig-devel
+Add_dependency build freetype-devel
+Add_dependency build glib-devel
+Add_dependency build jpeg-devel
+Add_dependency build pango-devel
+Add_dependency build libpng-devel
+Add_dependency build tiff-devel
+Add_dependency build libX11-devel
+Add_dependency build libXcomposite-devel
+Add_dependency build libXcursor-devel
+Add_dependency build libXdamage-devel
+Add_dependency build libXext-devel
+Add_dependency build libXfixes-devel
+Add_dependency build libXinerama-devel
+Add_dependency build libXi-devel
+Add_dependency build libXrandr-devel
+Add_dependency build libXrender-devel
diff --git a/srcpkgs/libX11/libX11-devel.template b/srcpkgs/libX11/libX11-devel.template
index a7e4fb3224..615fb36aa7 100644
--- a/srcpkgs/libX11/libX11-devel.template
+++ b/srcpkgs/libX11/libX11-devel.template
@@ -5,6 +5,20 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run pkg-config
+Add_dependency run xproto
+Add_dependency run xextproto
+Add_dependency run xtrans
+Add_dependency run xcmiscproto
+Add_dependency run kbproto
+Add_dependency run bigreqsproto
+Add_dependency run inputproto
+Add_dependency run xf86bigfontproto
+Add_dependency run libXdmcp-devel
+Add_dependency run libXau-devel
+Add_dependency run libxcb-devel
 Add_dependency run libX11
 
 do_install()
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 75cb1297c7..1fad79d838 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -14,6 +14,10 @@ long_desc="
  This is from the modular X.org X11 project."
 
 subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run libXdmcp
+Add_dependency run libXau
+Add_dependency run libxcb
 Add_dependency build pkg-config
 Add_dependency build xproto
 Add_dependency build xextproto
@@ -23,7 +27,6 @@ Add_dependency build kbproto
 Add_dependency build bigreqsproto
 Add_dependency build inputproto
 Add_dependency build xf86bigfontproto
-Add_dependency full glibc
-Add_dependency full libXdmcp
-Add_dependency full libXau
-Add_dependency full libxcb
+Add_dependency build libXdmcp-devel
+Add_dependency build libXau-devel
+Add_dependency build libxcb-devel
diff --git a/srcpkgs/libXau/libXau-devel.template b/srcpkgs/libXau/libXau-devel.template
index 0504b5e722..e950fac8ca 100644
--- a/srcpkgs/libXau/libXau-devel.template
+++ b/srcpkgs/libXau/libXau-devel.template
@@ -5,6 +5,9 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run xproto
 Add_dependency run libXau
 
 do_install()
diff --git a/srcpkgs/libXau/template b/srcpkgs/libXau/template
index 5b2b4b0f89..438248520a 100644
--- a/srcpkgs/libXau/template
+++ b/srcpkgs/libXau/template
@@ -11,6 +11,6 @@ long_desc="
  X.org X11 project."
 
 subpackages="$pkgname-devel"
-Add_dependency full glibc
+Add_dependency run glibc
 Add_dependency build pkg-config
 Add_dependency build xproto
diff --git a/srcpkgs/libXcomposite/libXcomposite-devel.template b/srcpkgs/libXcomposite/libXcomposite-devel.template
index b7e5a3d5a9..8ff8330da4 100644
--- a/srcpkgs/libXcomposite/libXcomposite-devel.template
+++ b/srcpkgs/libXcomposite/libXcomposite-devel.template
@@ -5,6 +5,15 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run pkg-config
+Add_dependency run xproto
+Add_dependency run fixesproto
+Add_dependency run compositeproto
+Add_dependency run libX11-devel
+Add_dependency run libXext-devel
+Add_dependency run libXfixes-devel
 Add_dependency run libXcomposite
 
 do_install()
diff --git a/srcpkgs/libXcomposite/template b/srcpkgs/libXcomposite/template
index 5f8e73657d..bc9bd3ea76 100644
--- a/srcpkgs/libXcomposite/template
+++ b/srcpkgs/libXcomposite/template
@@ -11,11 +11,14 @@ long_desc="
  Library. This is from the modular X.org project."
 
 subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run libX11
+Add_dependency run libXext
+Add_dependency run libXfixes
 Add_dependency build pkg-config
 Add_dependency build xproto
 Add_dependency build fixesproto
 Add_dependency build compositeproto
-Add_dependency full glibc
-Add_dependency full libX11
-Add_dependency full libXext
-Add_dependency full libXfixes
+Add_dependency build libX11-devel
+Add_dependency build libXext-devel
+Add_dependency build libXfixes-devel
diff --git a/srcpkgs/libXdamage/libXdamage-devel.template b/srcpkgs/libXdamage/libXdamage-devel.template
index 4bab5564b1..79a74e93f8 100644
--- a/srcpkgs/libXdamage/libXdamage-devel.template
+++ b/srcpkgs/libXdamage/libXdamage-devel.template
@@ -5,6 +5,13 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run pkg-config
+Add_dependency run xproto
+Add_dependency run damageproto
+Add_dependency run libX11-devel
+Add_dependency run libXfixes-devel
 Add_dependency run libXdamage
 
 do_install()
diff --git a/srcpkgs/libXdamage/template b/srcpkgs/libXdamage/template
index 0bed4ea2ea..a0de1a88ab 100644
--- a/srcpkgs/libXdamage/template
+++ b/srcpkgs/libXdamage/template
@@ -10,9 +10,11 @@ long_desc="
  This package contains the Xdamage extension."
 
 subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run libX11
+Add_dependency run libXfixes
 Add_dependency build pkg-config
 Add_dependency build xproto
 Add_dependency build damageproto
-Add_dependency full glibc
-Add_dependency full libX11
-Add_dependency full libXfixes
+Add_dependency build libX11-devel
+Add_dependency build libXfixes-devel
diff --git a/srcpkgs/libXdmcp/libXdmcp-devel.template b/srcpkgs/libXdmcp/libXdmcp-devel.template
index 583fe3e8a1..cb347ea300 100644
--- a/srcpkgs/libXdmcp/libXdmcp-devel.template
+++ b/srcpkgs/libXdmcp/libXdmcp-devel.template
@@ -5,6 +5,9 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run xproto
 Add_dependency run libXdmcp
 
 do_install()
diff --git a/srcpkgs/libXdmcp/template b/srcpkgs/libXdmcp/template
index 8bfbe6c97d..7bc99a7350 100644
--- a/srcpkgs/libXdmcp/template
+++ b/srcpkgs/libXdmcp/template
@@ -11,6 +11,6 @@ long_desc="
  from the modular X.org X11 project."
 
 subpackages="$pkgname-devel"
-Add_dependency full glibc
+Add_dependency run glibc
 Add_dependency build pkg-config
 Add_dependency build xproto
diff --git a/srcpkgs/libXfixes/libXfixes-devel.template b/srcpkgs/libXfixes/libXfixes-devel.template
index 94682b2615..057507c4ad 100644
--- a/srcpkgs/libXfixes/libXfixes-devel.template
+++ b/srcpkgs/libXfixes/libXfixes-devel.template
@@ -5,6 +5,12 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run pkg-config
+Add_dependency run xproto
+Add_dependency run fixesproto
+Add_dependency run libX11-devel
 Add_dependency run libXfixes
 
 do_install()
diff --git a/srcpkgs/libXfixes/template b/srcpkgs/libXfixes/template
index ad12220e78..0ff2cb989c 100644
--- a/srcpkgs/libXfixes/template
+++ b/srcpkgs/libXfixes/template
@@ -16,8 +16,9 @@ long_desc="
  X11 project."
 
 subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run libX11
 Add_dependency build pkg-config
 Add_dependency build xproto
 Add_dependency build fixesproto
-Add_dependency full glibc
-Add_dependency full libX11
+Add_dependency build libX11-devel
diff --git a/srcpkgs/libXrender/libXrender-devel.template b/srcpkgs/libXrender/libXrender-devel.template
index e15c9ac31a..540169499b 100644
--- a/srcpkgs/libXrender/libXrender-devel.template
+++ b/srcpkgs/libXrender/libXrender-devel.template
@@ -5,6 +5,10 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run renderproto
+Add_dependency run libX11-devel
 Add_dependency run libXrender
 
 do_install()
diff --git a/srcpkgs/libXrender/template b/srcpkgs/libXrender/template
index 8ca3577dbb..28b472f423 100644
--- a/srcpkgs/libXrender/template
+++ b/srcpkgs/libXrender/template
@@ -19,7 +19,8 @@ long_desc="
  This is the modular X.org X11 project version."
 
 subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run libX11
 Add_dependency build pkg-config
 Add_dependency build renderproto
-Add_dependency full glibc
-Add_dependency full libX11
+Add_dependency build libX11-devel
diff --git a/srcpkgs/libXxf86vm/libXxf86vm-devel.template b/srcpkgs/libXxf86vm/libXxf86vm-devel.template
index 826e9ef5bc..e94aee596e 100644
--- a/srcpkgs/libXxf86vm/libXxf86vm-devel.template
+++ b/srcpkgs/libXxf86vm/libXxf86vm-devel.template
@@ -5,6 +5,14 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run pkg-config
+Add_dependency run xproto
+Add_dependency run xextproto
+Add_dependency run xf86vidmodeproto
+Add_dependency run libX11-devel
+Add_dependency run libXext-devel
 Add_dependency run libXxf86vm
 
 do_install()
diff --git a/srcpkgs/libXxf86vm/template b/srcpkgs/libXxf86vm/template
index aecc4fcff4..fd930fb037 100644
--- a/srcpkgs/libXxf86vm/template
+++ b/srcpkgs/libXxf86vm/template
@@ -14,10 +14,12 @@ long_desc="
  This library is from the modular X.org project."
 
 subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run libX11
+Add_dependency run libXext
 Add_dependency build pkg-config
 Add_dependency build xproto
 Add_dependency build xextproto
 Add_dependency build xf86vidmodeproto
-Add_dependency full glibc
-Add_dependency full libX11
-Add_dependency full libXext
+Add_dependency build libX11-devel
+Add_dependency build libXext-devel
diff --git a/srcpkgs/libxcb/libxcb-devel.template b/srcpkgs/libxcb/libxcb-devel.template
index ce11cd2d7a..b3982c749c 100644
--- a/srcpkgs/libxcb/libxcb-devel.template
+++ b/srcpkgs/libxcb/libxcb-devel.template
@@ -5,6 +5,11 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run python
+Add_dependency run libXdmcp-devel
+Add_dependency run libXau-devel
 Add_dependency run libxcb
 
 do_install()
diff --git a/srcpkgs/libxcb/template b/srcpkgs/libxcb/template
index e2ce62d4e5..53a2ab33c5 100644
--- a/srcpkgs/libxcb/template
+++ b/srcpkgs/libxcb/template
@@ -20,10 +20,12 @@ long_desc="
  requests and receive responses with both, which eases porting to XCB."
  
 subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run libXdmcp
+Add_dependency run libXau
 Add_dependency build pkg-config
 Add_dependency build python
-Add_dependency build libxslt
+Add_dependency build libxslt-devel
 Add_dependency build xcb-proto ">=1.6"
-Add_dependency full glibc
-Add_dependency full libXdmcp
-Add_dependency full libXau
+Add_dependency build libXdmcp-devel
+Add_dependency build libXau-devel
diff --git a/srcpkgs/pango/pango-devel.template b/srcpkgs/pango/pango-devel.template
index 7123c70a90..561ec47dd3 100644
--- a/srcpkgs/pango/pango-devel.template
+++ b/srcpkgs/pango/pango-devel.template
@@ -5,6 +5,16 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run pkg-config
+Add_dependency run gobject-introspection
+Add_dependency run glib-devel
+Add_dependency run cairo-devel
+Add_dependency run fontconfig-devel
+Add_dependency run freetype-devel
+Add_dependency run libXft-devel
+Add_dependency run libXrender-devel
 Add_dependency run pango
 
 do_install()
diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template
index 29d5f30221..c801fa43e0 100644
--- a/srcpkgs/pango/template
+++ b/srcpkgs/pango/template
@@ -1,6 +1,7 @@
 # Template build file for 'pango'.
 pkgname=pango
 version=1.26.1
+revision=1
 distfiles="${GNOME_SITE}/pango/1.26/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--localstatedir=/var"
@@ -32,16 +33,21 @@ long_desc="
 subpackages="$pkgname-devel"
 triggers="pango-modules"
 
+Add_dependency run glibc
+Add_dependency run glib
+Add_dependency run cairo
+Add_dependency run fontconfig
+Add_dependency run freetype
+Add_dependency run libX11
+Add_dependency run libXft
+Add_dependency run libXrender
 Add_dependency build pkg-config
 Add_dependency build gobject-introspection
-Add_dependency full glibc
-Add_dependency full glib
-Add_dependency full zlib
-Add_dependency full fontconfig
-Add_dependency full freetype
-Add_dependency full cairo
-Add_dependency full libX11
-Add_dependency full libXt
-Add_dependency full libXft
-Add_dependency full libXrender
+Add_dependency build glib-devel
+Add_dependency build cairo-devel
+Add_dependency build fontconfig-devel
+Add_dependency build freetype-devel
+Add_dependency build libX11-devel
+Add_dependency build libXft-devel
+Add_dependency build libXrender-devel
 # XXX Add missing dependency libthai.
diff --git a/srcpkgs/xcb-util/template b/srcpkgs/xcb-util/template
index f6e61ca3f0..703f053551 100644
--- a/srcpkgs/xcb-util/template
+++ b/srcpkgs/xcb-util/template
@@ -27,7 +27,8 @@ long_desc="
  wm: Framework for window manager implementation."
 
 subpackages="$pkgname-devel"
+Add_dependency run glibc
+Add_dependency run libxcb
 Add_dependency build pkg-config
 Add_dependency build gperf
-Add_dependency full glibc
-Add_dependency full libxcb
+Add_dependency build libxcb
diff --git a/srcpkgs/xcb-util/xcb-util-devel.template b/srcpkgs/xcb-util/xcb-util-devel.template
index e5db5a8e63..52e8b413e5 100644
--- a/srcpkgs/xcb-util/xcb-util-devel.template
+++ b/srcpkgs/xcb-util/xcb-util-devel.template
@@ -5,6 +5,9 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run libxcb-devel
 Add_dependency run xcb-util
 
 do_install()