6 files changed, 14 insertions, 1 deletions
diff --git a/guix/build/asdf-build-system.scm b/guix/build/asdf-build-system.scm
index a47e825439..92154e7d34 100644
--- a/guix/build/asdf-build-system.scm
+++ b/guix/build/asdf-build-system.scm
@@ -24,7 +24,11 @@
   #:use-module (guix build union)
   #:use-module (guix build lisp-utils)
   #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-11)
   #:use-module (srfi srfi-26)
+  #:use-module (ice-9 rdelim)
+  #:use-module (ice-9 receive)
+  #:use-module (ice-9 regex)
   #:use-module (ice-9 match)
   #:use-module (ice-9 format)
   #:use-module (ice-9 ftw)
diff --git a/guix/build/elm-build-system.scm b/guix/build/elm-build-system.scm
index 87a426e2a9..02d7c029dd 100644
--- a/guix/build/elm-build-system.scm
+++ b/guix/build/elm-build-system.scm
@@ -23,6 +23,7 @@
   #:use-module (guix build union)
   #:use-module (ice-9 ftw)
   #:use-module (ice-9 rdelim)
+  #:use-module (ice-9 regex)
   #:use-module (ice-9 match)
   #:use-module (ice-9 popen)
   #:use-module (ice-9 vlist)
diff --git a/guix/build/guile-build-system.scm b/guix/build/guile-build-system.scm
index a293b3f624..32a431d347 100644
--- a/guix/build/guile-build-system.scm
+++ b/guix/build/guile-build-system.scm
@@ -26,7 +26,6 @@
   #:use-module (ice-9 rdelim)
   #:use-module (ice-9 regex)
   #:use-module (ice-9 format)
-  #:autoload   (ice-9 threads) (current-processor-count)
   #:use-module (guix build utils)
   #:export (target-guile-effective-version
             %standard-phases
diff --git a/guix/build/lisp-utils.scm b/guix/build/lisp-utils.scm
index 2ebd4bec9b..646d4a3365 100644
--- a/guix/build/lisp-utils.scm
+++ b/guix/build/lisp-utils.scm
@@ -20,9 +20,11 @@
 
 (define-module (guix build lisp-utils)
   #:use-module (ice-9 format)
+  #:use-module (ice-9 hash-table)
   #:use-module (ice-9 match)
   #:use-module (ice-9 regex)
   #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-26)
   #:use-module (guix build utils)
   #:export (%lisp
             %lisp-type
diff --git a/guix/build/make-bootstrap.scm b/guix/build/make-bootstrap.scm
index ffa8de175c..0d29338ce3 100644
--- a/guix/build/make-bootstrap.scm
+++ b/guix/build/make-bootstrap.scm
@@ -20,6 +20,9 @@
 
 (define-module (guix build make-bootstrap)
   #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-11)
+  #:use-module (srfi srfi-19)
+  #:use-module (srfi srfi-26)
   #:use-module (guix build utils)
   #:export (copy-linux-headers
             make-stripped-libc))
diff --git a/guix/build/waf-build-system.scm b/guix/build/waf-build-system.scm
index 63791ee6ed..56048e7685 100644
--- a/guix/build/waf-build-system.scm
+++ b/guix/build/waf-build-system.scm
@@ -19,6 +19,10 @@
 (define-module (guix build waf-build-system)
   #:use-module ((guix build gnu-build-system) #:prefix gnu:)
   #:use-module (guix build utils)
+  #:use-module (ice-9 match)
+  #:use-module (ice-9 ftw)
+  #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-26)
   #:export (%standard-phases
             waf-build))