Only include root.h where it is actually needed.

diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 4430d11..ec038c2 100644 (file)
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,13 @@
+2000-03-18  Dirk Herrmann  <D.Herrmann@tu-bs.de>
+
+       * _scm.h:  Don't include root.h everywhere...
+
+       * async.c continuations.c eq.c eval.c evalext.c feature.c gc.c
+       gdbint.c gsubr.c ioext.c keywords.c lang.c load.c macros.c
+       numbers.c objprop.c ports.c print.c procprop.c ramap.c read.c
+       srcprop.c stackchk.c stacks.c strports.c symbols.c unif.c
+       variable.c vectors.c vports.c: ... only include it here.
+
 2000-03-17  Dirk Herrmann  <D.Herrmann@tu-bs.de>
 
        * _scm.h:  Don't include strings.h everywhere...

diff --git a/libguile/_scm.h b/libguile/_scm.h
index ce1afe3..71424b1 100644 (file)
--- a/libguile/_scm.h
+++ b/libguile/_scm.h
@@ -70,7 +70,6 @@
 #include "numbers.h"           /* Everyone deals with fixnums.  */
 #include "symbols.h"           /* For length, chars, values, miscellany.  */
 #include "boolean.h"           /* Everyone wonders about the truth.  */
-#include "root.h"              /* Everyone uses these objects.  */
 #include "async.h"             /* Everyone allows/disallows ints.  */
 #ifdef USE_THREADS
 #include "threads.h"           /* The cooperative thread package does

diff --git a/libguile/async.c b/libguile/async.c
index 8b0ee4b..6a31a09 100644 (file)
--- a/libguile/async.c
+++ b/libguile/async.c
@@ -49,6 +49,7 @@
 #include "_scm.h"
 #include "eval.h"
 #include "throw.h"
+#include "root.h"
 #include "smob.h"
 
 #include "validate.h"

diff --git a/libguile/continuations.c b/libguile/continuations.c
index 8d64e33..6c7a537 100644 (file)
--- a/libguile/continuations.c
+++ b/libguile/continuations.c
@@ -46,6 +46,7 @@
 
 #include <stdio.h>
 #include "_scm.h"
+#include "root.h"
 #include "stackchk.h"
 #ifdef DEBUG_EXTENSIONS
 #include "debug.h"

diff --git a/libguile/eq.c b/libguile/eq.c
index cebcf40..24230a0 100644 (file)
--- a/libguile/eq.c
+++ b/libguile/eq.c
@@ -48,6 +48,7 @@
 #include "ramap.h"
 #include "stackchk.h"
 #include "strorder.h"
+#include "root.h"
 #include "smob.h"
 #include "unif.h"
 #include "vectors.h"

diff --git a/libguile/eval.c b/libguile/eval.c
index 72cffef..36f73fe 100644 (file)
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -96,6 +96,7 @@ char *alloca ();
 #include "feature.h"
 #include "modules.h"
 #include "ports.h"
+#include "root.h"
 #include "vectors.h"
 
 #include "validate.h"

diff --git a/libguile/evalext.c b/libguile/evalext.c
index 9fefca6..c719670 100644 (file)
--- a/libguile/evalext.c
+++ b/libguile/evalext.c
@@ -48,6 +48,7 @@
 #include "eval.h"
 #include "macros.h"
 #include "modules.h"
+#include "root.h"
 
 #include "validate.h"
 #include "evalext.h"

diff --git a/libguile/feature.c b/libguile/feature.c
index d5dca46..a7c6556 100644 (file)
--- a/libguile/feature.c
+++ b/libguile/feature.c
@@ -50,6 +50,7 @@
 #include "eval.h"
 #include "ports.h"
 #include "procprop.h"
+#include "root.h"
 #include "smob.h"
 #include "strings.h"
 

diff --git a/libguile/gc.c b/libguile/gc.c
index 5fd86e3..dbd5d27 100644 (file)
--- a/libguile/gc.c
+++ b/libguile/gc.c
@@ -54,6 +54,7 @@
 #include "unif.h"
 #include "async.h"
 #include "ports.h"
+#include "root.h"
 #include "strings.h"
 #include "vectors.h"
 

diff --git a/libguile/gdbint.c b/libguile/gdbint.c
index 030a59d..52df23c 100644 (file)
--- a/libguile/gdbint.c
+++ b/libguile/gdbint.c
@@ -61,6 +61,7 @@
 #include "chars.h"
 #include "modules.h"
 #include "ports.h"
