diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index 92fd7282be7f5d7ea1b1a0b8a38cc22a88c93906..e207ae65d6a429dbeef29677f2fd3bd0c214b90e 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -160,7 +160,7 @@ (define-public dvdisaster
     (build-system gnu-build-system)
     (inputs
      `(("gettext" ,gnu:gettext)
-       ("gtk+" ,gtk+)
+       ("gtk+" ,gtk+-2)
        ("pkg-config" ,pkg-config)
        ("which" ,which)))
     (arguments
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index e517dc85e11406dfa3cee007cff93fb4ea529807..8554cc3f015810ced550e5b9227125bfd15bcd70 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -72,7 +72,7 @@ (define-public emacs
 
        ;; TODO: Add the optional dependencies.
        ("xlibs" ,libx11)
-       ("gtk+" ,gtk+)
+       ("gtk+" ,gtk+-2)
        ("libXft" ,libxft)
        ("libtiff" ,libtiff)
        ;; ("libungif" ,libungif)
diff --git a/gnu/packages/geeqie.scm b/gnu/packages/geeqie.scm
index 54b3a05c3fe6ba2b6b04769eb11282836ad9ba5f..9f182e95beaeb68402a435b45cf89b0806a4a18f 100644
--- a/gnu/packages/geeqie.scm
+++ b/gnu/packages/geeqie.scm
@@ -76,7 +76,7 @@ (define-public geeqie
        ("lcms" ,lcms)
        ("exiv2" ,exiv2)
        ("libpng" ,libpng)
-       ("gtk+" ,gtk+)
+       ("gtk+" ,gtk+-2)
        ("pkg-config" ,pkg-config)))
     (home-page "http://geeqie.sourceforge.net")
     (synopsis "Lightweight GTK+ based image viewer")
diff --git a/gnu/packages/gkrellm.scm b/gnu/packages/gkrellm.scm
index b57ab3212af145ecc5eda95068f93cfd4a02edb2..f53b4fc8917c38f0eb7bded01f20c359ba9b87ca 100644
--- a/gnu/packages/gkrellm.scm
+++ b/gnu/packages/gkrellm.scm
@@ -43,7 +43,7 @@ (define-public gkrellm
     (build-system gnu-build-system)
     (inputs
      `(("gettext" ,gnu:gettext)
-       ("gtk+" ,gtk+)
+       ("gtk+" ,gtk+-2)
        ("libice" ,libice)
        ("libsm" ,libsm)))
     (native-inputs
diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm
index ee7f938e45af735018f7cc6cdc968b860dce3bc0..2d103b9d8db77481ea4b5c461d8a80a87f612387 100644
--- a/gnu/packages/mp3.scm
+++ b/gnu/packages/mp3.scm
@@ -250,7 +250,7 @@ (define-public ripperx
    (inputs
     `(("patch/libm" ,(search-patch "ripperx-libm.patch"))
       ("glib" ,glib)
-      ("gtk+" ,gtk+)
+      ("gtk+" ,gtk+-2)
       ("id3lib" ,id3lib)
       ("pkg-config" ,pkg-config)))
    (arguments
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index b7df902136a5e90cfc16a8c8a47802f7d2dc3b19..1351e1a4bbb98d90a4b40c6420563075a1b463e6 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -35,7 +35,6 @@ (define-module (gnu packages scheme)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages libffi)
   #:use-module (gnu packages libjpeg)
-  #:use-module ((gnu packages gtk) #:select (cairo pango))
   #:use-module (ice-9 match))
 
 (define-public mit-scheme