Make libguile header inclusion consistent within libguile c files

Change from '#include "libguile/foo.h"' and '#include <libguile/foo.h>' to '#include "foo.h"'.
2025-06-15 16:20:17 +02:00 · 2018-06-20 17:19:31 +02:00 · 2018-06-20 17:19:31 +02:00 · 3068bc7384
commit 3068bc7384
parent 51e36329d8
119 changed files with 1751 additions and 1757 deletions
--- a/libguile/alist.c
+++ b/libguile/alist.c
@ -23,13 +23,13 @@
 # include <config.h>
 #endif
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/eq.h"
+#include "eq.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/alist.h"
+#include "alist.h"
@ -395,6 +395,6 @@ SCM_DEFINE (scm_assoc_remove_x, "assoc-remove!", 2, 0, 0,
 void
 scm_init_alist ()
 {
-#include "libguile/alist.x"
+#include "alist.x"
 }
--- a/libguile/array-handle.c
+++ b/libguile/array-handle.c
@ -26,16 +26,16 @@
 #include <string.h>
-#include "libguile/bitvectors.h"
+#include "bitvectors.h"
-#include "libguile/bytevectors.h"
+#include "bytevectors.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/arrays.h"
+#include "arrays.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
-#include "libguile/array-handle.h"
+#include "array-handle.h"
 SCM scm_i_array_element_types[SCM_ARRAY_ELEMENT_TYPE_LAST + 1];
@ -373,5 +373,5 @@ scm_init_array_handle (void)
  DEFINE_ARRAY_TYPE (c32, C32);
  DEFINE_ARRAY_TYPE (c64, C64);
-#include "libguile/array-handle.x"
+#include "array-handle.x"
 }
--- a/libguile/array-map.c
+++ b/libguile/array-map.c
@ -28,26 +28,26 @@
 #include <string.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/arrays.h"
+#include "arrays.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/chars.h"
+#include "chars.h"
-#include "libguile/eq.h"
+#include "eq.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/feature.h"
+#include "feature.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/bitvectors.h"
+#include "bitvectors.h"
-#include "libguile/srfi-4.h"
+#include "srfi-4.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/procs.h"
+#include "procs.h"
-#include "libguile/generalized-arrays.h"
+#include "generalized-arrays.h"
-#include "libguile/array-map.h"
+#include "array-map.h"
 #include <assert.h>
 /* The WHAT argument for `scm_gc_malloc ()' et al.  */
@ -904,6 +904,6 @@ SCM_DEFINE (scm_array_slice_for_each_in_order, "array-slice-for-each-in-order",
 void
 scm_init_array_map (void)
 {
-#include "libguile/array-map.x"
+#include "array-map.x"
  scm_add_feature (s_scm_array_for_each);
 }
--- a/libguile/arrays.c
+++ b/libguile/arrays.c
@ -30,32 +30,32 @@
 #include "verify.h"
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/eq.h"
+#include "eq.h"
-#include "libguile/chars.h"
+#include "chars.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/fports.h"
+#include "fports.h"
-#include "libguile/feature.h"
+#include "feature.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/srfi-13.h"
+#include "srfi-13.h"
-#include "libguile/srfi-4.h"
+#include "srfi-4.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/bitvectors.h"
+#include "bitvectors.h"
-#include "libguile/procs.h"
+#include "procs.h"
-#include "libguile/bytevectors.h"
+#include "bytevectors.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
-#include "libguile/read.h"
+#include "read.h"
-#include "libguile/arrays.h"
+#include "arrays.h"
-#include "libguile/array-map.h"
+#include "array-map.h"
-#include "libguile/generalized-vectors.h"
+#include "generalized-vectors.h"
-#include "libguile/generalized-arrays.h"
+#include "generalized-arrays.h"
-#include "libguile/uniform.h"
+#include "uniform.h"
 size_t
@ -960,6 +960,6 @@ scm_init_arrays ()
 {
  scm_add_feature ("array");
-#include "libguile/arrays.x"
+#include "arrays.x"
 }
--- a/libguile/async.c
+++ b/libguile/async.c
@ -23,17 +23,17 @@
 #  include <config.h>
 #endif
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/atomics-internal.h"
+#include "atomics-internal.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/throw.h"
+#include "throw.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
-#include "libguile/deprecation.h"
+#include "deprecation.h"
-#include "libguile/async.h"
+#include "async.h"
 #ifdef HAVE_STRING_H
 #include <string.h>
@ -427,5 +427,5 @@ scm_c_call_with_unblocked_asyncs (void *(*proc) (void *data), void *data)
 void
 scm_init_async ()
 {
-#include "libguile/async.x"
+#include "async.x"
 }
--- a/libguile/atomic.c
+++ b/libguile/atomic.c
@ -22,12 +22,12 @@
 # include <config.h>
 #endif
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/extensions.h"
+#include "extensions.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/atomics-internal.h"
+#include "atomics-internal.h"
-#include "libguile/atomic.h"
+#include "atomic.h"
 SCM_DEFINE (scm_make_atomic_box, "make-atomic-box", 1, 0, 0,
@ -116,7 +116,7 @@ scm_i_atomic_box_print (SCM exp, SCM port, scm_print_state *pstate)
 static void
 scm_init_atomic (void)
 {
-#include "libguile/atomic.x"
+#include "atomic.x"
 }
 void
--- a/libguile/backtrace.c
+++ b/libguile/backtrace.c
@ -25,36 +25,36 @@
 #include <stdio.h>
 #include <ctype.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
 #include <unistd.h>
 #ifdef HAVE_IO_H
 #include <io.h>
 #endif
-#include "libguile/backtrace.h"
+#include "backtrace.h"
-#include "libguile/deprecation.h"
+#include "deprecation.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/filesys.h"
+#include "filesys.h"
-#include "libguile/fluids.h"
+#include "fluids.h"
-#include "libguile/frames.h"
+#include "frames.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/keywords.h"
+#include "keywords.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/posix.h"
+#include "posix.h"
-#include "libguile/private-options.h"
+#include "private-options.h"
-#include "libguile/srcprop.h"
+#include "srcprop.h"
-#include "libguile/stacks.h"
+#include "stacks.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/strports.h"
+#include "strports.h"
-#include "libguile/struct.h"
+#include "struct.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/throw.h"
+#include "throw.h"
-#include "libguile/variable.h"
+#include "variable.h"
 /* {Error reporting and backtraces}
 *
@ -326,5 +326,5 @@ void
 scm_init_backtrace ()
 {
  scm_c_define_gsubr ("print-exception", 4, 0, 0, boot_print_exception);
-#include "libguile/backtrace.x"
+#include "backtrace.x"
 }
--- a/libguile/bitvectors.c
+++ b/libguile/bitvectors.c
@ -25,17 +25,17 @@
 #include <string.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/array-handle.h"
+#include "array-handle.h"
-#include "libguile/bitvectors.h"
+#include "bitvectors.h"
-#include "libguile/generalized-vectors.h"
+#include "generalized-vectors.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/arrays.h"
+#include "arrays.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/srfi-4.h"
+#include "srfi-4.h"
 /* Bit vectors. Would be nice if they were implemented on top of bytevectors,
 * but alack, all we have is this crufty C.
@ -887,5 +887,5 @@ SCM_VECTOR_IMPLEMENTATION (SCM_ARRAY_ELEMENT_TYPE_BIT, scm_make_bitvector)
 void
 scm_init_bitvectors ()
 {
-#include "libguile/bitvectors.x"
+#include "bitvectors.x"
 }
--- a/libguile/boolean.c
+++ b/libguile/boolean.c
@ -23,10 +23,10 @@
 # include <config.h>
 #endif
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/error.h"
+#include "error.h"
 #include "verify.h"
@ -106,6 +106,6 @@ scm_is_bool (SCM obj)
 void
 scm_init_boolean ()
 {
-#include "libguile/boolean.x"
+#include "boolean.x"
 }
--- a/libguile/bytevectors.c
+++ b/libguile/bytevectors.c
@ -36,22 +36,22 @@
 #include <gmp.h>
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
-#include "libguile/extensions.h"
+#include "extensions.h"
-#include "libguile/bytevectors.h"
+#include "bytevectors.h"
-#include "libguile/generalized-vectors.h"
+#include "generalized-vectors.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/arrays.h"
+#include "arrays.h"
-#include "libguile/array-handle.h"
+#include "array-handle.h"
-#include "libguile/uniform.h"
+#include "uniform.h"
-#include "libguile/srfi-4.h"
+#include "srfi-4.h"
 /* Utilities.  */
@ -2130,5 +2130,5 @@ scm_bootstrap_bytevectors (void)
 void
 scm_init_bytevectors (void)
 {
-#include "libguile/bytevectors.x"
+#include "bytevectors.x"
 }
--- a/libguile/chars.c
+++ b/libguile/chars.c
@ -29,13 +29,13 @@
 #include <unicase.h>
 #include <unictype.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/chars.h"
+#include "chars.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/srfi-14.h"
+#include "srfi-14.h"
@ -679,6 +679,6 @@ scm_i_charname_to_char (const char *charname, size_t charname_len)
 void
 scm_init_chars ()
 {
-#include "libguile/chars.x"
+#include "chars.x"
 }
--- a/libguile/chooks.c
+++ b/libguile/chooks.c
@ -25,8 +25,8 @@
 #include <stdio.h>
-#include "libguile/gc.h"
+#include "gc.h"
-#include "libguile/chooks.h"
+#include "chooks.h"
 /* C level hooks
--- a/libguile/continuations.c
+++ b/libguile/continuations.c
@ -30,26 +30,26 @@
 #include <ucontext.h>
 #endif
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/async.h"
+#include "async.h"
-#include "libguile/backtrace.h"
+#include "backtrace.h"
-#include "libguile/debug.h"
+#include "debug.h"
-#include "libguile/init.h"
+#include "init.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/stackchk.h"
+#include "stackchk.h"
-#include "libguile/stacks.h"
+#include "stacks.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/dynstack.h"
+#include "dynstack.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/vm.h"
+#include "vm.h"
-#include "libguile/instructions.h"
+#include "instructions.h"
-#include "libguile/continuations.h"
+#include "continuations.h"
@ -529,5 +529,5 @@ scm_init_continuations ()
 {
  tc16_continuation = scm_make_smob_type ("continuation", 0);
  scm_set_smob_print (tc16_continuation, continuation_print);
-#include "libguile/continuations.x"
+#include "continuations.x"
 }
--- a/libguile/control.c
+++ b/libguile/control.c
@ -22,16 +22,16 @@
 #include <alloca.h>
-#include "libguile/dynstack.h"
+#include "dynstack.h"
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/control.h"
+#include "control.h"
-#include "libguile/extensions.h"
+#include "extensions.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/programs.h"
+#include "programs.h"
-#include "libguile/threads.h"
+#include "threads.h"
-#include "libguile/instructions.h"
+#include "instructions.h"
-#include "libguile/vm.h"
+#include "vm.h"
@ -236,7 +236,7 @@ scm_init_ice_9_control (void *unused)
 void
 scm_init_control (void)
 {
-#include "libguile/control.x"
+#include "control.x"
  scm_c_register_extension ("libguile-" SCM_EFFECTIVE_VERSION,
                            "scm_init_ice_9_control", scm_init_ice_9_control,
--- a/libguile/debug-malloc.c
+++ b/libguile/debug-malloc.c
@ -23,12 +23,12 @@
 #include <string.h>
 #include <stdio.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/alist.h"
+#include "alist.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/debug-malloc.h"
+#include "debug-malloc.h"
 /*
 * The following code is a hack which I wrote quickly in order to
@ -243,6 +243,6 @@ scm_debug_malloc_prehistory ()
 void
 scm_init_debug_malloc ()
 {
-#include "libguile/debug-malloc.x"
+#include "debug-malloc.x"
 }
--- a/libguile/debug.c
+++ b/libguile/debug.c
@ -35,35 +35,35 @@
 # include <windows.h>
 #endif
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/async.h"
+#include "async.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/stackchk.h"
+#include "stackchk.h"
-#include "libguile/throw.h"
+#include "throw.h"
-#include "libguile/macros.h"
+#include "macros.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/struct.h"
+#include "struct.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/procprop.h"
+#include "procprop.h"
-#include "libguile/srcprop.h"
+#include "srcprop.h"
-#include "libguile/alist.h"
+#include "alist.h"
-#include "libguile/continuations.h"
+#include "continuations.h"
-#include "libguile/strports.h"
+#include "strports.h"
-#include "libguile/read.h"
+#include "read.h"
-#include "libguile/feature.h"
+#include "feature.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/fluids.h"
+#include "fluids.h"
-#include "libguile/programs.h"
+#include "programs.h"
-#include "libguile/memoize.h"
+#include "memoize.h"
-#include "libguile/variable.h"
+#include "variable.h"
-#include "libguile/vm.h"
+#include "vm.h"
-#include "libguile/debug.h"
+#include "debug.h"
-#include "libguile/private-options.h"
+#include "private-options.h"
@ -221,5 +221,5 @@ scm_init_debug ()
  scm_add_feature ("debug-extensions");
-#include "libguile/debug.x"
+#include "debug.x"
 }
--- a/libguile/deprecated.c
+++ b/libguile/deprecated.c
@ -22,8 +22,8 @@
 #define SCM_BUILDING_DEPRECATED_CODE
-#include "libguile/deprecation.h"
+#include "deprecation.h"
-#include "libguile/deprecated.h"
+#include "deprecated.h"
 #if (SCM_ENABLE_DEPRECATED == 1)
@ -36,7 +36,7 @@
 void
 scm_i_init_deprecated ()
 {
-#include "libguile/deprecated.x"
+#include "deprecated.x"
 }
 #endif /* SCM_ENABLE_DEPRECATD == 1 */
--- a/libguile/deprecation.c
+++ b/libguile/deprecation.c
@ -27,16 +27,16 @@
 #include <string.h>
 #include <stdarg.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/deprecation.h"
+#include "deprecation.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/threads.h"
+#include "threads.h"
-#include "libguile/private-options.h"
+#include "private-options.h"
@ -177,5 +177,5 @@ scm_init_deprecation ()
      SCM_WARN_DEPRECATED = 0;
      atexit (print_deprecation_summary);
    }
-#include "libguile/deprecation.x"
+#include "deprecation.x"
 }
