From 83584ef23105be514c474ca0a1f107d681888d5d Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Thu, 14 Jun 2018 22:16:01 +0200
Subject: Fix libguile subcomponent headers not to include <libguile.h>

* libguile/bytevectors.h: Include uniform.h, for use in the macros.
* libguile/extensions.h: Include libpath.h, for the
  SCM_EFFECTIVE_VERSION, which is almost always used with these
  routines.
* libguile/frames.h:
* libguile/instructions.h:
* libguile/intrinsics.h:
* libguile/loader.h:
* libguile/programs.h:
* libguile/vm.h: Include <libguile/__scm.h> instead of <libguile.h>.
  Cuts a circular include, but also precipitates a lot of maintenance in
  the .c files.

* libguile/*.c: Update C files to add needed all needed includes that
  before were getting automatically pulled in by the indirect inclusion
  of libguile.h.
---
 libguile/eq.c | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

(limited to 'libguile/eq.c')

diff --git a/libguile/eq.c b/libguile/eq.c
index f1153f2cc..492d43b68 100644
--- a/libguile/eq.c
+++ b/libguile/eq.c
@@ -23,33 +23,31 @@
 
 #include <math.h>
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
 #include "libguile/_scm.h"
 #include "libguile/array-map.h"
-#include "libguile/stackchk.h"
-#include "libguile/strorder.h"
 #include "libguile/async.h"
-#include "libguile/smob.h"
-#include "libguile/arrays.h"
-#include "libguile/vectors.h"
-#include "libguile/hashtab.h"
+#include "libguile/bitvectors.h"
 #include "libguile/bytevectors.h"
-#include "libguile/syntax.h"
-
-#include "libguile/struct.h"
-#include "libguile/goops.h"
-
-#include "libguile/validate.h"
 #include "libguile/eq.h"
-
+#include "libguile/eval.h"
+#include "libguile/generalized-arrays.h"
+#include "libguile/goops.h"
+#include "libguile/hashtab.h"
 #include "libguile/private-options.h"
+#include "libguile/smob.h"
+#include "libguile/stackchk.h"
+#include "libguile/strorder.h"
+#include "libguile/struct.h"
+#include "libguile/syntax.h"
+#include "libguile/validate.h"
+#include "libguile/vectors.h"
 
 
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-
 static SCM scm_i_eq_p (SCM x, SCM y, SCM rest);
 SCM_DEFINE (scm_i_eq_p, "eq?", 0, 2, 1,
             (SCM x, SCM y, SCM rest),
-- 
cgit v1.2.1