Devolve threads.h from _scm.h.

* libguile/__scm.h (scm_print_state, scm_t_dynstack): Add forward
  declarations.
* libguile/_scm.h: Remove threads.h.
* libguile/atomic.c:
* libguile/bitvectors.h:
* libguile/bytevectors.c:
* libguile/continuations.h:
* libguile/control.c:
* libguile/deprecation.c:
* libguile/dynl.c:
* libguile/dynstack.h:
* libguile/dynwind.c:
* libguile/extensions.c:
* libguile/fdes-finalizers.c:
* libguile/foreign-object.c:
* libguile/frames.c:
* libguile/guardians.c:
* libguile/hashtab.c:
* libguile/list.c:
* libguile/loader.c:
* libguile/macros.c:
* libguile/memoize.c:
* libguile/net_db.c:
* libguile/pairs.c:
* libguile/procprop.c:
* libguile/rdelim.c:
* libguile/simpos.c:
* libguile/srfi-14.c:
* libguile/srfi-60.c:
* libguile/strings.c:
* libguile/strports.c:
* libguile/syntax.c:
* libguile/syntax.h:
* libguile/unicode.c:
* libguile/variable.c:
* libguile/vectors.c:
* libguile/weak-set.c:
* libguile/weak-set.h:
* libguile/weak-table.c:
* libguile/weak-table.h:
* libguile/weak-vector.c: Add threads.h as appropriate, or possible
  other headers that threads.h pulled in.

libguile/__scm.h

@@ -426,6 +426,8 @@ typedef long SCM_STACKITEM;
 
 
 /* Trivial type declarations and forward declarations.  */
+typedef struct scm_print_state scm_print_state;
+typedef struct scm_dynstack scm_t_dynstack;
 typedef scm_t_int32 scm_t_wchar;
 
 

libguile/_scm.h

@@ -37,7 +37,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/threads.h"	/* You are not alone. */
 #include "libguile/foreign.h"	/* Snarfing needs the foreign data structures. */
 #include "libguile/programs.h"	/* ... and program.h. */
 #include "libguile/modules.h"

libguile/atomic.c

@@ -23,6 +23,7 @@
 #endif
 
 #include "libguile/_scm.h"
+#include "libguile/boolean.h"
 #include "libguile/gsubr.h"
 #include "libguile/extensions.h"
 #include "libguile/ports.h"

libguile/bitvectors.h

@@ -3,7 +3,8 @@
 #ifndef SCM_BITVECTORS_H
 #define SCM_BITVECTORS_H
 
-/* Copyright (C) 1995,1996,1997,1999,2000,2001, 2004, 2006, 2008, 2009, 2014 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1997,1999-2001,2004,2006,2008-2009,2014,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

libguile/bytevectors.c

@@ -37,6 +37,7 @@
 #include <gmp.h>
 
 #include "libguile/_scm.h"
+#include "libguile/boolean.h"
 #include "libguile/gsubr.h"
 #include "libguile/dynwind.h"
 #include "libguile/extensions.h"

libguile/continuations.h

@@ -27,6 +27,7 @@
 #include <setjmp.h>
 
 #include "libguile/__scm.h"
+#include "libguile/throw.h"
 
 
 

libguile/control.c

@@ -23,12 +23,14 @@
 #include <alloca.h>
 
 #include "libguile/_scm.h"
+#include "libguile/dynstack.h"
 #include "libguile/gsubr.h"
 #include "libguile/pairs.h"
 #include "libguile/control.h"
 #include "libguile/extensions.h"
 #include "libguile/list.h"
 #include "libguile/programs.h"
+#include "libguile/threads.h"
 #include "libguile/instructions.h"
 #include "libguile/vm.h"
 

libguile/deprecation.c

@@ -35,6 +35,7 @@
 #include "libguile/list.h"
 #include "libguile/strings.h"
 #include "libguile/ports.h"
+#include "libguile/threads.h"
 
 #include "libguile/private-options.h"
 

libguile/dynl.c

@@ -62,6 +62,7 @@ maybe_drag_in_eprintf ()
 #include "libguile/deprecation.h"
 #include "libguile/dynwind.h"
 #include "libguile/foreign.h"
+#include "libguile/threads.h"
 #include "libguile/gc.h"
 
 #include <ltdl.h>

libguile/dynstack.h

@@ -23,13 +23,14 @@
 
 
 
+#include <setjmp.h>
 #include <signal.h>
 
 #include "libguile/__scm.h"
 
 
 
-typedef struct
+typedef struct scm_dynstack
 {
   scm_t_bits *base;
   scm_t_bits *top;

libguile/dynwind.c

@@ -30,6 +30,7 @@
 #include "libguile/boolean.h"
 #include "libguile/dynstack.h"
 #include "libguile/eval.h"
+#include "libguile/threads.h"
 #include "libguile/pairs.h"
 #include "libguile/ports.h"
 #include "libguile/variable.h"

libguile/extensions.c

@@ -32,6 +32,7 @@
 #include "libguile/extensions.h"
 #include "libguile/gc.h"
 #include "libguile/strings.h"
+#include "libguile/threads.h"
 
 typedef struct extension_t
 {

libguile/fdes-finalizers.c

@@ -30,6 +30,7 @@
 #include "libguile/hashtab.h"
 #include "libguile/list.h"
 #include "libguile/numbers.h"
+#include "libguile/threads.h"
 #include "libguile/fdes-finalizers.h"
 
 

libguile/foreign-object.c

@@ -32,6 +32,7 @@
 #include "libguile/list.h"
 #include "libguile/numbers.h"
 #include "libguile/procs.h"
+#include "libguile/threads.h"
 #include "libguile/variable.h"
 
 

libguile/frames.c

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

libguile/guardians.c

@@ -64,6 +64,7 @@
 #include "libguile/ports.h"
 #include "libguile/print.h"
 #include "libguile/smob.h"
+#include "libguile/threads.h"
 #include "libguile/weak-vector.h"
 
 

libguile/hashtab.c

@@ -40,6 +40,7 @@
 #include "libguile/list.h"
 #include "libguile/numbers.h"
 #include "libguile/ports.h"
+#include "libguile/procs.h"
 #include "libguile/vectors.h"
 #include "libguile/weak-table.h"
 

libguile/list.c

@@ -28,6 +28,7 @@
 #include "libguile/pairs.h"
 #include "libguile/boolean.h"
 #include "libguile/numbers.h"
+#include "libguile/procs.h"
 #include "libguile/eq.h"
 
 #include "libguile/list.h"

libguile/loader.c

@@ -48,6 +48,7 @@
 #include "extensions.h"
 #include "pairs.h"
 #include "programs.h"
+#include "threads.h"
 #include "loader.h"
 
 /* This file contains the loader for Guile's on-disk format: ELF with

libguile/macros.c

@@ -27,6 +27,7 @@
 #include "libguile/boolean.h"
 #include "libguile/ports.h"
 #include "libguile/print.h"
+#include "libguile/procs.h"
 #include "libguile/random.h"
 #include "libguile/smob.h"
 #include "libguile/macros.h"

libguile/memoize.c

@@ -34,6 +34,7 @@
 #include "libguile/_scm.h"
 #include "libguile/alist.h"
 #include "libguile/continuations.h"
+#include "libguile/dynstack.h"
 #include "libguile/eq.h"
 #include "libguile/expand.h"
 #include "libguile/list.h"
@@ -46,6 +47,7 @@
 #include "libguile/print.h"
 #include "libguile/strings.h"
 #include "libguile/throw.h"
+#include "libguile/threads.h"
 #include "libguile/variable.h"
 #include "libguile/vectors.h"
 

libguile/net_db.c

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

libguile/pairs.c

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

libguile/procprop.c

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

libguile/rdelim.c

@@ -21,6 +21,7 @@
 #endif
 
 #include "libguile/_scm.h"
+#include "libguile/boolean.h"
 #include "libguile/gsubr.h"
 #include "libguile/pairs.h"
 

libguile/simpos.c

@@ -28,6 +28,7 @@
 #include <unistd.h>  /* for _exit */
 
 #include "libguile/_scm.h"
