C files should #include only the header files they need, not

libguile.h (which #includes all the header files); the pointless
recompilation was wasting my time.
* Makefile.in (all .o dependency lists): Regenerated.
* libguile.h: Don't try to get a definition for size_t here...
* __scm.h: Do it here.
* _scm.h: Since this is the internal libguile header, put things
here that all (or a majority) of the libguile files will want.
Don't #include <libguile.h> here; that generates dependencies on
way too much.  Instead, get "__scm.h", "error.h", "pairs.h",
"list.h", "gc.h", "gsubr.h", "procs.h", "numbers.h", "symbols.h",
"boolean.h", "strings.h", "vectors.h", "root.h", "ports.h", and
"async.h".
* alist.c: Get "eq.h", "list.h", "alist.h".
* append.c: Get "append.h", "list.h".
* arbiters.c: Get "arbiters.h", "smob.h".
* async.c: Get "async.h", "smob.h", "throw.h", "eval.h".
* boolean.c: Get "boolean.h".
* chars.c: Get "chars.h".
* continuations.c: Get "continuations.h", "dynwind.h", "debug.h",
"stackchk.h".
* debug.c: Get "debug.h", "feature.h", "read.h", "strports.h",
"continuations.h", "alist.h", "srcprop.h", "procprop.h", "smob.h",
"genio.h", "throw.h", "eval.h".
* dynwind.c: Get "dynwind.h", "alist.h", "eval.h".
* eq.c: Get "eq.h", "unif.h", "smob.h", "strorder.h",
"stackchk.h".
* error.c: Get "error.h", "throw.h", "genio.h", "pairs.h".
* eval.c: Get "eval.h", "stackchk.h", "srcprop.h", "debug.h",
"hashtab.h", "procprop.h", "markers.h", "smob.h", "throw.h",
"continuations.h", "eq.h", "sequences.h", "alist.h", "append.h",
"debug.h".
* fdsocket.c: Get "fdsocket.h", "unif.h", "filesys.h".
* feature.c: Get "feature.h".
* files.c: Get "files.h".
* filesys.c: Get "filesys.h", "smob.h", "genio.h".
* fports.c: Get "fports.h", "markers.h".
* gc.c: Get "async.h", "unif.h", "smob.h", "weaks.h",
"genio.h", "struct.h", "stackchk.h", "stime.h".
* gdbint.c: Get "gdbint.h", "chars.h", "eval.h", "print.h",
"read.h", "strports.h", "tag.h".
* genio.c: Get "genio.h", "chars.h".
* gsubr.c: Get "gsubr.h", "genio.h".
* hash.c: Get "hash.h", "chars.h".
* hashtab.c: Get "hashtab.h", "eval.h", "hash.h", "alist.h".
* init.c: Get everyone who has an scm_init_mumble function:
"weaks.h", "vports.h", "version.h", "vectors.h", "variable.h",
"unif.h", "throw.h", "tag.h", "symbols.h", "struct.h",
"strports.h", "strorder.h", "strop.h", "strings.h", "stime.h",
"stackchk.h", "srcprop.h", "socket.h", "simpos.h", "sequences.h",
"scmsigs.h", "read.h", "ramap.h", "procs.h", "procprop.h",
"print.h", "posix.h", "ports.h", "pairs.h", "options.h",
"objprop.h", "numbers.h", "mbstrings.h", "mallocs.h", "load.h",
"list.h", "kw.h", "ioext.h", "hashtab.h", "hash.h", "gsubr.h",
"gdbint.h", "gc.h", "fports.h", "filesys.h", "files.h",
"feature.h", "fdsocket.h", "eval.h", "error.h", "eq.h",
"dynwind.h", "debug.h", "continuations.h", "chars.h", "boolean.h",
"async.h", "arbiters.h", "append.h", "alist.h".
* ioext.c: Get "ioext.h", "fports.h".
* kw.c: Get "kw.h", "smob.h", "mbstrings.h", "genio.h".
* list.c: Get "list.h", "eq.h".
* load.c: Get "load.h", "eval.h", "read.h", "fports.h".
* mallocs.c: Get "smob.h", "genio.h".
* markers.c: Get "markers.h".
* mbstrings.c: Get "mbstrings.h", "read.h", "genio.h", "unif.h",
"chars.h".
* numbers.c: Get "unif.h", "genio.h".
* objprop.c: Get "objprop.h", "weaks.h", "alist.h", "hashtab.h".
* options.c: Get "options.h".
* ports.c: Get "ports.h", "vports.h", "strports.h", "fports.h",
"markers.h", "chars.h", "genio.h".
* posix.c: Get "posix.h", "sequences.h", "feature.h", "unif.h",
"read.h", "scmsigs.h", "genio.h", "fports.h".
* print.c: Get "print.h",  "unif.h", "weaks.h", "read.h",
"procprop.h", "eval.h", "smob.h", "mbstrings.h", "genio.h",
"chars.h".
* procprop.c: Get "procprop.h", "eval.h", "alist.h".
* procs.c: Get "procs.h".
* ramap.c: Get "ramap.h", "feature.h", "eval.h", "eq.h",
"chars.h", "smob.h", "unif.h".
* read.c: Get "alist.h", "kw.h", "mbstrings.h", "unif.h",
"eval.h", "genio.h", "chars.h".
* root.c: Get "root.h", "stackchk.h".
* scmsigs.c: Get "scmsigs.h".
* sequences.c: Get "sequences.h".
* simpos.c: Get "simpos.h", "scmsigs.h".
* smob.c: Get "smob.h".
* socket.c: Get "socket.h", "feature.h".
* srcprop.c: Get "srcprop.h", "weaks.h", "hashtab.h", "debug.h",
"alist.h", "smob.h".
* stackchk.c: Get "stackchk.h", "genio.h".
* stime.c: Get "stime.h"."libguile/continuations.h".
* strings.c: Get "strings.h", "chars.h".
* strop.c: Get "strop.h", "chars.h".
* strorder.c: Get "strorder.h", "chars.h".
* strports.c: Get "strports.h", "print.h", "eval.h", "unif.h".
* struct.c: Get "struct.h", "chars.h".
* symbols.c: Get "symbols.h", "mbstrings.h", "alist.h",
"variable.h", "eval.h", "chars.h".
* tag.c: Get "tag.h", "struct.h", "chars.h".
* throw.c: Get "throw.h", "continuations.h", "debug.h",
"dynwind.h", "eval.h", "alist.h", "smob.h", "genio.h".
* unif.c: Get "unif.h", "feature.h", "strop.h", "sequences.h",
"smob.h", "genio.h", "eval.h", "chars.h".
* variable.c: Get "variable.h", "smob.h", "genio.h".
* vectors.c: Get "vectors.h", "eq.h".
* version.c: Get "version.h".
* vports.c: Get "vports.h", "fports.h", "chars.h", "eval.h".
* weaks.c: Get "weaks.h".

libguile/_scm.h

@@ -44,7 +44,24 @@
  */
 
 
-#include "libguile.h"
+#include "__scm.h"
+
+/* Include headers for those files central to the implementation.  The
+   rest should be explicitly #included in the C files themselves.  */
+#include "error.h"		/* Everyone signals errors.  */
+#include "pairs.h"		/* Everyone conses.  */
+#include "list.h"		/* Everyone makes lists.  */
+#include "gc.h"			/* Everyone allocates.  */
+#include "gsubr.h"		/* Everyone defines global functions.  */
+#include "procs.h"		/* Same.  */
+#include "numbers.h"		/* Everyone deals with fixnums.  */
+#include "symbols.h"		/* For length, chars, values, miscellany.  */
+#include "boolean.h"		/* Everyone wonders about the truth.  */
+#include "strings.h"		/* Everyone loves string.  */
+#include "vectors.h"		/* Vectors are used for structures a lot.  */
+#include "root.h"		/* Everyone uses these objects.  */
+#include "ports.h"		/* Everyone does I/O.  */
+#include "async.h"		/* Everyone allows/disallows ints.  */
 
 /* On VMS, GNU C's errno.h contains a special hack to get link attributes
  * for errno correct for linking to the C RTL.

libguile/alist.c

@@ -41,6 +41,10 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "eq.h"
+#include "list.h"
+
+#include "alist.h"
 
 
 

libguile/append.c

@@ -42,6 +42,9 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "list.h"
+
+#include "append.h"
 
 
 

libguile/arbiters.c

@@ -42,6 +42,9 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "smob.h"
+
+#include "arbiters.h"
 
 
 /* {Arbiters}

libguile/async.c

@@ -43,6 +43,11 @@
 #include <stdio.h>
 #include <signal.h>
 #include "_scm.h"
+#include "eval.h"
+#include "throw.h"
+#include "smob.h"
+
+#include "async.h"
 
 #ifdef HAVE_STRING_H
 #include <string.h>

libguile/boolean.c

@@ -42,6 +42,8 @@
 
 #include <stdio.h>
 #include "_scm.h"
+
+#include "boolean.h"
 
 
 

libguile/chars.c

@@ -44,6 +44,7 @@
 #include <ctype.h>
 #include "_scm.h"
 
+#include "chars.h"
 
 
 

libguile/debug.c

@@ -21,7 +21,19 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "eval.h"
+#include "throw.h"
+#include "genio.h"
+#include "smob.h"
+#include "procprop.h"
+#include "srcprop.h"
+#include "alist.h"
+#include "continuations.h"
+#include "strports.h"
+#include "read.h"
+#include "feature.h"
 
+#include "debug.h"
 
 
 /* {Run time control of the debugging evaluator}

libguile/dynwind.c

@@ -42,7 +42,10 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "eval.h"
+#include "alist.h"
 
+#include "dynwind.h"
 
 
 /* {Dynamic wind}

libguile/eq.c

@@ -41,7 +41,12 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "stackchk.h"
+#include "strorder.h"
+#include "smob.h"
+#include "unif.h"
 
+#include "eq.h"
 
 SCM_PROC1 (s_eq_p, "eq?", scm_tc7_rpsubr, scm_eq_p);
 #ifdef __STDC__

libguile/error.c

@@ -42,6 +42,11 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "pairs.h"
+#include "genio.h"
+#include "throw.h"
+
+#include "error.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

libguile/eval.c

@@ -56,7 +56,26 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "debug.h"
+#include "append.h"
+#include "alist.h"
+#include "sequences.h"
+#include "eq.h"
+#include "continuations.h"
+#include "throw.h"
+#include "smob.h"
+#include "markers.h"
+#include "procprop.h"
+#include "hashtab.h"
 
+#ifdef DEBUG_EXTENSIONS
+#include "debug.h"
+#endif /* DEBUG_EXTENSIONS */
+
+#include "srcprop.h"
+#include "stackchk.h"
+
+#include "eval.h"
 
 
 /* The evaluator contains a plethora of EVAL symbols.

libguile/feature.c

@@ -43,6 +43,8 @@
 #include <stdio.h>
 #include "_scm.h"
 
+#include "feature.h"
+
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif

libguile/filesys.c

@@ -40,7 +40,10 @@
  */
 
 #include "_scm.h"
+#include "genio.h"
+#include "smob.h"
 
+#include "filesys.h"
 
 #ifdef TIME_WITH_SYS_TIME
 # include <sys/time.h>

libguile/fports.c

@@ -42,6 +42,9 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "markers.h"
+
+#include "fports.h"
 
 #ifdef HAVE_STRING_H
 #include <string.h>

libguile/gc.c

@@ -41,6 +41,14 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "stime.h"
+#include "stackchk.h"
+#include "struct.h"
+#include "genio.h"
+#include "weaks.h"
+#include "smob.h"
+#include "unif.h"
+#include "async.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>

libguile/gdbint.c

@@ -45,7 +45,14 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "tag.h"
+#include "strports.h"
+#include "read.h"
+#include "print.h"
+#include "eval.h"
+#include "chars.h"
 
+#include "gdbint.h"
 
 /* {Support for debugging with gdb}
  *

libguile/genio.c

@@ -42,6 +42,9 @@
 #include "extchrs.h"
 #include <stdio.h>
 #include "_scm.h"
+#include "chars.h"
+
+#include "genio.h"
 
 #ifdef HAVE_STRING_H
 #include <string.h>

libguile/gsubr.c

@@ -42,7 +42,9 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "genio.h"
 
+#include "gsubr.h"
 
 /*
  * gsubr.c

libguile/hash.c

@@ -42,7 +42,9 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "chars.h"
 
+#include "hash.h"
 
 
 #ifndef floor

libguile/hashtab.c

@@ -42,7 +42,11 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "alist.h"
+#include "hash.h"
+#include "eval.h"
 
+#include "hashtab.h"
 
 
 #ifdef __STDC__

libguile/init.c

@@ -43,6 +43,70 @@
 #include <stdio.h>
 #include "_scm.h"
 
+/* Everybody has an init function.  */
+#include "alist.h"
+#include "append.h"
+#include "arbiters.h"
+#include "async.h"
+#include "boolean.h"
+#include "chars.h"
+#include "continuations.h"
+#ifdef DEBUG_EXTENSIONS
+#include "debug.h"
+#endif
+#include "dynwind.h"
+#include "eq.h"
+#include "error.h"
+#include "eval.h"
+#include "fdsocket.h"
+#include "feature.h"
+#include "files.h"
+#include "filesys.h"
+#include "fports.h"
+#include "gc.h"
+#include "gdbint.h"
+#include "gsubr.h"
+#include "hash.h"
+#include "hashtab.h"
+#include "ioext.h"
+#include "kw.h"
+#include "list.h"
+#include "load.h"
+#include "mallocs.h"
+#include "mbstrings.h"
+#include "numbers.h"
+#include "objprop.h"
+#include "options.h"
+#include "pairs.h"
+#include "ports.h"
+#include "posix.h"
+#include "print.h"
+#include "procprop.h"
+#include "procs.h"
+#include "ramap.h"
+#include "read.h"
+#include "scmsigs.h"
+#include "sequences.h"
+#include "simpos.h"
+#include "socket.h"
+#include "srcprop.h"
+#include "stackchk.h"
+#include "stime.h"
+#include "strings.h"
+#include "strop.h"
+#include "strorder.h"
+#include "strports.h"
+#include "struct.h"
+#include "symbols.h"
+#include "tag.h"
+#include "throw.h"
+#include "unif.h"
+#include "variable.h"
+#include "vectors.h"
+#include "version.h"
+#include "vports.h"
+#include "weaks.h"
+
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif

libguile/ioext.c

@@ -44,6 +44,9 @@
 #include <stdio.h>
 #include "fd.h"
 #include "_scm.h"
+#include "fports.h"
+
+#include "ioext.h"
 
 #ifdef HAVE_STRING_H
 #include <string.h>

libguile/kw.c

@@ -42,7 +42,11 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "genio.h"
+#include "mbstrings.h"
+#include "smob.h"
 
+#include "kw.h"
 
 
 #ifdef __STDC__

libguile/list.c

@@ -41,6 +41,9 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "eq.h"
+
+#include "list.h"
 
 #ifdef __STDC__
 #include <stdarg.h>

libguile/load.c

@@ -43,6 +43,11 @@
 #include <stdio.h>
 #include "_scm.h"
 #include "libpath.h"
+#include "fports.h"
+#include "read.h"
+#include "eval.h"
+
+#include "load.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>

libguile/mallocs.c

@@ -21,7 +21,11 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "genio.h"
+#include "smob.h"
+
 #include "mallocs.h"
+
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
 #endif

libguile/markers.c

@@ -43,6 +43,7 @@
 #include <stdio.h>
 #include "_scm.h"
 
+#include "markers.h"
 
 
 /* {GC marking}

libguile/mbstrings.c

@@ -46,7 +46,12 @@
 #include "extchrs.h"
 #include <stdio.h>
 #include "_scm.h"
+#include "chars.h"
+#include "unif.h"
+#include "genio.h"
+#include "read.h"
 
+#include "mbstrings.h"
 
 
 SCM_PROC(s_multi_byte_string_p, "multi-byte-string?", 1, 0, 0, scm_multi_byte_string_p);

libguile/numbers.c

@@ -43,8 +43,10 @@
 #include <stdio.h>
 #include <math.h>
 #include "_scm.h"
+#include "genio.h"
+#include "unif.h"
 
-
+#include "numbers.h"
 
 #define DIGITS '0':case '1':case '2':case '3':case '4':\
  case '5':case '6':case '7':case '8':case '9'

libguile/objprop.c

@@ -42,7 +42,11 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "hashtab.h"
+#include "alist.h"
+#include "weaks.h"
 
+#include "objprop.h"
 
 
 /* {Object Properties}

libguile/options.c

@@ -46,6 +46,7 @@
 #include <stdio.h>
 #include "_scm.h"
 
+#include "options.h"
 
 
 /* {Run-time options}

libguile/ports.c

@@ -41,7 +41,15 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "genio.h"
+#include "chars.h"
 
+#include "markers.h"
+#include "fports.h"
+#include "strports.h"
+#include "vports.h"
+
+#include "ports.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>

libguile/posix.c

@@ -42,7 +42,15 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "fports.h"
+#include "genio.h"
+#include "scmsigs.h"
+#include "read.h"
+#include "unif.h"
+#include "feature.h"
+#include "sequences.h"
 
+#include "posix.h"
 
 
 #ifdef HAVE_STRING_H

libguile/print.c

@@ -42,9 +42,17 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "chars.h"
+#include "genio.h"
+#include "mbstrings.h"
+#include "smob.h"
+#include "eval.h"
+#include "procprop.h"
+#include "read.h"
+#include "weaks.h"
+#include "unif.h"
 
-
-
+#include "print.h"
 
 
 /* {Names of immediate symbols}

libguile/procprop.c

@@ -42,7 +42,10 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "alist.h"
+#include "eval.h"
 
+#include "procprop.h"
 
 
 static SCM

libguile/procs.c

@@ -43,7 +43,7 @@
 #include <stdio.h>
 #include "_scm.h"
 
-
+#include "procs.h"
 
 
 

libguile/ramap.c

@@ -45,7 +45,14 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "unif.h"
+#include "smob.h"
+#include "chars.h"
+#include "eq.h"
+#include "eval.h"
+#include "feature.h"
 
+#include "ramap.h"
 
 
 #ifdef ARRAYS

libguile/read.c

@@ -43,6 +43,14 @@
 #include "extchrs.h"
 #include <stdio.h>
 #include "_scm.h"
+#include "chars.h"
+#include "genio.h"
+#include "eval.h"
+#include "unif.h"
+#include "mbstrings.h"
+#include "kw.h"
+#include "alist.h"
+
 #include "read.h"
 
 

libguile/root.c

@@ -42,7 +42,9 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "stackchk.h"
 
+#include "root.h"
 
 
 SCM scm_sys_protects[SCM_NUM_PROTECTS];

libguile/scmsigs.c

@@ -44,6 +44,8 @@
 #include <signal.h>
 #include "_scm.h"
 
+#include "scmsigs.h"
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

libguile/sequences.c

@@ -43,6 +43,7 @@
 #include <stdio.h>
 #include "_scm.h"
 
+#include "sequences.h"
 
 
 

libguile/simpos.c

@@ -43,6 +43,9 @@
 #include <stdio.h>
 #include "_scm.h"
 
+#include "scmsigs.h"
+#include "simpos.h"
+
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif

libguile/smob.c

@@ -42,6 +42,9 @@
 
 #include <stdio.h>
 #include "_scm.h"
+
+#include "smob.h"
+
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
 #endif

libguile/socket.c

@@ -48,6 +48,9 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "feature.h"
+
+#include "socket.h"
 
 #ifdef HAVE_STRING_H
 #include <string.h>

libguile/srcprop.c

@@ -45,7 +45,13 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "smob.h"
+#include "alist.h"
+#include "debug.h"
+#include "hashtab.h"
+#include "weaks.h"
 
+#include "srcprop.h"
 
 /* {Source Properties}
  *

libguile/stackchk.c

@@ -42,7 +42,9 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "genio.h"
 
+#include "stackchk.h"
 
 
 /* {Stack Checking}

libguile/stime.c

@@ -42,6 +42,9 @@
 
 #include <stdio.h>
 #include "_scm.h"
+
+#include "stime.h"
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

libguile/strings.c

@@ -42,7 +42,9 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "chars.h"
 
+#include "strings.h"
 
 
 /* {Strings}

libguile/strop.c

@@ -20,7 +20,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include <stdio.h>
 #include "_scm.h"
+#include "chars.h"
 
+#include "strop.h"
 
 
 #ifdef __STDC__

libguile/strorder.c

@@ -42,7 +42,9 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "chars.h"
 
+#include "strorder.h"
 
 
 SCM_PROC1 (s_string_equal_p, "string=?", scm_tc7_rpsubr, scm_string_equal_p);

libguile/strports.c

@@ -42,6 +42,11 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "unif.h"
+#include "eval.h"
+#include "print.h"
+
+#include "strports.h"
 
 #ifdef HAVE_STRING_H
 #include <string.h>

libguile/struct.c

@@ -42,6 +42,9 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "chars.h"
+
+#include "struct.h"
 
 #ifdef HAVE_STRING_H
 #include <string.h>

libguile/symbols.c

@@ -42,6 +42,13 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "chars.h"
+#include "eval.h"
+#include "variable.h"
+#include "alist.h"
+#include "mbstrings.h"
+
+#include "symbols.h"
 
 #ifdef HAVE_STRING_H
 #include <string.h>

libguile/tag.c

@@ -41,7 +41,10 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "chars.h"
+#include "struct.h"
 
+#include "tag.h"
 
 
 SCM_CONST_LONG (scm_utag_immediate_integer, "utag_immediate_integer", 0);

libguile/throw.c

@@ -42,7 +42,17 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "genio.h"
+#include "smob.h"
+#include "alist.h"
+#include "eval.h"
+#include "dynwind.h"
+#ifdef DEBUG_EXTENSIONS
+#include "debug.h"
+#endif
+#include "continuations.h"
 
+#include "throw.h"
 
 
 

libguile/unif.c

@@ -42,6 +42,15 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "chars.h"
+#include "eval.h"
+#include "genio.h"
+#include "smob.h"
+#include "sequences.h"
+#include "strop.h"
+#include "feature.h"
+
+#include "unif.h"
 #include "ramap.h"
 
 

libguile/variable.c

@@ -42,7 +42,10 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "genio.h"
+#include "smob.h"
 
+#include "variable.h"
 
 #ifdef __STDC__
 static scm_sizet

libguile/vectors.c

@@ -42,7 +42,9 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "eq.h"
 
+#include "vectors.h"
 
 
 

libguile/version.c

@@ -42,6 +42,7 @@
 
 #include "_scm.h"
 
+#include "version.h"
 
 
 /* Return a Scheme string containing Guile's major version number.  */

libguile/vports.c

@@ -42,6 +42,11 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "eval.h"
+#include "chars.h"
+#include "fports.h"
+
+#include "vports.h"
 
 #ifdef HAVE_STRING_H
 #include <string.h>

libguile/weaks.c

@@ -42,6 +42,7 @@
 #include <stdio.h>
 #include "_scm.h"
 
+#include "weaks.h"