--- a/libguile/dynl.c
+++ b/libguile/dynl.c
@ -50,19 +50,19 @@ maybe_drag_in_eprintf ()
 #include <stdio.h>
 #include <string.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/libpath.h"
+#include "libpath.h"
-#include "libguile/dynl.h"
+#include "dynl.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/keywords.h"
+#include "keywords.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/deprecation.h"
+#include "deprecation.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
-#include "libguile/foreign.h"
+#include "foreign.h"
-#include "libguile/threads.h"
+#include "threads.h"
-#include "libguile/gc.h"
+#include "gc.h"
 #include <ltdl.h>
@ -408,5 +408,5 @@ scm_init_dynamic_linking ()
 			    scm_i_pthread_mutexattr_recursive);
  sysdep_dynl_init ();
-#include "libguile/dynl.x"
+#include "dynl.x"
 }
--- a/libguile/dynstack.c
+++ b/libguile/dynstack.c
@ -26,11 +26,11 @@
 #include <assert.h>
 #include <setjmp.h>
-#include "libguile/control.h"
+#include "control.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/fluids.h"
+#include "fluids.h"
-#include "libguile/dynstack.h"
+#include "dynstack.h"
-#include "libguile/variable.h"
+#include "variable.h"
--- a/libguile/dynwind.c
+++ b/libguile/dynwind.c
@ -26,15 +26,15 @@
 #include <assert.h>
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/dynstack.h"
+#include "dynstack.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/threads.h"
+#include "threads.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/variable.h"
+#include "variable.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
@ -138,5 +138,5 @@ scm_swap_bindings (SCM vars, SCM vals)
 void
 scm_init_dynwind ()
 {
-#include "libguile/dynwind.x"
+#include "dynwind.x"
 }
--- a/libguile/eq.c
+++ b/libguile/eq.c
@ -27,26 +27,26 @@
 #include <string.h>
 #endif
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/array-map.h"
+#include "array-map.h"
-#include "libguile/async.h"
+#include "async.h"
-#include "libguile/bitvectors.h"
+#include "bitvectors.h"
-#include "libguile/bytevectors.h"
+#include "bytevectors.h"
-#include "libguile/eq.h"
+#include "eq.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/foreign.h"
+#include "foreign.h"
-#include "libguile/generalized-arrays.h"
+#include "generalized-arrays.h"
-#include "libguile/goops.h"
+#include "goops.h"
-#include "libguile/hashtab.h"
+#include "hashtab.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/private-options.h"
+#include "private-options.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/stackchk.h"
+#include "stackchk.h"
-#include "libguile/strorder.h"
+#include "strorder.h"
-#include "libguile/struct.h"
+#include "struct.h"
-#include "libguile/syntax.h"
+#include "syntax.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
@ -405,6 +405,6 @@ scm_equal_p (SCM x, SCM y)
 void
 scm_init_eq ()
 {
-#include "libguile/eq.x"
+#include "eq.x"
 }
--- a/libguile/error.c
+++ b/libguile/error.c
@ -28,18 +28,18 @@
 #include <stdio.h>
 #include <errno.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/async.h"
+#include "async.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/throw.h"
+#include "throw.h"
-#include "libguile/error.h"
+#include "error.h"
 #ifdef HAVE_STRING_H
 #include <string.h>
@ -299,7 +299,7 @@ scm_misc_error (const char *subr, const char *message, SCM args)
 void
 scm_init_error ()
 {
-#include "libguile/cpp-E.c"
+#include "cpp-E.c"
-#include "libguile/error.x"
+#include "error.x"
 }
--- a/libguile/eval.c
+++ b/libguile/eval.c
@ -26,46 +26,46 @@
 #include <alloca.h>
 #include <stdarg.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/alist.h"
+#include "alist.h"
-#include "libguile/async.h"
+#include "async.h"
-#include "libguile/continuations.h"
+#include "continuations.h"
-#include "libguile/control.h"
+#include "control.h"
-#include "libguile/debug.h"
+#include "debug.h"
-#include "libguile/deprecation.h"
+#include "deprecation.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
-#include "libguile/eq.h"
+#include "eq.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/expand.h"
+#include "expand.h"
-#include "libguile/feature.h"
+#include "feature.h"
-#include "libguile/fluids.h"
+#include "fluids.h"
-#include "libguile/goops.h"
+#include "goops.h"
-#include "libguile/hash.h"
+#include "hash.h"
-#include "libguile/hashtab.h"
+#include "hashtab.h"
-#include "libguile/keywords.h"
+#include "keywords.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/macros.h"
+#include "macros.h"
-#include "libguile/memoize.h"
+#include "memoize.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/print.h"
+#include "print.h"
-#include "libguile/private-options.h"
+#include "private-options.h"
-#include "libguile/procprop.h"
+#include "procprop.h"
-#include "libguile/programs.h"
+#include "programs.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/srcprop.h"
+#include "srcprop.h"
-#include "libguile/stackchk.h"
+#include "stackchk.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/threads.h"
+#include "threads.h"
-#include "libguile/throw.h"
+#include "throw.h"
-#include "libguile/values.h"
+#include "values.h"
-#include "libguile/variable.h"
+#include "variable.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
-#include "libguile/vm.h"
+#include "vm.h"
@ -971,5 +971,5 @@ scm_init_eval ()
  var_primitive_eval = scm_define (SCM_SUBR_NAME (primitive_eval),
                                   primitive_eval);
-#include "libguile/eval.x"
+#include "eval.x"
 }