+#include "libguile/boolean.h"
 #include "libguile/gsubr.h"
 
 #include "libguile/numbers.h"

libguile/srfi-14.c

@@ -38,6 +38,7 @@
 #include "libguile/ports.h"
 #include "libguile/numbers.h"
 #include "libguile/procs.h"
+#include "libguile/smob.h"
 #include "libguile/srfi-14.h"
 #include "libguile/strings.h"
 #include "libguile/values.h"

libguile/srfi-60.c

@@ -25,6 +25,7 @@
 #endif
 
 #include "libguile/_scm.h"
+#include "libguile/boolean.h"
 #include "libguile/gsubr.h"
 #include "libguile/pairs.h"
 #include "libguile/eq.h"

libguile/strings.c

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

libguile/strports.c

@@ -41,6 +41,7 @@
 #include "libguile/modules.h"
 #include "libguile/deprecation.h"
 #include "libguile/srfi-4.h"
+#include "libguile/threads.h"
 #include "libguile/variable.h"
 
 #include "libguile/strports.h"

libguile/syntax.c

@@ -28,6 +28,7 @@
 #include "libguile/eval.h"
 #include "libguile/ports.h"
 #include "libguile/syntax.h"
+#include "libguile/threads.h"
 #include "libguile/variable.h"
 
 

libguile/syntax.h

@@ -1,7 +1,7 @@
 #ifndef SCM_SYNTAX_H
 #define SCM_SYNTAX_H
 
-/* Copyright (C) 2017 Free Software Foundation, Inc.
+/* Copyright (C) 2017-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

libguile/unicode.c

@@ -28,6 +28,7 @@
 #include <uniname.h>
 
 #include "libguile/_scm.h"
+#include "libguile/chars.h"
 #include "libguile/gsubr.h"
 #include "libguile/extensions.h"
 

libguile/variable.c

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

libguile/vectors.c

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

libguile/weak-set.c

@@ -31,6 +31,7 @@
 #include "libguile/hash.h"
 #include "libguile/eval.h"
 #include "libguile/ports.h"
+#include "libguile/threads.h"
 #include "libguile/bdw-gc.h"
 
 #include "libguile/weak-list.h"

libguile/weak-set.h

@@ -3,7 +3,7 @@
 #ifndef SCM_WEAK_SET_H
 #define SCM_WEAK_SET_H
 
-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 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

libguile/weak-table.c

@@ -37,6 +37,7 @@
 #include "libguile/numbers.h"
 #include "libguile/ports.h"
 #include "libguile/procs.h"
+#include "libguile/threads.h"
 #include "libguile/weak-list.h"
 #include "libguile/weak-table.h"
 

libguile/weak-table.h

@@ -3,7 +3,7 @@
 #ifndef SCM_WEAK_TABLE_H
 #define SCM_WEAK_TABLE_H
 
-/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2011-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

libguile/weak-vector.c

@@ -27,6 +27,7 @@
 #include <string.h>
 
 #include "libguile/_scm.h"
+#include "libguile/boolean.h"
 #include "libguile/gsubr.h"
 #include "libguile/extensions.h"
 #include "libguile/list.h"