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.

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. */

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"

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"

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"

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"

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"

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"

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"
 

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"

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"

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"

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"

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"

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"
 
 

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"

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"

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"

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"

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,

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"

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"

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"

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"

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"

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"

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"

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"

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"

libguile/intrinsics.c

@@ -28,6 +28,7 @@
 #include "fluids.h"
 #include "goops.h"
 #include "keywords.h"
+#include "numbers.h"
 #include "intrinsics.h"
 
 

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"

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"

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"

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"

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"

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"

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

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

libguile/simpos.c

@@ -29,6 +29,7 @@
 
 #include "libguile/_scm.h"
 
+#include "libguile/numbers.h"
 #include "libguile/strings.h"
 #include "libguile/simpos.h"
 

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"
 

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"

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"

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"

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"

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"
 
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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"

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"
 

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"