diff options
author | Jim Blandy <jimb@red-bean.com> | 1996-09-10 02:26:07 +0000 |
---|---|---|
committer | Jim Blandy <jimb@red-bean.com> | 1996-09-10 02:26:07 +0000 |
commit | 20e6290e38294de51ca0ca2b29c11d0f0042593c (patch) | |
tree | fbc3de62200570fe33d92ed201ff8d7c261d2434 | |
parent | 4b8f71a82b50730b6cce71df098a5acfea649960 (diff) | |
download | guile-20e6290e38294de51ca0ca2b29c11d0f0042593c.tar.gz |
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".
62 files changed, 340 insertions, 9 deletions
diff --git a/libguile/_scm.h b/libguile/_scm.h index 1c7e74ebc..419cb269a 100644 --- a/libguile/_scm.h +++ b/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. diff --git a/libguile/alist.c b/libguile/alist.c index 85c4395af..95a891809 100644 --- a/libguile/alist.c +++ b/libguile/alist.c @@ -41,6 +41,10 @@ #include <stdio.h> #include "_scm.h" +#include "eq.h" +#include "list.h" + +#include "alist.h" diff --git a/libguile/append.c b/libguile/append.c index 4f09a1dcf..551d8d369 100644 --- a/libguile/append.c +++ b/libguile/append.c @@ -42,6 +42,9 @@ #include <stdio.h> #include "_scm.h" +#include "list.h" + +#include "append.h" diff --git a/libguile/arbiters.c b/libguile/arbiters.c index d5e374b42..3088a3537 100644 --- a/libguile/arbiters.c +++ b/libguile/arbiters.c @@ -42,6 +42,9 @@ #include <stdio.h> #include "_scm.h" +#include "smob.h" + +#include "arbiters.h" /* {Arbiters} diff --git a/libguile/async.c b/libguile/async.c index 2658ca3d3..17219d3ef 100644 --- a/libguile/async.c +++ b/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> diff --git a/libguile/boolean.c b/libguile/boolean.c index cc8c63382..36477c21a 100644 --- a/libguile/boolean.c +++ b/libguile/boolean.c @@ -42,6 +42,8 @@ #include <stdio.h> #include "_scm.h" + +#include "boolean.h" diff --git a/libguile/chars.c b/libguile/chars.c index 70ec0ab82..eb3622f0d 100644 --- a/libguile/chars.c +++ b/libguile/chars.c @@ -44,6 +44,7 @@ #include <ctype.h> #include "_scm.h" +#include "chars.h" diff --git a/libguile/debug.c b/libguile/debug.c index d76a61e6f..b614114d3 100644 --- a/libguile/debug.c +++ b/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} diff --git a/libguile/dynwind.c b/libguile/dynwind.c index b80a00c76..82ac6d632 100644 --- a/libguile/dynwind.c +++ b/libguile/dynwind.c @@ -42,7 +42,10 @@ #include <stdio.h> #include "_scm.h" +#include "eval.h" +#include "alist.h" +#include "dynwind.h" /* {Dynamic wind} diff --git a/libguile/eq.c b/libguile/eq.c index ed6dc4e12..ad704184f 100644 --- a/libguile/eq.c +++ b/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__ diff --git a/libguile/error.c b/libguile/error.c index 8c6d81dd6..fd654d80b 100644 --- a/libguile/error.c +++ b/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> diff --git a/libguile/eval.c b/libguile/eval.c index 900423628..301426e43 100644 --- a/libguile/eval.c +++ b/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. diff --git a/libguile/feature.c b/libguile/feature.c index e0640793e..9f4918316 100644 --- a/libguile/feature.c +++ b/libguile/feature.c @@ -43,6 +43,8 @@ #include <stdio.h> #include "_scm.h" +#include "feature.h" + #ifdef HAVE_STRING_H #include <string.h> #endif diff --git a/libguile/filesys.c b/libguile/filesys.c index 1122d1f88..c3184d912 100644 --- a/libguile/filesys.c +++ b/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> diff --git a/libguile/fports.c b/libguile/fports.c index fbd5eb443..a5b30a10d 100644 --- a/libguile/fports.c +++ b/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> diff --git a/libguile/gc.c b/libguile/gc.c index edcb78491..0491a70ba 100644 --- a/libguile/gc.c +++ b/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> diff --git a/libguile/gdbint.c b/libguile/gdbint.c index df8e2c40c..ab7c68cc3 100644 --- a/libguile/gdbint.c +++ b/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} * diff --git a/libguile/genio.c b/libguile/genio.c index 5e43d04c3..5661e059e 100644 --- a/libguile/genio.c +++ b/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> diff --git a/libguile/gsubr.c b/libguile/gsubr.c index 2f1cc75e9..5f0a3e981 100644 --- a/libguile/gsubr.c +++ b/libguile/gsubr.c @@ -42,7 +42,9 @@ #include <stdio.h> #include "_scm.h" +#include "genio.h" +#include "gsubr.h" /* * gsubr.c diff --git a/libguile/hash.c b/libguile/hash.c index 48f171a61..f1739ecbd 100644 --- a/libguile/hash.c +++ b/libguile/hash.c @@ -42,7 +42,9 @@ #include <stdio.h> #include "_scm.h" +#include "chars.h" +#include "hash.h" #ifndef floor diff --git a/libguile/hashtab.c b/libguile/hashtab.c index fd37e2574..132edca78 100644 --- a/libguile/hashtab.c +++ b/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__ diff --git a/libguile/init.c b/libguile/init.c index bb49f7eb4..d5c4f4439 100644 --- a/libguile/init.c +++ b/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 diff --git a/libguile/ioext.c b/libguile/ioext.c index 274b547f2..e4c154143 100644 --- a/libguile/ioext.c +++ b/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> diff --git a/libguile/kw.c b/libguile/kw.c index e559ef3ea..58c7e48db 100644 --- a/libguile/kw.c +++ b/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__ diff --git a/libguile/list.c b/libguile/list.c index 15c20fd32..a343dfda5 100644 --- a/libguile/list.c +++ b/libguile/list.c @@ -41,6 +41,9 @@ #include <stdio.h> #include "_scm.h" +#include "eq.h" + +#include "list.h" #ifdef __STDC__ #include <stdarg.h> diff --git a/libguile/load.c b/libguile/load.c index 1129a6981..ccc32a618 100644 --- a/libguile/load.c +++ b/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> diff --git a/libguile/mallocs.c b/libguile/mallocs.c index 0f3022ed6..e4184d52c 100644 --- a/libguile/mallocs.c +++ b/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 diff --git a/libguile/markers.c b/libguile/markers.c index d6a3c8288..fa6705902 100644 --- a/libguile/markers.c +++ b/libguile/markers.c @@ -43,6 +43,7 @@ #include <stdio.h> #include "_scm.h" +#include "markers.h" /* {GC marking} diff --git a/libguile/mbstrings.c b/libguile/mbstrings.c index 4d8bb1834..a6f5ea677 100644 --- a/libguile/mbstrings.c +++ b/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); diff --git a/libguile/numbers.c b/libguile/numbers.c index bc2e831cb..a02e44811 100644 --- a/libguile/numbers.c +++ b/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' diff --git a/libguile/objprop.c b/libguile/objprop.c index 981d2d55e..1337c1221 100644 --- a/libguile/objprop.c +++ b/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} diff --git a/libguile/options.c b/libguile/options.c index 393115f41..8b3784d95 100644 --- a/libguile/options.c +++ b/libguile/options.c @@ -46,6 +46,7 @@ #include <stdio.h> #include "_scm.h" +#include "options.h" /* {Run-time options} diff --git a/libguile/ports.c b/libguile/ports.c index 63acf17eb..3407b4ca3 100644 --- a/libguile/ports.c +++ b/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> diff --git a/libguile/posix.c b/libguile/posix.c index 685bf2978..48c0b8b61 100644 --- a/libguile/posix.c +++ b/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 diff --git a/libguile/print.c b/libguile/print.c index 7f0afa370..123a6946f 100644 --- a/libguile/print.c +++ b/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} diff --git a/libguile/procprop.c b/libguile/procprop.c index a984008db..ecf10a92a 100644 --- a/libguile/procprop.c +++ b/libguile/procprop.c @@ -42,7 +42,10 @@ #include <stdio.h> #include "_scm.h" +#include "alist.h" +#include "eval.h" +#include "procprop.h" static SCM diff --git a/libguile/procs.c b/libguile/procs.c index 6c5a5b2c4..25c1135a0 100644 --- a/libguile/procs.c +++ b/libguile/procs.c @@ -43,7 +43,7 @@ #include <stdio.h> #include "_scm.h" - +#include "procs.h" diff --git a/libguile/ramap.c b/libguile/ramap.c index a913da0e6..9a968fae3 100644 --- a/libguile/ramap.c +++ b/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 diff --git a/libguile/read.c b/libguile/read.c index 828e7bc76..2ecb39733 100644 --- a/libguile/read.c +++ b/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" diff --git a/libguile/root.c b/libguile/root.c index 8b3a63a1e..c0f629bec 100644 --- a/libguile/root.c +++ b/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]; diff --git a/libguile/scmsigs.c b/libguile/scmsigs.c index bb7f740f9..f33c1b036 100644 --- a/libguile/scmsigs.c +++ b/libguile/scmsigs.c @@ -44,6 +44,8 @@ #include <signal.h> #include "_scm.h" +#include "scmsigs.h" + #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/libguile/sequences.c b/libguile/sequences.c index 6973f74dc..d58d20040 100644 --- a/libguile/sequences.c +++ b/libguile/sequences.c @@ -43,6 +43,7 @@ #include <stdio.h> #include "_scm.h" +#include "sequences.h" diff --git a/libguile/simpos.c b/libguile/simpos.c index 970c6a004..f9e79e46d 100644 --- a/libguile/simpos.c +++ b/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 diff --git a/libguile/smob.c b/libguile/smob.c index 4843d486f..40604af2a 100644 --- a/libguile/smob.c +++ b/libguile/smob.c @@ -42,6 +42,9 @@ #include <stdio.h> #include "_scm.h" + +#include "smob.h" + #ifdef HAVE_MALLOC_H #include <malloc.h> #endif diff --git a/libguile/socket.c b/libguile/socket.c index c48a5a5c6..89ce1d01e 100644 --- a/libguile/socket.c +++ b/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> diff --git a/libguile/srcprop.c b/libguile/srcprop.c index 94021bae0..fab94f13d 100644 --- a/libguile/srcprop.c +++ b/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} * diff --git a/libguile/stackchk.c b/libguile/stackchk.c index de7c96c03..2e22edbf7 100644 --- a/libguile/stackchk.c +++ b/libguile/stackchk.c @@ -42,7 +42,9 @@ #include <stdio.h> #include "_scm.h" +#include "genio.h" +#include "stackchk.h" /* {Stack Checking} diff --git a/libguile/stime.c b/libguile/stime.c index fef78d63d..b43bb7da9 100644 --- a/libguile/stime.c +++ b/libguile/stime.c @@ -42,6 +42,9 @@ #include <stdio.h> #include "_scm.h" + +#include "stime.h" + #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/libguile/strings.c b/libguile/strings.c index ea96e8c30..4472dca89 100644 --- a/libguile/strings.c +++ b/libguile/strings.c @@ -42,7 +42,9 @@ #include <stdio.h> #include "_scm.h" +#include "chars.h" +#include "strings.h" /* {Strings} diff --git a/libguile/strop.c b/libguile/strop.c index 366d249da..ac312534a 100644 --- a/libguile/strop.c +++ b/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__ diff --git a/libguile/strorder.c b/libguile/strorder.c index 5e1a15a26..8339a893e 100644 --- a/libguile/strorder.c +++ b/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); diff --git a/libguile/strports.c b/libguile/strports.c index 29ef1d310..7d2d44a41 100644 --- a/libguile/strports.c +++ b/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> diff --git a/libguile/struct.c b/libguile/struct.c index a15c5508e..1c280c7c4 100644 --- a/libguile/struct.c +++ b/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> diff --git a/libguile/symbols.c b/libguile/symbols.c index 6d9a1c8cc..338606fc5 100644 --- a/libguile/symbols.c +++ b/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> diff --git a/libguile/tag.c b/libguile/tag.c index a305d70b2..66023cf23 100644 --- a/libguile/tag.c +++ b/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); diff --git a/libguile/throw.c b/libguile/throw.c index aa353a511..9b2818701 100644 --- a/libguile/throw.c +++ b/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" diff --git a/libguile/unif.c b/libguile/unif.c index 796991546..81df53a2f 100644 --- a/libguile/unif.c +++ b/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" diff --git a/libguile/variable.c b/libguile/variable.c index 984de26db..fe70d24f9 100644 --- a/libguile/variable.c +++ b/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 diff --git a/libguile/vectors.c b/libguile/vectors.c index c30a8590a..d474f463d 100644 --- a/libguile/vectors.c +++ b/libguile/vectors.c @@ -42,7 +42,9 @@ #include <stdio.h> #include "_scm.h" +#include "eq.h" +#include "vectors.h" diff --git a/libguile/version.c b/libguile/version.c index da83749e4..8b699f681 100644 --- a/libguile/version.c +++ b/libguile/version.c @@ -42,6 +42,7 @@ #include "_scm.h" +#include "version.h" /* Return a Scheme string containing Guile's major version number. */ diff --git a/libguile/vports.c b/libguile/vports.c index dfe6e13b1..71dec27a4 100644 --- a/libguile/vports.c +++ b/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> diff --git a/libguile/weaks.c b/libguile/weaks.c index ff0926599..8897f66cc 100644 --- a/libguile/weaks.c +++ b/libguile/weaks.c @@ -42,6 +42,7 @@ #include <stdio.h> #include "_scm.h" +#include "weaks.h" |