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.

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

libguile/alist.c

@@ -24,6 +24,7 @@
 #endif
 
 #include "libguile/_scm.h"
+#include "libguile/boolean.h"
 #include "libguile/eq.h"
 #include "libguile/list.h"
 

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"

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"

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

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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>
 
 

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"

libguile/goops.h

@@ -32,6 +32,7 @@
  */
 
 #include "libguile/__scm.h"
+#include "libguile/boolean.h"
 #include "libguile/list.h"
 
 

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"

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"

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"

libguile/intrinsics.c

@@ -21,6 +21,7 @@
 #endif
 
 #include "_scm.h"
+#include "boolean.h"
 #include "alist.h"
 #include "cache-internal.h"
 #include "extensions.h"

libguile/list.c

@@ -24,6 +24,7 @@
 #endif
 
 #include "libguile/_scm.h"
+#include "libguile/boolean.h"
 #include "libguile/eq.h"
 
 #include "libguile/list.h"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

libguile/procprop.c

@@ -24,6 +24,7 @@
 #endif
 
 #include "libguile/_scm.h"
+#include "libguile/boolean.h"
 
 #include "libguile/alist.h"
 #include "libguile/eval.h"

libguile/procs.h

@@ -25,6 +25,7 @@
 
 
 #include "libguile/__scm.h"
+#include "libguile/boolean.h"
 #include <libguile/error.h>
 
 

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"

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"

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"

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"

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"

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"
 
 
 

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"

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"
 

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"

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
 {

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"

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"

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"

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"

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"

libguile/struct.h

@@ -25,6 +25,7 @@
 
 
 #include "libguile/__scm.h"
+#include "libguile/boolean.h"
 #include <libguile/error.h>
 #include "libguile/print.h"
 

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"

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"

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"

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"