summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2018-06-19 15:37:23 +0200
committerAndy Wingo <wingo@pobox.com>2018-06-19 15:37:23 +0200
commitd3cfabd89b1ba8d5d0516ad711ef9e433dac9aa0 (patch)
treeb2e660a4968be6668f40fb8ab69c315c58d7e158
parentaa896ac3ef15dcfaa6a2b318f60f5d26a557de83 (diff)
downloadguile-d3cfabd89b1ba8d5d0516ad711ef9e433dac9aa0.tar.gz
Devolve numbers.h from _scm.h.
* libguile/_scm.h: Remove numbers.h. * libguile/array-handle.c: * libguile/array-map.c: * libguile/arrays.c: * libguile/backtrace.c: * libguile/bitvectors.c: * libguile/bytevectors.c: * libguile/chars.c: * libguile/continuations.c: * libguile/debug-malloc.c: * libguile/error.c: * libguile/eval.c: * libguile/filesys.c: * libguile/foreign-object.c: * libguile/foreign.c: * libguile/fports.c: * libguile/frames.c: * libguile/gc.c: * libguile/generalized-arrays.c: * libguile/gettext.c: * libguile/goops.c: * libguile/gsubr.c: * libguile/guardians.c: * libguile/hash.c: * libguile/hashtab.c: * libguile/hooks.c: * libguile/i18n.c: * libguile/instructions.c: * libguile/intrinsics.c: * libguile/ioext.c: * libguile/list.c: * libguile/memoize.c: * libguile/net_db.c: * libguile/options.c: * libguile/ports.c: * libguile/posix-w32.c: * libguile/posix.c: * libguile/procprop.c: * libguile/programs.c: * libguile/r6rs-ports.c: * libguile/random.c: * libguile/rdelim.c: * libguile/read.c: * libguile/regex-posix.c: * libguile/rw.c: * libguile/scmsigs.c: * libguile/simpos.c: * libguile/smob.c: * libguile/socket.c: * libguile/srcprop.c: * libguile/srfi-13.c: * libguile/srfi-14.c: * libguile/srfi-4.c: * libguile/stackchk.c: * libguile/stacks.c: * libguile/stime.c: * libguile/strings.c: * libguile/struct.c: * libguile/symbols.c: * libguile/threads.c: * libguile/throw.c: * libguile/vectors.c: * libguile/version.c: * libguile/vm.c: * libguile/vports.c: * libguile/weak-table.c: Add numbers.h.
-rw-r--r--libguile/_scm.h1
-rw-r--r--libguile/array-handle.c1
-rw-r--r--libguile/array-map.c1
-rw-r--r--libguile/arrays.c1
-rw-r--r--libguile/backtrace.c1
-rw-r--r--libguile/bitvectors.c1
-rw-r--r--libguile/bytevectors.c1
-rw-r--r--libguile/chars.c1
-rw-r--r--libguile/continuations.c1
-rw-r--r--libguile/debug-malloc.c3
-rw-r--r--libguile/error.c1
-rw-r--r--libguile/eval.c1
-rw-r--r--libguile/filesys.c1
-rw-r--r--libguile/foreign-object.c1
-rw-r--r--libguile/foreign.c1
-rw-r--r--libguile/fports.c1
-rw-r--r--libguile/frames.c1
-rw-r--r--libguile/gc.c1
-rw-r--r--libguile/generalized-arrays.c1
-rw-r--r--libguile/gettext.c3
-rw-r--r--libguile/goops.c1
-rw-r--r--libguile/gsubr.c1
-rw-r--r--libguile/guardians.c1
-rw-r--r--libguile/hash.c1
-rw-r--r--libguile/hashtab.c1
-rw-r--r--libguile/hooks.c1
-rw-r--r--libguile/i18n.c1
-rw-r--r--libguile/instructions.c1
-rw-r--r--libguile/intrinsics.c1
-rw-r--r--libguile/ioext.c1
-rw-r--r--libguile/list.c1
-rw-r--r--libguile/memoize.c1
-rw-r--r--libguile/net_db.c1
-rw-r--r--libguile/options.c1
-rw-r--r--libguile/ports.c1
-rw-r--r--libguile/posix-w32.c2
-rw-r--r--libguile/posix.c1
-rw-r--r--libguile/procprop.c1
-rw-r--r--libguile/programs.c1
-rw-r--r--libguile/r6rs-ports.c1
-rw-r--r--libguile/random.c1
-rw-r--r--libguile/rdelim.c1
-rw-r--r--libguile/read.c1
-rw-r--r--libguile/regex-posix.c1
-rw-r--r--libguile/rw.c1
-rw-r--r--libguile/scmsigs.c1
-rw-r--r--libguile/simpos.c1
-rw-r--r--libguile/smob.c1
-rw-r--r--libguile/socket.c1
-rw-r--r--libguile/srcprop.c1
-rw-r--r--libguile/srfi-13.c1
-rw-r--r--libguile/srfi-14.c1
-rw-r--r--libguile/srfi-4.c1
-rw-r--r--libguile/stackchk.c4
-rw-r--r--libguile/stacks.c1
-rw-r--r--libguile/stime.c1
-rw-r--r--libguile/strings.c1
-rw-r--r--libguile/struct.c1
-rw-r--r--libguile/symbols.c1
-rw-r--r--libguile/threads.c1
-rw-r--r--libguile/throw.c1
-rw-r--r--libguile/vectors.c1
-rw-r--r--libguile/version.c3
-rw-r--r--libguile/vm.c1
-rw-r--r--libguile/vports.c1
-rw-r--r--libguile/weak-table.c1
66 files changed, 70 insertions, 6 deletions
diff --git a/libguile/_scm.h b/libguile/_scm.h
index 755a9ba55..920d09bd7 100644
--- a/libguile/_scm.h
+++ b/libguile/_scm.h
@@ -36,7 +36,6 @@
/* Include headers for those files central to the implementation. The
rest should be explicitly #included in the C files themselves. */
-#include "libguile/numbers.h" /* Everyone deals with fixnums. */
#include "libguile/symbols.h" /* For length, chars, values, miscellany. */
#include "libguile/threads.h" /* You are not alone. */
#include "libguile/snarf.h" /* Everyone snarfs. */
diff --git a/libguile/array-handle.c b/libguile/array-handle.c
index e8d33d9ed..94b95a657 100644
--- a/libguile/array-handle.c
+++ b/libguile/array-handle.c
@@ -32,6 +32,7 @@
#include "libguile/bytevectors.h"
#include "libguile/list.h"
#include "libguile/arrays.h"
+#include "libguile/numbers.h"
#include "libguile/pairs.h"
#include "libguile/vectors.h"
#include "libguile/array-handle.h"
diff --git a/libguile/array-map.c b/libguile/array-map.c
index 10ffee702..923dedd0d 100644
--- a/libguile/array-map.c
+++ b/libguile/array-map.c
@@ -40,6 +40,7 @@
#include "libguile/feature.h"
#include "libguile/vectors.h"
#include "libguile/list.h"
+#include "libguile/numbers.h"
#include "libguile/bitvectors.h"
#include "libguile/srfi-4.h"
#include "libguile/procs.h"
diff --git a/libguile/arrays.c b/libguile/arrays.c
index ed2fb6ee9..685231c0e 100644
--- a/libguile/arrays.c
+++ b/libguile/arrays.c
@@ -43,6 +43,7 @@
#include "libguile/srfi-13.h"
#include "libguile/srfi-4.h"
#include "libguile/vectors.h"
+#include "libguile/numbers.h"
#include "libguile/bitvectors.h"
#include "libguile/procs.h"
#include "libguile/bytevectors.h"
diff --git a/libguile/backtrace.c b/libguile/backtrace.c
index 17d8f8154..9b4a63075 100644
--- a/libguile/backtrace.c
+++ b/libguile/backtrace.c
@@ -42,6 +42,7 @@
#include "libguile/frames.h"
#include "libguile/list.h"
#include "libguile/keywords.h"
+#include "libguile/numbers.h"
#include "libguile/ports.h"
#include "libguile/posix.h"
#include "libguile/private-options.h"
diff --git a/libguile/bitvectors.c b/libguile/bitvectors.c
index c498d9fd3..a7be06e15 100644
--- a/libguile/bitvectors.c
+++ b/libguile/bitvectors.c
@@ -32,6 +32,7 @@
#include "libguile/array-handle.h"
#include "libguile/bitvectors.h"
#include "libguile/generalized-vectors.h"
+#include "libguile/numbers.h"
#include "libguile/list.h"
#include "libguile/arrays.h"
#include "libguile/ports.h"
diff --git a/libguile/bytevectors.c b/libguile/bytevectors.c
index eb590d2fa..75d9bca0c 100644
--- a/libguile/bytevectors.c
+++ b/libguile/bytevectors.c
@@ -42,6 +42,7 @@
#include "libguile/bytevectors.h"
#include "libguile/generalized-vectors.h"
#include "libguile/list.h"
+#include "libguile/numbers.h"
#include "libguile/pairs.h"
#include "libguile/ports.h"
#include "libguile/strings.h"
diff --git a/libguile/chars.c b/libguile/chars.c
index 2c5551b14..237653606 100644
--- a/libguile/chars.c
+++ b/libguile/chars.c
@@ -32,6 +32,7 @@
#include "libguile/_scm.h"
#include "libguile/boolean.h"
#include "libguile/chars.h"
+#include "libguile/numbers.h"
#include "libguile/pairs.h"
#include "libguile/srfi-14.h"
diff --git a/libguile/continuations.c b/libguile/continuations.c
index 2707308de..508ba88e8 100644
--- a/libguile/continuations.c
+++ b/libguile/continuations.c
@@ -38,6 +38,7 @@
#include "libguile/debug.h"
#include "libguile/init.h"
#include "libguile/list.h"
+#include "libguile/numbers.h"
#include "libguile/smob.h"
#include "libguile/stackchk.h"
#include "libguile/stacks.h"
diff --git a/libguile/debug-malloc.c b/libguile/debug-malloc.c
index fa3612de2..f6dabe7b0 100644
--- a/libguile/debug-malloc.c
+++ b/libguile/debug-malloc.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 2000,2006,2008,2018 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -25,6 +25,7 @@
#include "libguile/_scm.h"
#include "libguile/alist.h"
+#include "libguile/numbers.h"
#include "libguile/strings.h"
#include "libguile/debug-malloc.h"
diff --git a/libguile/error.c b/libguile/error.c
index f0d0cf422..13019072f 100644
--- a/libguile/error.c
+++ b/libguile/error.c
@@ -32,6 +32,7 @@
#include "libguile/async.h"
#include "libguile/dynwind.h"
#include "libguile/list.h"
+#include "libguile/numbers.h"
#include "libguile/pairs.h"
#include "libguile/strings.h"
#include "libguile/throw.h"
diff --git a/libguile/eval.c b/libguile/eval.c
index 2d22375a4..70b682a09 100644
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -50,6 +50,7 @@
#include "libguile/macros.h"
#include "libguile/memoize.h"
#include "libguile/modules.h"
+#include "libguile/numbers.h"
#include "libguile/ports.h"
#include "libguile/print.h"
#include "libguile/private-options.h"
diff --git a/libguile/filesys.c b/libguile/filesys.c
index de1887095..0be0b8f9a 100644
--- a/libguile/filesys.c
+++ b/libguile/filesys.c
@@ -91,6 +91,7 @@
#include "libguile/iselect.h"
#include "libguile/list.h"
#include "libguile/load.h" /* for scm_i_mirror_backslashes */
+#include "libguile/numbers.h"
#include "libguile/ports-internal.h"
#include "libguile/ports.h"
#include "libguile/posix.h"
diff --git a/libguile/foreign-object.c b/libguile/foreign-object.c
index f410cb906..9442cf629 100644
--- a/libguile/foreign-object.c
+++ b/libguile/foreign-object.c
@@ -29,6 +29,7 @@
#include "libguile/foreign-object.h"
#include "libguile/goops.h"
#include "libguile/list.h"
+#include "libguile/numbers.h"
#include "libguile/procs.h"
diff --git a/libguile/foreign.c b/libguile/foreign.c
index 050c489c2..ba7bc2161 100644
--- a/libguile/foreign.c
+++ b/libguile/foreign.c
@@ -38,6 +38,7 @@
#include "libguile/finalizers.h"
#include "libguile/foreign.h"
#include "libguile/keywords.h"
+#include "libguile/numbers.h"
#include "libguile/list.h"
#include "libguile/instructions.h"
#include "libguile/pairs.h"
diff --git a/libguile/fports.c b/libguile/fports.c
index c400be456..6121a0b80 100644
--- a/libguile/fports.c
+++ b/libguile/fports.c
@@ -59,6 +59,7 @@
#include "libguile/gc.h"
#include "libguile/hashtab.h"
#include "libguile/keywords.h"
+#include "libguile/numbers.h"
#include "libguile/ports-internal.h"
#include "libguile/posix.h"
#include "libguile/read.h"
diff --git a/libguile/frames.c b/libguile/frames.c
index 0ae858f05..11eb54efb 100644
--- a/libguile/frames.c
+++ b/libguile/frames.c
@@ -26,6 +26,7 @@
#include "boolean.h"
#include "eval.h"
#include "extensions.h"
+#include "numbers.h"
#include "frames.h"
#include "ports.h"
#include "vm.h"
diff --git a/libguile/gc.c b/libguile/gc.c
index 39d4f3298..f52302a8b 100644
--- a/libguile/gc.c
+++ b/libguile/gc.c
@@ -43,6 +43,7 @@
#include "libguile/ports.h"
#include "libguile/hooks.h"
#include "libguile/list.h"
+#include "libguile/numbers.h"
#include "libguile/simpos.h"
#include "libguile/strings.h"
#include "libguile/vectors.h"
diff --git a/libguile/generalized-arrays.c b/libguile/generalized-arrays.c
index 6fbdbafb2..d45d20605 100644
--- a/libguile/generalized-arrays.c
+++ b/libguile/generalized-arrays.c
@@ -33,6 +33,7 @@
#include "libguile/array-handle.h"
#include "libguile/generalized-arrays.h"
#include "libguile/list.h"
+#include "libguile/numbers.h"
SCM_INTERNAL SCM scm_i_array_ref (SCM v,
diff --git a/libguile/gettext.c b/libguile/gettext.c
index 2ae3ae5e4..3de3f5e89 100644
--- a/libguile/gettext.c
+++ b/libguile/gettext.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2004, 2006, 2018 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -24,6 +24,7 @@
#include "libguile/_scm.h"
#include "libguile/feature.h"
#include "libguile/strings.h"
+#include "libguile/numbers.h"
#include "libguile/dynwind.h"
#include "libguile/gettext.h"
diff --git a/libguile/goops.c b/libguile/goops.c
index a08f06f1d..5b2b9665a 100644
--- a/libguile/goops.c
+++ b/libguile/goops.c
@@ -40,6 +40,7 @@
#include "libguile/keywords.h"
#include "libguile/macros.h"
#include "libguile/modules.h"
+#include "libguile/numbers.h"
#include "libguile/pairs.h"
#include "libguile/ports.h"
#include "libguile/ports-internal.h"
diff --git a/libguile/gsubr.c b/libguile/gsubr.c
index 7eab772ff..3ed6f2787 100644
--- a/libguile/gsubr.c
+++ b/libguile/gsubr.c
@@ -30,6 +30,7 @@
#include "libguile/frames.h"
#include "libguile/gsubr.h"
#include "libguile/instructions.h"
+#include "libguile/numbers.h"
#include "libguile/private-options.h"
#include "libguile/programs.h"
#include "libguile/srfi-4.h"
diff --git a/libguile/guardians.c b/libguile/guardians.c
index fa5b43b63..52025b3a4 100644
--- a/libguile/guardians.c
+++ b/libguile/guardians.c
@@ -59,6 +59,7 @@
#include "libguile/guardians.h"
#include "libguile/hashtab.h"
#include "libguile/list.h"
+#include "libguile/numbers.h"
#include "libguile/ports.h"
#include "libguile/print.h"
#include "libguile/smob.h"
diff --git a/libguile/hash.c b/libguile/hash.c
index 8172f8f65..21dee0df1 100644
--- a/libguile/hash.c
+++ b/libguile/hash.c
@@ -35,6 +35,7 @@
#include "libguile/chars.h"
#include "libguile/pairs.h"
#include "libguile/ports.h"
+#include "libguile/numbers.h"
#include "libguile/strings.h"
#include "libguile/struct.h"
#include "libguile/symbols.h"
diff --git a/libguile/hashtab.c b/libguile/hashtab.c
index c0fe2db1b..03f71ff0f 100644
--- a/libguile/hashtab.c
+++ b/libguile/hashtab.c
@@ -37,6 +37,7 @@
#include "libguile/hash.h"
#include "libguile/hashtab.h"
#include "libguile/list.h"
+#include "libguile/numbers.h"
#include "libguile/ports.h"
#include "libguile/vectors.h"
#include "libguile/weak-table.h"
diff --git a/libguile/hooks.c b/libguile/hooks.c
index b60c68abb..dd3766adc 100644
--- a/libguile/hooks.c
+++ b/libguile/hooks.c
@@ -30,6 +30,7 @@
#include "libguile/eval.h"
#include "libguile/list.h"
+#include "libguile/numbers.h"
#include "libguile/ports.h"
#include "libguile/procprop.h"
#include "libguile/smob.h"
diff --git a/libguile/i18n.c b/libguile/i18n.c
index aa8314185..d7c444725 100644
--- a/libguile/i18n.c
+++ b/libguile/i18n.c
@@ -31,6 +31,7 @@
#include "libguile/list.h"
#include "libguile/strings.h"
#include "libguile/chars.h"
+#include "libguile/numbers.h"
#include "libguile/dynwind.h"
#include "libguile/syscalls.h"
#include "libguile/smob.h"
diff --git a/libguile/instructions.c b/libguile/instructions.c
index 6538d5686..19d9dec7c 100644
--- a/libguile/instructions.c
+++ b/libguile/instructions.c
@@ -25,6 +25,7 @@
#include "_scm.h"
#include "threads.h"
#include "libguile/list.h"
+#include "libguile/numbers.h"
#include "libguile/pairs.h"
#include "instructions.h"
#include "extensions.h"
diff --git a/libguile/intrinsics.c b/libguile/intrinsics.c
index 6c9356add..9d2f17fb2 100644
--- a/libguile/intrinsics.c
+++ b/libguile/intrinsics.c
@@ -28,6 +28,7 @@
#include "fluids.h"
#include "goops.h"
#include "keywords.h"
+#include "numbers.h"
#include "intrinsics.h"
diff --git a/libguile/ioext.c b/libguile/ioext.c
index e63b853c4..100d70830 100644
--- a/libguile/ioext.c
+++ b/libguile/ioext.c
@@ -37,6 +37,7 @@
#include "libguile/fports.h"
#include "libguile/hashtab.h"
#include "libguile/ioext.h"
+#include "libguile/numbers.h"
#include "libguile/ports-internal.h"
#include "libguile/ports.h"
#include "libguile/strings.h"
diff --git a/libguile/list.c b/libguile/list.c
index 89e63436f..7c1627ab9 100644
--- a/libguile/list.c
+++ b/libguile/list.c
@@ -26,6 +26,7 @@
#include "libguile/_scm.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"
+#include "libguile/numbers.h"
#include "libguile/eq.h"
#include "libguile/list.h"
diff --git a/libguile/memoize.c b/libguile/memoize.c
index 4d71e67a2..1a149c5e4 100644
--- a/libguile/memoize.c
+++ b/libguile/memoize.c
@@ -39,6 +39,7 @@
#include "libguile/macros.h"
#include "libguile/memoize.h"
#include "libguile/modules.h"
+#include "libguile/numbers.h"
#include "libguile/srcprop.h"
#include "libguile/ports.h"
#include "libguile/print.h"
diff --git a/libguile/net_db.c b/libguile/net_db.c
index 34f97565f..b500eb802 100644
--- a/libguile/net_db.c
+++ b/libguile/net_db.c
@@ -50,6 +50,7 @@
#include "libguile/boolean.h"
#include "libguile/feature.h"
#include "libguile/list.h"
+#include "libguile/numbers.h"
#include "libguile/strings.h"
#include "libguile/vectors.h"
#include "libguile/dynwind.h"
diff --git a/libguile/options.c b/libguile/options.c
index 56b692332..558ea45d5 100644
--- a/libguile/options.c
+++ b/libguile/options.c
@@ -27,6 +27,7 @@
#include "libguile/boolean.h"
#include "libguile/list.h"
#include "libguile/mallocs.h"
+#include "libguile/numbers.h"
#include "libguile/strings.h"
#include "libguile/options.h"
diff --git a/libguile/ports.c b/libguile/ports.c
index d95af7efb..5a51360fc 100644
--- a/libguile/ports.c
+++ b/libguile/ports.c
@@ -56,6 +56,7 @@
#include "libguile/hashtab.h"
#include "libguile/strings.h"
#include "libguile/mallocs.h"
+#include "libguile/numbers.h"
#include "libguile/ports.h"
#include "libguile/ports-internal.h"
#include "libguile/private-options.h"
diff --git a/libguile/posix-w32.c b/libguile/posix-w32.c
index 1f00ec168..142b57675 100644
--- a/libguile/posix-w32.c
+++ b/libguile/posix-w32.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2006, 2008, 2016 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2006, 2008, 2016, 2018 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/posix.c b/libguile/posix.c
index 0fc3aaf73..edf03b01c 100644
--- a/libguile/posix.c
+++ b/libguile/posix.c
@@ -73,6 +73,7 @@
#include "libguile/bitvectors.h"
#include "libguile/scmsigs.h"
#include "libguile/feature.h"
+#include "libguile/numbers.h"
#include "libguile/strings.h"
#include "libguile/srfi-13.h"
#include "libguile/srfi-14.h"
diff --git a/libguile/procprop.c b/libguile/procprop.c
index d04081388..01a635c2e 100644
--- a/libguile/procprop.c
+++ b/libguile/procprop.c
@@ -32,6 +32,7 @@
#include "libguile/list.h"
#include "libguile/procs.h"
#include "libguile/gsubr.h"
+#include "libguile/numbers.h"
#include "libguile/smob.h"
#include "libguile/vectors.h"
#include "libguile/weak-table.h"
diff --git a/libguile/programs.c b/libguile/programs.c
index 267969a55..697338419 100644
--- a/libguile/programs.c
+++ b/libguile/programs.c
@@ -28,6 +28,7 @@
#include "eval.h"
#include "extensions.h"
#include "modules.h"
+#include "numbers.h"
#include "pairs.h"
#include "ports.h"
#include "programs.h"
diff --git a/libguile/r6rs-ports.c b/libguile/r6rs-ports.c
index 64c0e7dff..3db8bd54b 100644
--- a/libguile/r6rs-ports.c
+++ b/libguile/r6rs-ports.c
@@ -33,6 +33,7 @@
#include "libguile/eval.h"
#include "libguile/extensions.h"
#include "libguile/procs.h"
+#include "libguile/numbers.h"
#include "libguile/r6rs-ports.h"
#include "libguile/strings.h"
#include "libguile/smob.h"
diff --git a/libguile/random.c b/libguile/random.c
index 7ecb3f24d..66626f76c 100644
--- a/libguile/random.c
+++ b/libguile/random.c
@@ -39,6 +39,7 @@
#include "libguile/list.h"
#include "libguile/numbers.h"
#include "libguile/feature.h"
+#include "libguile/numbers.h"
#include "libguile/pairs.h"
#include "libguile/stime.h"
#include "libguile/strings.h"
diff --git a/libguile/rdelim.c b/libguile/rdelim.c
index 4df3f005e..40d0073da 100644
--- a/libguile/rdelim.c
+++ b/libguile/rdelim.c
@@ -32,6 +32,7 @@
#include "libguile/chars.h"
#include "libguile/list.h"
#include "libguile/modules.h"
+#include "libguile/numbers.h"
#include "libguile/ports.h"
#include "libguile/rdelim.h"
#include "libguile/strings.h"
diff --git a/libguile/read.c b/libguile/read.c
index 497f1d9a1..7b9854183 100644
--- a/libguile/read.c
+++ b/libguile/read.c
@@ -48,6 +48,7 @@
#include "libguile/hash.h"
#include "libguile/eq.h"
#include "libguile/fluids.h"
+#include "libguile/numbers.h"
#include "libguile/ports.h"
#include "libguile/ports-internal.h"
#include "libguile/fports.h"
diff --git a/libguile/regex-posix.c b/libguile/regex-posix.c
index 3451b9b8a..8f47912de 100644
--- a/libguile/regex-posix.c
+++ b/libguile/regex-posix.c
@@ -46,6 +46,7 @@
#include "libguile/async.h"
#include "libguile/list.h"
+#include "libguile/numbers.h"
#include "libguile/smob.h"
#include "libguile/symbols.h"
#include "libguile/vectors.h"
diff --git a/libguile/rw.c b/libguile/rw.c
index 5cae924b2..b13da1c89 100644
--- a/libguile/rw.c
+++ b/libguile/rw.c
@@ -30,6 +30,7 @@
#include "libguile/_scm.h"
#include "libguile/async.h"
#include "libguile/fports.h"
+#include "libguile/numbers.h"
#include "libguile/ports.h"
#include "libguile/rw.h"
#include "libguile/strings.h"
diff --git a/libguile/scmsigs.c b/libguile/scmsigs.c
index c46aa98d0..a2797344d 100644
--- a/libguile/scmsigs.c
+++ b/libguile/scmsigs.c
@@ -50,6 +50,7 @@
#include "libguile/feature.h"
#include "libguile/eval.h"
#include "libguile/list.h"
+#include "libguile/numbers.h"
#include "libguile/procs.h"
#include "libguile/vectors.h"
#include "libguile/syscalls.h"
diff --git a/libguile/simpos.c b/libguile/simpos.c
index 2e8c0448b..3701f791e 100644
--- a/libguile/simpos.c
+++ b/libguile/simpos.c
@@ -29,6 +29,7 @@
#include "libguile/_scm.h"
+#include "libguile/numbers.h"
#include "libguile/strings.h"
#include "libguile/simpos.h"
diff --git a/libguile/smob.c b/libguile/smob.c
index 141cb0605..e2ebef8f0 100644
--- a/libguile/smob.c
+++ b/libguile/smob.c
@@ -33,6 +33,7 @@
#include "libguile/goops.h"
#include "libguile/finalizers.h"
#include "libguile/instructions.h"
+#include "libguile/numbers.h"
#include "libguile/ports.h"
#include "libguile/programs.h"
diff --git a/libguile/socket.c b/libguile/socket.c
index 20b2d05ee..1ab81586e 100644
--- a/libguile/socket.c
+++ b/libguile/socket.c
@@ -54,6 +54,7 @@
#include "libguile/feature.h"
#include "libguile/fports.h"
#include "libguile/list.h"
+#include "libguile/numbers.h"
#include "libguile/strings.h"
#include "libguile/vectors.h"
#include "libguile/dynwind.h"
diff --git a/libguile/srcprop.c b/libguile/srcprop.c
index 0f68dfbf2..d33731bc5 100644
--- a/libguile/srcprop.c
+++ b/libguile/srcprop.c
@@ -34,6 +34,7 @@
#include "libguile/hash.h"
#include "libguile/keywords.h"
#include "libguile/list.h"
+#include "libguile/numbers.h"
#include "libguile/ports.h"
#include "libguile/gc.h"
#include "libguile/weak-table.h"
diff --git a/libguile/srfi-13.c b/libguile/srfi-13.c
index 9101976b4..d961c50ca 100644
--- a/libguile/srfi-13.c
+++ b/libguile/srfi-13.c
@@ -35,6 +35,7 @@
#include "libguile/error.h"
#include "libguile/hash.h"
#include "libguile/list.h"
+#include "libguile/numbers.h"
#include "libguile/procs.h"
#include "libguile/srfi-13.h"
#include "libguile/srfi-14.h"
diff --git a/libguile/srfi-14.c b/libguile/srfi-14.c
index c7b55a141..059923b49 100644
--- a/libguile/srfi-14.c
+++ b/libguile/srfi-14.c
@@ -35,6 +35,7 @@
#include "libguile/eval.h"
#include "libguile/list.h"
#include "libguile/ports.h"
+#include "libguile/numbers.h"
#include "libguile/procs.h"
#include "libguile/srfi-14.h"
#include "libguile/strings.h"
diff --git a/libguile/srfi-4.c b/libguile/srfi-4.c
index fffad4884..9d78a555c 100644
--- a/libguile/srfi-4.c
+++ b/libguile/srfi-4.c
@@ -34,6 +34,7 @@
#include "libguile/eval.h"
#include "libguile/extensions.h"
#include "libguile/generalized-vectors.h"
+#include "libguile/numbers.h"
#include "libguile/uniform.h"
diff --git a/libguile/stackchk.c b/libguile/stackchk.c
index 96f72408d..28760c497 100644
--- a/libguile/stackchk.c
+++ b/libguile/stackchk.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1995,1996,1997, 2000, 2001, 2006, 2008, 2010, 2011, 2014 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1997,2000-2001,2006,2008,2010-2011,2014,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -23,6 +24,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/numbers.h"
#include "libguile/ports.h"
#include "libguile/threads.h"
#include "libguile/dynwind.h"
diff --git a/libguile/stacks.c b/libguile/stacks.c
index d0f5ebcb7..e3842332c 100644
--- a/libguile/stacks.c
+++ b/libguile/stacks.c
@@ -33,6 +33,7 @@
#include "libguile/list.h"
#include "libguile/struct.h"
#include "libguile/macros.h"
+#include "libguile/numbers.h"
#include "libguile/pairs.h"
#include "libguile/procprop.h"
#include "libguile/modules.h"
diff --git a/libguile/stime.c b/libguile/stime.c
index b77216262..aaa159546 100644
--- a/libguile/stime.c
+++ b/libguile/stime.c
@@ -54,6 +54,7 @@
#include "libguile/boolean.h"
#include "libguile/async.h"
#include "libguile/feature.h"
+#include "libguile/numbers.h"
#include "libguile/strings.h"
#include "libguile/vectors.h"
#include "libguile/dynwind.h"
diff --git a/libguile/strings.c b/libguile/strings.c
index 7a2211147..f1a263033 100644
--- a/libguile/strings.c
+++ b/libguile/strings.c
@@ -39,6 +39,7 @@
#include "libguile/pairs.h"
#include "libguile/chars.h"
#include "libguile/strings.h"
+#include "libguile/numbers.h"
#include "libguile/ports.h"
#include "libguile/ports-internal.h"
#include "libguile/error.h"
diff --git a/libguile/struct.c b/libguile/struct.c
index ec78b07b4..a7f66992d 100644
--- a/libguile/struct.c
+++ b/libguile/struct.c
@@ -36,6 +36,7 @@
#include "libguile/eval.h"
#include "libguile/finalizers.h"
#include "libguile/goops.h"
+#include "libguile/numbers.h"
#include "libguile/alist.h"
#include "libguile/hashtab.h"
#include "libguile/pairs.h"
diff --git a/libguile/symbols.c b/libguile/symbols.c
index 81d1e8847..603502fca 100644
--- a/libguile/symbols.c
+++ b/libguile/symbols.c
@@ -37,6 +37,7 @@
#include "libguile/variable.h"
#include "libguile/alist.h"
#include "libguile/fluids.h"
+#include "libguile/numbers.h"
#include "libguile/strings.h"
#include "libguile/vectors.h"
#include "libguile/weak-set.h"
diff --git a/libguile/threads.c b/libguile/threads.c
index 1e0ad56b4..8e3887a9d 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -50,6 +50,7 @@
#include "libguile/eval.h"
#include "libguile/list.h"
#include "libguile/async.h"
+#include "libguile/numbers.h"
#include "libguile/ports.h"
#include "libguile/threads.h"
#include "libguile/dynwind.h"
diff --git a/libguile/throw.c b/libguile/throw.c
index 23163e43b..18c0e0d08 100644
--- a/libguile/throw.c
+++ b/libguile/throw.c
@@ -37,6 +37,7 @@
#include "libguile/backtrace.h"
#include "libguile/debug.h"
#include "libguile/list.h"
+#include "libguile/numbers.h"
#include "libguile/stackchk.h"
#include "libguile/stacks.h"
#include "libguile/fluids.h"
diff --git a/libguile/vectors.c b/libguile/vectors.c
index 1db079d5c..13024ed8f 100644
--- a/libguile/vectors.c
+++ b/libguile/vectors.c
@@ -27,6 +27,7 @@
#include "libguile/pairs.h"
#include "libguile/eq.h"
#include "libguile/list.h"
+#include "libguile/numbers.h"
#include "libguile/vectors.h"
#include "libguile/array-handle.h"
diff --git a/libguile/version.c b/libguile/version.c
index f1bd3c3f9..b72cd4037 100644
--- a/libguile/version.c
+++ b/libguile/version.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996, 1999, 2000, 2001, 2006, 2008, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996, 1999, 2000, 2001, 2006, 2008, 2010, 2018 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -25,6 +25,7 @@
#include <stdio.h>
#include "libguile/_scm.h"
#include "libguile/strings.h"
+#include "libguile/numbers.h"
#include "libguile/version.h"
diff --git a/libguile/vm.c b/libguile/vm.c
index da095f9ac..404a98b3a 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -50,6 +50,7 @@
#include "libguile/dynwind.h"
#include "libguile/extensions.h"
#include "libguile/alist.h"
+#include "libguile/numbers.h"
#include "libguile/procprop.h"
#include "libguile/list.h"
#include "libguile/stackchk.h"
diff --git a/libguile/vports.c b/libguile/vports.c
index b10190268..7c07f9c3c 100644
--- a/libguile/vports.c
+++ b/libguile/vports.c
@@ -34,6 +34,7 @@
#include "libguile/ports.h"
#include "libguile/ports-internal.h"
#include "libguile/fports.h"
+#include "libguile/numbers.h"
#include "libguile/strings.h"
#include "libguile/vectors.h"
diff --git a/libguile/weak-table.c b/libguile/weak-table.c
index 24a4cad31..f56490106 100644
--- a/libguile/weak-table.c
+++ b/libguile/weak-table.c
@@ -33,6 +33,7 @@
#include "libguile/finalizers.h"
#include "libguile/hash.h"
#include "libguile/eval.h"
+#include "libguile/numbers.h"
#include "libguile/ports.h"
#include "libguile/procs.h"
#include "libguile/weak-list.h"