* _scm.h: #include "print.h" here, since it seems to be used just

about everywhere.
* eval.c, gdbint.c, genio.h, numbers.h, smob.h, srcprop.c,
strports.c, unif.h: Don't #include "print.h".

diff --git a/libguile/_scm.h b/libguile/_scm.h
index 71782d3..d6003cd 100644 (file)
--- a/libguile/_scm.h
+++ b/libguile/_scm.h
@@ -49,6 +49,7 @@
 /* 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 "print.h"             /* Everyone needs to print.  */
 #include "pairs.h"             /* Everyone conses.  */
 #include "list.h"              /* Everyone makes lists.  */
 #include "gc.h"                        /* Everyone allocates.  */

diff --git a/libguile/eval.c b/libguile/eval.c
index 898642c..93d19af 100644 (file)
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -68,7 +68,6 @@
 #include "procprop.h"
 #include "hashtab.h"
 #include "hash.h"
-#include "print.h"
 
 #ifdef DEBUG_EXTENSIONS
 #include "debug.h"

diff --git a/libguile/gdbint.c b/libguile/gdbint.c
index a75baf8..d3b27ec 100644 (file)
--- a/libguile/gdbint.c
+++ b/libguile/gdbint.c
@@ -48,7 +48,6 @@
 #include "tag.h"
 #include "strports.h"
 #include "read.h"
-#include "print.h"
 #include "eval.h"
 #include "chars.h"
 

diff --git a/libguile/genio.h b/libguile/genio.h
index 10aac41..ef2fc6b 100644 (file)
--- a/libguile/genio.h
+++ b/libguile/genio.h
@@ -45,7 +45,6 @@
 \f
 
 #include "libguile/__scm.h"
-#include "libguile/print.h"
 
 \f
 #ifdef __STDC__

diff --git a/libguile/numbers.h b/libguile/numbers.h
index 6f6647b..c16d39a 100644 (file)
--- a/libguile/numbers.h
+++ b/libguile/numbers.h
@@ -45,7 +45,6 @@
 \f
 
 #include "libguile/__scm.h"
-#include "print.h"
 
 \f
 

diff --git a/libguile/smob.h b/libguile/smob.h
index f7ab334..cf5712f 100644 (file)
--- a/libguile/smob.h
+++ b/libguile/smob.h
@@ -44,7 +44,6 @@
  */
 \f
 #include "libguile/__scm.h"
-#include "print.h"
 
 \f
 typedef struct scm_smobfuns
@@ -68,7 +67,6 @@ extern scm_smobfuns *scm_smobs;
 /* Everyone who uses smobs needs to print.  */
 #include "libguile/ports.h"
 #include "libguile/genio.h"
-#include "libguile/print.h"
 
 /* ... and they all need to GC.  */
 #include "libguile/markers.h"

diff --git a/libguile/srcprop.c b/libguile/srcprop.c
index e2c7af9..537302d 100644 (file)
--- a/libguile/srcprop.c
+++ b/libguile/srcprop.c
@@ -51,7 +51,6 @@
 #include "hashtab.h"
 #include "hash.h"
 #include "weaks.h"
-#include "print.h"
 
 #include "srcprop.h"
 \f

diff --git a/libguile/strports.c b/libguile/strports.c
index 5dc9c32..5f09a20 100644 (file)
--- a/libguile/strports.c
+++ b/libguile/strports.c
@@ -44,7 +44,6 @@
 #include "_scm.h"
 #include "unif.h"
 #include "eval.h"
-#include "print.h"
 
 #include "strports.h"
 

diff --git a/libguile/unif.h b/libguile/unif.h
index a4071ee..c112b4f 100644 (file)
--- a/libguile/unif.h
+++ b/libguile/unif.h
@@ -45,7 +45,6 @@
 \f
 
 #include "libguile/__scm.h"
-#include "print.h"
 
 \f
 typedef struct scm_array