--- a/libguile/evalext.c
+++ b/libguile/evalext.c
@ -23,16 +23,16 @@
 # include <config.h>
 #endif
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/fluids.h"
+#include "fluids.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/variable.h"
+#include "variable.h"
-#include "libguile/evalext.h"
+#include "evalext.h"
 SCM_DEFINE (scm_defined_p, "defined?", 1, 1, 0,
            (SCM sym, SCM module),
@ -110,5 +110,5 @@ SCM_DEFINE (scm_self_evaluating_p, "self-evaluating?", 1, 0, 0,
 void 
 scm_init_evalext ()
 {
-#include "libguile/evalext.x"
+#include "evalext.x"
 }
--- a/libguile/expand.c
+++ b/libguile/expand.c
@ -23,26 +23,26 @@
 #  include <config.h>
 #endif
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/alist.h"
+#include "alist.h"
-#include "libguile/continuations.h"
+#include "continuations.h"
-#include "libguile/eq.h"
+#include "eq.h"
-#include "libguile/expand.h"
+#include "expand.h"
-#include "libguile/hashtab.h"
+#include "hashtab.h"
-#include "libguile/keywords.h"
+#include "keywords.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/macros.h"
+#include "macros.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/print.h"
+#include "print.h"
-#include "libguile/srcprop.h"
+#include "srcprop.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/throw.h"
+#include "throw.h"
-#include "libguile/variable.h"
+#include "variable.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
@ -1654,5 +1654,5 @@ scm_init_expand ()
  scm_c_define ("%expanded-vtables", scm_vector (exp_vtable_list));
-#include "libguile/expand.x"
+#include "expand.x"
 }
--- a/libguile/extensions.c
+++ b/libguile/extensions.c
@ -25,13 +25,13 @@
 #include <string.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/dynl.h"
+#include "dynl.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
-#include "libguile/extensions.h"
+#include "extensions.h"
-#include "libguile/gc.h"
+#include "gc.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/threads.h"
+#include "threads.h"
 typedef struct extension_t
 {
@ -173,5 +173,5 @@ SCM_DEFINE (scm_load_extension, "load-extension", 2, 0, 0,
 void
 scm_init_extensions ()
 {
-#include "libguile/extensions.x"
+#include "extensions.x"
 }
--- a/libguile/fdes-finalizers.c
+++ b/libguile/fdes-finalizers.c
@ -21,16 +21,16 @@
 # include <config.h>
 #endif
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/extensions.h"
+#include "extensions.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/hashtab.h"
+#include "hashtab.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/threads.h"
+#include "threads.h"
-#include "libguile/fdes-finalizers.h"
+#include "fdes-finalizers.h"
@ -120,7 +120,7 @@ scm_run_fdes_finalizers (int fd)
 static void
 scm_init_fdes_finalizers (void)
 {
-#include "libguile/fdes-finalizers.x"
+#include "fdes-finalizers.x"
 }
 void
--- a/libguile/feature.c
+++ b/libguile/feature.c
@ -27,15 +27,15 @@
 #include <string.h>
 #endif
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/fluids.h"
+#include "fluids.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/variable.h"
+#include "variable.h"
-#include "libguile/feature.h"
+#include "feature.h"
@ -116,5 +116,5 @@ scm_init_feature()
  scm_add_feature ("threads");
 #endif
-#include "libguile/feature.x"
+#include "feature.x"
 }
--- a/libguile/filesys.c
+++ b/libguile/filesys.c
@ -79,29 +79,29 @@
 # include <sys/sendfile.h>
 #endif
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/async.h"
+#include "async.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
-#include "libguile/fdes-finalizers.h"
+#include "fdes-finalizers.h"
-#include "libguile/feature.h"
+#include "feature.h"
-#include "libguile/filesys.h"
+#include "filesys.h"
-#include "libguile/fports.h"
+#include "fports.h"
-#include "libguile/iselect.h"
+#include "iselect.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/load.h"	/* for scm_i_mirror_backslashes */
+#include "load.h"	/* for scm_i_mirror_backslashes */
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/ports-internal.h"
+#include "ports-internal.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/posix.h"
+#include "posix.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/srfi-13.h"
+#include "srfi-13.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/syscalls.h"
+#include "syscalls.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
@ -1941,5 +1941,5 @@ scm_init_filesys ()
  scm_dot_string = scm_from_locale_string (".");
-#include "libguile/filesys.x"
+#include "filesys.x"
 }
--- a/libguile/finalizers.c
+++ b/libguile/finalizers.c
@ -30,13 +30,13 @@
 #include <full-write.h>
-#include "libguile/async.h"
+#include "async.h"
-#include "libguile/bdw-gc.h"
+#include "bdw-gc.h"
-#include "libguile/finalizers.h"
+#include "finalizers.h"
-#include "libguile/gc.h"
+#include "gc.h"
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/init.h"
+#include "init.h"
-#include "libguile/threads.h"
+#include "threads.h"
--- a/libguile/fluids.c
+++ b/libguile/fluids.c
@ -24,22 +24,22 @@
 #include <stdio.h>
 #include <string.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/alist.h"
+#include "alist.h"
-#include "libguile/atomics-internal.h"
+#include "atomics-internal.h"
-#include "libguile/bdw-gc.h"
+#include "bdw-gc.h"
-#include "libguile/cache-internal.h"
+#include "cache-internal.h"
-#include "libguile/deprecation.h"
+#include "deprecation.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/fluids.h"
+#include "fluids.h"
-#include "libguile/hashtab.h"
+#include "hashtab.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/print.h"
+#include "print.h"
-#include "libguile/weak-table.h"
+#include "weak-table.h"
-#include "libguile/variable.h"
+#include "variable.h"
 /* A dynamic state associates fluids with values.  There are two
   representations of a dynamic state in Guile: the active
@ -677,5 +677,5 @@ SCM_DEFINE (scm_with_dynamic_state, "with-dynamic-state", 2, 0, 0,
 void
 scm_init_fluids ()
 {
-#include "libguile/fluids.x"
+#include "fluids.x"
 }
--- a/libguile/foreign-object.c
+++ b/libguile/foreign-object.c
@ -22,18 +22,18 @@
 #  include <config.h>
 #endif
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/extensions.h"
+#include "extensions.h"
-#include "libguile/finalizers.h"
+#include "finalizers.h"
-#include "libguile/foreign-object.h"
+#include "foreign-object.h"
-#include "libguile/goops.h"
+#include "goops.h"
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/procs.h"
+#include "procs.h"
-#include "libguile/threads.h"
+#include "threads.h"
-#include "libguile/variable.h"
+#include "variable.h"
--- a/libguile/foreign.c
+++ b/libguile/foreign.c
@ -28,26 +28,26 @@
 #include <assert.h>
 #include <errno.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/bytevectors.h"
+#include "bytevectors.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
-#include "libguile/eq.h"
+#include "eq.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/extensions.h"
+#include "extensions.h"
-#include "libguile/finalizers.h"
+#include "finalizers.h"
-#include "libguile/foreign.h"
+#include "foreign.h"
-#include "libguile/keywords.h"
+#include "keywords.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/instructions.h"
+#include "instructions.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/stacks.h"
+#include "stacks.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/threads.h"
+#include "threads.h"
-#include "libguile/weak-table.h"
+#include "weak-table.h"
@ -1164,7 +1164,7 @@ static void
 scm_init_foreign (void)
 {
 #ifndef SCM_MAGIC_SNARFER
-#include "libguile/foreign.x"
+#include "foreign.x"
 #endif
  scm_define (sym_void, scm_from_uint8 (SCM_FOREIGN_TYPE_VOID));
  scm_define (sym_float, scm_from_uint8 (SCM_FOREIGN_TYPE_FLOAT));
--- a/libguile/fports.c
+++ b/libguile/fports.c
@ -46,28 +46,28 @@
 #include <full-write.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/async.h"
+#include "async.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
-#include "libguile/extensions.h"
+#include "extensions.h"
-#include "libguile/fdes-finalizers.h"
+#include "fdes-finalizers.h"
-#include "libguile/fluids.h"
+#include "fluids.h"
-#include "libguile/filesys.h"
+#include "filesys.h"
-#include "libguile/fports.h"
+#include "fports.h"
-#include "libguile/gc.h"
+#include "gc.h"
-#include "libguile/hashtab.h"
+#include "hashtab.h"
-#include "libguile/keywords.h"
+#include "keywords.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/ports-internal.h"
+#include "ports-internal.h"
-#include "libguile/posix.h"
+#include "posix.h"
-#include "libguile/read.h"
+#include "read.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/syscalls.h"
+#include "syscalls.h"
-#include "libguile/variable.h"
+#include "variable.h"
 #if SIZEOF_OFF_T == SIZEOF_INT
 #define OFF_T_MAX  INT_MAX
@ -725,7 +725,7 @@ scm_init_fports_keywords ()
 static void
 scm_init_ice_9_fports (void)
 {
-#include "libguile/fports.x"
+#include "fports.x"
 }
 void
--- a/libguile/frames.c
+++ b/libguile/frames.c
@ -22,17 +22,17 @@
 #include <stdlib.h>
 #include <string.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
 #include "boolean.h"
 #include "eval.h"
 #include "extensions.h"
-#include "libguile/modules.h"
+#include "modules.h"
 #include "numbers.h"
 #include "frames.h"
 #include "ports.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
 #include "threads.h"
-#include "libguile/variable.h"
+#include "variable.h"
 #include "vm.h"
 SCM
@ -444,7 +444,7 @@ void
 scm_init_frames (void)
 {
 #ifndef SCM_MAGIC_SNARFER
-#include "libguile/frames.x"
+#include "frames.x"
 #endif
  scm_c_register_extension ("libguile-" SCM_EFFECTIVE_VERSION,
--- a/libguile/gc-malloc.c
+++ b/libguile/gc-malloc.c
@ -28,23 +28,23 @@
 #include <string.h>
 #include <stdlib.h>
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/stime.h"
+#include "stime.h"
-#include "libguile/stackchk.h"
+#include "stackchk.h"
-#include "libguile/struct.h"
+#include "struct.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/arrays.h"
+#include "arrays.h"
-#include "libguile/async.h"
+#include "async.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
-#include "libguile/hashtab.h"
+#include "hashtab.h"
-#include "libguile/deprecation.h"
+#include "deprecation.h"
-#include "libguile/gc.h"
+#include "gc.h"
 #ifdef GUILE_DEBUG_MALLOC
-#include "libguile/debug-malloc.h"
+#include "debug-malloc.h"
 #endif
 #include <unistd.h>
--- a/libguile/gc.c
+++ b/libguile/gc.c
@ -23,8 +23,8 @@
 #  include <config.h>
 #endif
-#include "libguile/gen-scmconfig.h"
+#include "gen-scmconfig.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
 #include <stdio.h>
 #include <errno.h>
@ -32,36 +32,36 @@
 #include <stdlib.h>
 #include <math.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/stime.h"
+#include "stime.h"
-#include "libguile/stackchk.h"
+#include "stackchk.h"
-#include "libguile/struct.h"
+#include "struct.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/arrays.h"
+#include "arrays.h"
-#include "libguile/async.h"
+#include "async.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/hooks.h"
+#include "hooks.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/simpos.h"
+#include "simpos.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
-#include "libguile/hashtab.h"
+#include "hashtab.h"
-#include "libguile/deprecation.h"
+#include "deprecation.h"
-#include "libguile/gc.h"
+#include "gc.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
-#include "libguile/bdw-gc.h"
+#include "bdw-gc.h"
 /* For GC_set_start_callback.  */
 #include <gc/gc_mark.h>
 #ifdef GUILE_DEBUG_MALLOC
-#include "libguile/debug-malloc.h"
+#include "debug-malloc.h"
 #endif
 #include <unistd.h>
@ -628,7 +628,7 @@ scm_init_gc ()
  GC_set_warn_proc (scm_gc_warn_proc);
  GC_set_start_callback (run_before_gc_c_hook);
-#include "libguile/gc.x"
+#include "gc.x"
 }
--- a/libguile/gen-scmconfig.c
+++ b/libguile/gen-scmconfig.c
@ -135,11 +135,11 @@
 #  include <config.h>
 #endif
 #include <libguile/gen-scmconfig.h>
 #include <stdio.h>
 #include <string.h>
 #include "gen-scmconfig.h"
 #define pf printf
 int
--- a/libguile/generalized-arrays.c
+++ b/libguile/generalized-arrays.c
@ -27,12 +27,12 @@
 #include <errno.h>
 #include <string.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/array-handle.h"
