diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index d770531f5d..0059effa95 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -59,8 +59,7 @@ (define-public xeyes
             "04c3md570j67g55h3bix1qbngcslnq91skli51k3g1avki88zkm9"))))
     (build-system gnu-build-system)
     (inputs
-      `(("libx11" ,libx11)
-        ("libxext" ,libxext)
+      `(("libxext" ,libxext)
         ("libxmu" ,libxmu)
         ("libxt" ,libxt)
         ("pkg-config" ,pkg-config)))
@@ -702,8 +701,7 @@ (define-public font-bitstream-type1
             "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"))))
     (build-system gnu-build-system)
     (inputs
-      `(("mkfontscale" ,mkfontscale)
-        ("mkfontdir" ,mkfontdir)
+      `(("mkfontdir" ,mkfontdir)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -953,8 +951,7 @@ (define-public font-misc-ethiopic
             "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"))))
     (build-system gnu-build-system)
     (inputs
-      `(("mkfontscale" ,mkfontscale)
-        ("mkfontdir" ,mkfontdir)
+      `(("mkfontdir" ,mkfontdir)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -1003,8 +1000,7 @@ (define-public font-misc-misc
             "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq"))))
     (build-system gnu-build-system)
     (inputs
-      `(("mkfontscale" ,mkfontscale)
-        ("mkfontdir" ,mkfontdir)
+      `(("mkfontdir" ,mkfontdir)
         ("font-util" ,font-util)
         ("bdftopcf" ,bdftopcf)
         ("pkg-config" ,pkg-config)))
@@ -1055,8 +1051,7 @@ (define-public font-schumacher-misc
             "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74"))))
     (build-system gnu-build-system)
     (inputs
-      `(("mkfontscale" ,mkfontscale)
-        ("mkfontdir" ,mkfontdir)
+      `(("mkfontdir" ,mkfontdir)
         ("font-util" ,font-util)
         ("bdftopcf" ,bdftopcf)
         ("pkg-config" ,pkg-config)))
