[Guile-commits] 61/86: Devolve symbols.h from _scm.h

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit a7bcd66f6f606a740ac0098529d69d30444a68cb
Author: Andy Wingo <address@hidden>
Date:   Wed Jun 20 12:19:12 2018 +0200

    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          | 1 -
 libguile/array-handle.c  | 1 +
 libguile/array-map.c     | 1 +
 libguile/backtrace.c     | 1 +
 libguile/bytevectors.c   | 1 +
 libguile/chars.c         | 1 +
 libguile/continuations.c | 1 +
 libguile/error.c         | 1 +
 libguile/eval.c          | 1 +
 libguile/evalext.c       | 1 +
 libguile/expand.c        | 1 +
 libguile/feature.c       | 1 +
 libguile/filesys.c       | 1 +
 libguile/foreign.c       | 1 +
 libguile/fports.c        | 1 +
 libguile/frames.c        | 1 +
 libguile/gc.c            | 1 +
 libguile/goops.c         | 1 +
 libguile/gsubr.c         | 1 +
 libguile/i18n.c          | 1 +
 libguile/instructions.c  | 1 +
 libguile/intrinsics.c    | 1 +
 libguile/keywords.c      | 3 ++-
 libguile/load.c          | 1 +
 libguile/macros.c        | 1 +
 libguile/memoize.c       | 1 +
 libguile/modules.c       | 1 +
 libguile/net_db.c        | 1 +
 libguile/options.c       | 1 +
 libguile/ports.c         | 1 +
 libguile/posix.c         | 1 +
 libguile/print.c         | 1 +
 libguile/procprop.c      | 1 +
 libguile/procs.c         | 6 ++++--
 libguile/r6rs-ports.c    | 1 +
 libguile/random.c        | 1 +
 libguile/read.c          | 1 +
 libguile/socket.c        | 1 +
 libguile/srcprop.c       | 1 +
 libguile/srfi-13.c       | 1 +
 libguile/srfi-14.c       | 1 +
 libguile/stacks.c        | 1 +
 libguile/strings.c       | 1 +
 libguile/strports.c      | 1 +
 libguile/struct.c        | 1 +
 libguile/threads.c       | 2 +-
 libguile/throw.c         | 1 +
 libguile/vm.c            | 1 +
 48 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/libguile/_scm.h b/libguile/_scm.h
index a66dac7..e35bf21 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 94b95a6..3c544a8 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 addd048..e0e8960 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 31c0fff..5c883ac 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 f50ca82..f53e57b 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 cab87cd..f9f019a 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 779810d..d887ecd 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 11d84bb..f3693d3 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 9de80c9..5207a7d 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 6e863b2..7738e10 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 9f6e455..7a9cde7 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 ed02c7b..acbfe30 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 1c52537..814e57b 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 9b20348..c535cda 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 ae04675..3dcfba8 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 4d32c84..417dbe6 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 41ddf5f..c79e6e7 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 3c947f7..f3304d4 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 7dbb541..02c6b51 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 9bd689a..64aa3d8 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 9d4826c..215b3db 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 3b2e6e7..eb52636 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 83e3b87..80d1a17 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 3fa1d6a..9f52439 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 81b6887..504fa33 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 3df26f3..db48147 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 56e34c0..acd61c6 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 16abe5f..03a355a 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 558ea45..9ef223b 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 1a69c07..6d6fe7d 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 9abc5f3..daa6b7f 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 a26a52d..477eaed 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 1333493..c840130 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 c168fe4..6d40e0e 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 cfad4e0..a381615 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 e3ac126..91d7c48 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 121662d..3c1ad74 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 ef8cc4b..ea19ec3 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 854eb64..4f5368f 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 0d400e0..d4f468f 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 d22c0a0..fa73139 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 23a2c26..abb4ab1 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 c046522..b27493a 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 62af502..dd3e596 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 3ffc54d..9824f31 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 0d8bd7f..18e663a 100644
--- a/libguile/threads.c
+++ b/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"
 
diff --git a/libguile/throw.c b/libguile/throw.c
index beabaa4..e698a86 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 9704732..98e3e3e 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"