[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] 65/86: Remove _scm.h
|
From: |
Andy Wingo |
|
Subject: |
[Guile-commits] 65/86: Remove _scm.h |
|
Date: |
Wed, 20 Jun 2018 14:09:42 -0400 (EDT) |
wingo pushed a commit to branch master
in repository guile.
commit 40ade0886ea5ce98434864ecffe77eb8ccf9f60a
Author: Andy Wingo <address@hidden>
Date: Wed Jun 20 14:04:00 2018 +0200
Remove _scm.h
* libguile/_scm.h: Remove. An internal header, never installed.
* libguile/__scm.h: Remove horrible documentation.
* libguile/Makefile.am (address@hidden@_la_SOURCES):
Remove _scm.h.
* libguile/alist.c:
* libguile/array-handle.c:
* libguile/array-map.c:
* libguile/arrays.c:
* libguile/async.c:
* libguile/atomic.c:
* libguile/backtrace.c:
* libguile/bitvectors.c:
* libguile/boolean.c:
* libguile/bytevectors.c:
* libguile/chars.c:
* libguile/continuations.c:
* libguile/control.c:
* libguile/debug-malloc.c:
* libguile/debug.c:
* libguile/deprecated.c:
* libguile/deprecation.c:
* libguile/dynl.c:
* libguile/dynstack.c:
* libguile/dynwind.c:
* libguile/eq.c:
* libguile/error.c:
* libguile/eval.c:
* libguile/evalext.c:
* libguile/expand.c:
* libguile/extensions.c:
* libguile/fdes-finalizers.c:
* libguile/feature.c:
* libguile/filesys.c:
* libguile/finalizers.c:
* libguile/fluids.c:
* libguile/foreign-object.c:
* libguile/foreign.c:
* libguile/fports.c:
* libguile/frames.c:
* libguile/gc-malloc.c:
* libguile/gc.c:
* libguile/gen-scmconfig.c:
* libguile/generalized-arrays.c:
* libguile/generalized-vectors.c:
* libguile/gettext.c:
* libguile/goops.c:
* libguile/gsubr.c:
* libguile/guardians.c:
* libguile/hash.c:
* libguile/hashtab.c:
* libguile/hooks.c:
* libguile/i18n.c:
* libguile/init.c:
* libguile/instructions.c:
* libguile/intrinsics.c:
* libguile/ioext.c:
* libguile/keywords.c:
* libguile/list.c:
* libguile/load.c:
* libguile/loader.c:
* libguile/macros.c:
* libguile/mallocs.c:
* libguile/memoize.c:
* libguile/modules.c:
* libguile/net_db.c:
* libguile/null-threads.c:
* libguile/numbers.c:
* libguile/objprop.c:
* libguile/options.c:
* libguile/pairs.c:
* libguile/poll.c:
* libguile/ports-internal.h:
* libguile/ports.c:
* libguile/posix.c:
* libguile/print.c:
* libguile/procprop.c:
* libguile/procs.c:
* libguile/programs.c:
* libguile/promises.c:
* libguile/r6rs-ports.c:
* libguile/random.c:
* libguile/rdelim.c:
* libguile/read.c:
* libguile/regex-posix.c:
* libguile/rw.c:
* libguile/scmsigs.c:
* libguile/script.c:
* libguile/simpos.c:
* libguile/smob.c:
* libguile/socket.c:
* libguile/sort.c:
* libguile/srcprop.c:
* libguile/srfi-1.c:
* libguile/srfi-13.c:
* libguile/srfi-14.c:
* libguile/srfi-4.c:
* libguile/srfi-60.c:
* libguile/stackchk.c:
* libguile/stacks.c:
* libguile/stime.c:
* libguile/strings.c:
* libguile/strorder.c:
* libguile/strports.c:
* libguile/struct.c:
* libguile/symbols.c:
* libguile/syntax.c:
* libguile/threads.c:
* libguile/throw.c:
* libguile/trees.c:
* libguile/unicode.c:
* libguile/uniform.c:
* libguile/values.c:
* libguile/variable.c:
* libguile/vectors.c:
* libguile/version.c:
* libguile/vm.c:
* libguile/vports.c:
* libguile/weak-set.c:
* libguile/weak-table.c:
* libguile/weak-vector.c: Remove _scm.h includes.
---
libguile/Makefile.am | 1 -
libguile/__scm.h | 11 -----------
libguile/_scm.h | 45 ------------------------------------------
libguile/alist.c | 1 -
libguile/array-handle.c | 1 -
libguile/array-map.c | 1 -
libguile/arrays.c | 1 -
libguile/async.c | 1 -
libguile/atomic.c | 1 -
libguile/backtrace.c | 1 -
libguile/bitvectors.c | 1 -
libguile/boolean.c | 1 -
libguile/bytevectors.c | 1 -
libguile/chars.c | 1 -
libguile/continuations.c | 1 -
libguile/control.c | 1 -
libguile/debug-malloc.c | 1 -
libguile/debug.c | 1 -
libguile/deprecated.c | 1 -
libguile/deprecation.c | 1 -
libguile/dynl.c | 1 -
libguile/dynstack.c | 1 -
libguile/dynwind.c | 1 -
libguile/eq.c | 1 -
libguile/error.c | 1 -
libguile/eval.c | 1 -
libguile/evalext.c | 1 -
libguile/expand.c | 1 -
libguile/extensions.c | 1 -
libguile/fdes-finalizers.c | 1 -
libguile/feature.c | 1 -
libguile/filesys.c | 1 -
libguile/finalizers.c | 1 -
libguile/fluids.c | 1 -
libguile/foreign-object.c | 1 -
libguile/foreign.c | 1 -
libguile/fports.c | 1 -
libguile/frames.c | 1 -
libguile/gc-malloc.c | 1 -
libguile/gc.c | 1 -
libguile/gen-scmconfig.c | 1 -
libguile/generalized-arrays.c | 1 -
libguile/generalized-vectors.c | 1 -
libguile/gettext.c | 1 -
libguile/goops.c | 1 -
libguile/gsubr.c | 1 -
libguile/guardians.c | 1 -
libguile/hash.c | 1 -
libguile/hashtab.c | 1 -
libguile/hooks.c | 1 -
libguile/i18n.c | 1 -
libguile/init.c | 1 -
libguile/instructions.c | 1 -
libguile/intrinsics.c | 1 -
libguile/ioext.c | 1 -
libguile/keywords.c | 1 -
libguile/list.c | 1 -
libguile/load.c | 1 -
libguile/loader.c | 1 -
libguile/macros.c | 1 -
libguile/mallocs.c | 5 ++---
libguile/memoize.c | 1 -
libguile/modules.c | 1 -
libguile/net_db.c | 1 -
libguile/null-threads.c | 3 +--
libguile/numbers.c | 1 -
libguile/objprop.c | 1 -
libguile/options.c | 1 -
libguile/pairs.c | 1 -
libguile/poll.c | 1 -
libguile/ports-internal.h | 1 -
libguile/ports.c | 1 -
libguile/posix.c | 1 -
libguile/print.c | 1 -
libguile/procprop.c | 1 -
libguile/procs.c | 1 -
libguile/programs.c | 1 -
libguile/promises.c | 1 -
libguile/r6rs-ports.c | 1 -
libguile/random.c | 1 -
libguile/rdelim.c | 1 -
libguile/read.c | 1 -
libguile/regex-posix.c | 1 -
libguile/rw.c | 1 -
libguile/scmsigs.c | 1 -
libguile/script.c | 1 -
libguile/simpos.c | 1 -
libguile/smob.c | 2 --
libguile/socket.c | 1 -
libguile/sort.c | 1 -
libguile/srcprop.c | 1 -
libguile/srfi-1.c | 1 -
libguile/srfi-13.c | 1 -
libguile/srfi-14.c | 1 -
libguile/srfi-4.c | 1 -
libguile/srfi-60.c | 1 -
libguile/stackchk.c | 1 -
libguile/stacks.c | 1 -
libguile/stime.c | 1 -
libguile/strings.c | 1 -
libguile/strorder.c | 1 -
libguile/strports.c | 1 -
libguile/struct.c | 1 -
libguile/symbols.c | 1 -
libguile/syntax.c | 1 -
libguile/threads.c | 1 -
libguile/throw.c | 1 -
libguile/trees.c | 1 -
libguile/unicode.c | 1 -
libguile/uniform.c | 3 +--
libguile/values.c | 1 -
libguile/variable.c | 1 -
libguile/vectors.c | 1 -
libguile/version.c | 1 -
libguile/vm.c | 1 -
libguile/vports.c | 1 -
libguile/weak-set.c | 1 -
libguile/weak-table.c | 1 -
libguile/weak-vector.c | 1 -
119 files changed, 4 insertions(+), 178 deletions(-)
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 286d3d1..1175f48 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -458,7 +458,6 @@ BUILT_SOURCES = cpp-E.c cpp-SIG.c libpath.h
$(BUILT_INCLUDES) \
all-local: guile-procedures.texi
address@hidden@_la_SOURCES = \
- _scm.h \
syscalls.h \
memmove.c strerror.c \
dynl.c regex-posix.c \
diff --git a/libguile/__scm.h b/libguile/__scm.h
index fe99ee6..0be2964 100644
--- a/libguile/__scm.h
+++ b/libguile/__scm.h
@@ -37,17 +37,6 @@
SIZEOF_BAR. See configure.in, gen-scmconfig.h.in, and
gen-scmconfig.c for examples of how to properly handle this issue.
The main documentation is in gen-scmconfig.c.
-
- "What's the difference between _scm.h and __scm.h?"
-
- _scm.h is not installed; it's only visible to the libguile sources
- themselves, and it includes config.h, the private config header.
-
- __scm.h is installed, and is #included by <libguile.h>. If both
- the client and libguile need some piece of information, and it
- doesn't fit well into the header file for any particular module, it
- should go in __scm.h. __scm.h includes scmconfig.h, the public
- config header.
**********************************************************************/
/* What did the configure script discover about the outside world? */
diff --git a/libguile/_scm.h b/libguile/_scm.h
deleted file mode 100644
index b0b5e63..0000000
--- a/libguile/_scm.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* classes: h_files */
-
-#ifndef SCM__SCM_H
-#define SCM__SCM_H
-
-/* Copyright (C) 1995-1996,2000-2002,2006,2008-2011,2013-2014,2018
- * Free Software Foundation, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 3 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-
-
-/**********************************************************************
- This file is Guile's central private header.
-
- When included by other files, this file should preceed any include
- other than __scm.h. See __scm.h for details regarding the purpose of
- and differences between _scm.h and __scm.h.
- **********************************************************************/
-
-#include "libguile/__scm.h"
-
-
-
-#endif /* SCM__SCM_H */
-
-/*
- Local Variables:
- c-file-style: "gnu"
- End:
-*/
diff --git a/libguile/alist.c b/libguile/alist.c
index 3f1d014..9b1d5a0 100644
--- a/libguile/alist.c
+++ b/libguile/alist.c
@@ -23,7 +23,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/boolean.h"
#include "libguile/eq.h"
diff --git a/libguile/array-handle.c b/libguile/array-handle.c
index 59abf1c..00200fe 100644
--- a/libguile/array-handle.c
+++ b/libguile/array-handle.c
@@ -26,7 +26,6 @@
#include <string.h>
-#include "libguile/_scm.h"
#include "libguile/__scm.h"
#include "libguile/bitvectors.h"
#include "libguile/bytevectors.h"
diff --git a/libguile/array-map.c b/libguile/array-map.c
index e0e8960..e6dd6cd 100644
--- a/libguile/array-map.c
+++ b/libguile/array-map.c
@@ -28,7 +28,6 @@
#include <string.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"
diff --git a/libguile/arrays.c b/libguile/arrays.c
index 7e5b983..8ba80cf 100644
--- a/libguile/arrays.c
+++ b/libguile/arrays.c
@@ -30,7 +30,6 @@
#include "verify.h"
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"
diff --git a/libguile/async.c b/libguile/async.c
index abe4c32..c89aaed 100644
--- a/libguile/async.c
+++ b/libguile/async.c
@@ -23,7 +23,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/atomics-internal.h"
diff --git a/libguile/atomic.c b/libguile/atomic.c
index f6cc33f..249d52a 100644
--- a/libguile/atomic.c
+++ b/libguile/atomic.c
@@ -22,7 +22,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/boolean.h"
#include "libguile/gsubr.h"
#include "libguile/extensions.h"
diff --git a/libguile/backtrace.c b/libguile/backtrace.c
index 5c883ac..f3be232 100644
--- a/libguile/backtrace.c
+++ b/libguile/backtrace.c
@@ -25,7 +25,6 @@
#include <stdio.h>
#include <ctype.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/boolean.h"
diff --git a/libguile/bitvectors.c b/libguile/bitvectors.c
index e3af335..78c4d38 100644
--- a/libguile/bitvectors.c
+++ b/libguile/bitvectors.c
@@ -25,7 +25,6 @@
#include <string.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"
diff --git a/libguile/boolean.c b/libguile/boolean.c
index 7103ade..d01148a 100644
--- a/libguile/boolean.c
+++ b/libguile/boolean.c
@@ -23,7 +23,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/boolean.h"
diff --git a/libguile/bytevectors.c b/libguile/bytevectors.c
index f53e57b..37515fe 100644
--- a/libguile/bytevectors.c
+++ b/libguile/bytevectors.c
@@ -36,7 +36,6 @@
#include <gmp.h>
-#include "libguile/_scm.h"
#include "libguile/boolean.h"
#include "libguile/gsubr.h"
#include "libguile/dynwind.h"
diff --git a/libguile/chars.c b/libguile/chars.c
index f9f019a..de9ab5d 100644
--- a/libguile/chars.c
+++ b/libguile/chars.c
@@ -29,7 +29,6 @@
#include <unicase.h>
#include <unictype.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/boolean.h"
#include "libguile/chars.h"
diff --git a/libguile/continuations.c b/libguile/continuations.c
index d887ecd..e8c6ed6 100644
--- a/libguile/continuations.c
+++ b/libguile/continuations.c
@@ -30,7 +30,6 @@
#include <ucontext.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"
diff --git a/libguile/control.c b/libguile/control.c
index 336a812..51b1543 100644
--- a/libguile/control.c
+++ b/libguile/control.c
@@ -22,7 +22,6 @@
#include <alloca.h>
-#include "libguile/_scm.h"
#include "libguile/dynstack.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
diff --git a/libguile/debug-malloc.c b/libguile/debug-malloc.c
index 1ab1aea..bf18292 100644
--- a/libguile/debug-malloc.c
+++ b/libguile/debug-malloc.c
@@ -23,7 +23,6 @@
#include <string.h>
#include <stdio.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/alist.h"
#include "libguile/numbers.h"
diff --git a/libguile/debug.c b/libguile/debug.c
index 984b864..22577d8 100644
--- a/libguile/debug.c
+++ b/libguile/debug.c
@@ -35,7 +35,6 @@
# include <windows.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/async.h"
#include "libguile/eval.h"
diff --git a/libguile/deprecated.c b/libguile/deprecated.c
index d47a0c5..b534b65 100644
--- a/libguile/deprecated.c
+++ b/libguile/deprecated.c
@@ -22,7 +22,6 @@
#define SCM_BUILDING_DEPRECATED_CODE
-#include "libguile/_scm.h"
#include "libguile/deprecation.h"
#include "libguile/deprecated.h"
diff --git a/libguile/deprecation.c b/libguile/deprecation.c
index 14e5518..61eddca 100644
--- a/libguile/deprecation.c
+++ b/libguile/deprecation.c
@@ -27,7 +27,6 @@
#include <string.h>
#include <stdarg.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
diff --git a/libguile/dynl.c b/libguile/dynl.c
index 050450f..f334276 100644
--- a/libguile/dynl.c
+++ b/libguile/dynl.c
@@ -50,7 +50,6 @@ maybe_drag_in_eprintf ()
#include <stdio.h>
#include <string.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/libpath.h"
#include "libguile/dynl.h"
diff --git a/libguile/dynstack.c b/libguile/dynstack.c
index 2c84472..7583cbf 100644
--- a/libguile/dynstack.c
+++ b/libguile/dynstack.c
@@ -26,7 +26,6 @@
#include <assert.h>
#include <setjmp.h>
-#include "libguile/_scm.h"
#include "libguile/control.h"
#include "libguile/eval.h"
#include "libguile/fluids.h"
diff --git a/libguile/dynwind.c b/libguile/dynwind.c
index b6efe22..57cafd5 100644
--- a/libguile/dynwind.c
+++ b/libguile/dynwind.c
@@ -26,7 +26,6 @@
#include <assert.h>
-#include "libguile/_scm.h"
#include "libguile/boolean.h"
#include "libguile/dynstack.h"
#include "libguile/eval.h"
diff --git a/libguile/eq.c b/libguile/eq.c
index d6e9149..14f325a 100644
--- a/libguile/eq.c
+++ b/libguile/eq.c
@@ -27,7 +27,6 @@
#include <string.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/boolean.h"
#include "libguile/array-map.h"
diff --git a/libguile/error.c b/libguile/error.c
index f3693d3..ebbc6c3 100644
--- a/libguile/error.c
+++ b/libguile/error.c
@@ -28,7 +28,6 @@
#include <stdio.h>
#include <errno.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/async.h"
#include "libguile/dynwind.h"
diff --git a/libguile/eval.c b/libguile/eval.c
index 5207a7d..1f9d088 100644
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -30,7 +30,6 @@
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"
-#include "libguile/_scm.h"
#include "libguile/alist.h"
#include "libguile/async.h"
#include "libguile/continuations.h"
diff --git a/libguile/evalext.c b/libguile/evalext.c
index 7738e10..5d271c2 100644
--- a/libguile/evalext.c
+++ b/libguile/evalext.c
@@ -23,7 +23,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/eval.h"
#include "libguile/list.h"
diff --git a/libguile/expand.c b/libguile/expand.c
index 7a9cde7..bb72674 100644
--- a/libguile/expand.c
+++ b/libguile/expand.c
@@ -27,7 +27,6 @@
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"
-#include "libguile/_scm.h"
#include "libguile/alist.h"
#include "libguile/continuations.h"
#include "libguile/eq.h"
diff --git a/libguile/extensions.c b/libguile/extensions.c
index d4f0de1..0aedcbc 100644
--- a/libguile/extensions.c
+++ b/libguile/extensions.c
@@ -25,7 +25,6 @@
#include <string.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/dynl.h"
#include "libguile/dynwind.h"
diff --git a/libguile/fdes-finalizers.c b/libguile/fdes-finalizers.c
index 9c50566..6e7e7c8 100644
--- a/libguile/fdes-finalizers.c
+++ b/libguile/fdes-finalizers.c
@@ -21,7 +21,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"
diff --git a/libguile/feature.c b/libguile/feature.c
index acbfe30..d3fc041 100644
--- a/libguile/feature.c
+++ b/libguile/feature.c
@@ -27,7 +27,6 @@
#include <string.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/modules.h"
#include "libguile/pairs.h"
diff --git a/libguile/filesys.c b/libguile/filesys.c
index 814e57b..235c28e 100644
--- a/libguile/filesys.c
+++ b/libguile/filesys.c
@@ -79,7 +79,6 @@
# include <sys/sendfile.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"
diff --git a/libguile/finalizers.c b/libguile/finalizers.c
index eb16f9d..dc03d01 100644
--- a/libguile/finalizers.c
+++ b/libguile/finalizers.c
@@ -30,7 +30,6 @@
#include <full-write.h>
-#include "libguile/_scm.h"
#include "libguile/async.h"
#include "libguile/bdw-gc.h"
#include "libguile/finalizers.h"
diff --git a/libguile/fluids.c b/libguile/fluids.c
index a746f7a..8424eed 100644
--- a/libguile/fluids.c
+++ b/libguile/fluids.c
@@ -24,7 +24,6 @@
#include <stdio.h>
#include <string.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/alist.h"
diff --git a/libguile/foreign-object.c b/libguile/foreign-object.c
index bb3b2a3..08e28a9 100644
--- a/libguile/foreign-object.c
+++ b/libguile/foreign-object.c
@@ -22,7 +22,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/eval.h"
#include "libguile/extensions.h"
#include "libguile/finalizers.h"
diff --git a/libguile/foreign.c b/libguile/foreign.c
index c535cda..f2d570b 100644
--- a/libguile/foreign.c
+++ b/libguile/foreign.c
@@ -28,7 +28,6 @@
#include <assert.h>
#include <errno.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/boolean.h"
#include "libguile/bytevectors.h"
diff --git a/libguile/fports.c b/libguile/fports.c
index 3dcfba8..db0de5b 100644
--- a/libguile/fports.c
+++ b/libguile/fports.c
@@ -46,7 +46,6 @@
#include <full-write.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"
diff --git a/libguile/frames.c b/libguile/frames.c
index 417dbe6..48e2910 100644
--- a/libguile/frames.c
+++ b/libguile/frames.c
@@ -22,7 +22,6 @@
#include <stdlib.h>
#include <string.h>
-#include "_scm.h"
#include "libguile/gsubr.h"
#include "boolean.h"
#include "eval.h"
diff --git a/libguile/gc-malloc.c b/libguile/gc-malloc.c
index 3b9b9ca..19f80ec 100644
--- a/libguile/gc-malloc.c
+++ b/libguile/gc-malloc.c
@@ -28,7 +28,6 @@
#include <string.h>
#include <stdlib.h>
-#include "libguile/_scm.h"
#include "libguile/eval.h"
#include "libguile/stime.h"
#include "libguile/stackchk.h"
diff --git a/libguile/gc.c b/libguile/gc.c
index c79e6e7..8f65d68 100644
--- a/libguile/gc.c
+++ b/libguile/gc.c
@@ -32,7 +32,6 @@
#include <stdlib.h>
#include <math.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/eval.h"
#include "libguile/stime.h"
diff --git a/libguile/gen-scmconfig.c b/libguile/gen-scmconfig.c
index ec9d7a8..1d4d31a 100644
--- a/libguile/gen-scmconfig.c
+++ b/libguile/gen-scmconfig.c
@@ -28,7 +28,6 @@
installed during "make install" and so may not be referred to by
any public headers.
- libguile/_scm.h: Guile's private core header. _scm.h is not
installed. It's only visible to the libguile sources
themselves, and it includes config.h, the private config header.
Among other things this file provides a place to make decisions
diff --git a/libguile/generalized-arrays.c b/libguile/generalized-arrays.c
index b521a48..19d29e0 100644
--- a/libguile/generalized-arrays.c
+++ b/libguile/generalized-arrays.c
@@ -27,7 +27,6 @@
#include <errno.h>
#include <string.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/__scm.h"
diff --git a/libguile/generalized-vectors.c b/libguile/generalized-vectors.c
index b84acb3..46c4357 100644
--- a/libguile/generalized-vectors.c
+++ b/libguile/generalized-vectors.c
@@ -24,7 +24,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/error.h"
#include "libguile/__scm.h"
diff --git a/libguile/gettext.c b/libguile/gettext.c
index a505c2e..f682cb3 100644
--- a/libguile/gettext.c
+++ b/libguile/gettext.c
@@ -21,7 +21,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/feature.h"
#include "libguile/strings.h"
diff --git a/libguile/goops.c b/libguile/goops.c
index dac7c1e..f74f7cb 100644
--- a/libguile/goops.c
+++ b/libguile/goops.c
@@ -28,7 +28,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/boolean.h"
#include "libguile/async.h"
#include "libguile/chars.h"
diff --git a/libguile/gsubr.c b/libguile/gsubr.c
index 02c6b51..4394ff6 100644
--- a/libguile/gsubr.c
+++ b/libguile/gsubr.c
@@ -25,7 +25,6 @@
#include <stdio.h>
#include <stdarg.h>
-#include "libguile/_scm.h"
#include "libguile/foreign.h"
#include "libguile/frames.h"
#include "libguile/gsubr.h"
diff --git a/libguile/guardians.c b/libguile/guardians.c
index 135a442..fc6e9a2 100644
--- a/libguile/guardians.c
+++ b/libguile/guardians.c
@@ -49,7 +49,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"
diff --git a/libguile/hash.c b/libguile/hash.c
index 69227f2..8dffc48 100644
--- a/libguile/hash.c
+++ b/libguile/hash.c
@@ -31,7 +31,6 @@
#include <string.h>
#include <unistr.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/chars.h"
#include "libguile/foreign.h"
diff --git a/libguile/hashtab.c b/libguile/hashtab.c
index c41bf1a..de27e7d 100644
--- a/libguile/hashtab.c
+++ b/libguile/hashtab.c
@@ -27,7 +27,6 @@
#include <stdio.h>
#include <assert.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/alist.h"
diff --git a/libguile/hooks.c b/libguile/hooks.c
index 338988c..d65b10d 100644
--- a/libguile/hooks.c
+++ b/libguile/hooks.c
@@ -24,7 +24,6 @@
#endif
#include <stdio.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"
diff --git a/libguile/i18n.c b/libguile/i18n.c
index 64aa3d8..0786129 100644
--- a/libguile/i18n.c
+++ b/libguile/i18n.c
@@ -22,7 +22,6 @@
#include <alloca.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"
diff --git a/libguile/init.c b/libguile/init.c
index a9e946c..5470688 100644
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -31,7 +31,6 @@
#include <fcntl.h>
#include <gmp.h>
-#include "libguile/_scm.h"
/* Everybody has an init function. */
#include "libguile/alist.h"
diff --git a/libguile/instructions.c b/libguile/instructions.c
index 215b3db..ee1e323 100644
--- a/libguile/instructions.c
+++ b/libguile/instructions.c
@@ -22,7 +22,6 @@
#include <string.h>
-#include "_scm.h"
#include "libguile/gsubr.h"
#include "threads.h"
#include "libguile/list.h"
diff --git a/libguile/intrinsics.c b/libguile/intrinsics.c
index eb52636..9900646 100644
--- a/libguile/intrinsics.c
+++ b/libguile/intrinsics.c
@@ -20,7 +20,6 @@
# include <config.h>
#endif
-#include "_scm.h"
#include "libguile/gsubr.h"
#include "boolean.h"
#include "alist.h"
diff --git a/libguile/ioext.c b/libguile/ioext.c
index a089e46..e06fe65 100644
--- a/libguile/ioext.c
+++ b/libguile/ioext.c
@@ -27,7 +27,6 @@
#include <stdio.h>
#include <errno.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/async.h"
diff --git a/libguile/keywords.c b/libguile/keywords.c
index 80d1a17..cbe8201 100644
--- a/libguile/keywords.c
+++ b/libguile/keywords.c
@@ -26,7 +26,6 @@
#include <string.h>
#include <stdarg.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/async.h"
#include "libguile/list.h"
diff --git a/libguile/list.c b/libguile/list.c
index 9e3935d..bb15573 100644
--- a/libguile/list.c
+++ b/libguile/list.c
@@ -23,7 +23,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"
diff --git a/libguile/load.c b/libguile/load.c
index 9f52439..828af1e 100644
--- a/libguile/load.c
+++ b/libguile/load.c
@@ -27,7 +27,6 @@
#include <string.h>
#include <stdio.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/boolean.h"
#include "libguile/alist.h"
diff --git a/libguile/loader.c b/libguile/loader.c
index f969d76..2023bb6 100644
--- a/libguile/loader.c
+++ b/libguile/loader.c
@@ -39,7 +39,6 @@
#include <full-read.h>
-#include "_scm.h"
#include "libguile/gsubr.h"
#include "bytevectors.h"
#include "boolean.h"
diff --git a/libguile/macros.c b/libguile/macros.c
index 504fa33..9264602 100644
--- a/libguile/macros.c
+++ b/libguile/macros.c
@@ -22,7 +22,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/boolean.h"
#include "libguile/modules.h"
diff --git a/libguile/mallocs.c b/libguile/mallocs.c
index 23c1a60..865bb5f 100644
--- a/libguile/mallocs.c
+++ b/libguile/mallocs.c
@@ -1,6 +1,6 @@
/* classes: src_files
- * Copyright (C) 1995,1997,1998,2000,2001, 2006, 2011,
- * 2014 Free Software Foundation, Inc.
+ * Copyright (C) 1995-1998,2000-2001,2006,2011,2014,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -27,7 +27,6 @@
#include <stdlib.h>
-#include "libguile/_scm.h"
#include "libguile/ports.h"
#include "libguile/smob.h"
diff --git a/libguile/memoize.c b/libguile/memoize.c
index db48147..11ebfef 100644
--- a/libguile/memoize.c
+++ b/libguile/memoize.c
@@ -31,7 +31,6 @@
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"
-#include "libguile/_scm.h"
#include "libguile/alist.h"
#include "libguile/continuations.h"
#include "libguile/dynstack.h"
diff --git a/libguile/modules.c b/libguile/modules.c
index acd61c6..40a745f 100644
--- a/libguile/modules.c
+++ b/libguile/modules.c
@@ -24,7 +24,6 @@
#include <stdarg.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"
diff --git a/libguile/net_db.c b/libguile/net_db.c
index 03a355a..2205bd8 100644
--- a/libguile/net_db.c
+++ b/libguile/net_db.c
@@ -45,7 +45,6 @@
#include <netinet/in.h>
#include <arpa/inet.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"
diff --git a/libguile/null-threads.c b/libguile/null-threads.c
index 28eff2c..db96f07 100644
--- a/libguile/null-threads.c
+++ b/libguile/null-threads.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2006, 2008, 2018 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -21,7 +21,6 @@
#endif
#include <stdlib.h>
-#include "libguile/_scm.h"
#if SCM_USE_NULL_THREADS
diff --git a/libguile/numbers.c b/libguile/numbers.c
index d03b3af..cca0c38 100644
--- a/libguile/numbers.c
+++ b/libguile/numbers.c
@@ -59,7 +59,6 @@
#include <stdarg.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/boolean.h"
#include "libguile/feature.h"
diff --git a/libguile/objprop.c b/libguile/objprop.c
index a0fc3b7..0248e09 100644
--- a/libguile/objprop.c
+++ b/libguile/objprop.c
@@ -22,7 +22,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/alist.h"
#include "libguile/async.h"
diff --git a/libguile/options.c b/libguile/options.c
index 9ef223b..c7db60b 100644
--- a/libguile/options.c
+++ b/libguile/options.c
@@ -22,7 +22,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/list.h"
diff --git a/libguile/pairs.c b/libguile/pairs.c
index 84ac83d..5935a1b 100644
--- a/libguile/pairs.c
+++ b/libguile/pairs.c
@@ -23,7 +23,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/boolean.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
diff --git a/libguile/poll.c b/libguile/poll.c
index d5bcfe8..d898926 100644
--- a/libguile/poll.c
+++ b/libguile/poll.c
@@ -28,7 +28,6 @@
#include <errno.h>
#include <poll.h>
-#include "libguile/_scm.h"
#include "libguile/async.h"
#include "libguile/bytevectors.h"
#include "libguile/error.h"
diff --git a/libguile/ports-internal.h b/libguile/ports-internal.h
index 01c08e6..98f9414 100644
--- a/libguile/ports-internal.h
+++ b/libguile/ports-internal.h
@@ -26,7 +26,6 @@
#include <iconv.h>
#include <string.h>
-#include "libguile/_scm.h"
#include "libguile/bytevectors.h"
#include "libguile/list.h"
#include "libguile/pairs.h"
diff --git a/libguile/ports.c b/libguile/ports.c
index 6d6fe7d..550009f 100644
--- a/libguile/ports.c
+++ b/libguile/ports.c
@@ -38,7 +38,6 @@
#include <unistr.h>
#include <striconveh.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"
diff --git a/libguile/posix.c b/libguile/posix.c
index daa6b7f..85d4e19 100644
--- a/libguile/posix.c
+++ b/libguile/posix.c
@@ -62,7 +62,6 @@
#include <io.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/async.h"
diff --git a/libguile/print.c b/libguile/print.c
index f6231d9..940b708 100644
--- a/libguile/print.c
+++ b/libguile/print.c
@@ -30,7 +30,6 @@
#include <uniconv.h>
#include <unictype.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"
diff --git a/libguile/procprop.c b/libguile/procprop.c
index c840130..1416c15 100644
--- a/libguile/procprop.c
+++ b/libguile/procprop.c
@@ -23,7 +23,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"
diff --git a/libguile/procs.c b/libguile/procs.c
index 6d40e0e..9b0ce79 100644
--- a/libguile/procs.c
+++ b/libguile/procs.c
@@ -23,7 +23,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/goops.h"
diff --git a/libguile/programs.c b/libguile/programs.c
index 5fad4c9..1f6ea9a 100644
--- a/libguile/programs.c
+++ b/libguile/programs.c
@@ -21,7 +21,6 @@
#endif
#include <string.h>
-#include "_scm.h"
#include "libguile/gsubr.h"
#include "boolean.h"
#include "instructions.h"
diff --git a/libguile/promises.c b/libguile/promises.c
index 378028d..8daaf46 100644
--- a/libguile/promises.c
+++ b/libguile/promises.c
@@ -28,7 +28,6 @@
#include "libguile/__scm.h"
#include "libguile/gsubr.h"
-#include "libguile/_scm.h"
#include "libguile/alist.h"
#include "libguile/async.h"
#include "libguile/continuations.h"
diff --git a/libguile/r6rs-ports.c b/libguile/r6rs-ports.c
index a381615..c3c7003 100644
--- a/libguile/r6rs-ports.c
+++ b/libguile/r6rs-ports.c
@@ -26,7 +26,6 @@
#include <stdio.h>
#include <assert.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/boolean.h"
#include "libguile/bytevectors.h"
diff --git a/libguile/random.c b/libguile/random.c
index 91d7c48..4f2bebf 100644
--- a/libguile/random.c
+++ b/libguile/random.c
@@ -32,7 +32,6 @@
#include <sys/types.h>
#include <unistd.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/smob.h"
#include "libguile/generalized-arrays.h"
diff --git a/libguile/rdelim.c b/libguile/rdelim.c
index 578fb80..cee49bb 100644
--- a/libguile/rdelim.c
+++ b/libguile/rdelim.c
@@ -20,7 +20,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/boolean.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
diff --git a/libguile/read.c b/libguile/read.c
index 3c1ad74..b56220a 100644
--- a/libguile/read.c
+++ b/libguile/read.c
@@ -33,7 +33,6 @@
#include <c-ctype.h>
#include <alloca.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"
diff --git a/libguile/regex-posix.c b/libguile/regex-posix.c
index 7f105ce..2ddf252 100644
--- a/libguile/regex-posix.c
+++ b/libguile/regex-posix.c
@@ -35,7 +35,6 @@
#include <string.h>
#include <sys/types.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
diff --git a/libguile/rw.c b/libguile/rw.c
index fb8a36f..1e5a585 100644
--- a/libguile/rw.c
+++ b/libguile/rw.c
@@ -27,7 +27,6 @@
#include <errno.h>
#include <string.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/async.h"
#include "libguile/fports.h"
diff --git a/libguile/scmsigs.c b/libguile/scmsigs.c
index 8d9c81a..91dfc0e 100644
--- a/libguile/scmsigs.c
+++ b/libguile/scmsigs.c
@@ -41,7 +41,6 @@
#include <full-write.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"
diff --git a/libguile/script.c b/libguile/script.c
index 76bfb26..d3826de 100644
--- a/libguile/script.c
+++ b/libguile/script.c
@@ -30,7 +30,6 @@
#include <ctype.h>
#include <uniconv.h>
-#include "libguile/_scm.h"
#include "libguile/pairs.h"
#include "libguile/eval.h"
#include "libguile/feature.h"
diff --git a/libguile/simpos.c b/libguile/simpos.c
index 06c4655..6cd1f73 100644
--- a/libguile/simpos.c
+++ b/libguile/simpos.c
@@ -27,7 +27,6 @@
#include <stdlib.h> /* for getenv, system, exit, free */
#include <unistd.h> /* for _exit */
-#include "libguile/_scm.h"
#include "libguile/boolean.h"
#include "libguile/gsubr.h"
diff --git a/libguile/smob.c b/libguile/smob.c
index f710cd6..d308ccd 100644
--- a/libguile/smob.c
+++ b/libguile/smob.c
@@ -27,8 +27,6 @@
#include <stdlib.h>
#include <errno.h>
-#include "libguile/_scm.h"
-
#include "libguile/async.h"
#include "libguile/goops.h"
#include "libguile/gsubr.h"
diff --git a/libguile/socket.c b/libguile/socket.c
index ea19ec3..dea09a9 100644
--- a/libguile/socket.c
+++ b/libguile/socket.c
@@ -46,7 +46,6 @@
#include <gmp.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/async.h"
diff --git a/libguile/sort.c b/libguile/sort.c
index 6bbd334..2f023e3 100644
--- a/libguile/sort.c
+++ b/libguile/sort.c
@@ -39,7 +39,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"
diff --git a/libguile/srcprop.c b/libguile/srcprop.c
index 4f5368f..4cdca23 100644
--- a/libguile/srcprop.c
+++ b/libguile/srcprop.c
@@ -24,7 +24,6 @@
#include <errno.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/async.h"
diff --git a/libguile/srfi-1.c b/libguile/srfi-1.c
index 2f1dc4b..450c696 100644
--- a/libguile/srfi-1.c
+++ b/libguile/srfi-1.c
@@ -24,7 +24,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"
diff --git a/libguile/srfi-13.c b/libguile/srfi-13.c
index d4f468f..8375e5b 100644
--- a/libguile/srfi-13.c
+++ b/libguile/srfi-13.c
@@ -28,7 +28,6 @@
#include <unicase.h>
#include <unictype.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include <libguile/deprecation.h>
diff --git a/libguile/srfi-14.c b/libguile/srfi-14.c
index fa73139..65feacb 100644
--- a/libguile/srfi-14.c
+++ b/libguile/srfi-14.c
@@ -28,7 +28,6 @@
#include <string.h>
#include <unictype.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"
diff --git a/libguile/srfi-4.c b/libguile/srfi-4.c
index 51a7d01..9bcdf54 100644
--- a/libguile/srfi-4.c
+++ b/libguile/srfi-4.c
@@ -24,7 +24,6 @@
#include <string.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/boolean.h"
#include "libguile/__scm.h"
diff --git a/libguile/srfi-60.c b/libguile/srfi-60.c
index 8613d0b..96fbcee 100644
--- a/libguile/srfi-60.c
+++ b/libguile/srfi-60.c
@@ -24,7 +24,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/boolean.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
diff --git a/libguile/stackchk.c b/libguile/stackchk.c
index 12df6e9..9bc312c 100644
--- a/libguile/stackchk.c
+++ b/libguile/stackchk.c
@@ -23,7 +23,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/numbers.h"
#include "libguile/ports.h"
diff --git a/libguile/stacks.c b/libguile/stacks.c
index abb4ab1..aff4dfc 100644
--- a/libguile/stacks.c
+++ b/libguile/stacks.c
@@ -23,7 +23,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/boolean.h"
#include "libguile/control.h"
diff --git a/libguile/stime.c b/libguile/stime.c
index 3c093ed..cc1a484 100644
--- a/libguile/stime.c
+++ b/libguile/stime.c
@@ -49,7 +49,6 @@
#include <strftime.h>
#include <unistr.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"
diff --git a/libguile/strings.c b/libguile/strings.c
index b27493a..88f5303 100644
--- a/libguile/strings.c
+++ b/libguile/strings.c
@@ -35,7 +35,6 @@
#include "striconveh.h"
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/chars.h"
diff --git a/libguile/strorder.c b/libguile/strorder.c
index bfb4d3f..2f3a17c 100644
--- a/libguile/strorder.c
+++ b/libguile/strorder.c
@@ -22,7 +22,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/boolean.h"
#include "libguile/chars.h"
diff --git a/libguile/strports.c b/libguile/strports.c
index dd3e596..2f4b29e 100644
--- a/libguile/strports.c
+++ b/libguile/strports.c
@@ -24,7 +24,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include <stdio.h>
diff --git a/libguile/struct.c b/libguile/struct.c
index 9824f31..6395460 100644
--- a/libguile/struct.c
+++ b/libguile/struct.c
@@ -28,7 +28,6 @@
#define SCM_BUILDING_DEPRECATED_CODE
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/boolean.h"
#include "libguile/async.h"
diff --git a/libguile/symbols.c b/libguile/symbols.c
index a4b17bf..8510856 100644
--- a/libguile/symbols.c
+++ b/libguile/symbols.c
@@ -25,7 +25,6 @@
#include <unistr.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"
diff --git a/libguile/syntax.c b/libguile/syntax.c
index 6ddcfb9..0de27ee 100644
--- a/libguile/syntax.c
+++ b/libguile/syntax.c
@@ -22,7 +22,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/keywords.h"
#include "libguile/eval.h"
diff --git a/libguile/threads.c b/libguile/threads.c
index 18e663a..12de384 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -41,7 +41,6 @@
#include "libguile/pairs.h"
#include <gc/gc_mark.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/boolean.h"
#include "libguile/deprecation.h"
diff --git a/libguile/throw.c b/libguile/throw.c
index e698a86..0ec7be3 100644
--- a/libguile/throw.c
+++ b/libguile/throw.c
@@ -26,7 +26,6 @@
#include <alloca.h>
#include <stdio.h>
#include <unistdio.h>
-#include "libguile/_scm.h"
#include "libguile/pairs.h"
#include "libguile/boolean.h"
#include "libguile/smob.h"
diff --git a/libguile/trees.c b/libguile/trees.c
index b9da433..90ba52a 100644
--- a/libguile/trees.c
+++ b/libguile/trees.c
@@ -23,7 +23,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/eq.h"
diff --git a/libguile/unicode.c b/libguile/unicode.c
index 369a327..8dae7ba 100644
--- a/libguile/unicode.c
+++ b/libguile/unicode.c
@@ -27,7 +27,6 @@
#include <unictype.h>
#include <uniname.h>
-#include "libguile/_scm.h"
#include "libguile/chars.h"
#include "libguile/gsubr.h"
#include "libguile/extensions.h"
diff --git a/libguile/uniform.c b/libguile/uniform.c
index 13ee18a..2e66cbc 100644
--- a/libguile/uniform.c
+++ b/libguile/uniform.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,1998,2000,2001,2002,2003,2004, 2005, 2006,
2009, 2010, 2013, 2014 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998,2000,2001,2002,2003,2004, 2005, 2006,
2009, 2010, 2013, 2014, 2018 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -23,7 +23,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/__scm.h"
#include "libguile/uniform.h"
diff --git a/libguile/values.c b/libguile/values.c
index 63531ee..d1a67cc 100644
--- a/libguile/values.c
+++ b/libguile/values.c
@@ -21,7 +21,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
#include "libguile/eval.h"
diff --git a/libguile/variable.c b/libguile/variable.c
index 923dfc7..dad0bf3 100644
--- a/libguile/variable.c
+++ b/libguile/variable.c
@@ -23,7 +23,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/boolean.h"
#include "libguile/gsubr.h"
#include "libguile/eq.h"
diff --git a/libguile/vectors.c b/libguile/vectors.c
index 57c1890..a01b493 100644
--- a/libguile/vectors.c
+++ b/libguile/vectors.c
@@ -23,7 +23,6 @@
# include <config.h>
#endif
-#include "libguile/_scm.h"
#include "libguile/boolean.h"
#include "libguile/gsubr.h"
#include "libguile/pairs.h"
diff --git a/libguile/version.c b/libguile/version.c
index 1448891..315ab3d 100644
--- a/libguile/version.c
+++ b/libguile/version.c
@@ -23,7 +23,6 @@
#endif
#include <stdio.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/strings.h"
#include "libguile/numbers.h"
diff --git a/libguile/vm.c b/libguile/vm.c
index 0d34e69..17f1399 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -38,7 +38,6 @@
#include "libguile/pairs.h"
#include <gc/gc_mark.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/atomic.h"
#include "libguile/atomics-internal.h"
diff --git a/libguile/vports.c b/libguile/vports.c
index 23ec0a5..fbe0e9f 100644
--- a/libguile/vports.c
+++ b/libguile/vports.c
@@ -27,7 +27,6 @@
#include <stdio.h>
#include <errno.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/boolean.h"
#include "libguile/eval.h"
diff --git a/libguile/weak-set.c b/libguile/weak-set.c
index 6f409af..3d02214 100644
--- a/libguile/weak-set.c
+++ b/libguile/weak-set.c
@@ -25,7 +25,6 @@
#include <assert.h>
#include <string.h>
-#include "libguile/_scm.h"
#include "libguile/pairs.h"
#include "libguile/finalizers.h"
#include "libguile/hash.h"
diff --git a/libguile/weak-table.c b/libguile/weak-table.c
index 3b1e9ae..52f6fa9 100644
--- a/libguile/weak-table.c
+++ b/libguile/weak-table.c
@@ -28,7 +28,6 @@
#include "libguile/pairs.h"
#include <gc/gc_typed.h>
-#include "libguile/_scm.h"
#include "libguile/gsubr.h"
#include "libguile/alist.h"
#include "libguile/finalizers.h"
diff --git a/libguile/weak-vector.c b/libguile/weak-vector.c
index deb474a..16e1e35 100644
--- a/libguile/weak-vector.c
+++ b/libguile/weak-vector.c
@@ -26,7 +26,6 @@
#include <stdio.h>
#include <string.h>
-#include "libguile/_scm.h"
#include "libguile/boolean.h"
#include "libguile/gsubr.h"
#include "libguile/extensions.h"
- [Guile-commits] 80/86: Rationalize guile-readline includes, (continued)
- [Guile-commits] 80/86: Rationalize guile-readline includes, Andy Wingo, 2018/06/20
- [Guile-commits] 61/86: Devolve symbols.h from _scm.h, Andy Wingo, 2018/06/20
- [Guile-commits] 76/86: Move SCM_ARG1, etc definitions to error.h, Andy Wingo, 2018/06/20
- [Guile-commits] 59/86: Devolve threads.h from _scm.h., Andy Wingo, 2018/06/20
- [Guile-commits] 44/86: Devolve numbers.h from _scm.h., Andy Wingo, 2018/06/20
- [Guile-commits] 71/86: Use stdint.h limit macros, Andy Wingo, 2018/06/20
- [Guile-commits] 77/86: Minor __scm.h reformatting, Andy Wingo, 2018/06/20
- [Guile-commits] 85/86: libguile header files have uniform format for copyright declarations, Andy Wingo, 2018/06/20
- [Guile-commits] 47/86: Move subr snarfing macros to gsubr.h., Andy Wingo, 2018/06/20
- [Guile-commits] 83/86: Make .c copyright headers uniform, Andy Wingo, 2018/06/20
- [Guile-commits] 65/86: Remove _scm.h,
Andy Wingo <=
- [Guile-commits] 66/86: Remove useless "classes: h_files" from Guile headers., Andy Wingo, 2018/06/20
- [Guile-commits] 79/86: Rename __scm.h to scm.h, Andy Wingo, 2018/06/20
- [Guile-commits] 78/86: Inline tags.h into __scm.h, Andy Wingo, 2018/06/20
- [Guile-commits] 67/86: Remove Emacs local variables comments in Guile source, Andy Wingo, 2018/06/20
- [Guile-commits] 82/86: Rationalize include order in C files, Andy Wingo, 2018/06/20
- [Guile-commits] 81/86: Make libguile header inclusion consistent within libguile c files, Andy Wingo, 2018/06/20
- [Guile-commits] 84/86: Remove (C) from copyright statements, Andy Wingo, 2018/06/20
- [Guile-commits] 86/86: Update license notices in all C files, Andy Wingo, 2018/06/20