Remove list.h from _scm.h

* libguile/_scm.h: Remove list.h include.  Add appropriate includes to
  relevant callers.

51 files changed, 60 insertions, 10 deletions

diff --git a/libguile/_scm.h b/libguile/_scm.h
index f3b86d2be..da301bd18 100644
--- a/libguile/_scm.h
+++ b/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/pairs.h"	/* Everyone conses.  */
-#include "libguile/list.h"	/* Everyone makes lists.  */
 #include "libguile/gc.h"	/* Everyone allocates.  */
 #include "libguile/gsubr.h"	/* Everyone defines global functions.  */
 #include "libguile/procs.h"	/* Same.  */
diff --git a/libguile/array-handle.c b/libguile/array-handle.c
index a69bdbe5e..8af6d1d3f 100644
--- a/libguile/array-handle.c
+++ b/libguile/array-handle.c
@@ -27,6 +27,7 @@
 #include "libguile/_scm.h"
 #include "libguile/__scm.h"
 #include "libguile/bitvectors.h"
+#include "libguile/list.h"
 #include "libguile/arrays.h"
 #include "libguile/array-handle.h"
 
diff --git a/libguile/array-map.c b/libguile/array-map.c
index a0cbfb635..fa824939f 100644
--- a/libguile/array-map.c
+++ b/libguile/array-map.c
@@ -35,6 +35,7 @@
 #include "libguile/eval.h"
 #include "libguile/feature.h"
 #include "libguile/vectors.h"
+#include "libguile/list.h"
 #include "libguile/bitvectors.h"
 #include "libguile/srfi-4.h"
 #include "libguile/procs.h"
diff --git a/libguile/async.c b/libguile/async.c
index d8d5d2c71..0686674d0 100644
--- a/libguile/async.c
+++ b/libguile/async.c
@@ -27,6 +27,7 @@
 #include "libguile/atomics-internal.h"
 #include "libguile/eval.h"
 #include "libguile/throw.h"
+#include "libguile/list.h"
 #include "libguile/smob.h"
 #include "libguile/dynwind.h"
 #include "libguile/deprecation.h"
diff --git a/libguile/backtrace.c b/libguile/backtrace.c
index 73b40dbe2..76ac12861 100644
--- a/libguile/backtrace.c
+++ b/libguile/backtrace.c
@@ -39,6 +39,7 @@
 #include "libguile/filesys.h"
 #include "libguile/fluids.h"
 #include "libguile/frames.h"
+#include "libguile/list.h"
 #include "libguile/keywords.h"
 #include "libguile/ports.h"
 #include "libguile/posix.h"
diff --git a/libguile/bitvectors.c b/libguile/bitvectors.c
index cc3f73d30..7afb7a80f 100644
--- a/libguile/bitvectors.c
+++ b/libguile/bitvectors.c
@@ -30,6 +30,7 @@
 #include "libguile/array-handle.h"
 #include "libguile/bitvectors.h"
 #include "libguile/generalized-vectors.h"
+#include "libguile/list.h"
 #include "libguile/arrays.h"
 #include "libguile/srfi-4.h"
 
diff --git a/libguile/bytevectors.c b/libguile/bytevectors.c
index 3a0d90724..b97b3bfd3 100644
--- a/libguile/bytevectors.c
+++ b/libguile/bytevectors.c
@@ -41,6 +41,7 @@
 #include "libguile/extensions.h"
 #include "libguile/bytevectors.h"
 #include "libguile/generalized-vectors.h"
+#include "libguile/list.h"
 #include "libguile/strings.h"
 #include "libguile/arrays.h"
 #include "libguile/array-handle.h"
diff --git a/libguile/continuations.c b/libguile/continuations.c
index 1669bc1a5..1bbe371dd 100644
--- a/libguile/continuations.c
+++ b/libguile/continuations.c
@@ -35,6 +35,7 @@
 #include "libguile/backtrace.h"
 #include "libguile/debug.h"
 #include "libguile/init.h"
+#include "libguile/list.h"
 #include "libguile/smob.h"
 #include "libguile/stackchk.h"
 #include "libguile/stacks.h"
