Devolve symbols.h from _scm.h

* libguile/_scm.h: Remove symbols.h.
* libguile/array-handle.c:
* libguile/array-map.c:
* libguile/backtrace.c:
* libguile/bytevectors.c:
* libguile/chars.c:
* libguile/continuations.c:
* libguile/error.c:
* libguile/eval.c:
* libguile/evalext.c:
* libguile/expand.c:
* libguile/feature.c:
* libguile/filesys.c:
* libguile/foreign.c:
* libguile/fports.c:
* libguile/frames.c:
* libguile/gc.c:
* libguile/goops.c:
* libguile/gsubr.c:
* libguile/i18n.c:
* libguile/instructions.c:
* libguile/intrinsics.c:
* libguile/keywords.c:
* libguile/load.c:
* libguile/macros.c:
* libguile/memoize.c:
* libguile/modules.c:
* libguile/net_db.c:
* libguile/options.c:
* libguile/ports.c:
* libguile/posix.c:
* libguile/print.c:
* libguile/procprop.c:
* libguile/procs.c:
* libguile/r6rs-ports.c:
* libguile/random.c:
* libguile/read.c:
* libguile/socket.c:
* libguile/srcprop.c:
* libguile/srfi-13.c:
* libguile/srfi-14.c:
* libguile/stacks.c:
* libguile/strings.c:
* libguile/strports.c:
* libguile/struct.c:
* libguile/threads.c:
* libguile/throw.c:
* libguile/vm.c: Add symbols.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/symbols.h"	/* For length, chars, values, miscellany.  */
 #include "libguile/foreign.h"	/* Snarfing needs the foreign data structures. */
 #include "libguile/programs.h"	/* ... and program.h. */
 #include "libguile/strings.h"

libguile/array-handle.c

@@ -34,6 +34,7 @@
 #include "libguile/arrays.h"
 #include "libguile/numbers.h"
 #include "libguile/pairs.h"
+#include "libguile/symbols.h"
 #include "libguile/vectors.h"
 #include "libguile/array-handle.h"
 

libguile/array-map.c

@@ -44,6 +44,7 @@
 #include "libguile/numbers.h"
 #include "libguile/bitvectors.h"
 #include "libguile/srfi-4.h"
+#include "libguile/symbols.h"
 #include "libguile/procs.h"
 #include "libguile/generalized-arrays.h"
 

libguile/backtrace.c

@@ -53,6 +53,7 @@
 #include "libguile/strings.h"
 #include "libguile/strports.h"
 #include "libguile/struct.h"
+#include "libguile/symbols.h"
 #include "libguile/throw.h"
 #include "libguile/variable.h"
 

libguile/bytevectors.c

@@ -48,6 +48,7 @@
 #include "libguile/pairs.h"
 #include "libguile/ports.h"
 #include "libguile/strings.h"
+#include "libguile/symbols.h"
 #include "libguile/arrays.h"
 #include "libguile/array-handle.h"
 #include "libguile/uniform.h"

libguile/chars.c

@@ -35,6 +35,7 @@
 #include "libguile/chars.h"
 #include "libguile/numbers.h"
 #include "libguile/pairs.h"
+#include "libguile/symbols.h"
 #include "libguile/srfi-14.h"
 
 

libguile/continuations.c

@@ -46,6 +46,7 @@
 #include "libguile/ports.h"
 #include "libguile/dynstack.h"
 #include "libguile/eval.h"
+#include "libguile/symbols.h"
 #include "libguile/vm.h"
 #include "libguile/instructions.h"
 

libguile/error.c

@@ -37,6 +37,7 @@
 #include "libguile/numbers.h"
 #include "libguile/pairs.h"
 #include "libguile/strings.h"
+#include "libguile/symbols.h"
 #include "libguile/throw.h"
 
 #include "libguile/error.h"

libguile/eval.c

@@ -61,6 +61,7 @@
 #include "libguile/srcprop.h"
 #include "libguile/stackchk.h"
 #include "libguile/strings.h"
+#include "libguile/symbols.h"
 #include "libguile/threads.h"
 #include "libguile/throw.h"
 #include "libguile/values.h"

