Remove _scm.h

* libguile/_scm.h: Remove.  An internal header, never installed.
* libguile/__scm.h: Remove horrible documentation.
* libguile/Makefile.am (EXTRA_libguile_@GUILE_EFFECTIVE_VERSION@_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

@@ -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			\

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?  */

libguile/_scm.h

@@ -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:
-*/

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"

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"

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"

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"

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"

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"

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"
 

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"

libguile/boolean.c

@@ -23,7 +23,6 @@
 # include <config.h>
 #endif
 
-#include "libguile/_scm.h"
 #include "libguile/gsubr.h"
 
 #include "libguile/boolean.h"

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"

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"

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"

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"

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"

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"

libguile/deprecated.c

@@ -22,7 +22,6 @@
 
 #define SCM_BUILDING_DEPRECATED_CODE
 
-#include "libguile/_scm.h"
 #include "libguile/deprecation.h"
 #include "libguile/deprecated.h"
 

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

libguile/instructions.c

@@ -22,7 +22,6 @@
 
 #include <string.h>
 
-#include "_scm.h"
 #include "libguile/gsubr.h"
 #include "threads.h"
 #include "libguile/list.h"

libguile/intrinsics.c

@@ -20,7 +20,6 @@
 #  include <config.h>
 #endif
 
-#include "_scm.h"
 #include "libguile/gsubr.h"
 #include "boolean.h"
 #include "alist.h"

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"

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"

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"

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"

libguile/loader.c

@@ -39,7 +39,6 @@
 
 #include <full-read.h>
 
-#include "_scm.h"
 #include "libguile/gsubr.h"
 #include "bytevectors.h"
 #include "boolean.h"

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"

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"
 

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"

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"

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"

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
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

libguile/procprop.c

@@ -23,7 +23,6 @@
 # include <config.h>
 #endif
 
-#include "libguile/_scm.h"
 #include "libguile/pairs.h"
 #include "libguile/boolean.h"
 

libguile/procs.c

@@ -23,7 +23,6 @@
 # include <config.h>
 #endif
 
-#include "libguile/_scm.h"
 #include "libguile/gsubr.h"
 
 #include "libguile/goops.h"

libguile/programs.c

@@ -21,7 +21,6 @@
 #endif
 
 #include <string.h>
-#include "_scm.h"
 #include "libguile/gsubr.h"
 #include "boolean.h"
 #include "instructions.h"

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"

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"

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"

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"

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"

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"
 

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"

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"

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"

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"
 

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"

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"

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"

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"

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"

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>

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"

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"

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"

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"

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"

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"

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"