diff --git a/libguile/control.c b/libguile/control.c
index 552a10061..654d203c4 100644
--- a/libguile/control.c
+++ b/libguile/control.c
@@ -25,6 +25,7 @@
 #include "libguile/_scm.h"
 #include "libguile/control.h"
 #include "libguile/extensions.h"
+#include "libguile/list.h"
 #include "libguile/programs.h"
 #include "libguile/instructions.h"
 #include "libguile/vm.h"
diff --git a/libguile/deprecation.c b/libguile/deprecation.c
index 1ae8b6750..9546a76b3 100644
--- a/libguile/deprecation.c
+++ b/libguile/deprecation.c
@@ -30,6 +30,7 @@
 #include "libguile/_scm.h"
 
 #include "libguile/deprecation.h"
+#include "libguile/list.h"
 #include "libguile/strings.h"
 #include "libguile/ports.h"
 
diff --git a/libguile/dynl.c b/libguile/dynl.c
index 98891a938..59fbd7c7e 100644
--- a/libguile/dynl.c
+++ b/libguile/dynl.c
@@ -55,6 +55,7 @@ maybe_drag_in_eprintf ()
 #include "libguile/dynl.h"
 #include "libguile/smob.h"
 #include "libguile/keywords.h"
+#include "libguile/list.h"
 #include "libguile/ports.h"
 #include "libguile/strings.h"
 #include "libguile/deprecation.h"
diff --git a/libguile/error.c b/libguile/error.c
index 00cbfe983..f0d0cf422 100644
--- a/libguile/error.c
+++ b/libguile/error.c
@@ -31,6 +31,7 @@
 #include "libguile/_scm.h"
 #include "libguile/async.h"
 #include "libguile/dynwind.h"
+#include "libguile/list.h"
 #include "libguile/pairs.h"
 #include "libguile/strings.h"
 #include "libguile/throw.h"
diff --git a/libguile/evalext.c b/libguile/evalext.c
index 1644a9de7..3cfa8a66a 100644
--- a/libguile/evalext.c
+++ b/libguile/evalext.c
@@ -25,6 +25,7 @@
 
 #include "libguile/_scm.h"
 #include "libguile/eval.h"
+#include "libguile/list.h"
 #include "libguile/fluids.h"
 #include "libguile/modules.h"
 
diff --git a/libguile/fdes-finalizers.c b/libguile/fdes-finalizers.c
index 74e42f645..7678b8194 100644
--- a/libguile/fdes-finalizers.c
+++ b/libguile/fdes-finalizers.c
@@ -25,6 +25,7 @@
 #include "libguile/extensions.h"
 #include "libguile/eval.h"
 #include "libguile/hashtab.h"
+#include "libguile/list.h"
 #include "libguile/numbers.h"
 #include "libguile/fdes-finalizers.h"
 
diff --git a/libguile/filesys.c b/libguile/filesys.c
index 21cef9b4f..0e4c72d7c 100644
--- a/libguile/filesys.c
+++ b/libguile/filesys.c
@@ -87,6 +87,7 @@
 #include "libguile/filesys.h"
 #include "libguile/fports.h"
 #include "libguile/iselect.h"
+#include "libguile/list.h"
 #include "libguile/load.h"	/* for scm_i_mirror_backslashes */
 #include "libguile/ports-internal.h"
 #include "libguile/ports.h"
diff --git a/libguile/fluids.c b/libguile/fluids.c
index 0c4f5d862..c928cd9b4 100644
--- a/libguile/fluids.c
+++ b/libguile/fluids.c
@@ -34,6 +34,7 @@
 #include "libguile/eval.h"
 #include "libguile/fluids.h"
 #include "libguile/hashtab.h"
+#include "libguile/list.h"
 #include "libguile/ports.h"
 #include "libguile/print.h"
 #include "libguile/weak-table.h"
diff --git a/libguile/foreign-object.c b/libguile/foreign-object.c
index 94917e075..58f050a66 100644
--- a/libguile/foreign-object.c
+++ b/libguile/foreign-object.c
@@ -28,6 +28,7 @@
 #include "libguile/finalizers.h"
 #include "libguile/foreign-object.h"
 #include "libguile/goops.h"
+#include "libguile/list.h"
 
 
 
diff --git a/libguile/foreign.c b/libguile/foreign.c
index ab7524ecf..9a2ec3a39 100644
--- a/libguile/foreign.c
+++ b/libguile/foreign.c
@@ -37,6 +37,7 @@
 #include "libguile/finalizers.h"
 #include "libguile/foreign.h"
 #include "libguile/keywords.h"
+#include "libguile/list.h"
 #include "libguile/instructions.h"
 #include "libguile/stacks.h"
 #include "libguile/threads.h"
diff --git a/libguile/gc.c b/libguile/gc.c
index b3bbdbcde..7580ccae2 100644
--- a/libguile/gc.c
+++ b/libguile/gc.c
@@ -41,6 +41,7 @@
 #include "libguile/async.h"
 #include "libguile/ports.h"
 #include "libguile/hooks.h"
+#include "libguile/list.h"
 #include "libguile/simpos.h"
 #include "libguile/strings.h"
 #include "libguile/vectors.h"
diff --git a/libguile/generalized-arrays.c b/libguile/generalized-arrays.c
index fdbdb4aff..35be23d05 100644
--- a/libguile/generalized-arrays.c
+++ b/libguile/generalized-arrays.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,1998,2000,2001,2002,2003,2004, 2005, 2006, 2009, 2010, 2013, 2014 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998,2000,2001,2002,2003,2004, 2005, 2006, 2009, 2010, 2013, 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
@@ -31,6 +31,7 @@
 #include "libguile/__scm.h"
 #include "libguile/array-handle.h"
 #include "libguile/generalized-arrays.h"