+#include "root.h"
 #include "strings.h"
 
 #include "gdbint.h"

diff --git a/libguile/gsubr.c b/libguile/gsubr.c
index 77e4bea..8d2a107 100644 (file)
--- a/libguile/gsubr.c
+++ b/libguile/gsubr.c
@@ -47,6 +47,7 @@
 #include <stdio.h>
 #include "_scm.h"
 #include "procprop.h"
+#include "root.h"
 #include "vectors.h"
 
 #include "gsubr.h"

diff --git a/libguile/ioext.c b/libguile/ioext.c
index 854775a..99aeef0 100644 (file)
--- a/libguile/ioext.c
+++ b/libguile/ioext.c
@@ -53,6 +53,7 @@
 #include "unif.h"
 #include "chars.h"
 #include "feature.h"
+#include "root.h"
 #include "strings.h"
 
 #include "validate.h"

diff --git a/libguile/keywords.c b/libguile/keywords.c
index b1b5318..6d032fc 100644 (file)
--- a/libguile/keywords.c
+++ b/libguile/keywords.c
@@ -47,6 +47,7 @@
 #include <stdio.h>
 #include "_scm.h"
 #include "ports.h"
+#include "root.h"
 #include "smob.h"
 #include "vectors.h"
 

diff --git a/libguile/lang.c b/libguile/lang.c
index b021054..21cb6fb 100644 (file)
--- a/libguile/lang.c
+++ b/libguile/lang.c
@@ -48,6 +48,7 @@
 
 #include "eval.h"
 #include "macros.h"
+#include "root.h"
 
 #include "validate.h"
 #include "lang.h"

diff --git a/libguile/load.c b/libguile/load.c
index 93601c6..f435560 100644 (file)
--- a/libguile/load.c
+++ b/libguile/load.c
@@ -53,6 +53,7 @@
 #include "throw.h"
 #include "alist.h"
 #include "dynwind.h"
+#include "root.h"
 #include "strings.h"
 
 #include "validate.h"

diff --git a/libguile/macros.c b/libguile/macros.c
index e04539b..d3fd7b4 100644 (file)
--- a/libguile/macros.c
+++ b/libguile/macros.c
@@ -45,6 +45,7 @@
 \f
 
 #include "_scm.h"
+#include "root.h"
 #include "smob.h"
 
 #include "validate.h"

diff --git a/libguile/numbers.c b/libguile/numbers.c
index 014cae9..8bd3709 100644 (file)
--- a/libguile/numbers.c
+++ b/libguile/numbers.c
@@ -50,6 +50,7 @@
 #include "unif.h"
 #include "feature.h"
 #include "ports.h"
+#include "root.h"
 #include "smob.h"
 #include "strings.h"
 #include "vectors.h"

diff --git a/libguile/objprop.c b/libguile/objprop.c
index 1e1f683..b05ced8 100644 (file)
--- a/libguile/objprop.c
+++ b/libguile/objprop.c
@@ -48,6 +48,7 @@
 #include "_scm.h"
 #include "hashtab.h"
 #include "alist.h"
+#include "root.h"
 #include "weaks.h"
 
 #include "objprop.h"

diff --git a/libguile/ports.c b/libguile/ports.c
index 430c0ce..58bfe4e 100644 (file)
--- a/libguile/ports.c
+++ b/libguile/ports.c
@@ -52,6 +52,7 @@
 #include "chars.h"
 
 #include "keywords.h"
+#include "root.h"
 #include "strings.h"
 
 #include "validate.h"

diff --git a/libguile/print.c b/libguile/print.c
index baa4b63..079c4a6 100644 (file)
--- a/libguile/print.c
+++ b/libguile/print.c
@@ -58,6 +58,7 @@
 #include "struct.h"
 #include "objects.h"
 #include "ports.h"
+#include "root.h"
 #include "strings.h"
 #include "strports.h"
 #include "vectors.h"

diff --git a/libguile/procprop.c b/libguile/procprop.c
index 19806c6..419d8fe 100644 (file)
--- a/libguile/procprop.c
+++ b/libguile/procprop.c
@@ -52,6 +52,7 @@
 #include "procs.h"
 #include "gsubr.h"
 #include "objects.h"