+#include "array-handle.h"
-#include "libguile/generalized-arrays.h"
+#include "generalized-arrays.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
 SCM_INTERNAL SCM scm_i_array_ref (SCM v,
@ -404,5 +404,5 @@ SCM_DEFINE (scm_array_to_list, "array->list", 1, 0, 0,
 void
 scm_init_generalized_arrays ()
 {
-#include "libguile/generalized-arrays.x"
+#include "generalized-arrays.x"
 }
--- a/libguile/generalized-vectors.c
+++ b/libguile/generalized-vectors.c
@ -24,10 +24,10 @@
 #  include <config.h>
 #endif
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/error.h"
+#include "error.h"
-#include "libguile/generalized-vectors.h"
+#include "generalized-vectors.h"
 struct scm_t_vector_ctor
@ -70,5 +70,5 @@ SCM_DEFINE (scm_make_generalized_vector, "make-generalized-vector", 2, 1, 0,
 void
 scm_init_generalized_vectors ()
 {
-#include "libguile/generalized-vectors.x"
+#include "generalized-vectors.x"
 }
--- a/libguile/gettext.c
+++ b/libguile/gettext.c
@ -21,13 +21,13 @@
 # include <config.h>
 #endif
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/feature.h"
+#include "feature.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
-#include "libguile/gettext.h"
+#include "gettext.h"
 #include "libgettext.h"
 #include <locale.h>
@ -322,6 +322,6 @@ scm_init_gettext ()
     now.  */
  scm_add_feature ("i18n");
-#include "libguile/gettext.x"
+#include "gettext.x"
 }
--- a/libguile/goops.c
+++ b/libguile/goops.c
@ -28,33 +28,33 @@
 # include <config.h>
 #endif
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/async.h"
+#include "async.h"
-#include "libguile/chars.h"
+#include "chars.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/extensions.h"
+#include "extensions.h"
-#include "libguile/foreign.h"
+#include "foreign.h"
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/hashtab.h"
+#include "hashtab.h"
-#include "libguile/keywords.h"
+#include "keywords.h"
-#include "libguile/macros.h"
+#include "macros.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/ports-internal.h"
+#include "ports-internal.h"
-#include "libguile/procprop.h"
+#include "procprop.h"
-#include "libguile/programs.h"
+#include "programs.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/strports.h"
+#include "strports.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/variable.h"
+#include "variable.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
-#include "libguile/weak-table.h"
+#include "weak-table.h"
-#include "libguile/goops.h"
+#include "goops.h"
 /* Objects have identity, so references to classes and instances are by
   value, not by reference.  Redefinition of a class or modification of
@ -985,7 +985,7 @@ scm_init_goops_builtins (void *unused)
 {
  scm_module_goops = scm_current_module ();
-#include "libguile/goops.x"
+#include "goops.x"
  scm_c_define ("vtable-flag-vtable",
                scm_from_int (SCM_VTABLE_FLAG_VTABLE));
--- a/libguile/gsubr.c
+++ b/libguile/gsubr.c
@ -25,16 +25,16 @@
 #include <stdio.h>
 #include <stdarg.h>
-#include "libguile/foreign.h"
+#include "foreign.h"
-#include "libguile/frames.h"
+#include "frames.h"
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/instructions.h"
+#include "instructions.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/private-options.h"
+#include "private-options.h"
-#include "libguile/programs.h"
+#include "programs.h"
-#include "libguile/srfi-4.h"
+#include "srfi-4.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
 /*
@ -372,5 +372,5 @@ scm_c_define_gsubr_with_generic (const char *name,
 void
 scm_init_gsubr()
 {
-#include "libguile/gsubr.x"
+#include "gsubr.x"
 }
--- a/libguile/guardians.c
+++ b/libguile/guardians.c
@ -49,22 +49,22 @@
 # include <config.h>
 #endif
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/bdw-gc.h"
+#include "bdw-gc.h"
-#include "libguile/deprecation.h"
+#include "deprecation.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/guardians.h"
+#include "guardians.h"
-#include "libguile/hashtab.h"
+#include "hashtab.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/print.h"
+#include "print.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/threads.h"
+#include "threads.h"
-#include "libguile/weak-vector.h"
+#include "weak-vector.h"
 static scm_t_bits tc16_guardian;
@ -377,5 +377,5 @@ scm_init_guardians ()
  scm_set_smob_print (tc16_guardian, guardian_print);
  scm_set_smob_apply (tc16_guardian, guardian_apply, 0, 1, 0);
-#include "libguile/guardians.x"
+#include "guardians.x"
 }
--- a/libguile/guile.c
+++ b/libguile/guile.c
@ -28,14 +28,6 @@
 #  include <config.h>
 #endif
 #ifdef __MINGW32__
 # define SCM_IMPORT 1
 #endif
 #include <libguile.h>
 #ifdef HAVE_CONFIG_H
 #include <libguile/scmconfig.h>
 #endif
 #include <ltdl.h>
 #include <locale.h>
 #include <stdio.h>
@ -44,6 +36,8 @@
 #include <winsock2.h>
 #endif
 #include <libguile.h>
 static void
 inner_main (void *closure SCM_UNUSED, int argc, char **argv)
 {
--- a/libguile/hash.c
+++ b/libguile/hash.c
@ -31,19 +31,19 @@
 #include <string.h>
 #include <unistr.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/chars.h"
+#include "chars.h"
-#include "libguile/foreign.h"
+#include "foreign.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/struct.h"
+#include "struct.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/syntax.h"
+#include "syntax.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
-#include "libguile/hash.h"
+#include "hash.h"
 #ifndef floor
@ -431,6 +431,6 @@ SCM_DEFINE (scm_hash, "hash", 2, 0, 0,
 void
 scm_init_hash ()
 {
-#include "libguile/hash.x"
+#include "hash.x"
 }
--- a/libguile/hashtab.c
+++ b/libguile/hashtab.c
@ -27,21 +27,21 @@
 #include <stdio.h>
 #include <assert.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/alist.h"
+#include "alist.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/bdw-gc.h"
+#include "bdw-gc.h"
-#include "libguile/eq.h"
+#include "eq.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/hash.h"
+#include "hash.h"
-#include "libguile/hashtab.h"
+#include "hashtab.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/procs.h"
+#include "procs.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
-#include "libguile/weak-table.h"
+#include "weak-table.h"
@ -1074,5 +1074,5 @@ scm_internal_hash_for_each_handle (scm_t_hash_handle_fn fn, void *closure,
 void
 scm_init_hashtab ()
 {
-#include "libguile/hashtab.x"
+#include "hashtab.x"
 }
--- a/libguile/hooks.c
+++ b/libguile/hooks.c
@ -24,19 +24,19 @@
 #endif
 #include <stdio.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/procprop.h"
+#include "procprop.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/hooks.h"
+#include "hooks.h"
 /* Scheme level hooks
@ -228,5 +228,5 @@ scm_init_hooks ()
 {
  scm_tc16_hook = scm_make_smob_type ("hook", 0);
  scm_set_smob_print (scm_tc16_hook, hook_print);
-#include "libguile/hooks.x"
+#include "hooks.x"
 }
--- a/libguile/i18n.c
+++ b/libguile/i18n.c
@ -22,24 +22,24 @@
 #include <alloca.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/extensions.h"
+#include "extensions.h"
-#include "libguile/feature.h"
+#include "feature.h"
-#include "libguile/i18n.h"
+#include "i18n.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/chars.h"
+#include "chars.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
-#include "libguile/syscalls.h"
+#include "syscalls.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/values.h"
+#include "values.h"
-#include "libguile/variable.h"
+#include "variable.h"
-#include "libguile/threads.h"
+#include "threads.h"
 #include <locale.h>
 #include <string.h> /* `strcoll ()' */
@ -65,7 +65,7 @@
 # define USE_GNU_LOCALE_API
 #endif
-#include "libguile/posix.h"  /* for `scm_i_locale_mutex' */
+#include "posix.h"  /* for `scm_i_locale_mutex' */
 /* Use Gnulib's header, which also provides `nl_item' & co.  */
 #include <langinfo.h>
@ -1835,7 +1835,7 @@ scm_init_i18n ()
  scm_add_feature ("nl-langinfo");
  define_langinfo_items ();
-#include "libguile/i18n.x"
+#include "i18n.x"
  /* Initialize the global locale object with a special `locale' SMOB.  */
  /* XXX: We don't define it as `LC_GLOBAL_LOCALE' because of bugs as of
--- a/libguile/init.c
+++ b/libguile/init.c
@ -33,121 +33,121 @@
 /* Everybody has an init function.  */
-#include "libguile/alist.h"
+#include "alist.h"
-#include "libguile/async.h"
+#include "async.h"
-#include "libguile/atomic.h"
+#include "atomic.h"
-#include "libguile/backtrace.h"
+#include "backtrace.h"
-#include "libguile/bitvectors.h"
+#include "bitvectors.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/bytevectors.h"
+#include "bytevectors.h"
-#include "libguile/chars.h"
+#include "chars.h"
-#include "libguile/control.h"
+#include "control.h"
-#include "libguile/continuations.h"
+#include "continuations.h"
-#include "libguile/debug.h"
+#include "debug.h"
 #ifdef GUILE_DEBUG_MALLOC
-#include "libguile/debug-malloc.h"
+#include "debug-malloc.h"
 #endif
-#include "libguile/deprecation.h"
+#include "deprecation.h"
-#include "libguile/dynl.h"
+#include "dynl.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
-#include "libguile/eq.h"
+#include "eq.h"
-#include "libguile/error.h"
+#include "error.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/evalext.h"
+#include "evalext.h"
-#include "libguile/expand.h"
+#include "expand.h"
-#include "libguile/fdes-finalizers.h"
+#include "fdes-finalizers.h"
-#include "libguile/feature.h"
+#include "feature.h"
-#include "libguile/filesys.h"
+#include "filesys.h"
-#include "libguile/finalizers.h"
+#include "finalizers.h"
-#include "libguile/fluids.h"
+#include "fluids.h"
-#include "libguile/foreign.h"
+#include "foreign.h"
-#include "libguile/fports.h"
+#include "fports.h"
-#include "libguile/frames.h"
+#include "frames.h"
-#include "libguile/gc.h"
+#include "gc.h"
-#include "libguile/generalized-arrays.h"
+#include "generalized-arrays.h"
-#include "libguile/generalized-vectors.h"
+#include "generalized-vectors.h"
-#include "libguile/goops.h"
+#include "goops.h"
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/hash.h"
+#include "hash.h"
-#include "libguile/hashtab.h"
+#include "hashtab.h"
-#include "libguile/hooks.h"
+#include "hooks.h"
-#include "libguile/gettext.h"
+#include "gettext.h"
-#include "libguile/i18n.h"
+#include "i18n.h"
-#include "libguile/instructions.h"
+#include "instructions.h"
-#include "libguile/intrinsics.h"
+#include "intrinsics.h"
-#include "libguile/ioext.h"
+#include "ioext.h"
-#include "libguile/keywords.h"
+#include "keywords.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/load.h"
+#include "load.h"
-#include "libguile/macros.h"
+#include "macros.h"
-#include "libguile/mallocs.h"
+#include "mallocs.h"
-#include "libguile/memoize.h"
+#include "memoize.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/net_db.h"
+#include "net_db.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/loader.h"
+#include "loader.h"
-#include "libguile/objprop.h"
+#include "objprop.h"
-#include "libguile/options.h"
+#include "options.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/poll.h"
+#include "poll.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/posix.h"
+#include "posix.h"
 #ifdef ENABLE_REGEX
-#include "libguile/regex-posix.h"
+#include "regex-posix.h"
 #endif
-#include "libguile/print.h"
+#include "print.h"
-#include "libguile/procprop.h"
+#include "procprop.h"
-#include "libguile/procs.h"
+#include "procs.h"
-#include "libguile/programs.h"
+#include "programs.h"
-#include "libguile/promises.h"
+#include "promises.h"
-#include "libguile/array-map.h"
+#include "array-map.h"
-#include "libguile/random.h"
+#include "random.h"
-#include "libguile/rdelim.h"
+#include "rdelim.h"
-#include "libguile/read.h"
+#include "read.h"
-#include "libguile/rw.h"
+#include "rw.h"
-#include "libguile/scmsigs.h"
+#include "scmsigs.h"
-#include "libguile/script.h"
+#include "script.h"
-#include "libguile/simpos.h"
+#include "simpos.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/socket.h"
+#include "socket.h"
-#include "libguile/sort.h"
+#include "sort.h"
-#include "libguile/srcprop.h"
+#include "srcprop.h"
-#include "libguile/stackchk.h"
+#include "stackchk.h"
-#include "libguile/stacks.h"
+#include "stacks.h"
-#include "libguile/stime.h"
+#include "stime.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/srfi-1.h"
+#include "srfi-1.h"
-#include "libguile/srfi-4.h"
+#include "srfi-4.h"
-#include "libguile/srfi-13.h"
+#include "srfi-13.h"
-#include "libguile/srfi-14.h"
+#include "srfi-14.h"
-#include "libguile/srfi-60.h"
+#include "srfi-60.h"
-#include "libguile/strorder.h"
+#include "strorder.h"
-#include "libguile/strports.h"
+#include "strports.h"
-#include "libguile/struct.h"
+#include "struct.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/syntax.h"
+#include "syntax.h"
-#include "libguile/throw.h"
+#include "throw.h"
-#include "libguile/arrays.h"
+#include "arrays.h"
-#include "libguile/trees.h"
+#include "trees.h"
-#include "libguile/unicode.h"
+#include "unicode.h"
-#include "libguile/values.h"
+#include "values.h"
-#include "libguile/variable.h"
+#include "variable.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
-#include "libguile/version.h"
+#include "version.h"
-#include "libguile/vm.h"
+#include "vm.h"
-#include "libguile/vports.h"
+#include "vports.h"
-#include "libguile/guardians.h"
+#include "guardians.h"
-#include "libguile/extensions.h"
+#include "extensions.h"
-#include "libguile/uniform.h"
+#include "uniform.h"
-#include "libguile/deprecated.h"
+#include "deprecated.h"
-#include "libguile/weak-set.h"
+#include "weak-set.h"
-#include "libguile/weak-table.h"
+#include "weak-table.h"
-#include "libguile/weak-vector.h"
+#include "weak-vector.h"
-#include "libguile/foreign-object.h"
+#include "foreign-object.h"
-#include "libguile/r6rs-ports.h"
+#include "r6rs-ports.h"
-#include "libguile/init.h"
+#include "init.h"
-#include "libguile/private-options.h"
+#include "private-options.h"
 #ifdef HAVE_STRING_H
 #include <string.h>
--- a/libguile/inline.c
+++ b/libguile/inline.c
@ -23,9 +23,9 @@
 #define SCM_IMPLEMENT_INLINES 1
 #define SCM_INLINE_C_IMPLEMENTING_INLINES 1
-#include "libguile/gc.h"
+#include "gc.h"
-#include "libguile/array-handle.h"
+#include "array-handle.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/strings.h"
+#include "strings.h"
--- a/libguile/instructions.c
+++ b/libguile/instructions.c
@ -22,12 +22,12 @@
 #include <string.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
 #include "threads.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
 #include "instructions.h"
 #include "extensions.h"
@ -201,6 +201,6 @@ scm_init_instructions (void)
 #undef INIT
 #ifndef SCM_MAGIC_SNARFER
-#include "libguile/instructions.x"
+#include "instructions.x"
 #endif
 }
--- a/libguile/intrinsics.c
+++ b/libguile/intrinsics.c
@ -20,7 +20,7 @@
 #  include <config.h>
 #endif
-#include "libguile/gsubr.h"
+#include "gsubr.h"
 #include "boolean.h"
 #include "alist.h"
 #include "cache-internal.h"
@ -28,9 +28,9 @@
 #include "fluids.h"
 #include "goops.h"
 #include "keywords.h"
-#include "libguile/modules.h"
+#include "modules.h"
 #include "numbers.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
 #include "intrinsics.h"
@ -322,6 +322,6 @@ void
 scm_init_intrinsics (void)
 {
 #ifndef SCM_MAGIC_SNARFER
-#include "libguile/intrinsics.x"
+#include "intrinsics.x"
 #endif
 }
--- a/libguile/ioext.c
+++ b/libguile/ioext.c
@ -27,22 +27,22 @@
 #include <stdio.h>
 #include <errno.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/async.h"
+#include "async.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
-#include "libguile/extensions.h"
+#include "extensions.h"
-#include "libguile/fdes-finalizers.h"
+#include "fdes-finalizers.h"
-#include "libguile/feature.h"
+#include "feature.h"
-#include "libguile/fports.h"
+#include "fports.h"
-#include "libguile/hashtab.h"
+#include "hashtab.h"
-#include "libguile/ioext.h"
+#include "ioext.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/ports-internal.h"
+#include "ports-internal.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/syscalls.h"
+#include "syscalls.h"
-#include "libguile/weak-set.h"
+#include "weak-set.h"
 #include <fcntl.h>
@ -312,7 +312,7 @@ SCM_DEFINE (scm_fdes_to_ports, "fdes->ports", 1, 0, 0,
 static void
 scm_init_ice_9_ioext (void)
 {
-#include "libguile/ioext.x"
+#include "ioext.x"
 }
 void 
--- a/libguile/keywords.c
+++ b/libguile/keywords.c
@ -26,18 +26,18 @@
 #include <string.h>
 #include <stdarg.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/async.h"
+#include "async.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
-#include "libguile/hashtab.h"
+#include "hashtab.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/keywords.h"
+#include "keywords.h"
@ -197,6 +197,6 @@ void
 scm_init_keywords ()
 {
  keyword_obarray = scm_c_make_hash_table (0);
-#include "libguile/keywords.x"
+#include "keywords.x"
 }
--- a/libguile/list.c
+++ b/libguile/list.c
@ -23,15 +23,15 @@
 # include <config.h>
 #endif
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/procs.h"
+#include "procs.h"
-#include "libguile/eq.h"
+#include "eq.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/eval.h"
+#include "eval.h"
 #include <stdarg.h>
@ -1008,5 +1008,5 @@ SCM_DEFINE (scm_filter_x, "filter!", 2, 0, 0,
 void
 scm_init_list ()
 {
-#include "libguile/list.x"
+#include "list.x"
 }
--- a/libguile/load.c
+++ b/libguile/load.c
@ -27,34 +27,34 @@
 #include <string.h>
 #include <stdio.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/alist.h"
+#include "alist.h"
-#include "libguile/chars.h"
+#include "chars.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
-#include "libguile/eq.h"
+#include "eq.h"
-#include "libguile/strports.h"
+#include "strports.h"
-#include "libguile/backtrace.h"
+#include "backtrace.h"
-#include "libguile/keywords.h"
+#include "keywords.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/filesys.h"
+#include "filesys.h"
-#include "libguile/fports.h"
+#include "fports.h"
-#include "libguile/libpath.h"
+#include "libpath.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/loader.h"
+#include "loader.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/read.h"
+#include "read.h"
-#include "libguile/srfi-13.h"
+#include "srfi-13.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/throw.h"
+#include "throw.h"
-#include "libguile/variable.h"
+#include "variable.h"
-#include "libguile/load.h"
+#include "load.h"
-#include "libguile/fluids.h"
+#include "fluids.h"
-#include "libguile/vm.h" /* for load-compiled/vm */
+#include "vm.h" /* for load-compiled/vm */
 #include <sys/types.h>
 #include <sys/stat.h>
@ -1372,7 +1372,7 @@ scm_init_load ()
  init_build_info ();
-#include "libguile/load.x"
+#include "load.x"
 }
 void
--- a/libguile/loader.c
+++ b/libguile/loader.c
@ -39,7 +39,7 @@
 #include <full-read.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
 #include "bytevectors.h"
 #include "boolean.h"
 #include "elf.h"
@ -828,7 +828,7 @@ void
 scm_init_loader (void)
 {
 #ifndef SCM_MAGIC_SNARFER
-#include "libguile/loader.x"
+#include "loader.x"
 #endif
  scm_c_define_gsubr ("find-mapped-elf-image", 1, 0, 0,
--- a/libguile/macros.c
+++ b/libguile/macros.c
@ -22,19 +22,19 @@
 # include <config.h>
 #endif
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/print.h"
+#include "print.h"
-#include "libguile/procs.h"
+#include "procs.h"
-#include "libguile/random.h"
+#include "random.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/macros.h"
+#include "macros.h"
-#include "libguile/variable.h"
+#include "variable.h"
-#include "libguile/private-options.h"
+#include "private-options.h"
 static scm_t_bits scm_tc16_macro;
@ -218,7 +218,7 @@ scm_init_macros ()
 {
  scm_tc16_macro = scm_make_smob_type ("macro", 0);
  scm_set_smob_print (scm_tc16_macro, macro_print);
-#include "libguile/macros.x"
+#include "macros.x"
  syntax_session_id = fresh_syntax_session_id();
  scm_c_define_gsubr ("syntax-session-id", 0, 0, 0, scm_syntax_session_id);
--- a/libguile/mallocs.c
+++ b/libguile/mallocs.c
@ -26,10 +26,10 @@
 #include <stdlib.h>
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/mallocs.h"
+#include "mallocs.h"
 #include <unistd.h>
--- a/libguile/memoize.c
+++ b/libguile/memoize.c
@ -27,28 +27,28 @@
 #include <string.h>
 #include <stdio.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/alist.h"
+#include "alist.h"
-#include "libguile/continuations.h"
+#include "continuations.h"
-#include "libguile/dynstack.h"
+#include "dynstack.h"
-#include "libguile/eq.h"
+#include "eq.h"
-#include "libguile/expand.h"
+#include "expand.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/macros.h"
+#include "macros.h"
-#include "libguile/memoize.h"
+#include "memoize.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/srcprop.h"
+#include "srcprop.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/print.h"
+#include "print.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/throw.h"
+#include "throw.h"
-#include "libguile/threads.h"
+#include "threads.h"
-#include "libguile/variable.h"
+#include "variable.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
@ -901,7 +901,7 @@ SCM_DEFINE (scm_sys_resolve_variable, "%resolve-variable", 2, 0, 0,
 void
 scm_init_memoize ()
 {
-#include "libguile/memoize.x"
+#include "memoize.x"
  wind = scm_c_make_gsubr ("wind", 2, 0, 0, do_wind);
  unwind = scm_c_make_gsubr ("unwind", 0, 0, 0, do_unwind);
--- a/libguile/modules.c
+++ b/libguile/modules.c
@ -24,24 +24,24 @@
 #include <stdarg.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/procprop.h"
+#include "procprop.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
-#include "libguile/keywords.h"
+#include "keywords.h"
-#include "libguile/hashtab.h"
+#include "hashtab.h"
-#include "libguile/struct.h"
+#include "struct.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/variable.h"
+#include "variable.h"
-#include "libguile/fluids.h"
+#include "fluids.h"
-#include "libguile/deprecation.h"
+#include "deprecation.h"
-#include "libguile/modules.h"
+#include "modules.h"
 int scm_module_system_booted_p = 0;
@ -875,7 +875,7 @@ scm_modules_prehistory ()
 void
 scm_init_modules ()
 {
-#include "libguile/modules.x"
+#include "modules.x"
  module_make_local_var_x_var = scm_c_define ("module-make-local-var!",
 					    SCM_UNDEFINED);
  the_module = scm_make_fluid ();
--- a/libguile/net_db.c
+++ b/libguile/net_db.c
@ -45,21 +45,21 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/feature.h"
+#include "feature.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/throw.h"
+#include "throw.h"
-#include "libguile/net_db.h"
+#include "net_db.h"
-#include "libguile/socket.h"
+#include "socket.h"
 #if defined (HAVE_H_ERRNO)
@ -728,5 +728,5 @@ void
 scm_init_net_db ()
 {
  scm_add_feature ("net-db");
-#include "libguile/net_db.x"
+#include "net_db.x"
 }
--- a/libguile/null-threads.c
+++ b/libguile/null-threads.c
@ -24,7 +24,7 @@
 #if SCM_USE_NULL_THREADS
-#include "libguile/null-threads.h"
+#include "null-threads.h"
 static scm_i_pthread_key_t *all_keys = NULL;
--- a/libguile/numbers.c
+++ b/libguile/numbers.c
@ -59,23 +59,23 @@
 #include <stdarg.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/feature.h"
+#include "feature.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/finalizers.h"
+#include "finalizers.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/bdw-gc.h"
+#include "bdw-gc.h"
-#include "libguile/goops.h"
+#include "goops.h"
-#include "libguile/values.h"
+#include "values.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/deprecation.h"
+#include "deprecation.h"
-#include "libguile/eq.h"
+#include "eq.h"
 /* values per glibc, if not already defined */
 #ifndef M_LOG10E
@ -9731,7 +9731,7 @@ scm_i_range_error (SCM bad_val, SCM min, SCM max)
 #define SIZEOF_TYPE              0
 #define SCM_TO_TYPE_PROTO(arg)   scm_to_signed_integer (arg, scm_t_intmax min, scm_t_intmax max)
 #define SCM_FROM_TYPE_PROTO(arg) scm_from_signed_integer (arg)
-#include "libguile/conv-integer.i.c"
+#include "conv-integer.i.c"
 #define TYPE                     scm_t_uintmax
 #define TYPE_MIN                 min
@ -9739,7 +9739,7 @@ scm_i_range_error (SCM bad_val, SCM min, SCM max)
 #define SIZEOF_TYPE              0
 #define SCM_TO_TYPE_PROTO(arg)   scm_to_unsigned_integer (arg, scm_t_uintmax min, scm_t_uintmax max)
 #define SCM_FROM_TYPE_PROTO(arg) scm_from_unsigned_integer (arg)
-#include "libguile/conv-uinteger.i.c"
+#include "conv-uinteger.i.c"
 #define TYPE                     scm_t_int8
 #define TYPE_MIN                 INT8_MIN
@ -9747,7 +9747,7 @@ scm_i_range_error (SCM bad_val, SCM min, SCM max)
 #define SIZEOF_TYPE              1
 #define SCM_TO_TYPE_PROTO(arg)   scm_to_int8 (arg)
 #define SCM_FROM_TYPE_PROTO(arg) scm_from_int8 (arg)
-#include "libguile/conv-integer.i.c"
+#include "conv-integer.i.c"
 #define TYPE                     scm_t_uint8
 #define TYPE_MIN                 0
@ -9755,7 +9755,7 @@ scm_i_range_error (SCM bad_val, SCM min, SCM max)
 #define SIZEOF_TYPE              1
 #define SCM_TO_TYPE_PROTO(arg)   scm_to_uint8 (arg)
 #define SCM_FROM_TYPE_PROTO(arg) scm_from_uint8 (arg)
-#include "libguile/conv-uinteger.i.c"
+#include "conv-uinteger.i.c"
 #define TYPE                     scm_t_int16
 #define TYPE_MIN                 INT16_MIN
@ -9763,7 +9763,7 @@ scm_i_range_error (SCM bad_val, SCM min, SCM max)
 #define SIZEOF_TYPE              2
 #define SCM_TO_TYPE_PROTO(arg)   scm_to_int16 (arg)
 #define SCM_FROM_TYPE_PROTO(arg) scm_from_int16 (arg)
-#include "libguile/conv-integer.i.c"
+#include "conv-integer.i.c"
 #define TYPE                     scm_t_uint16
 #define TYPE_MIN                 0
@ -9771,7 +9771,7 @@ scm_i_range_error (SCM bad_val, SCM min, SCM max)
 #define SIZEOF_TYPE              2
 #define SCM_TO_TYPE_PROTO(arg)   scm_to_uint16 (arg)
 #define SCM_FROM_TYPE_PROTO(arg) scm_from_uint16 (arg)
-#include "libguile/conv-uinteger.i.c"
+#include "conv-uinteger.i.c"
 #define TYPE                     scm_t_int32
 #define TYPE_MIN                 INT32_MIN
@ -9779,7 +9779,7 @@ scm_i_range_error (SCM bad_val, SCM min, SCM max)
 #define SIZEOF_TYPE              4
 #define SCM_TO_TYPE_PROTO(arg)   scm_to_int32 (arg)
 #define SCM_FROM_TYPE_PROTO(arg) scm_from_int32 (arg)
-#include "libguile/conv-integer.i.c"
+#include "conv-integer.i.c"
 #define TYPE                     scm_t_uint32
 #define TYPE_MIN                 0
@ -9787,7 +9787,7 @@ scm_i_range_error (SCM bad_val, SCM min, SCM max)
 #define SIZEOF_TYPE              4
 #define SCM_TO_TYPE_PROTO(arg)   scm_to_uint32 (arg)
 #define SCM_FROM_TYPE_PROTO(arg) scm_from_uint32 (arg)
-#include "libguile/conv-uinteger.i.c"
+#include "conv-uinteger.i.c"
 #define TYPE                     scm_t_wchar
 #define TYPE_MIN                 (scm_t_int32)-1
@ -9795,7 +9795,7 @@ scm_i_range_error (SCM bad_val, SCM min, SCM max)
 #define SIZEOF_TYPE              4
 #define SCM_TO_TYPE_PROTO(arg)   scm_to_wchar (arg)
 #define SCM_FROM_TYPE_PROTO(arg) scm_from_wchar (arg)
-#include "libguile/conv-integer.i.c"
+#include "conv-integer.i.c"
 #define TYPE                     scm_t_int64
 #define TYPE_MIN                 INT64_MIN
@ -9803,7 +9803,7 @@ scm_i_range_error (SCM bad_val, SCM min, SCM max)
 #define SIZEOF_TYPE              8
 #define SCM_TO_TYPE_PROTO(arg)   scm_to_int64 (arg)
 #define SCM_FROM_TYPE_PROTO(arg) scm_from_int64 (arg)
-#include "libguile/conv-integer.i.c"
+#include "conv-integer.i.c"
 #define TYPE                     scm_t_uint64
 #define TYPE_MIN                 0
@ -9811,7 +9811,7 @@ scm_i_range_error (SCM bad_val, SCM min, SCM max)
 #define SIZEOF_TYPE              8
 #define SCM_TO_TYPE_PROTO(arg)   scm_to_uint64 (arg)
 #define SCM_FROM_TYPE_PROTO(arg) scm_from_uint64 (arg)
-#include "libguile/conv-uinteger.i.c"
+#include "conv-uinteger.i.c"
 void
 scm_to_mpz (SCM val, mpz_t rop)
@ -10376,5 +10376,5 @@ scm_init_numbers ()
                  DBL_MANT_DIG - 1);
  }
-#include "libguile/numbers.x"
+#include "numbers.x"
 }
--- a/libguile/objprop.c
+++ b/libguile/objprop.c
@ -22,13 +22,13 @@
 # include <config.h>
 #endif
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/alist.h"
+#include "alist.h"
-#include "libguile/async.h"
+#include "async.h"
-#include "libguile/hashtab.h"
+#include "hashtab.h"
-#include "libguile/objprop.h"
+#include "objprop.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/weak-table.h"
+#include "weak-table.h"
 /* {Object Properties}
@ -95,6 +95,6 @@ void
 scm_init_objprop ()
 {
  object_whash = scm_c_make_weak_table (0, SCM_WEAK_TABLE_KIND_KEY);
-#include "libguile/objprop.x"
+#include "objprop.x"
 }
--- a/libguile/options.c
+++ b/libguile/options.c
@ -22,15 +22,15 @@
 # include <config.h>
 #endif
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/mallocs.h"
+#include "mallocs.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/options.h"
+#include "options.h"
 /* {Run-time options}
@ -279,5 +279,5 @@ scm_init_opts (SCM (*func) (SCM), scm_t_option options[])
 void
 scm_init_options ()
 {
-#include "libguile/options.x"
+#include "options.x"
 }
--- a/libguile/pairs.c
+++ b/libguile/pairs.c
@ -23,9 +23,9 @@
 # include <config.h>
 #endif
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
 #include "verify.h"
@ -48,8 +48,8 @@ verify (SCM_BITS_DIFFER_IN_EXACTLY_ONE_BIT_POSITION		\
 #if (SCM_DEBUG_PAIR_ACCESSES == 1)
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/strings.h"
+#include "strings.h"
 void scm_error_pair_access (SCM non_pair)
 {
@ -333,7 +333,7 @@ SCM_DEFINE (scm_caaaar, "caaaar", 1, 0, 0, (SCM x), "")
 void
 scm_init_pairs ()
 {
-#include "libguile/pairs.x"
+#include "pairs.x"
  scm_c_define_gsubr ("cons", 2, 0, 0, scm_cons);
  scm_c_define_gsubr ("car", 1, 0, 0, scm_car);
  scm_c_define_gsubr ("cdr", 1, 0, 0, scm_cdr);
--- a/libguile/poll.c
+++ b/libguile/poll.c
@ -28,18 +28,18 @@
 #include <errno.h>
 #include <poll.h>
-#include "libguile/async.h"
+#include "async.h"
-#include "libguile/bytevectors.h"
+#include "bytevectors.h"
-#include "libguile/error.h"
+#include "error.h"
-#include "libguile/extensions.h"
+#include "extensions.h"
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/ports-internal.h"
+#include "ports-internal.h"
-#include "libguile/syscalls.h"
+#include "syscalls.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
-#include "libguile/poll.h"
+#include "poll.h"
--- a/libguile/ports.c
+++ b/libguile/ports.c
@ -38,38 +38,38 @@
 #include <unistr.h>
 #include <striconveh.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/async.h"
+#include "async.h"
-#include "libguile/atomics-internal.h"
+#include "atomics-internal.h"
-#include "libguile/deprecation.h"
+#include "deprecation.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/fports.h"  /* direct access for seek and truncate */
+#include "fports.h"  /* direct access for seek and truncate */
-#include "libguile/goops.h"
+#include "goops.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/chars.h"
+#include "chars.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
-#include "libguile/extensions.h"
+#include "extensions.h"
-#include "libguile/finalizers.h"
+#include "finalizers.h"
-#include "libguile/keywords.h"
+#include "keywords.h"
-#include "libguile/hashtab.h"
+#include "hashtab.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/mallocs.h"
+#include "mallocs.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/ports-internal.h"
+#include "ports-internal.h"
-#include "libguile/private-options.h"
+#include "private-options.h"
-#include "libguile/procs.h"
+#include "procs.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/syscalls.h"
+#include "syscalls.h"
-#include "libguile/variable.h"
+#include "variable.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
-#include "libguile/weak-set.h"
+#include "weak-set.h"
-#include "libguile/fluids.h"
+#include "fluids.h"
-#include "libguile/eq.h"
+#include "eq.h"
-#include "libguile/alist.h"
+#include "alist.h"
 #ifdef HAVE_STRING_H
 #include <string.h>
@ -4150,7 +4150,7 @@ SCM_DEFINE (scm_sys_make_void_port, "%make-void-port", 1, 0, 0,
 static void
 scm_init_ice_9_ports (void)
 {
-#include "libguile/ports.x"
+#include "ports.x"
  scm_c_define ("the-eof-object", SCM_EOF_VAL);
--- a/libguile/posix-w32.c
+++ b/libguile/posix-w32.c
@ -33,8 +33,8 @@
 #include <fcntl.h>
 #include "posix-w32.h"
-#include "libguile/gc.h"        /* for scm_*alloc, scm_strdup */
+#include "gc.h"        /* for scm_*alloc, scm_strdup */
-#include "libguile/threads.h"   /* for scm_i_scm_pthread_mutex_lock */
+#include "threads.h"   /* for scm_i_scm_pthread_mutex_lock */
 /*
 * Get name and information about current kernel.
--- a/libguile/posix.c
+++ b/libguile/posix.c
@ -62,30 +62,30 @@
 #include <io.h>
 #endif
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/async.h"
+#include "async.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
-#include "libguile/extensions.h"
+#include "extensions.h"
-#include "libguile/finalizers.h"
+#include "finalizers.h"
-#include "libguile/fports.h"
+#include "fports.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/bitvectors.h"
+#include "bitvectors.h"
-#include "libguile/scmsigs.h"
+#include "scmsigs.h"
-#include "libguile/feature.h"
+#include "feature.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/srfi-13.h"
+#include "srfi-13.h"
-#include "libguile/srfi-14.h"
+#include "srfi-14.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/syscalls.h"
+#include "syscalls.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
-#include "libguile/values.h"
+#include "values.h"
-#include "libguile/posix.h"
+#include "posix.h"
-#include "libguile/gettext.h"
+#include "gettext.h"
-#include "libguile/threads.h"
+#include "threads.h"
 #ifdef __MINGW32__
@ -2420,8 +2420,8 @@ scm_init_posix ()
  scm_c_define ("LOCK_NB", scm_from_int (LOCK_NB));
 #endif
-#include "libguile/cpp-SIG.c"
+#include "cpp-SIG.c"
-#include "libguile/posix.x"
+#include "posix.x"
 #ifdef HAVE_FORK
  scm_add_feature ("fork");
--- a/libguile/print.c
+++ b/libguile/print.c
@ -30,45 +30,45 @@
 #include <uniconv.h>
 #include <unictype.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/chars.h"
+#include "chars.h"
-#include "libguile/continuations.h"
+#include "continuations.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/control.h"
+#include "control.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/foreign.h"
+#include "foreign.h"
-#include "libguile/goops.h"
+#include "goops.h"
-#include "libguile/hashtab.h"
+#include "hashtab.h"
-#include "libguile/weak-set.h"
+#include "weak-set.h"
-#include "libguile/weak-table.h"
+#include "weak-table.h"
-#include "libguile/fluids.h"
+#include "fluids.h"
-#include "libguile/keywords.h"
+#include "keywords.h"
-#include "libguile/atomic.h"
+#include "atomic.h"
-#include "libguile/bitvectors.h"
+#include "bitvectors.h"
-#include "libguile/arrays.h"
+#include "arrays.h"
-#include "libguile/weak-vector.h"
+#include "weak-vector.h"
-#include "libguile/macros.h"
+#include "macros.h"
-#include "libguile/procprop.h"
+#include "procprop.h"
-#include "libguile/read.h"
+#include "read.h"
-#include "libguile/programs.h"
+#include "programs.h"
-#include "libguile/alist.h"
+#include "alist.h"
-#include "libguile/struct.h"
+#include "struct.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/ports-internal.h"
+#include "ports-internal.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/strports.h"
+#include "strports.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/syntax.h"
+#include "syntax.h"
-#include "libguile/variable.h"
+#include "variable.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/vm.h"
+#include "vm.h"
-#include "libguile/print.h"
+#include "print.h"
-#include "libguile/private-options.h"
+#include "private-options.h"
@ -1313,7 +1313,7 @@ scm_init_print ()
  scm_tc16_port_with_ps = scm_make_smob_type (0, 0);
  scm_set_smob_print (scm_tc16_port_with_ps, port_with_ps_print);
-#include "libguile/print.x"
+#include "print.x"
  scm_init_opts (scm_print_options, scm_print_opts);
  scm_print_opts[SCM_PRINT_HIGHLIGHT_PREFIX_I].val =
--- a/libguile/procprop.c
+++ b/libguile/procprop.c
@ -23,24 +23,24 @@
 # include <config.h>
 #endif
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/alist.h"
+#include "alist.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/procs.h"
+#include "procs.h"
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/threads.h"
+#include "threads.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
-#include "libguile/weak-table.h"
+#include "weak-table.h"
-#include "libguile/programs.h"
+#include "programs.h"
-#include "libguile/vm-builtins.h"
+#include "vm-builtins.h"
-#include "libguile/procprop.h"
+#include "procprop.h"
 SCM_GLOBAL_SYMBOL (scm_sym_system_procedure, "system-procedure");
@ -339,7 +339,7 @@ scm_init_procprop ()
 {
  overrides = scm_c_make_weak_table (0, SCM_WEAK_TABLE_KIND_KEY);
  arity_overrides = scm_c_make_weak_table (0, SCM_WEAK_TABLE_KIND_KEY);
-#include "libguile/procprop.x"
+#include "procprop.x"
  scm_init_vm_builtin_properties ();
 }
--- a/libguile/procs.c
+++ b/libguile/procs.c
@ -23,20 +23,20 @@
 # include <config.h>
 #endif
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/goops.h"
+#include "goops.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/struct.h"
+#include "struct.h"
-#include "libguile/deprecation.h"
+#include "deprecation.h"
-#include "libguile/procprop.h"
+#include "procprop.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/loader.h"
+#include "loader.h"
-#include "libguile/programs.h"
+#include "programs.h"
-#include "libguile/procs.h"
+#include "procs.h"
@ -133,5 +133,5 @@ scm_init_procs ()
                       1,
                       SCM_UNPACK (scm_from_latin1_symbol ("pwpw")));
-#include "libguile/procs.x"
+#include "procs.x"
 }
--- a/libguile/programs.c
+++ b/libguile/programs.c
@ -21,7 +21,7 @@
 #endif
 #include <string.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
 #include "boolean.h"
 #include "instructions.h"
 #include "alist.h"
@ -33,7 +33,7 @@
 #include "ports.h"
 #include "programs.h"
 #include "procprop.h" /* scm_sym_name */
-#include "libguile/variable.h"
+#include "variable.h"
 #include "vm.h"
@ -344,6 +344,6 @@ void
 scm_init_programs (void)
 {
 #ifndef SCM_MAGIC_SNARFER
-#include "libguile/programs.x"
+#include "programs.x"
 #endif
 }
--- a/libguile/promises.c
+++ b/libguile/promises.c
@ -25,37 +25,37 @@
 #include <alloca.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/alist.h"
+#include "alist.h"
-#include "libguile/async.h"
+#include "async.h"
-#include "libguile/continuations.h"
+#include "continuations.h"
-#include "libguile/debug.h"
+#include "debug.h"
-#include "libguile/deprecation.h"
+#include "deprecation.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
-#include "libguile/eq.h"
+#include "eq.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/feature.h"
+#include "feature.h"
-#include "libguile/fluids.h"
+#include "fluids.h"
-#include "libguile/goops.h"
+#include "goops.h"
-#include "libguile/hash.h"
+#include "hash.h"
-#include "libguile/hashtab.h"
+#include "hashtab.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/macros.h"
+#include "macros.h"
-#include "libguile/memoize.h"
+#include "memoize.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/print.h"
+#include "print.h"
-#include "libguile/procprop.h"
+#include "procprop.h"
-#include "libguile/procs.h"
+#include "procs.h"
-#include "libguile/programs.h"
+#include "programs.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/srcprop.h"
+#include "srcprop.h"
-#include "libguile/stackchk.h"
+#include "stackchk.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/threads.h"
+#include "threads.h"
-#include "libguile/throw.h"
+#include "throw.h"
-#include "libguile/values.h"
+#include "values.h"
-#include "libguile/promises.h"
+#include "promises.h"
@ -133,7 +133,7 @@ scm_init_promises ()
  scm_tc16_promise = scm_make_smob_type ("promise", 0);
  scm_set_smob_print (scm_tc16_promise, promise_print);
-#include "libguile/promises.x"
+#include "promises.x"
  scm_add_feature ("delay");
 }
--- a/libguile/r6rs-ports.c
+++ b/libguile/r6rs-ports.c
@ -26,21 +26,21 @@
 #include <stdio.h>
 #include <assert.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/bytevectors.h"
+#include "bytevectors.h"
-#include "libguile/chars.h"
+#include "chars.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/extensions.h"
+#include "extensions.h"
-#include "libguile/procs.h"
+#include "procs.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/r6rs-ports.h"
+#include "r6rs-ports.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/values.h"
+#include "values.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
-#include "libguile/ports-internal.h"
+#include "ports-internal.h"
@ -1176,5 +1176,5 @@ scm_register_r6rs_ports (void)
 void
 scm_init_r6rs_ports (void)
 {
-#include "libguile/r6rs-ports.x"
+#include "r6rs-ports.x"
 }
--- a/libguile/random.c
+++ b/libguile/random.c
@ -32,25 +32,25 @@
 #include <sys/types.h>
 #include <unistd.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/generalized-arrays.h"
+#include "generalized-arrays.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/feature.h"
+#include "feature.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/stime.h"
+#include "stime.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/arrays.h"
+#include "arrays.h"
-#include "libguile/srfi-4.h"
+#include "srfi-4.h"
-#include "libguile/variable.h"
+#include "variable.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
-#include "libguile/generalized-vectors.h"
+#include "generalized-vectors.h"
-#include "libguile/random.h"
+#include "random.h"
 /*
@ -802,7 +802,7 @@ scm_init_random ()
    for (i = m >> 1; i < m; ++i)
      scm_masktab[i] = m - 1;
-#include "libguile/random.x"
+#include "random.x"
  scm_add_feature ("random");
 }
--- a/libguile/rdelim.c
+++ b/libguile/rdelim.c
@ -20,9 +20,9 @@
 #  include <config.h>
 #endif
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
 #include <stdio.h>
@ -30,15 +30,15 @@
 #include <string.h>
 #endif
-#include "libguile/chars.h"
+#include "chars.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/rdelim.h"
+#include "rdelim.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/srfi-13.h"
+#include "srfi-13.h"
-#include "libguile/strports.h"
+#include "strports.h"
 SCM_DEFINE (scm_read_delimited_x, "%read-delimited!", 3, 3, 0,
            (SCM delims, SCM str, SCM gobble, SCM port, SCM start, SCM end),
@ -206,7 +206,7 @@ SCM_DEFINE (scm_write_line, "write-line", 1, 1, 0,
 SCM
 scm_init_rdelim_builtins (void)
 {
-#include "libguile/rdelim.x"
+#include "rdelim.x"
  return SCM_UNSPECIFIED;
 }
--- a/libguile/read.c
+++ b/libguile/read.c
@ -33,36 +33,36 @@
 #include <c-ctype.h>
 #include <alloca.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/bytevectors.h"
+#include "bytevectors.h"
-#include "libguile/chars.h"
+#include "chars.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/arrays.h"
+#include "arrays.h"
-#include "libguile/bitvectors.h"
+#include "bitvectors.h"
-#include "libguile/keywords.h"
+#include "keywords.h"
-#include "libguile/alist.h"
+#include "alist.h"
-#include "libguile/srcprop.h"
+#include "srcprop.h"
-#include "libguile/hashtab.h"
+#include "hashtab.h"
-#include "libguile/hash.h"
+#include "hash.h"
-#include "libguile/eq.h"
+#include "eq.h"
-#include "libguile/fluids.h"
+#include "fluids.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/ports-internal.h"
+#include "ports-internal.h"
-#include "libguile/fports.h"
+#include "fports.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/strports.h"
+#include "strports.h"
-#include "libguile/variable.h"
+#include "variable.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
-#include "libguile/srfi-4.h"
+#include "srfi-4.h"
-#include "libguile/srfi-13.h"
+#include "srfi-13.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/read.h"
+#include "read.h"
-#include "libguile/private-options.h"
+#include "private-options.h"
@ -2398,5 +2398,5 @@ scm_init_read ()
    SCM_VARIABLE_LOC (scm_c_define ("%read-hash-procedures", read_hash_procs));
  scm_init_opts (scm_read_options, scm_read_opts);
-#include "libguile/read.x"
+#include "read.x"
 }
--- a/libguile/regex-posix.c
+++ b/libguile/regex-posix.c
@ -35,8 +35,8 @@
 #include <string.h>
 #include <sys/types.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
 #include <regex.h>
@ -44,19 +44,19 @@
 #include <wchar.h>
 #endif
-#include "libguile/async.h"
+#include "async.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
-#include "libguile/strports.h"
+#include "strports.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/feature.h"
+#include "feature.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/regex-posix.h"
+#include "regex-posix.h"
 /* This is defined by some regex libraries and omitted by others. */
 #ifndef REG_BASIC
@ -332,7 +332,7 @@ scm_init_regex_posix ()
  scm_c_define ("regexp/notbol", scm_from_int (REG_NOTBOL));
  scm_c_define ("regexp/noteol", scm_from_int (REG_NOTEOL));
-#include "libguile/regex-posix.x"
+#include "regex-posix.x"
  scm_add_feature ("regex");
 }
--- a/libguile/rw.c
+++ b/libguile/rw.c
@ -27,17 +27,17 @@
 #include <errno.h>
 #include <string.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/async.h"
+#include "async.h"
-#include "libguile/fports.h"
+#include "fports.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/rw.h"
+#include "rw.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/strports.h"
+#include "strports.h"
-#include "libguile/syscalls.h"
+#include "syscalls.h"
-#include "libguile/ports-internal.h"
+#include "ports-internal.h"
 #include <unistd.h>
 #ifdef HAVE_IO_H
@ -272,7 +272,7 @@ SCM_DEFINE (scm_write_string_partial, "write-string/partial", 1, 3, 0,
 SCM 
 scm_init_rw_builtins ()
 {
-#include "libguile/rw.x"
+#include "rw.x"
  return SCM_UNSPECIFIED;
 }
--- a/libguile/scmsigs.c
+++ b/libguile/scmsigs.c
@ -41,24 +41,24 @@
 #include <full-write.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/async.h"
+#include "async.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
-#include "libguile/feature.h"
+#include "feature.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/procs.h"
+#include "procs.h"
-#include "libguile/variable.h"
+#include "variable.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
-#include "libguile/syscalls.h"
+#include "syscalls.h"
-#include "libguile/threads.h"
+#include "threads.h"
-#include "libguile/scmsigs.h"
+#include "scmsigs.h"
@ -754,6 +754,6 @@ scm_init_scmsigs ()
 #endif
 #endif /* defined(HAVE_SETITIMER) || defined(HAVE_GETITIMER) */
-#include "libguile/scmsigs.x"
+#include "scmsigs.x"
 }
--- a/libguile/script.c
+++ b/libguile/script.c
@ -30,18 +30,18 @@
 #include <ctype.h>
 #include <uniconv.h>
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/feature.h"
+#include "feature.h"
-#include "libguile/fluids.h"
+#include "fluids.h"
-#include "libguile/load.h"
+#include "load.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/read.h"
+#include "read.h"
-#include "libguile/script.h"
+#include "script.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/strports.h"
+#include "strports.h"
-#include "libguile/version.h"
+#include "version.h"
-#include "libguile/vm.h"
+#include "vm.h"
 #ifdef HAVE_STRING_H
 #include <string.h>
@ -430,5 +430,5 @@ scm_shell (int argc, char **argv)
 void
 scm_init_script ()
 {
-#include "libguile/script.x"
+#include "script.x"
 }
--- a/libguile/simpos.c
+++ b/libguile/simpos.c
@ -27,12 +27,12 @@
 #include <stdlib.h>  /* for getenv, system, exit, free */
 #include <unistd.h>  /* for _exit */
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/simpos.h"
+#include "simpos.h"
@ -138,6 +138,6 @@ SCM_DEFINE (scm_primitive__exit, "primitive-_exit", 0, 1, 0,
 void
 scm_init_simpos ()
 {
-#include "libguile/simpos.x"
+#include "simpos.x"
 }
--- a/libguile/smob.c
+++ b/libguile/smob.c
@ -27,18 +27,18 @@
 #include <stdlib.h>
 #include <errno.h>
-#include "libguile/async.h"
+#include "async.h"
-#include "libguile/goops.h"
+#include "goops.h"
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/finalizers.h"
+#include "finalizers.h"
-#include "libguile/instructions.h"
+#include "instructions.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/programs.h"
+#include "programs.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/bdw-gc.h"
+#include "bdw-gc.h"
 #include <gc/gc_mark.h>
--- a/libguile/socket.c
+++ b/libguile/socket.c
@ -46,24 +46,24 @@
 #include <gmp.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/async.h"
+#include "async.h"
-#include "libguile/arrays.h"
+#include "arrays.h"
-#include "libguile/bytevectors.h"
+#include "bytevectors.h"
-#include "libguile/feature.h"
+#include "feature.h"
-#include "libguile/fports.h"
+#include "fports.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
-#include "libguile/srfi-13.h"
+#include "srfi-13.h"
-#include "libguile/syscalls.h"
+#include "syscalls.h"
-#include "libguile/socket.h"
+#include "socket.h"
 #if defined (HAVE_UNIX_DOMAIN_SOCKETS) && !defined (SUN_LEN)
@ -1770,6 +1770,6 @@ scm_init_socket ()
  scm_add_feature ("socket");
-#include "libguile/socket.x"
+#include "socket.x"
 }
--- a/libguile/sort.c
+++ b/libguile/sort.c
@ -39,20 +39,20 @@
 # include <config.h>
 #endif
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/arrays.h"
+#include "arrays.h"
-#include "libguile/array-map.h"
+#include "array-map.h"
-#include "libguile/feature.h"
+#include "feature.h"
-#include "libguile/generalized-arrays.h"
+#include "generalized-arrays.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
-#include "libguile/async.h"
+#include "async.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
-#include "libguile/sort.h"
+#include "sort.h"
 /* We have two quicksort variants: one for SCM (#t) arrays and one for
   typed arrays.
@ -63,14 +63,14 @@
 #define VEC_PARAM   SCM * ra,
 #define GET(i)      ra[(i)*inc]
 #define SET(i, val) ra[(i)*inc] = val
-#include "libguile/quicksort.i.c"
+#include "quicksort.i.c"
 #define NAME        quicksorta
 #define INC_PARAM
 #define VEC_PARAM   scm_t_array_handle * const ra,
 #define GET(i)      scm_array_handle_ref (ra, scm_array_handle_pos_1 (ra, i))
 #define SET(i, val) scm_array_handle_set (ra, scm_array_handle_pos_1 (ra, i), val)
-#include "libguile/quicksort.i.c"
+#include "quicksort.i.c"
 SCM_DEFINE (scm_restricted_vector_sort_x, "restricted-vector-sort!", 4, 0, 0,
            (SCM vec, SCM less, SCM startpos, SCM endpos),
@ -646,7 +646,7 @@ SCM_DEFINE (scm_sort_list, "sort-list", 2, 0, 0,
 void
 scm_init_sort ()
 {
-#include "libguile/sort.x"
+#include "sort.x"
  scm_add_feature ("sort");
 }
--- a/libguile/srcprop.c
+++ b/libguile/srcprop.c
@ -24,25 +24,25 @@
 #include <errno.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/async.h"
+#include "async.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/alist.h"
+#include "alist.h"
-#include "libguile/debug.h"
+#include "debug.h"
-#include "libguile/hashtab.h"
+#include "hashtab.h"
-#include "libguile/hash.h"
+#include "hash.h"
-#include "libguile/keywords.h"
+#include "keywords.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/gc.h"
+#include "gc.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/weak-table.h"
+#include "weak-table.h"
-#include "libguile/srcprop.h"
+#include "srcprop.h"
-#include "libguile/private-options.h"
+#include "private-options.h"
 /* {Source Properties}
@ -360,6 +360,6 @@ scm_init_srcprop ()
  scm_last_alist_filename = scm_cons (SCM_EOL,
 				      scm_acons (SCM_EOL, SCM_EOL, SCM_EOL));
-#include "libguile/srcprop.x"
+#include "srcprop.x"
 }
--- a/libguile/srfi-1.c
+++ b/libguile/srfi-1.c
@ -24,18 +24,18 @@
 # include <config.h>
 #endif
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/eq.h"
+#include "eq.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/procs.h"
+#include "procs.h"
-#include "libguile/srfi-1.h"
+#include "srfi-1.h"
-#include "libguile/values.h"
+#include "values.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
-#include "libguile/extensions.h"
+#include "extensions.h"
 #include <stdarg.h>
@ -952,7 +952,7 @@ void
 scm_init_srfi_1 (void)
 {
 #ifndef SCM_MAGIC_SNARFER
-#include "libguile/srfi-1.x"
+#include "srfi-1.x"
 #endif
 }
--- a/libguile/srfi-13.c
+++ b/libguile/srfi-13.c
@ -28,18 +28,18 @@
 #include <unicase.h>
 #include <unictype.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include <libguile/deprecation.h>
+#include "deprecation.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/error.h"
+#include "error.h"
-#include "libguile/hash.h"
+#include "hash.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/procs.h"
+#include "procs.h"
-#include "libguile/srfi-13.h"
+#include "srfi-13.h"
-#include "libguile/srfi-14.h"
+#include "srfi-14.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
 #define MY_VALIDATE_SUBSTRING_SPEC(pos_str, str,              \
                                   pos_start, start, c_start, \
@ -3360,7 +3360,7 @@ SCM_DEFINE (scm_string_delete, "string-delete", 2, 2, 0,
 void
 scm_init_srfi_13 (void)
 {
-#include "libguile/srfi-13.x"
+#include "srfi-13.x"
 }
 /* End of srfi-13.c.  */
--- a/libguile/srfi-14.c
+++ b/libguile/srfi-14.c
@ -28,24 +28,24 @@
 #include <string.h>
 #include <unictype.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/chars.h"
+#include "chars.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/procs.h"
+#include "procs.h"
-#include "libguile/smob.h"
+#include "smob.h"
-#include "libguile/srfi-14.h"
+#include "srfi-14.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/values.h"
+#include "values.h"
 /* Include the pre-computed standard charset data.  */
-#include "libguile/srfi-14.i.c"
+#include "srfi-14.i.c"
 scm_t_char_range cs_full_ranges[] = {
  {0x0000, SCM_CODEPOINT_SURROGATE_START - 1}
@ -2118,7 +2118,7 @@ scm_init_srfi_14 (void)
  scm_char_set_designated = define_charset ("char-set:designated", &cs_designated);
  scm_char_set_full = define_charset ("char-set:full", &cs_full);
-#include "libguile/srfi-14.x"
+#include "srfi-14.x"
 }
 /* End of srfi-14.c.  */
--- a/libguile/srfi-4.c
+++ b/libguile/srfi-4.c
@ -24,19 +24,19 @@
 #include <string.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/bdw-gc.h"
+#include "bdw-gc.h"
-#include "libguile/srfi-4.h"
+#include "srfi-4.h"
-#include "libguile/bytevectors.h"
+#include "bytevectors.h"
-#include "libguile/error.h"
+#include "error.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/extensions.h"
+#include "extensions.h"
-#include "libguile/generalized-vectors.h"
+#include "generalized-vectors.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/uniform.h"
+#include "uniform.h"
-#include "libguile/variable.h"
+#include "variable.h"
 #define DEFINE_SCHEME_PROXY100(cname, modname, scmname)                   \
@ -296,7 +296,7 @@ scm_init_srfi_4 (void)
  REGISTER (c32, C32);
  REGISTER (c64, C64);
-#include "libguile/srfi-4.x"
+#include "srfi-4.x"
 }
 /* End of srfi-4.c.  */
--- a/libguile/srfi-60.c
+++ b/libguile/srfi-60.c
@ -24,16 +24,16 @@
 # include <config.h>
 #endif
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/eq.h"
+#include "eq.h"
-#include "libguile/extensions.h"
+#include "extensions.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/srfi-60.h"
+#include "srfi-60.h"
 SCM_DEFINE (scm_srfi60_log2_binary_factors, "log2-binary-factors", 1, 0, 0,
@ -458,6 +458,6 @@ void
 scm_init_srfi_60 (void)
 {
 #ifndef SCM_MAGIC_SNARFER
-#include "libguile/srfi-60.x"
+#include "srfi-60.x"
 #endif
 }
--- a/libguile/stackchk.c
+++ b/libguile/stackchk.c
@ -23,13 +23,13 @@
 # include <config.h>
 #endif
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/threads.h"
+#include "threads.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
-#include "libguile/stackchk.h"
+#include "stackchk.h"
 /* {Stack Checking}
@ -80,5 +80,5 @@ SCM_DEFINE (scm_sys_get_stack_size, "%get-stack-size", 0, 0, 0,
 void
 scm_init_stackchk ()
 {
-#include "libguile/stackchk.x"
+#include "stackchk.x"
 }
--- a/libguile/stacks.c
+++ b/libguile/stacks.c
@ -23,27 +23,27 @@
 # include <config.h>
 #endif
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/control.h"
+#include "control.h"
-#include "libguile/eval.h"
+#include "eval.h"
-#include "libguile/debug.h"
+#include "debug.h"
-#include "libguile/continuations.h"
+#include "continuations.h"
-#include "libguile/fluids.h"
+#include "fluids.h"
-#include "libguile/list.h"
+#include "list.h"
-#include "libguile/struct.h"
+#include "struct.h"
-#include "libguile/macros.h"
+#include "macros.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/procprop.h"
+#include "procprop.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/vm.h" /* to capture vm stacks */
+#include "vm.h" /* to capture vm stacks */
-#include "libguile/frames.h" /* vm frames */
+#include "frames.h" /* vm frames */
-#include "libguile/stacks.h"
+#include "stacks.h"
-#include "libguile/private-options.h"
+#include "private-options.h"
 static SCM scm_sys_stacks;
@ -471,5 +471,5 @@ scm_init_stacks ()
                                    SCM_UNDEFINED);
  scm_set_struct_vtable_name_x (scm_stack_type,
 				scm_from_latin1_symbol ("stack"));
-#include "libguile/stacks.x"
+#include "stacks.x"
 }
--- a/libguile/stime.c
+++ b/libguile/stime.c
@ -49,19 +49,19 @@
 #include <strftime.h>
 #include <unistr.h>
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/boolean.h"
+#include "boolean.h"
-#include "libguile/async.h"
+#include "async.h"
-#include "libguile/feature.h"
+#include "feature.h"
-#include "libguile/modules.h"
+#include "modules.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/vectors.h"
+#include "vectors.h"
-#include "libguile/dynwind.h"
+#include "dynwind.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/stime.h"
+#include "stime.h"
 #include <unistd.h>
 #include <time.h>				  /* Gnulib-provided */
@ -867,6 +867,6 @@ scm_init_stime()
    }
  scm_add_feature ("current-time");
-#include "libguile/stime.x"
+#include "stime.x"
 }
--- a/libguile/strings.c
+++ b/libguile/strings.c
@ -35,19 +35,19 @@
 #include "striconveh.h"
-#include "libguile/gsubr.h"
+#include "gsubr.h"
-#include "libguile/pairs.h"
+#include "pairs.h"
-#include "libguile/chars.h"
+#include "chars.h"
-#include "libguile/strings.h"
+#include "strings.h"
-#include "libguile/numbers.h"
+#include "numbers.h"
-#include "libguile/ports.h"
+#include "ports.h"
-#include "libguile/ports-internal.h"
+#include "ports-internal.h"
-#include "libguile/error.h"
+#include "error.h"
-#include "libguile/generalized-vectors.h"
+#include "generalized-vectors.h"
-#include "libguile/deprecation.h"
+#include "deprecation.h"
-#include "libguile/symbols.h"
+#include "symbols.h"
-#include "libguile/threads.h"
+#include "threads.h"
-#include "libguile/private-options.h"
+#include "private-options.h"
@ -2458,6 +2458,6 @@ scm_init_strings ()
 {
  scm_nullstr = scm_i_make_string (0, NULL, 0);
-#include "libguile/strings.x"
+#include "strings.x"
 }
--- a/Show more
+++ b/Show more