+#include "libguile/list.h"
 
 
 SCM_INTERNAL SCM scm_i_array_ref (SCM v,
diff --git a/libguile/goops.h b/libguile/goops.h
index 1ffa0cd4c..1e2a990d5 100644
--- a/libguile/goops.h
+++ b/libguile/goops.h
@@ -32,6 +32,7 @@
  */
 
 #include "libguile/__scm.h"
+#include "libguile/list.h"
 
 
 /* {Class flags}
diff --git a/libguile/guardians.c b/libguile/guardians.c
index 2a4fd5a05..b3f8fe660 100644
--- a/libguile/guardians.c
+++ b/libguile/guardians.c
@@ -56,6 +56,7 @@
 #include "libguile/eval.h"
 #include "libguile/guardians.h"
 #include "libguile/hashtab.h"
+#include "libguile/list.h"
 #include "libguile/ports.h"
 #include "libguile/print.h"
 #include "libguile/smob.h"
diff --git a/libguile/hashtab.c b/libguile/hashtab.c
index f9646185a..ee2ff2e85 100644
--- a/libguile/hashtab.c
+++ b/libguile/hashtab.c
@@ -35,6 +35,7 @@
 #include "libguile/eval.h"
 #include "libguile/hash.h"
 #include "libguile/hashtab.h"
+#include "libguile/list.h"
 #include "libguile/ports.h"
 #include "libguile/vectors.h"
 #include "libguile/weak-table.h"
diff --git a/libguile/hooks.c b/libguile/hooks.c
index 9136c5e88..d5fd90829 100644
--- a/libguile/hooks.c
+++ b/libguile/hooks.c
@@ -27,6 +27,7 @@
 #include "libguile/_scm.h"
 
 #include "libguile/eval.h"
+#include "libguile/list.h"
 #include "libguile/ports.h"
 #include "libguile/procprop.h"
 #include "libguile/smob.h"
diff --git a/libguile/i18n.c b/libguile/i18n.c
index f8364051b..905a9a752 100644
--- a/libguile/i18n.c
+++ b/libguile/i18n.c
@@ -26,6 +26,7 @@
 #include "libguile/extensions.h"
 #include "libguile/feature.h"
 #include "libguile/i18n.h"
+#include "libguile/list.h"
 #include "libguile/strings.h"
 #include "libguile/chars.h"
 #include "libguile/dynwind.h"
diff --git a/libguile/instructions.c b/libguile/instructions.c
index 594dc4375..f6c6a1189 100644
--- a/libguile/instructions.c
+++ b/libguile/instructions.c
@@ -24,6 +24,7 @@
 
 #include "_scm.h"
 #include "threads.h"
+#include "libguile/list.h"
 #include "instructions.h"
 #include "extensions.h"
 
diff --git a/libguile/keywords.c b/libguile/keywords.c
index c1bfea29f..950743e95 100644
--- a/libguile/keywords.c
+++ b/libguile/keywords.c
@@ -28,6 +28,7 @@
 
 #include "libguile/_scm.h"
 #include "libguile/async.h"
+#include "libguile/list.h"
 #include "libguile/ports.h"
 #include "libguile/smob.h"
 #include "libguile/dynwind.h"
diff --git a/libguile/load.c b/libguile/load.c
index acc14f59a..a0a59f32c 100644
--- a/libguile/load.c
+++ b/libguile/load.c
@@ -39,6 +39,7 @@
 #include "libguile/filesys.h"
 #include "libguile/fports.h"
 #include "libguile/libpath.h"
+#include "libguile/list.h"
 #include "libguile/loader.h"
 #include "libguile/modules.h"
 #include "libguile/read.h"
diff --git a/libguile/modules.c b/libguile/modules.c
index 9589e9af4..dba02a6fc 100644
--- a/libguile/modules.c
+++ b/libguile/modules.c
@@ -27,6 +27,7 @@
 #include "libguile/_scm.h"
 
 #include "libguile/eval.h"
+#include "libguile/list.h"
 #include "libguile/smob.h"
 #include "libguile/procprop.h"
 #include "libguile/vectors.h"
diff --git a/libguile/net_db.c b/libguile/net_db.c
index 7680f9188..78daea56d 100644
--- a/libguile/net_db.c
+++ b/libguile/net_db.c
@@ -47,6 +47,7 @@
 
 #include "libguile/_scm.h"
 #include "libguile/feature.h"
+#include "libguile/list.h"
 #include "libguile/strings.h"
 #include "libguile/vectors.h"
 #include "libguile/dynwind.h"
diff --git a/libguile/options.c b/libguile/options.c
index 2d7e18f65..17ef7fa76 100644
--- a/libguile/options.c
+++ b/libguile/options.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1995,1996,1998,2000,2001, 2006, 2008, 2009, 2010, 2011 Free Software Foundation
+/* Copyright (C) 1995-1996,1998,2000-2001,2006,2008-2011,2018
+ *   Free Software Foundation
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -22,6 +23,7 @@
 #endif
 
 #include "libguile/_scm.h"
+#include "libguile/list.h"
 #include "libguile/mallocs.h"
 #include "libguile/strings.h"
 
diff --git a/libguile/ports-internal.h b/libguile/ports-internal.h
index be7ba60f5..cfc5b7e2e 100644
--- a/libguile/ports-internal.h
+++ b/libguile/ports-internal.h
@@ -1,7 +1,7 @@
 /*
  * ports-internal.h - internal-only declarations for ports.
  *
- * Copyright (C) 2013 Free Software Foundation, Inc.
+ * Copyright (C) 2013, 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 +26,7 @@
 #include <iconv.h>
 
 #include "libguile/_scm.h"
+#include "libguile/list.h"
 #include "libguile/ports.h"
 
 typedef enum scm_t_port_type_flags {
diff --git a/libguile/posix.c b/libguile/posix.c
index 02b58fe00..1104aaf0d 100644
--- a/libguile/posix.c
+++ b/libguile/posix.c
@@ -68,6 +68,7 @@
 #include "libguile/extensions.h"
 #include "libguile/finalizers.h"
 #include "libguile/fports.h"
+#include "libguile/list.h"
 #include "libguile/bitvectors.h"
 #include "libguile/scmsigs.h"
 #include "libguile/feature.h"
diff --git a/libguile/procprop.c b/libguile/procprop.c
index 91002638e..75452ae92 100644
--- a/libguile/procprop.c
+++ b/libguile/procprop.c
@@ -27,6 +27,7 @@
 
 #include "libguile/alist.h"
 #include "libguile/eval.h"
+#include "libguile/list.h"
 #include "libguile/procs.h"
 #include "libguile/gsubr.h"
 #include "libguile/smob.h"
diff --git a/libguile/random.c b/libguile/random.c
index 5c6301f7d..640980481 100644
--- a/libguile/random.c
+++ b/libguile/random.c
@@ -36,6 +36,7 @@
 
 #include "libguile/smob.h"
 #include "libguile/generalized-arrays.h"
+#include "libguile/list.h"
 #include "libguile/numbers.h"
 #include "libguile/feature.h"
 #include "libguile/stime.h"
diff --git a/libguile/rdelim.c b/libguile/rdelim.c
index 6e048879d..bc3df33b3 100644
--- a/libguile/rdelim.c
+++ b/libguile/rdelim.c
@@ -29,6 +29,7 @@
 #endif
 
 #include "libguile/chars.h"
+#include "libguile/list.h"
 #include "libguile/modules.h"
 #include "libguile/ports.h"
 #include "libguile/rdelim.h"
diff --git a/libguile/regex-posix.c b/libguile/regex-posix.c
index 79ae34e69..101db01eb 100644
--- a/libguile/regex-posix.c
+++ b/libguile/regex-posix.c
@@ -43,6 +43,7 @@
 #endif
 
 #include "libguile/async.h"
+#include "libguile/list.h"
 #include "libguile/smob.h"
 #include "libguile/symbols.h"
 #include "libguile/vectors.h"
diff --git a/libguile/scmsigs.c b/libguile/scmsigs.c
index b3bf11240..8189eee44 100644
--- a/libguile/scmsigs.c
+++ b/libguile/scmsigs.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-2002, 2004, 2006-2009, 2011, 2013-2014, 2017-2018
+/* Copyright (C) 1995-2002,2004,2006-2009,2011,2013-2014,2017-2018
  *   Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -47,6 +47,7 @@
 #include "libguile/dynwind.h"
 #include "libguile/feature.h"
 #include "libguile/eval.h"
+#include "libguile/list.h"
 #include "libguile/vectors.h"
 #include "libguile/syscalls.h"
 #include "libguile/threads.h"
diff --git a/libguile/socket.c b/libguile/socket.c
index 572ad68aa..5a33379dc 100644
--- a/libguile/socket.c
+++ b/libguile/socket.c
@@ -51,6 +51,7 @@
 #include "libguile/arrays.h"
 #include "libguile/feature.h"
 #include "libguile/fports.h"
+#include "libguile/list.h"
 #include "libguile/strings.h"
 #include "libguile/vectors.h"
 #include "libguile/dynwind.h"
diff --git a/libguile/sort.c b/libguile/sort.c
index 00fb5b66f..e62d7da30 100644
--- a/libguile/sort.c
+++ b/libguile/sort.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1999, 2000, 2001, 2002, 2004, 2006, 2007, 2008, 2009,
- *   2010, 2011, 2012, 2014, 2018 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2002,2004,2006-2012,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
@@ -45,6 +45,7 @@
 #include "libguile/array-map.h"
 #include "libguile/feature.h"
 #include "libguile/generalized-arrays.h"
+#include "libguile/list.h"
 #include "libguile/vectors.h"
 #include "libguile/async.h"
 #include "libguile/dynwind.h"
diff --git a/libguile/srcprop.c b/libguile/srcprop.c
index c98b22b94..037450b91 100644
--- a/libguile/srcprop.c
+++ b/libguile/srcprop.c
@@ -29,9 +29,10 @@
 #include "libguile/smob.h"
 #include "libguile/alist.h"
 #include "libguile/debug.h"
-#include "libguile/keywords.h"
 #include "libguile/hashtab.h"
 #include "libguile/hash.h"
+#include "libguile/keywords.h"
+#include "libguile/list.h"
 #include "libguile/ports.h"
 #include "libguile/gc.h"
 #include "libguile/weak-table.h"
diff --git a/libguile/srfi-60.c b/libguile/srfi-60.c
index 80f476d8d..784b0654b 100644
--- a/libguile/srfi-60.c
+++ b/libguile/srfi-60.c
@@ -28,6 +28,7 @@
 #include "libguile/eq.h"
 
 #include "libguile/extensions.h"
+#include "libguile/list.h"
 #include "libguile/numbers.h"
 
 #include "libguile/srfi-60.h"
diff --git a/libguile/stacks.c b/libguile/stacks.c
index b7ed5ff11..65ce0f24d 100644
--- a/libguile/stacks.c
+++ b/libguile/stacks.c
@@ -29,6 +29,7 @@
 #include "libguile/debug.h"
 #include "libguile/continuations.h"
 #include "libguile/fluids.h"
+#include "libguile/list.h"
 #include "libguile/struct.h"
 #include "libguile/macros.h"
 #include "libguile/procprop.h"
diff --git a/libguile/symbols.c b/libguile/symbols.c
index 7f305d1ad..e32d0de8c 100644
--- a/libguile/symbols.c
+++ b/libguile/symbols.c
@@ -29,6 +29,7 @@
 #include "libguile/chars.h"
 #include "libguile/eval.h"
 #include "libguile/hash.h"
+#include "libguile/list.h"
 #include "libguile/smob.h"
 #include "libguile/strorder.h"
 #include "libguile/variable.h"
diff --git a/libguile/threads.c b/libguile/threads.c
index bc8a7acaf..5f8586a50 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -46,6 +46,7 @@
 #include "libguile/extensions.h"
 #include "libguile/hashtab.h"
 #include "libguile/eval.h"
+#include "libguile/list.h"
 #include "libguile/async.h"
 #include "libguile/ports.h"
 #include "libguile/threads.h"
diff --git a/libguile/throw.c b/libguile/throw.c
index bc7b1da97..7e528131c 100644
--- a/libguile/throw.c
+++ b/libguile/throw.c
@@ -34,6 +34,7 @@
 #include "libguile/deprecation.h"
 #include "libguile/backtrace.h"
 #include "libguile/debug.h"
+#include "libguile/list.h"
 #include "libguile/stackchk.h"
 #include "libguile/stacks.h"
 #include "libguile/fluids.h"
diff --git a/libguile/values.c b/libguile/values.c
index 4d4535c67..78fb93928 100644
--- a/libguile/values.c
+++ b/libguile/values.c
@@ -25,6 +25,7 @@
 #include "libguile/eval.h"
 #include "libguile/feature.h"
 #include "libguile/gc.h"
+#include "libguile/list.h"
 #include "libguile/numbers.h"
 #include "libguile/ports.h"
 #include "libguile/strings.h"
diff --git a/libguile/variable.c b/libguile/variable.c
index 52c8e27a2..f5c8ef81b 100644
--- a/libguile/variable.c
+++ b/libguile/variable.c
@@ -25,6 +25,7 @@
 
 #include "libguile/_scm.h"
 #include "libguile/eq.h"
+#include "libguile/list.h"
 #include "libguile/ports.h"
 #include "libguile/smob.h"
 #include "libguile/deprecation.h"
diff --git a/libguile/vectors.c b/libguile/vectors.c
index 017780f47..7c8e9bcba 100644
--- a/libguile/vectors.c
+++ b/libguile/vectors.c
@@ -25,6 +25,7 @@
 
 #include "libguile/_scm.h"
 #include "libguile/eq.h"
+#include "libguile/list.h"
 
 #include "libguile/vectors.h"
 #include "libguile/array-handle.h"
diff --git a/libguile/vm.c b/libguile/vm.c
index 400f7b8d7..04f63f7f3 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -49,6 +49,7 @@
 #include "libguile/extensions.h"
 #include "libguile/alist.h"
 #include "libguile/procprop.h"
+#include "libguile/list.h"
 #include "libguile/stackchk.h"
 #include "libguile/hooks.h"
 #include "libguile/smob.h"
diff --git a/libguile/weak-vector.c b/libguile/weak-vector.c
index f44e78f9d..66815a091 100644
--- a/libguile/weak-vector.c
+++ b/libguile/weak-vector.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1995, 1996, 1998, 2000, 2001, 2003, 2006, 2008, 2009,
- *   2010, 2011, 2012, 2013, 2014, 2018 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1996,1998,2000-2001,2003,2006,2008-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
@@ -27,6 +27,7 @@
 
 #include "libguile/_scm.h"
 #include "libguile/extensions.h"
+#include "libguile/list.h"
 #include "libguile/weak-vector.h"