libguile/evalext.c

@@ -30,6 +30,7 @@
 #include "libguile/fluids.h"
 #include "libguile/modules.h"
 #include "libguile/pairs.h"
+#include "libguile/symbols.h"
 #include "libguile/variable.h"
 
 #include "libguile/evalext.h"

libguile/expand.c

@@ -41,6 +41,7 @@
 #include "libguile/print.h"
 #include "libguile/srcprop.h"
 #include "libguile/strings.h"
+#include "libguile/symbols.h"
 #include "libguile/throw.h"
 #include "libguile/variable.h"
 #include "libguile/vectors.h"

libguile/feature.c

@@ -33,6 +33,7 @@
 #include "libguile/pairs.h"
 #include "libguile/strings.h"
 #include "libguile/fluids.h"
+#include "libguile/symbols.h"
 #include "libguile/variable.h"
 
 #include "libguile/feature.h"

libguile/filesys.c

@@ -100,6 +100,7 @@
 #include "libguile/smob.h"
 #include "libguile/srfi-13.h"
 #include "libguile/strings.h"
+#include "libguile/symbols.h"
 #include "libguile/syscalls.h"
 #include "libguile/vectors.h"
 

libguile/foreign.c

@@ -46,6 +46,7 @@
 #include "libguile/pairs.h"
 #include "libguile/ports.h"
 #include "libguile/stacks.h"
+#include "libguile/symbols.h"
 #include "libguile/threads.h"
 #include "libguile/weak-table.h"
 

libguile/fports.c

@@ -66,6 +66,7 @@
 #include "libguile/posix.h"
 #include "libguile/read.h"
 #include "libguile/strings.h"
+#include "libguile/symbols.h"
 #include "libguile/syscalls.h"
 #include "libguile/variable.h"
 

libguile/frames.c

@@ -31,6 +31,7 @@
 #include "numbers.h"
 #include "frames.h"
 #include "ports.h"
+#include "libguile/symbols.h"
 #include "threads.h"
 #include "libguile/variable.h"
 #include "vm.h"

libguile/gc.c

@@ -48,6 +48,7 @@
 #include "libguile/numbers.h"
 #include "libguile/simpos.h"
 #include "libguile/strings.h"
+#include "libguile/symbols.h"
 #include "libguile/vectors.h"
 #include "libguile/hashtab.h"
 #include "libguile/tags.h"

libguile/goops.c

@@ -49,6 +49,7 @@
 #include "libguile/smob.h"
 #include "libguile/strings.h"
 #include "libguile/strports.h"
+#include "libguile/symbols.h"
 #include "libguile/variable.h"
 #include "libguile/vectors.h"
 #include "libguile/weak-table.h"

libguile/gsubr.c

@@ -35,6 +35,7 @@
 #include "libguile/private-options.h"
 #include "libguile/programs.h"
 #include "libguile/srfi-4.h"
+#include "libguile/symbols.h"
 
 
 /*

libguile/i18n.c

@@ -37,6 +37,7 @@
 #include "libguile/dynwind.h"
 #include "libguile/syscalls.h"
 #include "libguile/smob.h"
+#include "libguile/symbols.h"
 #include "libguile/values.h"
 #include "libguile/variable.h"
 #include "libguile/threads.h"

libguile/instructions.c

@@ -28,6 +28,7 @@
 #include "libguile/list.h"
 #include "libguile/numbers.h"
 #include "libguile/pairs.h"
+#include "libguile/symbols.h"
 #include "instructions.h"
 #include "extensions.h"
 

libguile/intrinsics.c

@@ -31,6 +31,7 @@
 #include "keywords.h"
 #include "libguile/modules.h"
 #include "numbers.h"
+#include "libguile/symbols.h"
 #include "intrinsics.h"
 
 

libguile/keywords.c

@@ -35,9 +35,10 @@
 #include "libguile/smob.h"
 #include "libguile/dynwind.h"
 #include "libguile/hashtab.h"
+#include "libguile/strings.h"
+#include "libguile/symbols.h"
 
 #include "libguile/keywords.h"
-#include "libguile/strings.h"
 
 
 

libguile/load.c

@@ -48,6 +48,7 @@
 #include "libguile/read.h"
 #include "libguile/srfi-13.h"
 #include "libguile/strings.h"
+#include "libguile/symbols.h"
 #include "libguile/throw.h"
 #include "libguile/variable.h"
 

libguile/macros.c

@@ -31,6 +31,7 @@
 #include "libguile/procs.h"
 #include "libguile/random.h"
 #include "libguile/smob.h"
+#include "libguile/symbols.h"
 #include "libguile/macros.h"
 #include "libguile/variable.h"
 

libguile/memoize.c

@@ -46,6 +46,7 @@
 #include "libguile/ports.h"
 #include "libguile/print.h"
 #include "libguile/strings.h"
+#include "libguile/symbols.h"
 #include "libguile/throw.h"
 #include "libguile/threads.h"
 #include "libguile/variable.h"

libguile/modules.c

@@ -37,6 +37,7 @@
 #include "libguile/keywords.h"
 #include "libguile/hashtab.h"
 #include "libguile/struct.h"
+#include "libguile/symbols.h"
 #include "libguile/variable.h"
 #include "libguile/fluids.h"
 #include "libguile/deprecation.h"

libguile/net_db.c

@@ -56,6 +56,7 @@
 #include "libguile/strings.h"
 #include "libguile/vectors.h"
 #include "libguile/dynwind.h"
+#include "libguile/symbols.h"
 #include "libguile/throw.h"
 
 #include "libguile/net_db.h"

libguile/options.c

@@ -29,6 +29,7 @@
 #include "libguile/mallocs.h"
 #include "libguile/numbers.h"
 #include "libguile/strings.h"
+#include "libguile/symbols.h"
 
 #include "libguile/options.h"
 

libguile/ports.c

@@ -63,6 +63,7 @@
 #include "libguile/ports-internal.h"
 #include "libguile/private-options.h"
 #include "libguile/procs.h"
+#include "libguile/symbols.h"
 #include "libguile/syscalls.h"
 #include "libguile/variable.h"
 #include "libguile/vectors.h"

libguile/posix.c

@@ -79,6 +79,7 @@
 #include "libguile/strings.h"
 #include "libguile/srfi-13.h"
 #include "libguile/srfi-14.h"
+#include "libguile/symbols.h"
 #include "libguile/syscalls.h"
 #include "libguile/vectors.h"
 #include "libguile/values.h"

libguile/print.c

@@ -59,6 +59,7 @@
 #include "libguile/ports-internal.h"
 #include "libguile/strings.h"
 #include "libguile/strports.h"
+#include "libguile/symbols.h"
 #include "libguile/syntax.h"
 #include "libguile/variable.h"
 #include "libguile/vectors.h"

libguile/procprop.c

@@ -34,6 +34,7 @@
 #include "libguile/gsubr.h"
 #include "libguile/numbers.h"
 #include "libguile/smob.h"
+#include "libguile/symbols.h"
 #include "libguile/threads.h"
 #include "libguile/vectors.h"
 #include "libguile/weak-table.h"

libguile/procs.c

@@ -32,11 +32,13 @@
 #include "libguile/smob.h"
 #include "libguile/struct.h"
 #include "libguile/deprecation.h"
-
-#include "libguile/procs.h"
 #include "libguile/procprop.h"
+#include "libguile/symbols.h"
 #include "libguile/loader.h"
 #include "libguile/programs.h"
+
+#include "libguile/procs.h"
+
 
 
 

libguile/r6rs-ports.c

@@ -38,6 +38,7 @@
 #include "libguile/r6rs-ports.h"
 #include "libguile/strings.h"
 #include "libguile/smob.h"
+#include "libguile/symbols.h"
 #include "libguile/values.h"
 #include "libguile/vectors.h"
 #include "libguile/ports-internal.h"

libguile/random.c

@@ -44,6 +44,7 @@
 #include "libguile/pairs.h"
 #include "libguile/stime.h"
 #include "libguile/strings.h"
+#include "libguile/symbols.h"
 #include "libguile/arrays.h"
 #include "libguile/srfi-4.h"
 #include "libguile/variable.h"

libguile/read.c

@@ -60,6 +60,7 @@
 #include "libguile/vectors.h"
 #include "libguile/srfi-4.h"
 #include "libguile/srfi-13.h"
+#include "libguile/symbols.h"
 
 #include "libguile/read.h"
 #include "libguile/private-options.h"

libguile/socket.c

@@ -58,6 +58,7 @@
 #include "libguile/modules.h"
 #include "libguile/numbers.h"
 #include "libguile/strings.h"
+#include "libguile/symbols.h"
 #include "libguile/vectors.h"
 #include "libguile/dynwind.h"
 #include "libguile/srfi-13.h"

libguile/srcprop.c

@@ -39,6 +39,7 @@
 #include "libguile/numbers.h"
 #include "libguile/ports.h"
 #include "libguile/gc.h"
+#include "libguile/symbols.h"
 #include "libguile/weak-table.h"
 
 #include "libguile/srcprop.h"

libguile/srfi-13.c

@@ -40,6 +40,7 @@
 #include "libguile/procs.h"
 #include "libguile/srfi-13.h"
 #include "libguile/srfi-14.h"
+#include "libguile/symbols.h"
 
 #define MY_VALIDATE_SUBSTRING_SPEC(pos_str, str,              \
                                    pos_start, start, c_start, \

libguile/srfi-14.c

@@ -42,6 +42,7 @@
 #include "libguile/smob.h"
 #include "libguile/srfi-14.h"
 #include "libguile/strings.h"
+#include "libguile/symbols.h"
 #include "libguile/values.h"
 
 /* Include the pre-computed standard charset data.  */

libguile/stacks.c

@@ -39,6 +39,7 @@
 #include "libguile/procprop.h"
 #include "libguile/modules.h"
 #include "libguile/strings.h"
+#include "libguile/symbols.h"
 #include "libguile/vm.h" /* to capture vm stacks */
 #include "libguile/frames.h" /* vm frames */
 

libguile/strings.c

@@ -46,6 +46,7 @@
 #include "libguile/error.h"
 #include "libguile/generalized-vectors.h"
 #include "libguile/deprecation.h"
+#include "libguile/symbols.h"
 #include "libguile/threads.h"
 #include "libguile/private-options.h"
 

libguile/strports.c

@@ -37,6 +37,7 @@
 #include "libguile/procs.h"
 #include "libguile/read.h"
 #include "libguile/strings.h"
+#include "libguile/symbols.h"
 #include "libguile/syscalls.h"
 #include "libguile/modules.h"
 #include "libguile/deprecation.h"

libguile/struct.c

@@ -45,6 +45,7 @@
 #include "libguile/ports.h"
 #include "libguile/strings.h"
 #include "libguile/srfi-13.h"
+#include "libguile/symbols.h"
 
 #include "libguile/struct.h"
 

libguile/threads.c

@@ -30,7 +30,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>   /* for memset used by FD_ZERO on Solaris 10 */
-#include <sys/select.h>
 #include <sys/time.h>
 #include <unistd.h>
 
@@ -64,6 +63,7 @@
 #include "libguile/init.h"
 #include "libguile/scmsigs.h"
 #include "libguile/strings.h"
+#include "libguile/symbols.h"
 #include "libguile/variable.h"
 #include "libguile/vm.h"
 

libguile/throw.c

@@ -48,6 +48,7 @@
 #include "libguile/throw.h"
 #include "libguile/init.h"
 #include "libguile/strings.h"
+#include "libguile/symbols.h"
 #include "libguile/variable.h"
 
 #include "libguile/private-options.h"

libguile/vm.c

@@ -66,6 +66,7 @@
 #include "libguile/ports.h"
 #include "libguile/programs.h"
 #include "libguile/simpos.h"
+#include "libguile/symbols.h"
 #include "libguile/vectors.h"
 #include "libguile/vm.h"
 #include "libguile/vm-builtins.h"