8 files changed, 16 insertions, 18 deletions

diff --git a/gnu.scm b/gnu.scm
index 5f593bd5694..b95082f42e1 100644
--- a/gnu.scm
+++ b/gnu.scm
@@ -20,7 +20,6 @@
 
 (define-module (gnu)
   #:use-module (guix i18n)
-  #:use-module ((guix utils) #:select (&fix-hint))
   #:use-module (guix diagnostics)
   #:use-module (srfi srfi-34)
   #:use-module (srfi srfi-35)
diff --git a/gnu/system/mapped-devices.scm b/gnu/system/mapped-devices.scm
index c3f98302ad7..00f235e6b62 100644
--- a/gnu/system/mapped-devices.scm
+++ b/gnu/system/mapped-devices.scm
@@ -23,7 +23,7 @@
   #:use-module (guix records)
   #:use-module ((guix modules) #:hide (file-name->module-name))
   #:use-module (guix i18n)
-  #:use-module ((guix utils)
+  #:use-module ((guix diagnostics)
                 #:select (source-properties->location
                           &fix-hint
                           &error-location))
diff --git a/guix/channels.scm b/guix/channels.scm
index bbabf654a97..21a2fdb631b 100644
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -40,10 +40,6 @@
   #:use-module (guix sets)
   #:use-module (guix store)
   #:use-module (guix i18n)
-  #:use-module ((guix utils)
-                #:select (source-properties->location
-                          &error-location
-                          &fix-hint))
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-2)
   #:use-module (srfi srfi-9)
diff --git a/guix/diagnostics.scm b/guix/diagnostics.scm
index 8b24b1b9942..3096d384d81 100644
--- a/guix/diagnostics.scm
+++ b/guix/diagnostics.scm
@@ -43,6 +43,10 @@
             error-location?
             error-location
 
+            &fix-hint
+            fix-hint?
+            condition-fix-hint
+
             guix-warning-port
             program-name))
 
@@ -225,6 +229,10 @@ a location object."
   error-location?
   (location  error-location))                     ;<location>
 
+(define-condition-type &fix-hint &condition
+  fix-hint?
+  (hint condition-fix-hint))                      ;string
+
 
 (define guix-warning-port
   (make-parameter (current-warning-port)))
diff --git a/guix/profiles.scm b/guix/profiles.scm
index f34f73e17ea..0619e735fbf 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -32,6 +32,7 @@
   #:use-module ((guix utils) #:hide (package-name->name+version))
   #:use-module ((guix build utils)
                 #:select (package-name->name+version mkdir-p))
+  #:use-module ((guix diagnostics) #:select (&fix-hint))
   #:use-module (guix i18n)
   #:use-module (guix records)
   #:use-module (guix packages)
diff --git a/guix/scripts/system/reconfigure.scm b/guix/scripts/system/reconfigure.scm
index 9013e035f70..a2570839a80 100644
--- a/guix/scripts/system/reconfigure.scm
+++ b/guix/scripts/system/reconfigure.scm
@@ -39,7 +39,6 @@
   #:autoload   (guix git) (update-cached-checkout)
   #:use-module (guix i18n)
   #:use-module (guix diagnostics)
-  #:use-module ((guix utils) #:select (&fix-hint))
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-11)
diff --git a/guix/ssh.scm b/guix/ssh.scm
index b9e6ff8564b..418443992b6 100644
--- a/guix/ssh.scm
+++ b/guix/ssh.scm
@@ -20,7 +20,7 @@
   #:use-module (guix store)
   #:use-module (guix inferior)
   #:use-module (guix i18n)
-  #:use-module ((guix utils) #:select (&fix-hint))
+  #:use-module ((guix diagnostics) #:select (&fix-hint))
   #:use-module (gcrypt pk-crypto)
   #:use-module (ssh session)
   #:use-module (ssh auth)
diff --git a/guix/utils.scm b/guix/utils.scm
index 8198204ade5..436c5cd0931 100644
--- a/guix/utils.scm
+++ b/guix/utils.scm
@@ -29,7 +29,6 @@
   #:use-module (srfi srfi-9)
   #:use-module (srfi srfi-11)
   #:use-module (srfi srfi-26)
-  #:use-module (srfi srfi-35)
   #:use-module (srfi srfi-39)
   #:use-module (ice-9 ftw)
   #:use-module (rnrs io ports)                    ;need 'port-position' etc.
@@ -55,7 +54,11 @@
 
                &error-location
                error-location?
-               error-location)
+               error-location
+
+               &fix-hint
+               fix-hint?
+               condition-fix-hint)
   #:export (strip-keyword-arguments
             default-keyword-arguments
             substitute-keyword-arguments
@@ -63,10 +66,6 @@
 
             current-source-directory
 
-            &fix-hint
-            fix-hint?
-            condition-fix-hint
-
             nix-system->gnu-triplet
             gnu-triplet->nix-system
             %current-system
@@ -833,10 +832,6 @@ be determined."
           ;; raising an error would upset Geiser users
           #f))))))
 
-(define-condition-type &fix-hint &condition
-  fix-hint?
-  (hint condition-fix-hint))                      ;string
-
 ;;; Local Variables:
 ;;; eval: (put 'call-with-progress-reporter 'scheme-indent-function 1)
 ;;; End: