diff --git a/libguile/_scm.h b/libguile/_scm.h index a66dac760..e35bf2122 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/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" diff --git a/libguile/array-handle.c b/libguile/array-handle.c index 94b95a657..3c544a84f 100644 --- a/libguile/array-handle.c +++ b/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" diff --git a/libguile/array-map.c b/libguile/array-map.c index addd048b3..e0e8960a5 100644 --- a/libguile/array-map.c +++ b/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" diff --git a/libguile/backtrace.c b/libguile/backtrace.c index 31c0ffff5..5c883ac6f 100644 --- a/libguile/backtrace.c +++ b/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" diff --git a/libguile/bytevectors.c b/libguile/bytevectors.c index f50ca828d..f53e57b1b 100644 --- a/libguile/bytevectors.c +++ b/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" diff --git a/libguile/chars.c b/libguile/chars.c index cab87cd7e..f9f019a13 100644 --- a/libguile/chars.c +++ b/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" diff --git a/libguile/continuations.c b/libguile/continuations.c index 779810d9a..d887ecd9c 100644 --- a/libguile/continuations.c +++ b/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" diff --git a/libguile/error.c b/libguile/error.c index 11d84bbb8..f3693d36b 100644 --- a/libguile/error.c +++ b/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" diff --git a/libguile/eval.c b/libguile/eval.c index 9de80c9e8..5207a7d26 100644 --- a/libguile/eval.c +++ b/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" diff --git a/libguile/evalext.c b/libguile/evalext.c index 6e863b29c..7738e1084 100644 --- a/libguile/evalext.c +++ b/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" diff --git a/libguile/expand.c b/libguile/expand.c index 9f6e455e0..7a9cde7c6 100644 --- a/libguile/expand.c +++ b/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" diff --git a/libguile/feature.c b/libguile/feature.c index ed02c7b4a..acbfe30d9 100644 --- a/libguile/feature.c +++ b/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" diff --git a/libguile/filesys.c b/libguile/filesys.c index 1c52537f0..814e57b51 100644 --- a/libguile/filesys.c +++ b/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" diff --git a/libguile/foreign.c b/libguile/foreign.c index 9b20348ac..c535cda9b 100644 --- a/libguile/foreign.c +++ b/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" diff --git a/libguile/fports.c b/libguile/fports.c index ae046754d..3dcfba81e 100644 --- a/libguile/fports.c +++ b/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" diff --git a/libguile/frames.c b/libguile/frames.c index 4d32c848f..417dbe6bc 100644 --- a/libguile/frames.c +++ b/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" diff --git a/libguile/gc.c b/libguile/gc.c index 41ddf5f28..c79e6e73a 100644 --- a/libguile/gc.c +++ b/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" diff --git a/libguile/goops.c b/libguile/goops.c index 3c947f749..f3304d4d0 100644 --- a/libguile/goops.c +++ b/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" diff --git a/libguile/gsubr.c b/libguile/gsubr.c index 7dbb541cc..02c6b5141 100644 --- a/libguile/gsubr.c +++ b/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" /* diff --git a/libguile/i18n.c b/libguile/i18n.c index 9bd689a7a..64aa3d85e 100644 --- a/libguile/i18n.c +++ b/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" diff --git a/libguile/instructions.c b/libguile/instructions.c index 9d4826c9c..215b3dbe2 100644 --- a/libguile/instructions.c +++ b/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" diff --git a/libguile/intrinsics.c b/libguile/intrinsics.c index 3b2e6e754..eb5263671 100644 --- a/libguile/intrinsics.c +++ b/libguile/intrinsics.c @@ -31,6 +31,7 @@ #include "keywords.h" #include "libguile/modules.h" #include "numbers.h" +#include "libguile/symbols.h" #include "intrinsics.h" diff --git a/libguile/keywords.c b/libguile/keywords.c index 83e3b871b..80d1a17f5 100644 --- a/libguile/keywords.c +++ b/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" diff --git a/libguile/load.c b/libguile/load.c index 3fa1d6a32..9f524397b 100644 --- a/libguile/load.c +++ b/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" diff --git a/libguile/macros.c b/libguile/macros.c index 81b688701..504fa3372 100644 --- a/libguile/macros.c +++ b/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" diff --git a/libguile/memoize.c b/libguile/memoize.c index 3df26f3c9..db4814723 100644 --- a/libguile/memoize.c +++ b/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" diff --git a/libguile/modules.c b/libguile/modules.c index 56e34c0ef..acd61c6a3 100644 --- a/libguile/modules.c +++ b/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" diff --git a/libguile/net_db.c b/libguile/net_db.c index 16abe5f55..03a355a99 100644 --- a/libguile/net_db.c +++ b/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" diff --git a/libguile/options.c b/libguile/options.c index 558ea45d5..9ef223bcf 100644 --- a/libguile/options.c +++ b/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" diff --git a/libguile/ports.c b/libguile/ports.c index 1a69c0720..6d6fe7de0 100644 --- a/libguile/ports.c +++ b/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" diff --git a/libguile/posix.c b/libguile/posix.c index 9abc5f3d0..daa6b7f14 100644 --- a/libguile/posix.c +++ b/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" diff --git a/libguile/print.c b/libguile/print.c index a26a52d34..477eaed6d 100644 --- a/libguile/print.c +++ b/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" diff --git a/libguile/procprop.c b/libguile/procprop.c index 1333493a2..c84013088 100644 --- a/libguile/procprop.c +++ b/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" diff --git a/libguile/procs.c b/libguile/procs.c index c168fe4a6..6d40e0e2a 100644 --- a/libguile/procs.c +++ b/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" + diff --git a/libguile/r6rs-ports.c b/libguile/r6rs-ports.c index cfad4e04f..a3816158e 100644 --- a/libguile/r6rs-ports.c +++ b/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" diff --git a/libguile/random.c b/libguile/random.c index e3ac1264f..91d7c4882 100644 --- a/libguile/random.c +++ b/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" diff --git a/libguile/read.c b/libguile/read.c index 121662d6b..3c1ad7441 100644 --- a/libguile/read.c +++ b/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" diff --git a/libguile/socket.c b/libguile/socket.c index ef8cc4b91..ea19ec3ef 100644 --- a/libguile/socket.c +++ b/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" diff --git a/libguile/srcprop.c b/libguile/srcprop.c index 854eb6419..4f5368f3f 100644 --- a/libguile/srcprop.c +++ b/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" diff --git a/libguile/srfi-13.c b/libguile/srfi-13.c index 0d400e01e..d4f468fe3 100644 --- a/libguile/srfi-13.c +++ b/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, \ diff --git a/libguile/srfi-14.c b/libguile/srfi-14.c index d22c0a008..fa73139ca 100644 --- a/libguile/srfi-14.c +++ b/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. */ diff --git a/libguile/stacks.c b/libguile/stacks.c index 23a2c266c..abb4ab1bf 100644 --- a/libguile/stacks.c +++ b/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 */ diff --git a/libguile/strings.c b/libguile/strings.c index c04652202..b27493aae 100644 --- a/libguile/strings.c +++ b/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" diff --git a/libguile/strports.c b/libguile/strports.c index 62af50218..dd3e59636 100644 --- a/libguile/strports.c +++ b/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" diff --git a/libguile/struct.c b/libguile/struct.c index 3ffc54d6f..9824f3119 100644 --- a/libguile/struct.c +++ b/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" diff --git a/libguile/threads.c b/libguile/threads.c index 0d8bd7fa0..18e663a1d 100644 --- a/libguile/threads.c +++ b/libguile/threads.c @@ -30,7 +30,6 @@ #include #include #include /* for memset used by FD_ZERO on Solaris 10 */ -#include #include #include @@ -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" diff --git a/libguile/throw.c b/libguile/throw.c index beabaa4c7..e698a86d4 100644 --- a/libguile/throw.c +++ b/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" diff --git a/libguile/vm.c b/libguile/vm.c index 97047322d..98e3e3e16 100644 --- a/libguile/vm.c +++ b/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"