+#include "root.h"
 #include "vectors.h"
 
 #include "validate.h"

diff --git a/libguile/ramap.c b/libguile/ramap.c
index 9a14e41..2eca233 100644 (file)
--- a/libguile/ramap.c
+++ b/libguile/ramap.c
@@ -59,6 +59,7 @@
 #include "eq.h"
 #include "eval.h"
 #include "feature.h"
+#include "root.h"
 #include "vectors.h"
 
 #include "validate.h"

diff --git a/libguile/read.c b/libguile/read.c
index 985c4a3..346705f 100644 (file)
--- a/libguile/read.c
+++ b/libguile/read.c
@@ -55,6 +55,7 @@
 #include "hashtab.h"
 #include "hash.h"
 #include "ports.h"
+#include "root.h"
 #include "strings.h"
 #include "vectors.h"
 

diff --git a/libguile/srcprop.c b/libguile/srcprop.c
index c0845b3..831fbe0 100644 (file)
--- a/libguile/srcprop.c
+++ b/libguile/srcprop.c
@@ -55,6 +55,7 @@
 #include "hashtab.h"
 #include "hash.h"
 #include "ports.h"
+#include "root.h"
 #include "weaks.h"
 
 #include "validate.h"

diff --git a/libguile/stackchk.c b/libguile/stackchk.c
index fffdc64..b7fc61d 100644 (file)
--- a/libguile/stackchk.c
+++ b/libguile/stackchk.c
@@ -47,6 +47,7 @@
 #include <stdio.h>
 #include "_scm.h"
 #include "ports.h"
+#include "root.h"
 
 #include "stackchk.h"
 \f

diff --git a/libguile/stacks.c b/libguile/stacks.c
index 6120649..2a1abee 100644 (file)
--- a/libguile/stacks.c
+++ b/libguile/stacks.c
@@ -57,6 +57,7 @@
 #include "macros.h"
 #include "procprop.h"
 #include "modules.h"
+#include "root.h"
 #include "strings.h"
 
 #include "validate.h"

diff --git a/libguile/strports.c b/libguile/strports.c
index a86cd6b..1f4acec 100644 (file)
--- a/libguile/strports.c
+++ b/libguile/strports.c
@@ -55,6 +55,7 @@
 #include "eval.h"
 #include "ports.h"
 #include "read.h"
+#include "root.h"
 #include "strings.h"
 #include "vectors.h"
 

diff --git a/libguile/symbols.c b/libguile/symbols.c
index 118366c..5a9ea47 100644 (file)
--- a/libguile/symbols.c
+++ b/libguile/symbols.c
@@ -50,6 +50,7 @@
 #include "eval.h"
 #include "variable.h"
 #include "alist.h"
+#include "root.h"
 #include "strings.h"
 #include "vectors.h"
 #include "weaks.h"

diff --git a/libguile/unif.c b/libguile/unif.c
index b1b5b42..216482e 100644 (file)
--- a/libguile/unif.c
+++ b/libguile/unif.c
@@ -59,6 +59,7 @@
 #include "smob.h"
 #include "strop.h"
 #include "feature.h"
+#include "root.h"
 #include "strings.h"
 #include "vectors.h"
 

diff --git a/libguile/variable.c b/libguile/variable.c
index 25da2fd..4d35bb4 100644 (file)
--- a/libguile/variable.c
+++ b/libguile/variable.c
@@ -48,6 +48,7 @@
 #include "_scm.h"
 #include "eq.h"
 #include "ports.h"
+#include "root.h"
 #include "smob.h"
 
 #include "validate.h"

diff --git a/libguile/vectors.c b/libguile/vectors.c
index 053b62d..d6d6eb5 100644 (file)
--- a/libguile/vectors.c
+++ b/libguile/vectors.c
@@ -47,6 +47,7 @@
 #include <stdio.h>
 #include "_scm.h"
 #include "eq.h"
+#include "root.h"
 #include "strings.h"
 
 #include "validate.h"

diff --git a/libguile/vports.c b/libguile/vports.c
index 381a569..70164ec 100644 (file)
--- a/libguile/vports.c
+++ b/libguile/vports.c
@@ -49,6 +49,7 @@
 #include "eval.h"
 #include "chars.h"
 #include "fports.h"
+#include "root.h"
 #include "strings.h"
 #include "vectors.h"