summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2018-06-18 21:38:44 +0200
committerAndy Wingo <wingo@pobox.com>2018-06-18 21:38:44 +0200
commit1a99bd10f86c3ccfe3e879fedf65d8b4229af4ed (patch)
tree67bc2d9f81f6c2836198fb64a82ebf9da02cb62b
parent460552163e1f718ef1cd88d7a722e836b6e53b70 (diff)
downloadguile-1a99bd10f86c3ccfe3e879fedf65d8b4229af4ed.tar.gz
Devolve boolean.h include.
* libguile/_scm.h: Remove boolean.h include. * libguile/alist.c: * libguile/array-map.c: * libguile/arrays.c: * libguile/backtrace.c: * libguile/bitvectors.c: * libguile/chars.c: * libguile/continuations.c: * libguile/dynwind.c: * libguile/eq.c: * libguile/eval.c: * libguile/expand.c: * libguile/fdes-finalizers.c: * libguile/filesys.c: * libguile/foreign.c: * libguile/fports.c: * libguile/frames.c: * libguile/generalized-arrays.h: * libguile/goops.c: * libguile/goops.h: * libguile/guardians.c: * libguile/hooks.c: * libguile/i18n.c: * libguile/intrinsics.c: * libguile/list.c: * libguile/load.c: * libguile/loader.c: * libguile/macros.c: * libguile/memoize.c: * libguile/modules.c: * libguile/net_db.c: * libguile/numbers.c: * libguile/options.c: * libguile/ports.c: * libguile/print.c: * libguile/procprop.c: * libguile/procs.h: * libguile/programs.c: * libguile/r6rs-ports.c: * libguile/read.c: * libguile/scmsigs.c: * libguile/sort.c: * libguile/srcprop.h: * libguile/srfi-1.c: * libguile/srfi-13.c: * libguile/srfi-14.c: * libguile/srfi-14.h: * libguile/srfi-4.c: * libguile/stacks.c: * libguile/stime.c: * libguile/strorder.c: * libguile/struct.c: * libguile/struct.h: * libguile/symbols.c: * libguile/threads.c: * libguile/throw.c: * libguile/vports.c: Add boolean.h includes.
-rw-r--r--libguile/_scm.h1
-rw-r--r--libguile/alist.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/chars.c1
-rw-r--r--libguile/continuations.c1
-rw-r--r--libguile/dynwind.c4
-rw-r--r--libguile/eq.c1
-rw-r--r--libguile/eval.c1
-rw-r--r--libguile/expand.c1
-rw-r--r--libguile/fdes-finalizers.c1
-rw-r--r--libguile/filesys.c1
-rw-r--r--libguile/foreign.c1
-rw-r--r--libguile/fports.c1
-rw-r--r--libguile/frames.c1
-rw-r--r--libguile/generalized-arrays.h1
-rw-r--r--libguile/goops.c1
-rw-r--r--libguile/goops.h1
-rw-r--r--libguile/guardians.c1
-rw-r--r--libguile/hooks.c1
-rw-r--r--libguile/i18n.c1
-rw-r--r--libguile/intrinsics.c1
-rw-r--r--libguile/list.c1
-rw-r--r--libguile/load.c1
-rw-r--r--libguile/loader.c1
-rw-r--r--libguile/macros.c1
-rw-r--r--libguile/memoize.c1
-rw-r--r--libguile/modules.c1
-rw-r--r--libguile/net_db.c1
-rw-r--r--libguile/numbers.c1
-rw-r--r--libguile/options.c1
-rw-r--r--libguile/ports.c1
-rw-r--r--libguile/print.c1
-rw-r--r--libguile/procprop.c1
-rw-r--r--libguile/procs.h1
-rw-r--r--libguile/programs.c1
-rw-r--r--libguile/r6rs-ports.c1
-rw-r--r--libguile/read.c1
-rw-r--r--libguile/scmsigs.c1
-rw-r--r--libguile/sort.c1
-rw-r--r--libguile/srcprop.h5
-rw-r--r--libguile/srfi-1.c1
-rw-r--r--libguile/srfi-13.c10
-rw-r--r--libguile/srfi-14.c11
-rw-r--r--libguile/srfi-14.h4
-rw-r--r--libguile/srfi-4.c1
-rw-r--r--libguile/stacks.c1
-rw-r--r--libguile/stime.c1
-rw-r--r--libguile/strorder.c1
-rw-r--r--libguile/struct.c1
-rw-r--r--libguile/struct.h1
-rw-r--r--libguile/symbols.c1
-rw-r--r--libguile/threads.c1
-rw-r--r--libguile/throw.c1
-rw-r--r--libguile/vports.c1
57 files changed, 75 insertions, 11 deletions
diff --git a/libguile/_scm.h b/libguile/_scm.h
index da301bd18..35a5879e8 100644
--- a/libguile/_scm.h
+++ b/libguile/_scm.h
@@ -42,7 +42,6 @@
#include "libguile/procs.h" /* Same. */
#include "libguile/numbers.h" /* Everyone deals with fixnums. */
#include "libguile/symbols.h" /* For length, chars, values, miscellany. */
-#include "libguile/boolean.h" /* Everyone wonders about the truth. */
#include "libguile/threads.h" /* You are not alone. */
#include "libguile/snarf.h" /* Everyone snarfs. */
#include "libguile/foreign.h" /* Snarfing needs the foreign data structures. */
diff --git a/libguile/alist.c b/libguile/alist.c
index a1234bacc..c254e2103 100644
--- a/libguile/alist.c
+++ b/libguile/alist.c
@@ -24,6 +24,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/eq.h"
#include "libguile/list.h"
diff --git a/libguile/array-map.c b/libguile/array-map.c
index fa824939f..1422efb5b 100644
--- a/libguile/array-map.c
+++ b/libguile/array-map.c
@@ -27,6 +27,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/strings.h"
#include "libguile/arrays.h"
#include "libguile/smob.h"
diff --git a/libguile/arrays.c b/libguile/arrays.c
index e079a726c..945994e5a 100644
--- a/libguile/arrays.c
+++ b/libguile/arrays.c
@@ -31,6 +31,7 @@
#include "verify.h"
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/__scm.h"
#include "libguile/eq.h"
#include "libguile/chars.h"
diff --git a/libguile/backtrace.c b/libguile/backtrace.c
index 76ac12861..17d8f8154 100644
--- a/libguile/backtrace.c
+++ b/libguile/backtrace.c
@@ -26,6 +26,7 @@
#include <ctype.h>
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include <unistd.h>
#ifdef HAVE_IO_H
diff --git a/libguile/bitvectors.c b/libguile/bitvectors.c
index 7afb7a80f..1526d2bba 100644
--- a/libguile/bitvectors.c
+++ b/libguile/bitvectors.c
@@ -26,6 +26,7 @@
#include <string.h>
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/__scm.h"
#include "libguile/array-handle.h"
#include "libguile/bitvectors.h"
diff --git a/libguile/chars.c b/libguile/chars.c
index 9bd601599..5c78a5169 100644
--- a/libguile/chars.c
+++ b/libguile/chars.c
@@ -29,6 +29,7 @@
#include <unictype.h>
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/chars.h"
#include "libguile/srfi-14.h"
diff --git a/libguile/continuations.c b/libguile/continuations.c
index 1bbe371dd..482cadce1 100644
--- a/libguile/continuations.c
+++ b/libguile/continuations.c
@@ -31,6 +31,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/async.h"
#include "libguile/backtrace.h"
#include "libguile/debug.h"
diff --git a/libguile/dynwind.c b/libguile/dynwind.c
index 4a0b0dd2b..b33bebb6e 100644
--- a/libguile/dynwind.c
+++ b/libguile/dynwind.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1995,1996,1998,1999,2000,2001, 2003, 2004, 2006, 2008, 2010, 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1996,1998-2001,2003-2004,2006,2008,2010-2012,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
@@ -26,6 +27,7 @@
#include <assert.h>
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/dynstack.h"
#include "libguile/eval.h"
#include "libguile/ports.h"
diff --git a/libguile/eq.c b/libguile/eq.c
index 0dda7c739..5d19cfca5 100644
--- a/libguile/eq.c
+++ b/libguile/eq.c
@@ -28,6 +28,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/array-map.h"
#include "libguile/async.h"
#include "libguile/bitvectors.h"
diff --git a/libguile/eval.c b/libguile/eval.c
index 3b7e56046..d4648b274 100644
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -27,6 +27,7 @@
#include <stdarg.h>
#include "libguile/__scm.h"
+#include "libguile/boolean.h"
#include "libguile/_scm.h"
#include "libguile/alist.h"
#include "libguile/async.h"
diff --git a/libguile/expand.c b/libguile/expand.c
index 1780f759b..f2e462c06 100644
--- a/libguile/expand.c
+++ b/libguile/expand.c
@@ -24,6 +24,7 @@
#endif
#include "libguile/__scm.h"
+#include "libguile/boolean.h"
#include "libguile/_scm.h"
#include "libguile/alist.h"
#include "libguile/continuations.h"
diff --git a/libguile/fdes-finalizers.c b/libguile/fdes-finalizers.c
index 7678b8194..6bd5ad785 100644
--- a/libguile/fdes-finalizers.c
+++ b/libguile/fdes-finalizers.c
@@ -22,6 +22,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/extensions.h"
#include "libguile/eval.h"
#include "libguile/hashtab.h"
diff --git a/libguile/filesys.c b/libguile/filesys.c
index 0e4c72d7c..fbb2a56ed 100644
--- a/libguile/filesys.c
+++ b/libguile/filesys.c
@@ -80,6 +80,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/async.h"
#include "libguile/dynwind.h"
#include "libguile/fdes-finalizers.h"
diff --git a/libguile/foreign.c b/libguile/foreign.c
index 9a2ec3a39..9cbf0b297 100644
--- a/libguile/foreign.c
+++ b/libguile/foreign.c
@@ -29,6 +29,7 @@
#include <errno.h>
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/bytevectors.h"
#include "libguile/dynwind.h"
#include "libguile/eq.h"
diff --git a/libguile/fports.c b/libguile/fports.c
index 4694abb1f..623f7beb8 100644
--- a/libguile/fports.c
+++ b/libguile/fports.c
@@ -47,6 +47,7 @@
#include <full-write.h>
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/async.h"
#include "libguile/dynwind.h"
#include "libguile/extensions.h"
diff --git a/libguile/frames.c b/libguile/frames.c
index 8d8ffee23..14735f40f 100644
--- a/libguile/frames.c
+++ b/libguile/frames.c
@@ -23,6 +23,7 @@
#include <stdlib.h>
#include <string.h>
#include "_scm.h"
+#include "boolean.h"
#include "eval.h"
#include "extensions.h"
#include "frames.h"
diff --git a/libguile/generalized-arrays.h b/libguile/generalized-arrays.h
index f3d6ddf22..bd4a276aa 100644
--- a/libguile/generalized-arrays.h
+++ b/libguile/generalized-arrays.h
@@ -26,6 +26,7 @@
#include "libguile/__scm.h"
#include "libguile/array-handle.h"
+#include "libguile/boolean.h"
#include <libguile/error.h>
diff --git a/libguile/goops.c b/libguile/goops.c
index e5e2b0d1e..d3c6b7302 100644
--- a/libguile/goops.c
+++ b/libguile/goops.c
@@ -29,6 +29,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/async.h"
#include "libguile/chars.h"
#include "libguile/dynwind.h"
diff --git a/libguile/goops.h b/libguile/goops.h
index 1e2a990d5..b9d2aa572 100644
--- a/libguile/goops.h
+++ b/libguile/goops.h
@@ -32,6 +32,7 @@
*/
#include "libguile/__scm.h"
+#include "libguile/boolean.h"
#include "libguile/list.h"
diff --git a/libguile/guardians.c b/libguile/guardians.c
index b3f8fe660..cb12663a2 100644
--- a/libguile/guardians.c
+++ b/libguile/guardians.c
@@ -50,6 +50,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/bdw-gc.h"
#include "libguile/deprecation.h"
diff --git a/libguile/hooks.c b/libguile/hooks.c
index d5fd90829..20e6b5dfd 100644
--- a/libguile/hooks.c
+++ b/libguile/hooks.c
@@ -25,6 +25,7 @@
#include <stdio.h>
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/eval.h"
#include "libguile/list.h"
diff --git a/libguile/i18n.c b/libguile/i18n.c
index 905a9a752..0dcddb850 100644
--- a/libguile/i18n.c
+++ b/libguile/i18n.c
@@ -23,6 +23,7 @@
#include <alloca.h>
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/extensions.h"
#include "libguile/feature.h"
#include "libguile/i18n.h"
diff --git a/libguile/intrinsics.c b/libguile/intrinsics.c
index 39e8186b2..6c9356add 100644
--- a/libguile/intrinsics.c
+++ b/libguile/intrinsics.c
@@ -21,6 +21,7 @@
#endif
#include "_scm.h"
+#include "boolean.h"
#include "alist.h"
#include "cache-internal.h"
#include "extensions.h"
diff --git a/libguile/list.c b/libguile/list.c
index a2b63a1a1..b314dedf9 100644
--- a/libguile/list.c
+++ b/libguile/list.c
@@ -24,6 +24,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/eq.h"
#include "libguile/list.h"
diff --git a/libguile/load.c b/libguile/load.c
index a0a59f32c..61714c073 100644
--- a/libguile/load.c
+++ b/libguile/load.c
@@ -28,6 +28,7 @@
#include <stdio.h>
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/alist.h"
#include "libguile/chars.h"
#include "libguile/dynwind.h"
diff --git a/libguile/loader.c b/libguile/loader.c
index 50456149d..b36eb9e94 100644
--- a/libguile/loader.c
+++ b/libguile/loader.c
@@ -40,6 +40,7 @@
#include <full-read.h>
#include "_scm.h"
+#include "boolean.h"
#include "elf.h"
#include "eval.h"
#include "extensions.h"
diff --git a/libguile/macros.c b/libguile/macros.c
index 27ed7feea..d7d20071b 100644
--- a/libguile/macros.c
+++ b/libguile/macros.c
@@ -23,6 +23,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/ports.h"
#include "libguile/print.h"
#include "libguile/random.h"
diff --git a/libguile/memoize.c b/libguile/memoize.c
index f3f03e2dc..6ec9498ad 100644
--- a/libguile/memoize.c
+++ b/libguile/memoize.c
@@ -25,6 +25,7 @@
#endif
#include "libguile/__scm.h"
+#include "libguile/boolean.h"
#include "libguile/_scm.h"
#include "libguile/alist.h"
#include "libguile/continuations.h"
diff --git a/libguile/modules.c b/libguile/modules.c
index dba02a6fc..e6a4f3adb 100644
--- a/libguile/modules.c
+++ b/libguile/modules.c
@@ -25,6 +25,7 @@
#include <stdarg.h>
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/eval.h"
#include "libguile/list.h"
diff --git a/libguile/net_db.c b/libguile/net_db.c
index 78daea56d..8528b68ab 100644
--- a/libguile/net_db.c
+++ b/libguile/net_db.c
@@ -46,6 +46,7 @@
#include <arpa/inet.h>
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/feature.h"
#include "libguile/list.h"
#include "libguile/strings.h"
diff --git a/libguile/numbers.c b/libguile/numbers.c
index f512e979f..2c1f7f6c9 100644
--- a/libguile/numbers.c
+++ b/libguile/numbers.c
@@ -60,6 +60,7 @@
#include <stdarg.h>
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/feature.h"
#include "libguile/ports.h"
#include "libguile/finalizers.h"
diff --git a/libguile/options.c b/libguile/options.c
index 17ef7fa76..4bbee8bba 100644
--- a/libguile/options.c
+++ b/libguile/options.c
@@ -23,6 +23,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/list.h"
#include "libguile/mallocs.h"
#include "libguile/strings.h"
diff --git a/libguile/ports.c b/libguile/ports.c
index cac122244..8dad20e01 100644
--- a/libguile/ports.c
+++ b/libguile/ports.c
@@ -39,6 +39,7 @@
#include <striconveh.h>
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/async.h"
#include "libguile/atomics-internal.h"
#include "libguile/deprecation.h"
diff --git a/libguile/print.c b/libguile/print.c
index cc9df8f4f..c7dd54adc 100644
--- a/libguile/print.c
+++ b/libguile/print.c
@@ -31,6 +31,7 @@
#include <unictype.h>
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/chars.h"
#include "libguile/continuations.h"
#include "libguile/smob.h"
diff --git a/libguile/procprop.c b/libguile/procprop.c
index 75452ae92..a11f20eab 100644
--- a/libguile/procprop.c
+++ b/libguile/procprop.c
@@ -24,6 +24,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/alist.h"
#include "libguile/eval.h"
diff --git a/libguile/procs.h b/libguile/procs.h
index 5415f84a4..ec8443fc2 100644
--- a/libguile/procs.h
+++ b/libguile/procs.h
@@ -25,6 +25,7 @@
#include "libguile/__scm.h"
+#include "libguile/boolean.h"
#include <libguile/error.h>
diff --git a/libguile/programs.c b/libguile/programs.c
index 0cf799e59..78933338f 100644
--- a/libguile/programs.c
+++ b/libguile/programs.c
@@ -22,6 +22,7 @@
#include <string.h>
#include "_scm.h"
+#include "boolean.h"
#include "instructions.h"
#include "alist.h"
#include "eval.h"
diff --git a/libguile/r6rs-ports.c b/libguile/r6rs-ports.c
index a5245c62b..cbe6a8d0b 100644
--- a/libguile/r6rs-ports.c
+++ b/libguile/r6rs-ports.c
@@ -26,6 +26,7 @@
#include <assert.h>
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/bytevectors.h"
#include "libguile/chars.h"
#include "libguile/eval.h"
diff --git a/libguile/read.c b/libguile/read.c
index e19dd6c4a..6c9466cef 100644
--- a/libguile/read.c
+++ b/libguile/read.c
@@ -34,6 +34,7 @@
#include <alloca.h>
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/bytevectors.h"
#include "libguile/chars.h"
#include "libguile/eval.h"
diff --git a/libguile/scmsigs.c b/libguile/scmsigs.c
index 8189eee44..4b2505b01 100644
--- a/libguile/scmsigs.c
+++ b/libguile/scmsigs.c
@@ -42,6 +42,7 @@
#include <full-write.h>
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/async.h"
#include "libguile/dynwind.h"
diff --git a/libguile/sort.c b/libguile/sort.c
index e62d7da30..249dbb514 100644
--- a/libguile/sort.c
+++ b/libguile/sort.c
@@ -40,6 +40,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/eval.h"
#include "libguile/arrays.h"
#include "libguile/array-map.h"
diff --git a/libguile/srcprop.h b/libguile/srcprop.h
index 0252e54a1..6f417efa2 100644
--- a/libguile/srcprop.h
+++ b/libguile/srcprop.h
@@ -3,8 +3,8 @@
#ifndef SCM_SRCPROP_H
#define SCM_SRCPROP_H
-/* Copyright (C) 1995, 1996, 2000, 2001, 2006, 2008, 2009, 2010,
- * 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1996,2000-2001,2006,2008-2012,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/boolean.h"
diff --git a/libguile/srfi-1.c b/libguile/srfi-1.c
index 4859dd457..801c1ceab 100644
--- a/libguile/srfi-1.c
+++ b/libguile/srfi-1.c
@@ -25,6 +25,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/eq.h"
#include "libguile/list.h"
diff --git a/libguile/srfi-13.c b/libguile/srfi-13.c
index ff5e72150..b0763fc84 100644
--- a/libguile/srfi-13.c
+++ b/libguile/srfi-13.c
@@ -1,6 +1,7 @@
/* srfi-13.c --- SRFI-13 procedures for Guile
*
- * Copyright (C) 2001, 2004, 2005, 2006, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+ * Copyright (C) 2001,2004-2006,2008-2012,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
@@ -27,9 +28,12 @@
#include <unicase.h>
#include <unictype.h>
-#include "libguile.h"
-
+#include "libguile/_scm.h"
#include <libguile/deprecation.h>
+#include "libguile/eval.h"
+#include "libguile/error.h"
+#include "libguile/hash.h"
+#include "libguile/list.h"
#include "libguile/srfi-13.h"
#include "libguile/srfi-14.h"
diff --git a/libguile/srfi-14.c b/libguile/srfi-14.c
index af7c1d95b..74e59095f 100644
--- a/libguile/srfi-14.c
+++ b/libguile/srfi-14.c
@@ -1,6 +1,7 @@
/* srfi-14.c --- SRFI-14 procedures for Guile
*
- * Copyright (C) 2001, 2004, 2006, 2007, 2009, 2011 Free Software Foundation, Inc.
+ * Copyright (C) 2001,2004,2006-2007,2009,2011,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
@@ -26,10 +27,14 @@
#include <string.h>
#include <unictype.h>
-#include "libguile.h"
+#include "libguile/_scm.h"
+#include "libguile/boolean.h"
+#include "libguile/chars.h"
+#include "libguile/eval.h"
+#include "libguile/list.h"
#include "libguile/srfi-14.h"
#include "libguile/strings.h"
-#include "libguile/chars.h"
+#include "libguile/values.h"
/* Include the pre-computed standard charset data. */
#include "libguile/srfi-14.i.c"
diff --git a/libguile/srfi-14.h b/libguile/srfi-14.h
index dc9718d70..f3754c565 100644
--- a/libguile/srfi-14.h
+++ b/libguile/srfi-14.h
@@ -3,7 +3,8 @@
/* srfi-14.c --- SRFI-14 procedures for Guile
*
- * Copyright (C) 2001, 2004, 2006, 2008, 2011 Free Software Foundation, Inc.
+ * Copyright (C) 2001,2004,2006,2008,2011,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 @@
#include "libguile/__scm.h"
+#include "libguile/chars.h"
typedef struct
{
diff --git a/libguile/srfi-4.c b/libguile/srfi-4.c
index c4f9b1ec1..a1e2f65ea 100644
--- a/libguile/srfi-4.c
+++ b/libguile/srfi-4.c
@@ -23,6 +23,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/__scm.h"
#include "libguile/bdw-gc.h"
#include "libguile/srfi-4.h"
diff --git a/libguile/stacks.c b/libguile/stacks.c
index 65ce0f24d..71e37c3f2 100644
--- a/libguile/stacks.c
+++ b/libguile/stacks.c
@@ -24,6 +24,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/control.h"
#include "libguile/eval.h"
#include "libguile/debug.h"
diff --git a/libguile/stime.c b/libguile/stime.c
index f4dd06fb6..314eee4e6 100644
--- a/libguile/stime.c
+++ b/libguile/stime.c
@@ -50,6 +50,7 @@
#include <unistr.h>
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/async.h"
#include "libguile/feature.h"
#include "libguile/strings.h"
diff --git a/libguile/strorder.c b/libguile/strorder.c
index b8f278721..16aa4bc30 100644
--- a/libguile/strorder.c
+++ b/libguile/strorder.c
@@ -23,6 +23,7 @@
#endif
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/chars.h"
#include "libguile/strings.h"
#include "libguile/symbols.h"
diff --git a/libguile/struct.c b/libguile/struct.c
index d81c90b75..6dffe43a0 100644
--- a/libguile/struct.c
+++ b/libguile/struct.c
@@ -28,6 +28,7 @@
#define SCM_BUILDING_DEPRECATED_CODE
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/async.h"
#include "libguile/chars.h"
#include "libguile/deprecation.h"
diff --git a/libguile/struct.h b/libguile/struct.h
index fad4dadbb..cc4ce6108 100644
--- a/libguile/struct.h
+++ b/libguile/struct.h
@@ -25,6 +25,7 @@
#include "libguile/__scm.h"
+#include "libguile/boolean.h"
#include <libguile/error.h>
#include "libguile/print.h"
diff --git a/libguile/symbols.c b/libguile/symbols.c
index e32d0de8c..f0633e619 100644
--- a/libguile/symbols.c
+++ b/libguile/symbols.c
@@ -26,6 +26,7 @@
#include <unistr.h>
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/chars.h"
#include "libguile/eval.h"
#include "libguile/hash.h"
diff --git a/libguile/threads.c b/libguile/threads.c
index 5f8586a50..0e04af3cb 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -42,6 +42,7 @@
#include <gc/gc_mark.h>
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/deprecation.h"
#include "libguile/extensions.h"
#include "libguile/hashtab.h"
diff --git a/libguile/throw.c b/libguile/throw.c
index 7e528131c..1dbdf7b80 100644
--- a/libguile/throw.c
+++ b/libguile/throw.c
@@ -27,6 +27,7 @@
#include <stdio.h>
#include <unistdio.h>
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/smob.h"
#include "libguile/eval.h"
#include "libguile/eq.h"
diff --git a/libguile/vports.c b/libguile/vports.c
index 22ba06c16..b10190268 100644
--- a/libguile/vports.c
+++ b/libguile/vports.c
@@ -28,6 +28,7 @@
#include <errno.h>
#include "libguile/_scm.h"
+#include "libguile/boolean.h"
#include "libguile/eval.h"
#include "libguile/chars.h"
#include "libguile/ports.h"