summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libguile/Makefile.am1
-rw-r--r--libguile/__scm.h11
-rw-r--r--libguile/_scm.h45
-rw-r--r--libguile/alist.c1
-rw-r--r--libguile/array-handle.c1
-rw-r--r--libguile/array-map.c1
-rw-r--r--libguile/arrays.c1
-rw-r--r--libguile/async.c1
-rw-r--r--libguile/atomic.c1
-rw-r--r--libguile/backtrace.c1
-rw-r--r--libguile/bitvectors.c1
-rw-r--r--libguile/boolean.c1
-rw-r--r--libguile/bytevectors.c1
-rw-r--r--libguile/chars.c1
-rw-r--r--libguile/continuations.c1
-rw-r--r--libguile/control.c1
-rw-r--r--libguile/debug-malloc.c1
-rw-r--r--libguile/debug.c1
-rw-r--r--libguile/deprecated.c1
-rw-r--r--libguile/deprecation.c1
-rw-r--r--libguile/dynl.c1
-rw-r--r--libguile/dynstack.c1
-rw-r--r--libguile/dynwind.c1
-rw-r--r--libguile/eq.c1
-rw-r--r--libguile/error.c1
-rw-r--r--libguile/eval.c1
-rw-r--r--libguile/evalext.c1
-rw-r--r--libguile/expand.c1
-rw-r--r--libguile/extensions.c1
-rw-r--r--libguile/fdes-finalizers.c1
-rw-r--r--libguile/feature.c1
-rw-r--r--libguile/filesys.c1
-rw-r--r--libguile/finalizers.c1
-rw-r--r--libguile/fluids.c1
-rw-r--r--libguile/foreign-object.c1
-rw-r--r--libguile/foreign.c1
-rw-r--r--libguile/fports.c1
-rw-r--r--libguile/frames.c1
-rw-r--r--libguile/gc-malloc.c1
-rw-r--r--libguile/gc.c1
-rw-r--r--libguile/gen-scmconfig.c1
-rw-r--r--libguile/generalized-arrays.c1
-rw-r--r--libguile/generalized-vectors.c1
-rw-r--r--libguile/gettext.c1
-rw-r--r--libguile/goops.c1
-rw-r--r--libguile/gsubr.c1
-rw-r--r--libguile/guardians.c1
-rw-r--r--libguile/hash.c1
-rw-r--r--libguile/hashtab.c1
-rw-r--r--libguile/hooks.c1
-rw-r--r--libguile/i18n.c1
-rw-r--r--libguile/init.c1
-rw-r--r--libguile/instructions.c1
-rw-r--r--libguile/intrinsics.c1
-rw-r--r--libguile/ioext.c1
-rw-r--r--libguile/keywords.c1
-rw-r--r--libguile/list.c1
-rw-r--r--libguile/load.c1
-rw-r--r--libguile/loader.c1
-rw-r--r--libguile/macros.c1
-rw-r--r--libguile/mallocs.c5
-rw-r--r--libguile/memoize.c1
-rw-r--r--libguile/modules.c1
-rw-r--r--libguile/net_db.c1
-rw-r--r--libguile/null-threads.c3
-rw-r--r--libguile/numbers.c1
-rw-r--r--libguile/objprop.c1
-rw-r--r--libguile/options.c1
-rw-r--r--libguile/pairs.c1
-rw-r--r--libguile/poll.c1
-rw-r--r--libguile/ports-internal.h1
-rw-r--r--libguile/ports.c1
-rw-r--r--libguile/posix.c1
-rw-r--r--libguile/print.c1
-rw-r--r--libguile/procprop.c1
-rw-r--r--libguile/procs.c1
-rw-r--r--libguile/programs.c1
-rw-r--r--libguile/promises.c1
-rw-r--r--libguile/r6rs-ports.c1
-rw-r--r--libguile/random.c1
-rw-r--r--libguile/rdelim.c1
-rw-r--r--libguile/read.c1
-rw-r--r--libguile/regex-posix.c1
-rw-r--r--libguile/rw.c1
-rw-r--r--libguile/scmsigs.c1
-rw-r--r--libguile/script.c1
-rw-r--r--libguile/simpos.c1
-rw-r--r--libguile/smob.c2
-rw-r--r--libguile/socket.c1
-rw-r--r--libguile/sort.c1
-rw-r--r--libguile/srcprop.c1
-rw-r--r--libguile/srfi-1.c1
-rw-r--r--libguile/srfi-13.c1
-rw-r--r--libguile/srfi-14.c1
-rw-r--r--libguile/srfi-4.c1
-rw-r--r--libguile/srfi-60.c1
-rw-r--r--libguile/stackchk.c1
-rw-r--r--libguile/stacks.c1
-rw-r--r--libguile/stime.c1
-rw-r--r--libguile/strings.c1
-rw-r--r--libguile/strorder.c1
-rw-r--r--libguile/strports.c1
-rw-r--r--libguile/struct.c1
-rw-r--r--libguile/symbols.c1
-rw-r--r--libguile/syntax.c1
-rw-r--r--libguile/threads.c1
-rw-r--r--libguile/throw.c1
-rw-r--r--libguile/trees.c1
-rw-r--r--libguile/unicode.c1
-rw-r--r--libguile/uniform.c3
-rw-r--r--libguile/values.c1
-rw-r--r--libguile/variable.c1
-rw-r--r--libguile/vectors.c1
-rw-r--r--libguile/version.c1
-rw-r--r--libguile/vm.c1
-rw-r--r--libguile/vports.c1
-rw-r--r--libguile/weak-set.c1
-rw-r--r--libguile/weak-table.c1
-rw-r--r--libguile/weak-vector.c1
119 files changed, 4 insertions, 178 deletions
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 286d3d152..1175f485e 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
EXTRA_libguile_@GUILE_EFFECTIVE_VERSION@_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 fe99ee697..0be29648f 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 b0b5e634c..000000000
--- 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 3f1d014d7..9b1d5a032 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 59abf1c30..00200fed4 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 e0e8960a5..e6dd6cdc9 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 7e5b98333..8ba80cf3e 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 abe4c3207..c89aaedc8 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 f6cc33fa8..249d52a5b 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 5c883ac6f..f3be232b9 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 e3af3358f..78c4d3886 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 7103ade82..d01148a56 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 f53e57b1b..37515fef1 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 f9f019a13..de9ab5df2 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 d887ecd9c..e8c6ed609 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 336a81285..51b154385 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 1ab1aea83..bf18292d7 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 984b86404..22577d818 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 d47a0c59f..b534b6515 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 14e5518f3..61eddca37 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 050450f12..f33427673 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 2c84472d7..7583cbf66 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 b6efe2291..57cafd50f 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 d6e914934..14f325a25 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 f3693d36b..ebbc6c329 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 5207a7d26..1f9d08896 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 7738e1084..5d271c2f8 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 7a9cde7c6..bb72674b7 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 d4f0de15c..0aedcbc59 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 9c5056690..6e7e7c847 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 acbfe30d9..d3fc041c0 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 814e57b51..235c28e6e 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 eb16f9d1b..dc03d01cf 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 a746f7a19..8424eed96 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 bb3b2a370..08e28a92b 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 c535cda9b..f2d570b84 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 3dcfba81e..db0de5b68 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 417dbe6bc..48e291065 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 3b9b9ca28..19f80ec91 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 c79e6e73a..8f65d683a 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 ec9d7a8d5..1d4d31ab7 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 b521a48b4..19d29e0e3 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 b84acb38c..46c43576c 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 a505c2e3c..f682cb3e6 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 dac7c1e2e..f74f7cb64 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 02c6b5141..4394ff67e 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 135a442a5..fc6e9a2e2 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 69227f210..8dffc488f 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 c41bf1a73..de27e7d32 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 338988cd2..d65b10df7 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 64aa3d85e..0786129f7 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 a9e946cb9..5470688f5 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 215b3dbe2..ee1e32324 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 eb5263671..9900646c3 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 a089e4614..e06fe65f6 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 80d1a17f5..cbe82019f 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 9e3935dfe..bb1557366 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 9f524397b..828af1efa 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 f969d768a..2023bb6f4 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 504fa3372..9264602ec 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 23c1a6079..865bb5f74 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 db4814723..11ebfeff6 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 acd61c6a3..40a745f22 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 03a355a99..2205bd812 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 28eff2c61..db96f0741 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 d03b3af01..cca0c380b 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 a0fc3b70d..0248e0974 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 9ef223bcf..c7db60bf1 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 84ac83d27..5935a1b83 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 d5bcfe868..d89892681 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 01c08e610..98f94148d 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 6d6fe7de0..550009f18 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 daa6b7f14..85d4e190d 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 f6231d90f..940b7083e 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 c84013088..1416c1563 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 6d40e0e2a..9b0ce7983 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 5fad4c970..1f6ea9a93 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 378028d2c..8daaf4671 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 a3816158e..c3c70036d 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 91d7c4882..4f2bebf3b 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 578fb80d7..cee49bb7c 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 3c1ad7441..b56220a48 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 7f105ce5e..2ddf25205 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 fb8a36f59..1e5a5854a 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 8d9c81a68..91dfc0e78 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 76bfb260c..d3826de93 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 06c46558b..6cd1f73b5 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 f710cd67c..d308ccd93 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 ea19ec3ef..dea09a908 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 6bbd334a9..2f023e3de 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 4f5368f3f..4cdca2340 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 2f1dc4b34..450c69671 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 d4f468fe3..8375e5b0e 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 fa73139ca..65feacb8c 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 51a7d0122..9bcdf5458 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 8613d0bce..96fbcee6e 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 12df6e989..9bc312c97 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 abb4ab1bf..aff4dfc63 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 3c093ed1c..cc1a484fb 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 b27493aae..88f530328 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 bfb4d3f3e..2f3a17c4f 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 dd3e59636..2f4b29e5c 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 9824f3119..6395460ab 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 a4b17bfe0..851085633 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 6ddcfb970..0de27ee75 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 18e663a1d..12de38434 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 e698a86d4..0ec7be3e6 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 b9da433ee..90ba52a76 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 369a327bc..8dae7ba17 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 13ee18a0c..2e66cbc8b 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 63531eedd..d1a67cc2c 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 923dfc725..dad0bf3ee 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 57c189036..a01b493aa 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 144889125..315ab3d0e 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 0d34e6906..17f13993a 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 23ec0a5eb..fbe0e9fdc 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 6f409aff4..3d022146c 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 3b1e9ae6a..52f6fa93c 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 deb474a82..16e1e3552 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"