build-systems: gnu: Export %default-gnu-imported-modules and %default-gnu-modules.

Until now users would have to cargo cult or inspect the private
%default-modules variable of (guix build-systems gnu) to discover which
modules to include when extending the used modules via the #:modules argument.

The renaming was automated via the command:

  $ git grep -l %gnu-build-system-modules
    | xargs sed 's/%gnu-build-system-modules/%default-gnu-imported-modules/' -i

* guix/build-system/gnu.scm (%gnu-build-system-modules): Rename to...
(%default-gnu-imported-modules): ... this.
(%default-modules): Rename to...
(%default-gnu-modules): ... this.  Export.
(dist-package, gnu-build, gnu-cross-build): Adjust accordingly.

Change-Id: Idef307fff13cb76f3182d782b26e1cd3a5c757ee

80 files changed, 156 insertions, 156 deletions

diff --git a/gnu/packages/acl.scm b/gnu/packages/acl.scm
index eb20fdd549f..3e973322439 100644
--- a/gnu/packages/acl.scm
+++ b/gnu/packages/acl.scm
@@ -52,7 +52,7 @@
     (build-system gnu-build-system)
     (arguments
      `(#:modules ((ice-9 ftw)
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
        #:configure-flags '("--disable-static")
        #:tests? ,(not (or (%current-target-system)
                           (target-hurd?)))
diff --git a/gnu/packages/apl.scm b/gnu/packages/apl.scm
index 0b56c8b0889..1c1cd200a91 100644
--- a/gnu/packages/apl.scm
+++ b/gnu/packages/apl.scm
@@ -142,7 +142,7 @@ symbols, and almost all Latin-1 accented letters.")
     (native-inputs (list `(,openjdk18 "jdk") zip))
     (arguments
      (list
-       #:imported-modules `(,@%gnu-build-system-modules
+       #:imported-modules `(,@%default-gnu-imported-modules
                             (guix build ant-build-system))
        #:modules `((guix build gnu-build-system)
                    ((guix build ant-build-system) #:prefix ant:)
diff --git a/gnu/packages/axoloti.scm b/gnu/packages/axoloti.scm
index ebd2e37d5cf..27e80082f04 100644
--- a/gnu/packages/axoloti.scm
+++ b/gnu/packages/axoloti.scm
@@ -228,7 +228,7 @@ runtime.")
                   (sxml xpath)
                   (sxml transform))
       #:imported-modules `((guix build ant-build-system)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
        #:phases
        #~(modify-phases %standard-phases
            (delete 'configure)
@@ -380,7 +380,7 @@ patcher application.")))
                   (sxml xpath)
                   (sxml transform))
        #:imported-modules ((guix build ant-build-system)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'make-git-checkout-writable
@@ -790,7 +790,7 @@ This package provides the runtime.")
                   (sxml xpath)
                   (sxml transform))
       #:imported-modules `((guix build ant-build-system)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
       #:phases
       #~(modify-phases %standard-phases
           (delete 'configure)
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 5b00b1e89d5..78112e8a2a0 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -843,7 +843,7 @@ NTFS volumes using @code{ntfs-3g}, preserving NTFS-specific attributes.")
                 "1kbxa1irszp2zw8hd5qzqnrrzb4vxfivs1vn64yxnj0lak1jjzvb"))))
     (arguments
      `(#:modules ((ice-9 match) (ice-9 rdelim)
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
        #:phases
        ;; This mostly mirrors the steps taken in the install.sh that ships
        ;; with dirvish, but simplified because we aren't prompting interactively
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 72e34a45153..c46627a901a 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -1356,7 +1356,7 @@ to the @code{share/locale} sub-directory of this package.")
             ,@modules))
          ((#:imported-modules modules '())
           `((gnu build locale)
-            ,@%gnu-build-system-modules))
+            ,@%default-gnu-imported-modules))
          ((#:phases phases)
           `(modify-phases ,phases
              (replace 'build
diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm
index 1707403826e..050fb1e5905 100644
--- a/gnu/packages/benchmark.scm
+++ b/gnu/packages/benchmark.scm
@@ -90,7 +90,7 @@
     (build-system gnu-build-system)
     (arguments
      (list #:modules
-           `(,@%gnu-build-system-modules
+           `(,@%default-gnu-imported-modules
              (ice-9 textual-ports))
            #:test-target "test"
            #:configure-flags
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index f194b86d655..07048aebbe4 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -22861,9 +22861,9 @@ single-cell data named @url{https://github.com/PMBio/cardelino, cardelino}.")
      `(#:make-flags '("GUILE_AUTO_COMPILE=0") ; to prevent guild warnings
        #:modules (((guix build guile-build-system)
                    #:select (target-guile-effective-version))
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
        #:imported-modules ((guix build guile-build-system)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
        #:phases
        (modify-phases %standard-phases
          (add-after 'patch-source-shebangs 'patch-more-source-shebangs
diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index 71999709edc..3225c58d25d 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -114,9 +114,9 @@
     (arguments
      (list
       #:imported-modules `((guix build python-build-system)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
       #:modules `(((guix build python-build-system) #:select (python-version))
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
       #:tests? #f
       #:configure-flags
       #~(let ((icu (dirname (dirname (search-input-file
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 4072df50d7a..61def12c91d 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -1044,7 +1044,7 @@ U-Boot must be used."
             ,@modules))
          ((#:imported-modules imported-modules '())
           `((guix build kconfig)
-            ,@%gnu-build-system-modules
+            ,@%default-gnu-imported-modules
             ,@imported-modules))
          ((#:test-target _ "test")
           "test")
@@ -1949,7 +1949,7 @@ order to add a suitable bootloader menu entry.")
                     (ice-9 regex)
                     (rnrs bytevectors))
         #:imported-modules `((guix base32)
-                             ,@%gnu-build-system-modules)
+                             ,@%default-gnu-imported-modules)
         #:make-flags
         ;; XXX: 'BUILD_ID' is used to determine when another ROM in the
         ;; system contains identical code in order to save space within the
diff --git a/gnu/packages/bqn.scm b/gnu/packages/bqn.scm
index 4d03385d210..fd090ad4336 100644
--- a/gnu/packages/bqn.scm
+++ b/gnu/packages/bqn.scm
@@ -52,7 +52,7 @@
       (build-system gnu-build-system)
       (arguments
        (list
-        #:imported-modules `(,@%gnu-build-system-modules
+        #:imported-modules `(,@%default-gnu-imported-modules
                              (guix build ant-build-system))
         #:modules `((guix build gnu-build-system)
                     ((guix build ant-build-system)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 314598938b9..2ea34270e01 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -145,7 +145,7 @@ the checkout from TARBALL, a tarball containing said checkout.
        #:tests? #f
        #:guile ,%bootstrap-guile
        #:imported-modules ((guix build gnu-bootstrap)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
        #:phases
        (begin
          (use-modules (guix build gnu-bootstrap))
@@ -185,7 +185,7 @@ pure Scheme to Tar and decompression in one easy step.")
        #:tests? #f
        #:guile ,%bootstrap-guile
        #:imported-modules ((guix build gnu-bootstrap)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
        #:phases
        (begin
          (use-modules (guix build gnu-bootstrap))
@@ -214,7 +214,7 @@ pure Scheme to Tar and decompression in one easy step.")
        #:tests? #f
        #:guile ,%bootstrap-guile
        #:imported-modules ((guix build gnu-bootstrap)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
        #:phases
        (begin
          (use-modules (guix build gnu-bootstrap))
@@ -3236,7 +3236,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
       ;; Additional modules for the libstdc++ phase below.
       #:modules `((srfi srfi-1)
                   (srfi srfi-26)
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
 
       (substitute-keyword-arguments (package-arguments gcc)
         ((#:make-flags flags)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 7dca7a2d02f..93ffef39898 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -2210,7 +2210,7 @@ pointers, containers, compiler building blocks, etc.")
     (arguments
      `(#:test-target "test"
        #:imported-modules ((guix build copy-build-system)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
        #:modules (((guix build copy-build-system) #:prefix copy:)
                   (guix build gnu-build-system)
                   (guix build utils))
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index 2cc5f52e47d..7d152b3270f 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -359,7 +359,7 @@ target that libc."
     (arguments
      `(#:implicit-inputs? #f
        #:imported-modules ((gnu build cross-toolchain)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
        #:modules ((guix build gnu-build-system)
                   (guix build utils)
                   (gnu build cross-toolchain)
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 61da91d1f54..bf192d2b244 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -569,7 +569,7 @@ should only be used as part of the Guix cups-pk-helper service.")
     (arguments
      (list
       #:imported-modules `((guix build python-build-system)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
       #:modules '((guix build gnu-build-system)
                   (guix build utils)
                   ((guix build python-build-system) #:prefix python:))
@@ -888,7 +888,7 @@ HP@tie{}LaserJet, and possibly other printers.  See @file{README} for details.")
     (arguments
      (list #:modules
            `((srfi srfi-26)
-             ,@%gnu-build-system-modules)
+             ,@%default-gnu-imported-modules)
            #:configure-flags
            #~(list "--disable-static"
                    (string-append "--prefix=" #$output)
@@ -949,7 +949,7 @@ language.")
       (arguments
        `(#:modules
          ((srfi srfi-26)
-          ,@%gnu-build-system-modules)
+          ,@%default-gnu-imported-modules)
          #:make-flags
          (list (string-append "CUPSDRV="
                               (assoc-ref %outputs "out") "/share/cups/drv")
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 1322f29cc01..6a51d7103f3 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -246,9 +246,9 @@ not offer a replacement for libcurl.")
    (arguments
     `(#:modules (((guix build guile-build-system)
                   #:select (target-guile-effective-version))
-                 ,@%gnu-build-system-modules)
+                 ,@%default-gnu-imported-modules)
       #:imported-modules ((guix build guile-build-system)
-                          ,@%gnu-build-system-modules)
+                          ,@%default-gnu-imported-modules)
       #:configure-flags (list (string-append
                                "--with-guilesitedir="
                                (assoc-ref %outputs "out")
diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm
index 6f7b809fd25..7d689c42e1d 100644
--- a/gnu/packages/debian.scm
+++ b/gnu/packages/debian.scm
@@ -581,7 +581,7 @@ distributions such as Debian and Trisquel.")
     (arguments
      (list #:modules
            `((srfi srfi-71)
-             ,@%gnu-build-system-modules)
+             ,@%default-gnu-imported-modules)
            #:phases
            #~(modify-phases %standard-phases
                (add-before 'bootstrap 'patch-version
diff --git a/gnu/packages/dezyne.scm b/gnu/packages/dezyne.scm
index ecf4431bcc0..1cbcbfa4c2a 100644
--- a/gnu/packages/dezyne.scm
+++ b/gnu/packages/dezyne.scm
@@ -56,7 +56,7 @@
     (arguments
      (list
       #:modules `((ice-9 popen)
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
       #:phases
       #~(modify-phases %standard-phases
           (add-before 'configure 'setenv
@@ -132,7 +132,7 @@ has formal semantics expressed in @url{https://mcrl2.org,mCRL2}.")
     (arguments
      (list
       #:modules `((ice-9 popen)
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
       #:phases
       #~(modify-phases %standard-phases
           (add-before 'configure 'setenv
diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm
index 9f493d91ad9..04fe6fc4918 100644
--- a/gnu/packages/dictionaries.scm
+++ b/gnu/packages/dictionaries.scm
@@ -280,7 +280,7 @@ and a Python library.")
            (assoc-ref emacs:%standard-phases 'build)))
        #:make-flags (list (string-append "PREFIX=" %output)
                           "NETWORK_ACCESS=no test")
-       #:imported-modules (,@%gnu-build-system-modules
+       #:imported-modules (,@%default-gnu-imported-modules
                             (guix build emacs-build-system)
                             (guix build emacs-utils))
        #:modules ((guix build gnu-build-system)
diff --git a/gnu/packages/djvu.scm b/gnu/packages/djvu.scm
index 743fc7e2847..084aba23988 100644
--- a/gnu/packages/djvu.scm
+++ b/gnu/packages/djvu.scm
@@ -309,7 +309,7 @@ and white.")
        `(#:modules ((guix build gnu-build-system)
                     ((guix build python-build-system) #:prefix python:)
                     (guix build utils))
-         #:imported-modules (,@%gnu-build-system-modules
+         #:imported-modules (,@%default-gnu-imported-modules
                              (guix build python-build-system))
          #:test-target "test"
          #:phases
@@ -395,7 +395,7 @@ and background layers of images, which can then be encoded into a DjVu file.")
         #:modules '((guix build gnu-build-system)
                     ((guix build python-build-system) #:prefix python:)
                     (guix build utils))
-        #:imported-modules `(,@%gnu-build-system-modules
+        #:imported-modules `(,@%default-gnu-imported-modules
                              (guix build python-build-system))
         #:test-target "test"
         #:phases
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index c6d56a06b15..039cd524db5 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -343,7 +343,7 @@ the built-in registry server of Docker.")
         (guix build union)
         (guix build utils))
       #:imported-modules
-      `(,@%gnu-build-system-modules
+      `(,@%default-gnu-imported-modules
         (guix build union)
         (guix build go-build-system))
       #:phases
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 8205f0eaf01..47f7a1372d2 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -2564,7 +2564,7 @@ for editing Racket's Scribble documentation syntax in Emacs.")
      `(#:modules ((guix build gnu-build-system)
                   ((guix build emacs-build-system) #:prefix emacs:)
                   (guix build utils))
-       #:imported-modules (,@%gnu-build-system-modules
+       #:imported-modules (,@%default-gnu-imported-modules
                            (guix build emacs-build-system)
                            (guix build emacs-utils))
        #:configure-flags (list (string-append "--with-lispdir="
@@ -2675,8 +2675,8 @@ replacement.")
       #:modules `((ice-9 match)
                   (srfi srfi-26)
                   ((guix build emacs-build-system) #:prefix emacs:)
-                  ,@%gnu-build-system-modules)
-      #:imported-modules `(,@%gnu-build-system-modules
+                  ,@%default-gnu-imported-modules)
+      #:imported-modules `(,@%default-gnu-imported-modules
                            (guix build emacs-build-system)
                            (guix build emacs-utils))
       #:phases
@@ -3609,7 +3609,7 @@ or unexpected behavior inside an elisp configuration file (typically
                   ((guix build emacs-build-system) #:prefix emacs:)
                   (guix build utils)
                   (guix build emacs-utils))
-      #:imported-modules `(,@%gnu-build-system-modules
+      #:imported-modules `(,@%default-gnu-imported-modules
                            (guix build emacs-build-system)
                            (guix build emacs-utils))
       #:configure-flags
@@ -4213,7 +4213,7 @@ defined in RFC 2425 and RFC 2426 to/from The Insidious Big Brother Database
                   ((guix build emacs-build-system) #:prefix emacs:)
                   (guix build utils)
                   (guix build emacs-utils))
-      #:imported-modules `(,@%gnu-build-system-modules
+      #:imported-modules `(,@%default-gnu-imported-modules
                            (guix build emacs-build-system)
                            (guix build emacs-utils))
       #:configure-flags
@@ -4804,7 +4804,7 @@ a set of simplified face specifications and a user-supplied color palette.")
        #:modules ((guix build gnu-build-system)
                   ((guix build emacs-build-system) #:prefix emacs:)
                   (guix build utils))
-       #:imported-modules (,@%gnu-build-system-modules
+       #:imported-modules (,@%default-gnu-imported-modules
                            (guix build emacs-build-system)
                            (guix build emacs-utils))
        #:phases
@@ -5945,7 +5945,7 @@ during idle time, while Emacs is doing nothing else.")
                   ((guix build emacs-build-system) #:prefix emacs:)
                   (guix build utils)
                   (guix build emacs-utils))
-       #:imported-modules (,@%gnu-build-system-modules
+       #:imported-modules (,@%default-gnu-imported-modules
                            (guix build emacs-build-system)
                            (guix build emacs-utils))
        #:phases
@@ -6154,7 +6154,7 @@ type, for example: packages, buffers, files, etc.")
         #:modules '((guix build gnu-build-system)
                     ((guix build emacs-build-system) #:prefix emacs:)
                     (guix build utils))
-        #:imported-modules `(,@%gnu-build-system-modules
+        #:imported-modules `(,@%default-gnu-imported-modules
                              (guix build emacs-build-system)
                              (guix build emacs-utils))
         #:configure-flags
@@ -9257,7 +9257,7 @@ completion of relevant keywords.")
         #:modules `((guix build gnu-build-system)
                     ((guix build emacs-build-system) #:prefix emacs:)
                     (guix build utils))
-        #:imported-modules `(,@%gnu-build-system-modules
+        #:imported-modules `(,@%default-gnu-imported-modules
                              (guix build emacs-build-system)
                              (guix build emacs-utils))
         #:configure-flags
@@ -37777,7 +37777,7 @@ a @samp{date} keywords, and optionally, a @samp{filetags} keyword.")
        (list #:modules '((guix build gnu-build-system)
                          (guix build utils)
                          (guix build emacs-utils))
-             #:imported-modules `(,@%gnu-build-system-modules
+             #:imported-modules `(,@%default-gnu-imported-modules
                                   (guix build emacs-utils))
              #:test-target "test"
              #:phases
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 6d074413770..3879742e0a0 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -190,7 +190,7 @@ SuperCPU.")
        #:tests? #f ; No check target and custom tests don't seem to build
        #:imported-modules
        ((guix build copy-build-system)
-        ,@%gnu-build-system-modules)
+        ,@%default-gnu-imported-modules)
        #:modules
        (((guix build copy-build-system)
          #:prefix copy:)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 9f620dc004e..c5602899a78 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -568,7 +568,7 @@ featuring various improvements and bug fixes.")))
        #:parallel-build? #f
        #:tests? #f ;; no tests-suite
        #:modules ((srfi srfi-1)
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
        #:phases
        (modify-phases %standard-phases
          (add-after 'build 'make-doc
@@ -665,7 +665,7 @@ multipole-accelerated algorithm.")
        #:parallel-build? #f
        #:tests? #f ;; no tests-suite
        #:modules ((srfi srfi-1)
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
        #:phases
        (modify-phases %standard-phases
          (delete 'configure)
@@ -3390,7 +3390,7 @@ program that can perform mesh processing tasks in batch mode, without a GUI.")
      (list
       #:imported-modules `((guix build emacs-build-system)
                            (guix build emacs-utils)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
       #:modules '((guix build gnu-build-system)
                   ((guix build emacs-build-system) #:prefix emacs:)
                   (guix build utils))
diff --git a/gnu/packages/esolangs.scm b/gnu/packages/esolangs.scm
index 0651dda1b02..796f8d3f23b 100644
--- a/gnu/packages/esolangs.scm
+++ b/gnu/packages/esolangs.scm
@@ -135,7 +135,7 @@ are encoded as (nested) directories.  Note that the switches you pass to
                 "shakespeare-spl-fix-grammar.patch"))))
     (build-system copy-build-system)
     (arguments
-     `(#:imported-modules (,@%gnu-build-system-modules
+     `(#:imported-modules (,@%default-gnu-imported-modules
                            (guix build copy-build-system))
        #:modules ((guix build copy-build-system)
                   ((guix build gnu-build-system) #:prefix gnu:)
diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm
index 43486125676..44655d1d333 100644
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@ -680,7 +680,7 @@ coreboot.")
     (supported-systems %supported-systems)
     (arguments
      (substitute-keyword-arguments (package-arguments seabios)
-       ((#:modules modules %gnu-build-system-modules)
+       ((#:modules modules %default-gnu-imported-modules)
         `((ice-9 match)
           (ice-9 threads)
           ,@modules))
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index c269a32065c..8d0322cfee8 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -980,9 +980,9 @@ OpenType variant of these fonts.")
     (build-system gnu-build-system)
     (arguments
      (list
-      #:imported-modules `(,@%gnu-build-system-modules
+      #:imported-modules `(,@%default-gnu-imported-modules
                            (guix build font-build-system))
-      #:modules `(,@%gnu-build-system-modules
+      #:modules `(,@%default-gnu-imported-modules
                   ((guix build font-build-system) #:prefix font:))
       #:phases #~(modify-phases %standard-phases
                    (add-after 'unpack 'patch-source
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 92937d626cf..27e64770d45 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -523,7 +523,7 @@ display servers.  It supports many different languages and emoji.")
         #:make-flags #~(list (string-append "DESTDIR=" #$output)
                              #$(string-append "CC=" (cc-for-target)))
         #:imported-modules `((guix build copy-build-system)
-                             ,@%gnu-build-system-modules)
+                             ,@%default-gnu-imported-modules)
         #:modules `((guix build gnu-build-system)
                     ((guix build copy-build-system) #:prefix copy:)
                     (guix build utils))
@@ -643,8 +643,7 @@ database is translated at Transifex.")
      (list
       #:tests? #f                       ;no check target
       #:modules `((srfi srfi-26)
-                  (guix build gnu-build-system)
-                  (guix build utils))
+                  ,@%default-gnu-modules)
       #:phases
       #~(modify-phases %standard-phases
         (add-after 'unpack 'patch-hardcoded-paths
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 59325fd47aa..404ddd7632c 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -695,9 +695,9 @@ clone.")
                   (srfi srfi-1)
                   ((guix build guile-build-system)
                    #:select (target-guile-effective-version))
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
        #:imported-modules ((guix build guile-build-system)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-command
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index fb1dda36b36..68240ed7942 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -420,7 +420,7 @@ Go.  It also includes runtime support libraries for these languages.")
            ;; For native builds of some GCC versions the C++ include path needs to
            ;; be adjusted so it does not interfere with GCC's own build processes.
            (substitute-keyword-arguments (package-arguments parent)
-             ((#:modules modules %gnu-build-system-modules)
+             ((#:modules modules %default-gnu-imported-modules)
               `((srfi srfi-1)
                 ,@modules))
              ((#:phases phases)
@@ -955,7 +955,7 @@ using compilers other than GCC."
       #:out-of-source? #t
       #:modules `((srfi srfi-1)
                   (srfi srfi-26)
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
       #:phases
       #~(modify-phases %standard-phases
           #$@(if (version>=? (package-version gcc) "11")
@@ -1103,7 +1103,7 @@ as the 'native-search-paths' field."
     (native-search-paths search-paths)
     (arguments
      (substitute-keyword-arguments (package-arguments gcc)
-       ((#:modules modules %gnu-build-system-modules)
+       ((#:modules modules %default-gnu-imported-modules)
         `(,@modules
           (srfi srfi-1)
           (srfi srfi-26)
diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm
index f832202d180..15e6a887265 100644
--- a/gnu/packages/gdb.scm
+++ b/gnu/packages/gdb.scm
@@ -64,7 +64,7 @@
      `(#:tests? #f                      ;FIXME: 217 unexpected failures
        #:out-of-source? #t
        #:modules ((srfi srfi-1)
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
        #:phases (modify-phases %standard-phases
                   (add-after 'unpack 'patch-paths
                     (lambda* (#:key inputs #:allow-other-keys)
diff --git a/gnu/packages/genimage.scm b/gnu/packages/genimage.scm
index 4a9d24fe783..94a85ce2e4a 100644
--- a/gnu/packages/genimage.scm
+++ b/gnu/packages/genimage.scm
@@ -61,7 +61,7 @@
       (arguments
        `(#:modules
          ((ice-9 match)
-          ,@%gnu-build-system-modules)
+          ,@%default-gnu-imported-modules)
          #:phases
          (modify-phases %standard-phases
            (add-after 'unpack 'guixify
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 954a4ad4a07..3255f25d542 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -2816,7 +2816,7 @@ orienteering sport.")
          #:modules ((guix build gnu-build-system)
                     ((guix build python-build-system) #:prefix python:)
                     (guix build utils))
-         #:imported-modules (,@%gnu-build-system-modules
+         #:imported-modules (,@%default-gnu-imported-modules
                              (guix build python-build-system))
          #:phases
          (modify-phases %standard-phases
diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index 9a757e6a346..6ee7148e496 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -354,7 +354,7 @@ buffers.")
      (list
       #:modules `((ice-9 popen)
                   (ice-9 rdelim)
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'remove-gcc-reference
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 0e4c2a8ab48..d2db475ab80 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11835,7 +11835,7 @@ mp3, Ogg Vorbis and FLAC")
     (arguments
      `(#:imported-modules ((guix build python-build-system)
                            (guix build glib-or-gtk-build-system)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
 
        #:modules ((guix build glib-or-gtk-build-system)
                   (guix build utils)
diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm
index af024b2a048..7188c9c65e6 100644
--- a/gnu/packages/gnucash.scm
+++ b/gnu/packages/gnucash.scm
@@ -81,7 +81,7 @@
       #:test-target "check"
       #:configure-flags #~(list "-DWITH_PYTHON=ON")
       #:make-flags #~(list "GUILE_AUTO_COMPILE=0")
-      #:imported-modules `(,@%gnu-build-system-modules
+      #:imported-modules `(,@%default-gnu-imported-modules
                            (guix build cmake-build-system)
                            (guix build glib-or-gtk-build-system))
       #:modules '((guix build cmake-build-system)
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 14c25998d8e..fb2860be2ea 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -997,7 +997,7 @@ passphrase when @code{gpg} is run and needs it.")))
      `(#:modules
        ((ice-9 match)
         (ice-9 ftw)
-        ,@%gnu-build-system-modules)
+        ,@%default-gnu-imported-modules)
        #:phases
        (modify-phases
            %standard-phases
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 85e26deea5b..75752d5e531 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -119,7 +119,7 @@
      (list
       #:imported-modules %cargo-utils-modules ;for `generate-all-checksums'
       #:modules `((guix build cargo-utils)
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
       #:test-target "check-jstests"
       #:configure-flags
       #~(list
@@ -868,7 +868,7 @@ variable defined below.  It requires guile-json to be installed."
                   (rnrs io ports)
                   (guix elf)
                   (guix build gremlin)
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'apply-guix-specific-patches
@@ -1344,7 +1344,7 @@ list of languages supported as well as the currently used changeset."
       #:modules `((guix build utils)          ;find-files
                   (sxml simple)
                   (ice-9 regex)
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'patch-source-shebangs 'patch-cargo-checksums
diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index 115fe20b529..88c74d40276 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -840,9 +840,9 @@ transformed into common image formats for display or printing.")
                 "1bmck5fcihj9lr5kd8x624bdi9xhfc13pl4mwzv74jr5lz07kr6d"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:imported-modules (,@%gnu-build-system-modules
+     `(#:imported-modules (,@%default-gnu-imported-modules
                            (guix build python-build-system))
-       #:modules (,@%gnu-build-system-modules
+       #:modules (,@%default-gnu-imported-modules
                   ((guix build python-build-system) #:select (site-packages)))
        ;; The build process peaks around 4GB/RAM per core.
        #:parallel-build? #f
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index d91e5dcb6e9..b0899903601 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -201,9 +201,9 @@
     (arguments
      `(#:modules (((guix build guile-build-system)
                    #:select (target-guile-effective-version))
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
        #:imported-modules ((guix build guile-build-system)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
        #:make-flags
        ;; TODO: The documentation must be built with the `docs' target.
        (let* ((out (assoc-ref %outputs "out"))
@@ -290,9 +290,9 @@ more.")
      `(#:make-flags '("GUILE_AUTO_COMPILE=0")
        #:modules (((guix build guile-build-system)
                    #:select (target-guile-effective-version))
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
        #:imported-modules ((guix build guile-build-system)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
        #:phases (modify-phases %standard-phases
                   (add-after 'install 'wrap-guilescript
                     (lambda* (#:key outputs #:allow-other-keys)
@@ -786,9 +786,9 @@ you send to a FIFO file.")
     (arguments
      `(#:modules (((guix build guile-build-system)
                    #:select (target-guile-effective-version))
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
        #:imported-modules ((guix build guile-build-system)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
        #:phases (modify-phases %standard-phases
                   (delete 'strip)
                   (add-after 'install 'wrap-program
@@ -1905,9 +1905,9 @@ bindings to the @code{yaml-cpp} C++ library.")
     (arguments
      `(#:modules (((guix build guile-build-system)
                    #:select (target-guile-effective-version))
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
        #:imported-modules ((guix build guile-build-system)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
        #:configure-flags
        (list (string-append
               "--with-guile-site-dir=" %output "/share/guile/site/"
@@ -2138,10 +2138,10 @@ above command-line parameters.")
         #:modules `(((guix build guile-build-system)
                      #:select
                      (target-guile-effective-version))
-                    ,@%gnu-build-system-modules)
+                    ,@%default-gnu-imported-modules)
         #:phases
         (with-imported-modules `((guix build guile-build-system)
-                                 ,@%gnu-build-system-modules)
+                                 ,@%default-gnu-imported-modules)
           #~(modify-phases %standard-phases
               (add-after 'install 'hall-wrap-binaries
                 (lambda* (#:key inputs #:allow-other-keys)
@@ -2287,7 +2287,7 @@ user which package sets would they like to install from it.")
                   (guix build emacs-utils)
                   (ice-9 rdelim)
                   (ice-9 popen))
-       #:imported-modules (,@%gnu-build-system-modules
+       #:imported-modules (,@%default-gnu-imported-modules
                            (guix build emacs-build-system)
                            (guix build emacs-utils))
        #:phases
@@ -2696,7 +2696,7 @@ many readers as needed).")
                    #:select (target-guile-effective-version))
                   (guix build utils))
        #:imported-modules ((guix build guile-build-system)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
        #:configure-flags (list "--with-gnu-filesystem-hierarchy")
        #:phases
        (modify-phases %standard-phases
@@ -3015,7 +3015,7 @@ inspired by the SCSH regular expression system.")
     (build-system gnu-build-system)
     (arguments
      `(#:modules ((ice-9 match) (ice-9 ftw)
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
        #:tests? #f ; test suite is non-deterministic :(
        #:phases (modify-phases %standard-phases
                   (add-after 'install 'wrap-haunt
@@ -3300,7 +3300,7 @@ The picture values can directly be displayed in Geiser.")
        `(#:modules
          ((ice-9 match)
           (srfi srfi-1)
-          ,@%gnu-build-system-modules)
+          ,@%default-gnu-imported-modules)
          #:tests? #f                    ; there are none
          #:make-flags
          (list (string-append "PICT_DIR="
@@ -5729,9 +5729,9 @@ schedulers.")
       (arguments
        `(#:modules (((guix build guile-build-system)
                      #:prefix guile:)
-                    ,@%gnu-build-system-modules)
+                    ,@%default-gnu-imported-modules)
          #:imported-modules ((guix build guile-build-system)
-                             ,@%gnu-build-system-modules)
+                             ,@%default-gnu-imported-modules)
          #:tests? #false ; there are none
          #:phases
          (modify-phases %standard-phases
@@ -5951,9 +5951,9 @@ high-level API for network management that uses rtnetlink.")
      `(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings
        #:modules (((guix build guile-build-system)
                    #:select (target-guile-effective-version))
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
        #:imported-modules ((guix build guile-build-system)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
        #:phases (modify-phases %standard-phases
                   (add-after 'install 'wrap-program
                     (lambda* (#:key inputs outputs #:allow-other-keys)
@@ -5980,6 +5980,7 @@ high-level API for network management that uses rtnetlink.")
     (native-inputs (list autoconf automake pkg-config texinfo))
     (inputs (list bash-minimal guile-2.2 guile2.2-json guile2.2-lib
                   guile2.2-gnutls))
+
     (home-page "https://github.com/artyom-poptsov/guile-gitlab")
     (synopsis "Guile interface to GitLab")
     (description
@@ -6007,9 +6008,9 @@ GitLab instance.")
      `(#:make-flags '("GUILE_AUTO_COMPILE=0")     ;to prevent guild warnings
        #:modules (((guix build guile-build-system)
                    #:select (target-guile-effective-version))
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
        #:imported-modules ((guix build guile-build-system)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
        #:phases
        (modify-phases %standard-phases
          (delete 'strip)
diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index a2775b2f842..69ef9ee7ef6 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -521,7 +521,7 @@ traditional Chinese output.")
     (build-system gnu-build-system)
     (arguments
      `(#:modules ((ice-9 match)
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
        #:tests? #f                  ; no tests
        #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
        #:phases
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 6b5e08e87d4..239553fe3a8 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -895,7 +895,7 @@ work.")
     (outputs (list "out" "pbmtools"))
     (arguments
      `(#:modules ((srfi srfi-26)
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
        #:phases
        (modify-phases %standard-phases
          (delete 'configure)            ; no configure script
diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm
index 4ed9b57cf2c..9f1f76a602b 100644
--- a/gnu/packages/instrumentation.scm
+++ b/gnu/packages/instrumentation.scm
@@ -587,7 +587,7 @@ whole-system symbolic access, and can also handle simple tracing jobs.")
      (list
       #:modules
       `((ice-9 match)
-        ,@%gnu-build-system-modules)
+        ,@%default-gnu-imported-modules)
       #:make-flags
       #~(list
          (string-append "CC=" #$(cc-for-target)))
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index a2414161da5..fec475daade 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -723,7 +723,7 @@ IcedTea build harness.")
       (arguments
        `(#:imported-modules
          ((guix build ant-build-system)
-          ,@%gnu-build-system-modules)
+          ,@%default-gnu-imported-modules)
 
          #:disallowed-references ,(list (gexp-input icedtea-7 "jdk"))
 
@@ -889,7 +889,7 @@ new Date();"))
     (arguments
      `(#:imported-modules
        ((guix build ant-build-system)
-        ,@%gnu-build-system-modules)
+        ,@%default-gnu-imported-modules)
        #:modules
        ((guix build utils)
         (guix build gnu-build-system)
@@ -8114,7 +8114,7 @@ discards all logging messages.")
     (arguments
      `(#:tests? #f ; no test target
        #:imported-modules ((guix build ant-build-system)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
        #:modules (((guix build ant-build-system) #:prefix ant:)
                   (guix build gnu-build-system)
                   (guix build utils))
diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index 060f44e3c85..7a3deb0b438 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -969,7 +969,7 @@ and manipulation.")
                    #:prefix emacs:)
                   (guix build utils)
                   (guix build emacs-utils))
-       #:imported-modules (,@%gnu-build-system-modules
+       #:imported-modules (,@%default-gnu-imported-modules
                            (guix build emacs-build-system)
                            (guix build emacs-utils))
        #:phases (modify-phases %standard-phases
diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm
index c7487b12593..21f73f799dd 100644
--- a/gnu/packages/librewolf.scm
+++ b/gnu/packages/librewolf.scm
@@ -286,7 +286,7 @@
                   (rnrs io ports)
                   (guix elf)
                   (guix build gremlin)
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
       #:phases #~(modify-phases %standard-phases
                    (add-after 'unpack 'fix-preferences
                      (lambda* (#:key inputs #:allow-other-keys)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 3ba4a7e9e24..68f9ea2fe98 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -285,7 +285,7 @@ of 'uname -r' behind the Linux version numbers."
     (arguments
      (substitute-keyword-arguments
          (package-arguments linux)
-       ((#:imported-modules imported-modules %gnu-build-system-modules)
+       ((#:imported-modules imported-modules %default-gnu-imported-modules)
         `((guix build kconfig) ,@imported-modules))
        ((#:modules modules)
         `((guix build kconfig) ,@modules))
@@ -5846,7 +5846,7 @@ arrays when needed.")
                     (for-each delete-file-recursively directories)
                     (remove-store-references "sbin/mdadm")
                     (delete-file "sbin/mdmon")))))))
-       ((#:modules modules %gnu-build-system-modules)
+       ((#:modules modules %default-gnu-imported-modules)
         `((ice-9 ftw) ,@modules))
        ((#:strip-flags _ '())
         ''("--strip-all"))                        ;strip a few extra KiB
@@ -7326,7 +7326,7 @@ graphically visualizing a @file{perf.data} file.")
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags (list "--disable-pywrap")
-       #:modules (,@%gnu-build-system-modules
+       #:modules (,@%default-gnu-imported-modules
                   (ice-9 binary-ports)
                   (rnrs bytevectors)
                   (srfi srfi-26))
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 4c5b713cbfb..08c7aaada62 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -384,10 +384,10 @@ Learning usecases.")
                   "07kdsngvr4n1qxpqzv1nlay7g41d6jzjppa8vzmrg220s8ing87z"))))
       (build-system gnu-build-system)
       (arguments
-       `(#:imported-modules (,@%gnu-build-system-modules
+       `(#:imported-modules (,@%default-gnu-imported-modules
                              (guix build python-build-system))
          #:modules          ((guix build python-build-system)
-                             ,@%gnu-build-system-modules)
+                             ,@%default-gnu-imported-modules)
          #:phases
          (modify-phases %standard-phases
            (add-after 'unpack 'enter-dir
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 3387d870b15..35be81d4b32 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -4222,7 +4222,7 @@ It is a replacement for the @command{urlview} program.")
                    #:select (target-guile-effective-version))
                   (guix build utils))
       #:imported-modules `((guix build guile-build-system)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
 
       #:configure-flags '(list "--localstatedir=/var")
 
@@ -4873,7 +4873,7 @@ ex-like commands on it.")
                   ((guix build emacs-build-system) #:prefix emacs:)
                   (guix build utils)
                   (ice-9 string-fun))
-       #:imported-modules (,@%gnu-build-system-modules
+       #:imported-modules (,@%default-gnu-imported-modules
                            (guix build emacs-build-system)
                            (guix build emacs-utils))
        #:make-flags (list (string-append "prefix=" %output)
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 4dd45a4a279..96d2a5a81af 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -473,7 +473,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
      (outputs '("out"))                           ; all in one
      (arguments
       (substitute-keyword-arguments (package-arguments gcc-7)
-        ((#:modules modules %gnu-build-system-modules)
+        ((#:modules modules %default-gnu-imported-modules)
          `((srfi srfi-1)
            (srfi srfi-26)
            (ice-9 regex)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 557d9acc484..e59f36c0bc5 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -4242,7 +4242,7 @@ language understood by many solvers.")
      `(#:modules ((ice-9 match)
                   (ice-9 popen)
                   (srfi srfi-1)
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
        #:phases
        (modify-phases %standard-phases
          (replace 'configure
@@ -7211,7 +7211,7 @@ set.")
      (list openblas))
     (arguments
      `(#:modules ((srfi srfi-1)
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
        #:configure-flags '("--enable-shared"
                            "--disable-fortran"
                            "--without-MPI"
@@ -7718,7 +7718,7 @@ theories} (SMT) solver.  It provides a C/C++ API, as well as Python bindings.")
     (build-system gnu-build-system)
     (arguments
      `(#:imported-modules ((guix build python-build-system)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
        #:modules (((guix build python-build-system) #:select (site-packages))
                   (guix build gnu-build-system)
                   (guix build utils))
@@ -9208,7 +9208,7 @@ symbolic reasoning engines that need to reason about polynomial constraints.")
      (arguments
       (list #:test-target "test"
             #:modules `((ice-9 match)
-                        ,@%gnu-build-system-modules)
+                        ,@%default-gnu-imported-modules)
             #:configure-flags #~(list "--aiger=.")
             #:phases
             #~(modify-phases %standard-phases
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 3f375f34c63..f9f462a1a7a 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1414,7 +1414,7 @@ Encryption to Gajim.")
            #:modules '((guix build cmake-build-system)
                        ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
                        (guix build utils))
-           #:imported-modules `(,@%gnu-build-system-modules
+           #:imported-modules `(,@%default-gnu-imported-modules
                                 (guix build cmake-build-system)
                                 (guix build glib-or-gtk-build-system))
            #:phases
diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index 3916d4c4068..b6b95852d26 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -388,7 +388,7 @@ interface for the Music Player Daemon.")
                   (guix build python-build-system)
                   ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
                   (guix build utils))
-       #:imported-modules (,@%gnu-build-system-modules
+       #:imported-modules (,@%default-gnu-imported-modules
                            (guix build python-build-system)
                            (guix build glib-or-gtk-build-system))
        #:phases
diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index bca215df47c..75cfd4af66a 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -399,7 +399,7 @@ software vendors, application developers and computer science researchers.")
                   ((guix build ant-build-system) #:prefix ant:)
                   (guix build utils))
       #:imported-modules `((guix build ant-build-system)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
       (substitute-keyword-arguments (package-arguments openmpi)
         ((#:configure-flags flags)
          #~(cons "--enable-mpi-java" #$flags))
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index b1687422890..87ca64cda4b 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -3585,7 +3585,7 @@ can connect to any JACK port and record the output into a stereo WAV file.")
      `(#:modules ((guix build gnu-build-system)
                   ((guix build python-build-system) #:prefix python:)
                   (guix build utils))
-       #:imported-modules (,@%gnu-build-system-modules
+       #:imported-modules (,@%default-gnu-imported-modules
                            (guix build python-build-system))
        #:make-flags
        (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index e59696772c0..3334ca62510 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -3907,7 +3907,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.")
       (arguments
        (list
         #:imported-modules `((guix build python-build-system) ;for site-packages
-                             ,@%gnu-build-system-modules)
+                             ,@%default-gnu-imported-modules)
         #:modules '(((guix build python-build-system) #:prefix python:)
                     (guix build gnu-build-system)
                     (guix build utils))
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 1204c788830..0e357bc8918 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1320,7 +1320,7 @@ the OCaml core distribution.")
     (build-system gnu-build-system)
     (arguments
      (list
-      #:imported-modules `(,@%gnu-build-system-modules
+      #:imported-modules `(,@%default-gnu-imported-modules
                            (guix build emacs-build-system)
                            (guix build emacs-utils))
       #:modules '((guix build gnu-build-system)
diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm
index bd244cea1ee..3f441f56b46 100644
--- a/gnu/packages/openldap.scm
+++ b/gnu/packages/openldap.scm
@@ -232,7 +232,7 @@ servers from Python programs.")
                    #:select (add-installed-pythonpath python-version))
                   (guix build utils))
       #:imported-modules `((guix build python-build-system)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
       #:disallowed-references (list httpd)
       #:configure-flags
       #~(list "--enable-cmocka"
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 6d09b1b1b80..22282c48637 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1567,9 +1567,9 @@ environments.")
        (list
         #:modules `(((guix build guile-build-system)
                      #:select (target-guile-effective-version))
-                    ,@%gnu-build-system-modules)
+                    ,@%default-gnu-imported-modules)
         #:imported-modules `((guix build guile-build-system)
-                             ,@%gnu-build-system-modules)
+                             ,@%default-gnu-imported-modules)
         #:phases
         #~(modify-phases %standard-phases
             (add-before 'build 'set-GUILE_AUTO_COMPILE
@@ -1825,9 +1825,9 @@ in an isolated environment, in separate namespaces.")
        (list
         #:modules `(((guix build guile-build-system)
                      #:select (target-guile-effective-version))
-                    ,@%gnu-build-system-modules)
+                    ,@%default-gnu-imported-modules)
         #:imported-modules `((guix build guile-build-system)
-                             ,@%gnu-build-system-modules)
+                             ,@%default-gnu-imported-modules)
         #:phases
         #~(modify-phases %standard-phases
             (add-before 'build 'set-GUILE_AUTO_COMPILE
diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index 0fd75b328ac..5174ada018c 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -132,7 +132,7 @@
                   (guix build gnu-build-system)
                   (guix build utils)
                   (srfi srfi-26))
-      #:imported-modules `(,@%gnu-build-system-modules
+      #:imported-modules `(,@%default-gnu-imported-modules
                            (guix build emacs-utils))
       #:configure-flags
       #~(list (string-append "--enable-gc=" #$(this-package-input "libgc"))
@@ -263,7 +263,7 @@ using the Cairo drawing library.")
     (build-system gnu-build-system)
     (arguments
      `(#:imported-modules ((guix build guile-build-system)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
        #:modules (((guix build guile-build-system)
                    #:select (target-guile-effective-version))
                   (guix build gnu-build-system)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index a91bebf358a..a0b44c77798 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -3936,10 +3936,10 @@ module provides support functions to the automatically generated code.")
     (arguments
      `(#:tests? #f ; no check target
        #:imported-modules ((guix build python-build-system)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
        #:modules ((srfi srfi-1)
                   ((guix build python-build-system) #:select (python-version))
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
        #:phases
        (modify-phases %standard-phases
          (replace 'configure
@@ -4462,7 +4462,7 @@ securely.  It will not store any data unencrypted unless explicitly requested.")
        `(#:tests? #f                    ; No target
          #:imported-modules
          ((guix build copy-build-system)
-          ,@%gnu-build-system-modules)
+          ,@%default-gnu-imported-modules)
          #:modules
          (((guix build copy-build-system) #:prefix copy:)
           (guix build gnu-build-system)
diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm
index 3598418e584..1016915b473 100644
--- a/gnu/packages/racket.scm
+++ b/gnu/packages/racket.scm
@@ -582,7 +582,7 @@ used to build the name of the resulting store item."
                   (guix build union)
                   (ice-9 match))
       #:imported-modules `((guix build union)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
       #:phases
       #~(modify-phases %standard-phases
           (delete 'unpack)
diff --git a/gnu/packages/ratpoison.scm b/gnu/packages/ratpoison.scm
index 14933da5a80..b39b679b7ec 100644
--- a/gnu/packages/ratpoison.scm
+++ b/gnu/packages/ratpoison.scm
@@ -48,7 +48,7 @@
     (arguments
      (list
       #:modules `((ice-9 format)
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
       ;; Specify the absolute location of xterm, as the user experience sucks
       ;; when no terminal is available (can't consult help with 'C-t ?', for
       ;; example).
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 4c3ef667171..3d5301dd3a4 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -1286,7 +1286,7 @@ Gerbil code within Emacs.")))
     (arguments
      (list
       #:modules `((ice-9 ftw)
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
       #:phases
       #~(modify-phases %standard-phases
           (add-before 'configure 'patch-sh-references
diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm
index 3fc88154fa7..6b41fbc5deb 100644
--- a/gnu/packages/selinux.scm
+++ b/gnu/packages/selinux.scm
@@ -251,7 +251,7 @@ binary policies.")
     (name "python-sepolgen")
     (arguments
      (substitute-keyword-arguments (package-arguments libsepol)
-       ((#:modules _ #~%gnu-build-system-modules)
+       ((#:modules _ #~%default-gnu-imported-modules)
         '((srfi srfi-1)
           (guix build gnu-build-system)
           (guix build utils)))
diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index 3fa9596072f..d791e87d343 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -129,7 +129,7 @@ chart.")
                                          "/etc/boxes-config"))
        #:modules
        ((ice-9 match)
-        ,@%gnu-build-system-modules)
+        ,@%default-gnu-imported-modules)
        #:phases
        (modify-phases %standard-phases
          (delete 'configure)
diff --git a/gnu/packages/simh.scm b/gnu/packages/simh.scm
index 9f5c04d8fbb..7be6d934dec 100644
--- a/gnu/packages/simh.scm
+++ b/gnu/packages/simh.scm
@@ -53,7 +53,7 @@
            #:make-flags
            #~(list (string-append "GCC=" #$(cc-for-target) " -fcommon"))
            #:modules `((ice-9 string-fun)
-                       ,@%gnu-build-system-modules)
+                       ,@%default-gnu-imported-modules)
            #:phases
            #~(modify-phases %standard-phases
                (delete 'configure)
diff --git a/gnu/packages/speech.scm b/gnu/packages/speech.scm
index 36b67ccd93e..0aa2a274883 100644
--- a/gnu/packages/speech.scm
+++ b/gnu/packages/speech.scm
@@ -356,7 +356,7 @@ be used by the sighted.")
        #:modules ((guix build gnu-build-system)
                   (guix build utils)
                   (guix build emacs-utils))
-       #:imported-modules (,@%gnu-build-system-modules
+       #:imported-modules (,@%default-gnu-imported-modules
                            (guix build emacs-utils))
        #:phases
        (modify-phases %standard-phases
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 16e4a312ccb..4adb3d96347 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -6906,7 +6906,7 @@ Java package that provides routines for various statistical distributions.")
           #:modules '((guix build gnu-build-system)
                       (guix build utils)
                       (guix build emacs-utils))
-          #:imported-modules `(,@%gnu-build-system-modules
+          #:imported-modules `(,@%default-gnu-imported-modules
                                (guix build emacs-build-system)
                                (guix build emacs-utils))
           #:make-flags
diff --git a/gnu/packages/stb.scm b/gnu/packages/stb.scm
index 9286bcd87d2..e9c99b6518a 100644
--- a/gnu/packages/stb.scm
+++ b/gnu/packages/stb.scm
@@ -47,7 +47,7 @@
        `(#:modules ((ice-9 ftw)
                     (ice-9 regex)
                     (srfi srfi-26)
-                    ,@%gnu-build-system-modules)
+                    ,@%default-gnu-imported-modules)
          #:phases (modify-phases %standard-phases
                     (delete 'configure)
                     (delete 'build)
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index a77164b93ed..432d6f79a1d 100644
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@ -618,7 +618,7 @@ formerly a part of telegram-cli, but now being maintained separately.")
         #:tests? #f                    ; No target
          #:imported-modules
          `((guix build copy-build-system)
-           ,@%gnu-build-system-modules)
+           ,@%default-gnu-imported-modules)
          #:modules
          '(((guix build copy-build-system)
             #:prefix copy:)
@@ -691,7 +691,7 @@ formerly a part of telegram-cli, but now being maintained separately.")
         #:tests? #f                     ; No target
         #:imported-modules
         `((guix build copy-build-system)
-          ,@%gnu-build-system-modules)
+          ,@%default-gnu-imported-modules)
         #:modules
         '(((guix build copy-build-system)
            #:prefix copy:)
diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm
index a5ddc958593..efa26f1dcc0 100644
--- a/gnu/packages/texinfo.scm
+++ b/gnu/packages/texinfo.scm
@@ -230,7 +230,7 @@ is on expressing the content semantically, avoiding physical markup commands.")
        #:disallowed-references ,(assoc-ref (package-inputs texinfo)
                                            "perl")
        #:modules ((ice-9 ftw) (srfi srfi-1)
-                  ,@%gnu-build-system-modules)))
+                  ,@%default-gnu-imported-modules)))
     (synopsis "Standalone Info documentation reader")
     (inputs (modify-inputs (package-inputs texinfo)
               (prepend gzip)))))
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 3a72bcbe3de..9803f947932 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -1236,7 +1236,7 @@ used with the Scintilla editing component.")
            ))
     (arguments
      `(#:imported-modules ((guix build glib-or-gtk-build-system)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
        #:modules (((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
                   (guix build gnu-build-system)
                   (guix build utils))
diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm
index 3d01346c8cc..ba6bbaa8736 100644
--- a/gnu/packages/tor-browsers.scm
+++ b/gnu/packages/tor-browsers.scm
@@ -398,7 +398,7 @@ Browser.")
                   (rnrs io ports)
                   (guix elf)
                   (guix build gremlin)
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'apply-guix-specific-patches
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 6098c119fa8..a2cd09cde08 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -263,7 +263,7 @@ Python 3.3 and later, rather than on Python 2.")
                   (ice-9 format)
                   (ice-9 textual-ports)
                   ((guix build gnu-build-system) #:prefix gnu:)
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-modules)
       ;; Make sure the full bash does not end up in the final closure.
       #:disallowed-references (list bash perl)
       #:test-target "test"
@@ -2102,7 +2102,7 @@ control to Git repositories.")
     (build-system gnu-build-system)
     (arguments
      `(#:imported-modules ((guix build guile-build-system)
-                           ,@%gnu-build-system-modules)
+                           ,@%default-gnu-imported-modules)
        #:make-flags (list "GUILE_AUTO_COMPILE=0")
        #:phases
        (modify-phases %standard-phases
@@ -4093,7 +4093,7 @@ TkDiff is included for browsing and merging your changes.")
      (list
       #:tests? #f                       ;No tests.
       #:imported-modules
-      `(,@%gnu-build-system-modules
+      `(,@%default-gnu-imported-modules
         (guix build python-build-system))
       #:modules
       '((guix build gnu-build-system)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 84be73a4335..511764102f0 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1912,7 +1912,7 @@ audio/video codec library.")
                "0np0yalqdrm7rn7iykgfzz3ly4vbgigrajg48c1l6n7qrzqvfszv"))))
     (arguments
      (substitute-keyword-arguments (package-arguments ffmpeg-4)
-       ((#:modules modules %gnu-build-system-modules)
+       ((#:modules modules %default-gnu-imported-modules)
         `((srfi srfi-1)
           ,@modules))
        ((#:configure-flags flags)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 3bdfe094a16..26d58b612c6 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -251,7 +251,7 @@
                   (srfi srfi-26)
                   (ice-9 ftw)
                   (ice-9 match)
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
       #:phases
       #~(modify-phases %standard-phases
           ;; Since we removed the bundled firmwares above, many tests
@@ -757,10 +757,10 @@ firmware blobs.  You can
                                        "ganeti-relax-dependencies.patch"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:imported-modules (,@%gnu-build-system-modules
+     `(#:imported-modules (,@%default-gnu-imported-modules
                            (guix build haskell-build-system)
                            (guix build python-build-system))
-       #:modules (,@%gnu-build-system-modules
+       #:modules (,@%default-gnu-imported-modules
                   ((guix build haskell-build-system) #:prefix haskell:)
                   ((guix build python-build-system) #:select (site-packages))
                   (srfi srfi-1)
@@ -1978,7 +1978,7 @@ client desktops.
                             (search-input-file %build-inputs
                                                "/bin/xmlto")))
        #:modules ((ice-9 ftw)
-                  ,@%gnu-build-system-modules)
+                  ,@%default-gnu-imported-modules)
        #:phases
        (modify-phases %standard-phases
          (delete 'configure)            ; no configure script
@@ -2350,7 +2350,7 @@ Open Container Initiative (OCI) image layout and its tagged images.")
       #:tests? #f                       ; The tests require Docker
       #:test-target "test-unit"
       #:imported-modules
-      (source-module-closure `(,@%gnu-build-system-modules
+      (source-module-closure `(,@%default-gnu-imported-modules
                                (guix build go-build-system)))
       #:phases
       #~(modify-phases %standard-phases
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index ddb2f1d303c..7a14e6dfb58 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -380,7 +380,7 @@ systems intended primarily for local access.")
        `(#:modules ((guix build gnu-build-system)
                     (guix build qt-utils)
                     (guix build utils))
-         #:imported-modules (,@%gnu-build-system-modules
+         #:imported-modules (,@%default-gnu-imported-modules
                              (guix build qt-utils))
          #:make-flags
          (list (string-append "PREFIX=" %output))
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 0b5e6ff17ed..31eeaf4be36 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -235,7 +235,7 @@
      `(#:tests? #f                      ; no target
        #:imported-modules
        ((guix build copy-build-system)
-        ,@%gnu-build-system-modules)
+        ,@%default-gnu-imported-modules)
        #:modules
        (((guix build copy-build-system) #:prefix copy:)
         (guix build gnu-build-system)
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 8d9b592bb32..da6568f7e1c 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -1587,7 +1587,7 @@ driver for the X.Org X Server version 1.7 and later (X11R7.5 or later).")
          "1fi27b73x85qqar526dbd33av7mahca2ykaqwr7siqiw1qqcby6j"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:imported-modules (,@%gnu-build-system-modules
+     `(#:imported-modules (,@%default-gnu-imported-modules
                            (guix build python-build-system))
        #:phases
        (modify-phases %standard-phases
@@ -3012,11 +3012,11 @@ can optionally use some appearance settings from XSettings, tint2 and GTK.")
       #:tests? #f                       ;no test suite
       #:modules `(((guix build guile-build-system)
                    #:select (target-guile-effective-version))
-                  ,@%gnu-build-system-modules
+                  ,@%default-gnu-imported-modules
                   (srfi srfi-26))
       #:phases
       (with-imported-modules `((guix build guile-build-system)
-                               ,@%gnu-build-system-modules)
+                               ,@%default-gnu-imported-modules)
         #~(modify-phases %standard-phases
             (add-after 'install 'wrap
               (lambda* (#:key inputs #:allow-other-keys)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 51283d316ac..980927787f1 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -6316,7 +6316,7 @@ X11 servers, Windows, or macOS.")
      `(#:modules ((guix build gnu-build-system)
                   (guix build utils)
                   (guix build emacs-utils))
-       #:imported-modules (,@%gnu-build-system-modules
+       #:imported-modules (,@%default-gnu-imported-modules
                            (guix build emacs-utils))
        #:configure-flags
        (list "--with-anthy-utf8"