@@ -1272,8 +1267,7 @@ (define-public iceauth
             "1aq6v671s2x5rc6zn0rgxb4wddg4vq94mckw3cpwl7ccrjjvd5hl"))))
     (build-system gnu-build-system)
     (inputs
-      `(("xproto" ,xproto)
-        ("libice" ,libice)
+      `(("libice" ,libice)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -1493,7 +1487,6 @@ (define-public libsm
     (build-system gnu-build-system)
     (inputs
       `(("xtrans" ,xtrans)
-        ("xproto" ,xproto)
         ("util-linux" ,util-linux)
         ("libice" ,libice)
         ("pkg-config" ,pkg-config)))
@@ -1596,8 +1589,7 @@ (define-public libxft
             "1gdv6559cdz1lfw73x7wsvax1fkvphmayrymprljhyyb5nwk5kkz"))))
     (build-system gnu-build-system)
     (inputs
-      `(("renderproto" ,renderproto)
-        ("libx11" ,libx11)
+      `(("libx11" ,libx11)
         ("xproto" ,xproto)
         ("libxrender" ,libxrender)
         ("xproto" ,xproto)
@@ -1628,7 +1620,6 @@ (define-public libxkbfile
     (build-system gnu-build-system)
     (inputs
       `(("libx11" ,libx11)
-        ("kbproto" ,kbproto)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -1654,9 +1645,7 @@ (define-public libxmu
     (inputs
       `(("libxt" ,libxt)
         ("xproto" ,xproto)
-        ("xextproto" ,xextproto)
         ("libxext" ,libxext)
-        ("libx11" ,libx11)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -1683,9 +1672,7 @@ (define-public libxpm
       `(("gettext" ,gnu:gettext)
         ("libxt" ,libxt)
         ("xproto" ,xproto)
-        ("xextproto" ,xextproto)
         ("libxext" ,libxext)
-        ("libx11" ,libx11)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -1710,7 +1697,6 @@ (define-public libxres
     (build-system gnu-build-system)
     (inputs
       `(("xproto" ,xproto)
-        ("xextproto" ,xextproto)
         ("libxext" ,libxext)
         ("libx11" ,libx11)
         ("resourceproto" ,resourceproto)
@@ -1737,8 +1723,7 @@ (define-public libxscrnsaver
             "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg"))))
     (build-system gnu-build-system)
     (inputs
-      `(("xextproto" ,xextproto)
-        ("libxext" ,libxext)
+      `(("libxext" ,libxext)
         ("libx11" ,libx11)
         ("scrnsaverproto" ,scrnsaverproto)
         ("pkg-config" ,pkg-config)))
@@ -2047,8 +2032,6 @@ (define-public smproxy
     (inputs
       `(("libxt" ,libxt)
         ("libxmu" ,libxmu)
-        ("libsm" ,libsm)
-        ("libice" ,libice)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -2195,7 +2178,6 @@ (define-public xbacklight
       `(("libx11" ,libx11)
         ("libxrandr" ,libxrandr)
         ("libxrender" ,libxrender)
-        ("libxcb" ,libxcb)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -2336,7 +2318,6 @@ (define-public xcursorgen
     (build-system gnu-build-system)
     (inputs
       `(("libxcursor" ,libxcursor)
-        ("libx11" ,libx11)
         ("libpng" ,libpng)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
@@ -2362,17 +2343,14 @@ (define-public xdpyinfo
     (build-system gnu-build-system)
     (inputs
       `(("inputproto" ,inputproto)
+        ("libx11" ,libx11)
         ("libxxf86vm" ,libxxf86vm)
-;;         ("libxxf86misc" ,libxxf86misc)
         ("libxxf86dga" ,libxxf86dga)
         ("libxtst" ,libxtst)
         ("libxrender" ,libxrender)
         ("libxinerama" ,libxinerama)
         ("libxi" ,libxi)
-        ("libxext" ,libxext)
         ("libxcomposite" ,libxcomposite)
-        ("libxcb" ,libxcb)
-        ("libx11" ,libx11)
         ("libdmx" ,libdmx)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
@@ -2398,9 +2376,7 @@ (define-public xdriinfo
     (build-system gnu-build-system)
     (inputs
       `(("mesa" ,mesa)
-        ("glproto" ,glproto)
         ("libx11" ,libx11)
-        ("glproto" ,glproto)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -3546,7 +3522,6 @@ (define-public xinput
         ("libxrandr" ,libxrandr)
         ("libxinerama" ,libxinerama)
         ("libxi" ,libxi)
-        ("libxext" ,libxext)
         ("libx11" ,libx11)
         ("inputproto" ,inputproto)
         ("pkg-config" ,pkg-config)))
@@ -3626,7 +3601,6 @@ (define-public xkbutils
       `(("libxt" ,libxt)
         ("xproto" ,xproto)
         ("libxaw" ,libxaw)
-        ("libx11" ,libx11)
         ("inputproto" ,inputproto)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
@@ -3960,8 +3934,7 @@ (define-public xset
             "1s61mvscd0h7y6anljarj7nkii6plhs8ndx1fm8b1f1h00a1qdv1"))))
     (build-system gnu-build-system)
     (inputs
-      `(;("libxxf86misc" ,libxxf86misc)
-        ("xproto" ,xproto)
+      `(("xproto" ,xproto)
         ("libxmu" ,libxmu)
         ("libxext" ,libxext)
         ("libx11" ,libx11)
@@ -3991,7 +3964,6 @@ (define-public xsetroot
       `(("libxmu" ,libxmu)
         ("libxcursor" ,libxcursor)
         ("xbitmaps" ,xbitmaps)
-        ("libx11" ,libx11)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -4065,7 +4037,6 @@ (define-public xwd
     (inputs
       `(("libxt" ,libxt)
         ("xproto" ,xproto)
-        ("libx11" ,libx11)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -4089,10 +4060,9 @@ (define-public xwininfo
             "0fmcr5yl03xw7m8p9h1rk67rrj7gp5x16a547xhmg8idw2f6r9lg"))))
     (build-system gnu-build-system)
     (inputs
-      `(("xproto" ,xproto)
-        ("libxcb" ,libxcb)
-        ("libx11" ,libx11)
-        ("pkg-config" ,pkg-config)))
+      `(("libx11" ,libx11)
+        ("pkg-config" ,pkg-config)
+        ("xproto" ,xproto)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
@@ -4172,9 +4142,7 @@ (define-public libxdamage
     (inputs
       `(("xproto" ,xproto)
         ("libxfixes" ,libxfixes)
-        ("xextproto" ,xextproto)
         ("libx11" ,libx11)
-        ("fixesproto" ,fixesproto)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -4201,7 +4169,6 @@ (define-public libxext
       `(("xextproto" ,xextproto)))
     (inputs
       `(("libxau" ,libxau)
-        ("xproto" ,xproto)
         ("libx11" ,libx11)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
@@ -4228,8 +4195,7 @@ (define-public libxinerama
     (propagated-inputs
       `(("xineramaproto" ,xineramaproto)))
     (inputs
-      `(("xextproto" ,xextproto)
-        ("libxext" ,libxext)
+      `(("libxext" ,libxext)
         ("libx11" ,libx11)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
@@ -4312,8 +4278,6 @@ (define-public libxtst
       `(("recordproto" ,recordproto)))
     (inputs
       `(("libxi" ,libxi)
-        ("xextproto" ,xextproto)
-        ("libxext" ,libxext)
         ("libx11" ,libx11)
         ("inputproto" ,inputproto)
         ("pkg-config" ,pkg-config)))
@@ -4342,7 +4306,6 @@ (define-public libxv
      `(("videoproto" ,videoproto)))
     (inputs
       `(("xproto" ,xproto)
-        ("xextproto" ,xextproto)
         ("libxext" ,libxext)
         ("libx11" ,libx11)
         ("pkg-config" ,pkg-config)))
@@ -4478,8 +4441,6 @@ (define-public libxaw
     (inputs
       `(("libxt" ,libxt)
         ("xproto" ,xproto)
-        ("xextproto" ,xextproto)
-        ("libx11" ,libx11)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -4506,7 +4467,6 @@ (define-public libxfixes
       `(("fixesproto" ,fixesproto)))
     (inputs
       `(("xproto" ,xproto)
-        ("xextproto" ,xextproto)
         ("libx11" ,libx11)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
@@ -4564,7 +4524,6 @@ (define-public libxi
       `(("libxext" ,libxext)))
     (inputs
       `(("xproto" ,xproto)
-        ("xextproto" ,xextproto)
         ("libx11" ,libx11)
         ("inputproto" ,inputproto)
         ("pkg-config" ,pkg-config)))
@@ -4595,9 +4554,7 @@ (define-public libxrandr
     (inputs
       `(("libxrender" ,libxrender)
         ("xproto" ,xproto)
-        ("xextproto" ,xextproto)
         ("libx11" ,libx11)
-        ("renderproto" ,renderproto)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -4624,10 +4581,8 @@ (define-public libxvmc
       `(("libxv" ,libxv)))
     (inputs
       `(("xproto" ,xproto)
-        ("xextproto" ,xextproto)
         ("libxext" ,libxext)
         ("libx11" ,libx11)
-        ("videoproto" ,videoproto)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -4655,7 +4610,6 @@ (define-public libxxf86vm
         ("xf86vidmodeproto" ,xf86vidmodeproto)))
     (inputs
       `(("libx11" ,libx11)
-        ("libxext" ,libxext)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
@@ -4694,7 +4648,6 @@ (define-public mesa
         ("expat" ,expat)
         ("flex" ,flex)
         ("libx11" ,libx11)
-        ("libxext" ,libxext)
         ("libxfixes" ,libxfixes)
         ("libxml2" ,libxml2)
         ("makedepend" ,makedepend)
@@ -4753,8 +4706,7 @@ (define-public libxcb
       `(("xcb-proto" ,xcb-proto)
         ("libxslt" ,libxslt)
         ("pkg-config" ,pkg-config)
-        ("python" ,python)
-        ("xproto" ,xproto)))
+        ("python" ,python)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
@@ -4795,18 +4747,13 @@ (define-public xorg-server
         ("damageproto" ,damageproto)
         ("dbus" ,dbus)
         ("dmxproto" ,dmxproto)
-        ("glproto" ,glproto)
         ("libdmx" ,libdmx)
-        ("libx11" ,libx11)
         ("libxau" ,libxau)
         ("libxaw" ,libxaw)
         ("libxdmcp" ,libxdmcp)
-        ("libxext" ,libxext)
         ("libxfixes" ,libxfixes)
         ("libxfont" ,libxfont)
         ("libxkbfile" ,libxkbfile)
-        ("libxmu" ,libxmu)
-        ("libxpm" ,libxpm)
         ("libxrender" ,libxrender)
         ("libxres" ,libxres)
         ("libxt" ,libxt)
@@ -4823,7 +4770,6 @@ (define-public xorg-server
         ("xf86dgaproto" ,xf86dgaproto)
         ("xf86driproto" ,xf86driproto)
         ("xf86vidmodeproto" ,xf86vidmodeproto)
-;;        ("xkbcomp" ,xkbcomp)
 ;;        ("xkbutils" ,xkbutils)
 ;;        ("xkeyboard-config" ,xkeyboard-config)
         ("xtrans" ,xtrans)
@@ -4859,7 +4805,6 @@ (define-public libx11
         ("libxcb" ,libxcb)))
     (inputs
       `(("inputproto" ,inputproto)
-        ("libxcb" ,libxcb)
         ("pkg-config" ,pkg-config)
         ("xextproto" ,xextproto)
         ("xtrans" ,xtrans)))
@@ -4892,8 +4837,7 @@ (define-public libxcursor
         ("libxfixes" ,libxfixes)
         ("xproto" ,xproto)))
     (inputs
-      `(("fixesproto" ,fixesproto)
-        ("pkg-config" ,pkg-config)))
+      `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")
     (description "X.org provides an implementation of the X Window System")
@@ -4920,9 +4864,7 @@ (define-public libxt
         ("libice" ,libice)
         ("libsm" ,libsm)))
     (inputs
-      `(("xproto" ,xproto)
-        ("libx11" ,libx11)
-        ("kbproto" ,kbproto)
+      `(("libx11" ,libx11)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
     (synopsis "xorg implementation of the X Window System")