Make libguile header inclusion consistent within libguile c files

Change from '#include "libguile/foo.h"' and '#include <libguile/foo.h>'
to '#include "foo.h"'.

119 files changed, 1800 insertions, 1806 deletions

diff --git a/libguile/alist.c b/libguile/alist.c
index 5b80bf595..0a8861dc3 100644
--- a/libguile/alist.c
+++ b/libguile/alist.c
@@ -23,13 +23,13 @@
 # include <config.h>
 #endif
 
-#include "libguile/gsubr.h"
-#include "libguile/boolean.h"
-#include "libguile/eq.h"
-#include "libguile/list.h"
-#include "libguile/pairs.h"
-#include "libguile/numbers.h"
-#include "libguile/alist.h"
+#include "gsubr.h"
+#include "boolean.h"
+#include "eq.h"
+#include "list.h"
+#include "pairs.h"
+#include "numbers.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"
 }
 
diff --git a/libguile/array-handle.c b/libguile/array-handle.c
index b49b8e9ea..d8e8ff185 100644
--- a/libguile/array-handle.c
+++ b/libguile/array-handle.c
@@ -26,16 +26,16 @@
 
 #include <string.h>
 
-#include "libguile/bitvectors.h"
-#include "libguile/bytevectors.h"
-#include "libguile/list.h"
-#include "libguile/arrays.h"
-#include "libguile/numbers.h"
-#include "libguile/pairs.h"
-#include "libguile/strings.h"
-#include "libguile/symbols.h"
-#include "libguile/vectors.h"
-#include "libguile/array-handle.h"
+#include "bitvectors.h"
+#include "bytevectors.h"
+#include "list.h"
+#include "arrays.h"
+#include "numbers.h"
+#include "pairs.h"
+#include "strings.h"
+#include "symbols.h"
+#include "vectors.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"
 }
diff --git a/libguile/array-map.c b/libguile/array-map.c
index 1238df9ba..6205be065 100644
--- a/libguile/array-map.c
+++ b/libguile/array-map.c
@@ -28,26 +28,26 @@
 
 #include <string.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/boolean.h"
-#include "libguile/strings.h"
-#include "libguile/arrays.h"
-#include "libguile/smob.h"
-#include "libguile/chars.h"
-#include "libguile/eq.h"
-#include "libguile/eval.h"
-#include "libguile/feature.h"
-#include "libguile/vectors.h"
-#include "libguile/list.h"
-#include "libguile/numbers.h"
-#include "libguile/bitvectors.h"
-#include "libguile/srfi-4.h"
-#include "libguile/symbols.h"
-#include "libguile/procs.h"
-#include "libguile/generalized-arrays.h"
-
-#include "libguile/array-map.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "boolean.h"
+#include "strings.h"
+#include "arrays.h"
+#include "smob.h"
+#include "chars.h"
+#include "eq.h"
+#include "eval.h"
+#include "feature.h"
+#include "vectors.h"
+#include "list.h"
+#include "numbers.h"
+#include "bitvectors.h"
+#include "srfi-4.h"
+#include "symbols.h"
+#include "procs.h"
+#include "generalized-arrays.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);
 }
diff --git a/libguile/arrays.c b/libguile/arrays.c
index 92f78068e..fee0bd0a0 100644
--- a/libguile/arrays.c
+++ b/libguile/arrays.c
@@ -30,32 +30,32 @@
 
 #include "verify.h"
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/boolean.h"
-#include "libguile/eq.h"
-#include "libguile/chars.h"
-#include "libguile/eval.h"
-#include "libguile/fports.h"
-#include "libguile/feature.h"
-#include "libguile/modules.h"
-#include "libguile/strings.h"
-#include "libguile/srfi-13.h"
-#include "libguile/srfi-4.h"
-#include "libguile/vectors.h"
-#include "libguile/numbers.h"
-#include "libguile/bitvectors.h"
-#include "libguile/procs.h"
-#include "libguile/bytevectors.h"
-#include "libguile/list.h"
-#include "libguile/dynwind.h"
-#include "libguile/read.h"
-
-#include "libguile/arrays.h"
-#include "libguile/array-map.h"
-#include "libguile/generalized-vectors.h"
-#include "libguile/generalized-arrays.h"
-#include "libguile/uniform.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "boolean.h"
+#include "eq.h"
+#include "chars.h"
+#include "eval.h"
+#include "fports.h"
+#include "feature.h"
+#include "modules.h"
+#include "strings.h"
+#include "srfi-13.h"
+#include "srfi-4.h"
+#include "vectors.h"
+#include "numbers.h"
+#include "bitvectors.h"
+#include "procs.h"
+#include "bytevectors.h"
+#include "list.h"
+#include "dynwind.h"
+#include "read.h"
+
+#include "arrays.h"
+#include "array-map.h"
+#include "generalized-vectors.h"
+#include "generalized-arrays.h"
+#include "uniform.h"
 
 
 size_t
@@ -960,6 +960,6 @@ scm_init_arrays ()
 {
   scm_add_feature ("array");
 
-#include "libguile/arrays.x"
+#include "arrays.x"
 
 }
diff --git a/libguile/async.c b/libguile/async.c
index ddb815388..ee00dace2 100644
--- a/libguile/async.c
+++ b/libguile/async.c
@@ -23,17 +23,17 @@
 #  include <config.h>
 #endif
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/atomics-internal.h"
-#include "libguile/eval.h"
-#include "libguile/throw.h"
-#include "libguile/list.h"
-#include "libguile/smob.h"
-#include "libguile/dynwind.h"
-#include "libguile/deprecation.h"
-
-#include "libguile/async.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "atomics-internal.h"
+#include "eval.h"
+#include "throw.h"
+#include "list.h"
+#include "smob.h"
+#include "dynwind.h"
+#include "deprecation.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"
 }
diff --git a/libguile/atomic.c b/libguile/atomic.c
index 249d52a5b..2f1afd199 100644
--- a/libguile/atomic.c
+++ b/libguile/atomic.c
@@ -22,12 +22,12 @@
 # include <config.h>
 #endif
 
-#include "libguile/boolean.h"
-#include "libguile/gsubr.h"
-#include "libguile/extensions.h"
-#include "libguile/ports.h"
-#include "libguile/atomics-internal.h"
-#include "libguile/atomic.h"
+#include "boolean.h"
+#include "gsubr.h"
+#include "extensions.h"
+#include "ports.h"
+#include "atomics-internal.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
diff --git a/libguile/backtrace.c b/libguile/backtrace.c
index 959152d48..b5c9ce097 100644
--- a/libguile/backtrace.c
+++ b/libguile/backtrace.c
@@ -25,36 +25,36 @@
 #include <stdio.h>
 #include <ctype.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/boolean.h"
+#include "gsubr.h"
+#include "boolean.h"
 
 #include <unistd.h>
 #ifdef HAVE_IO_H
 #include <io.h>
 #endif
 
-#include "libguile/backtrace.h"
-#include "libguile/deprecation.h"
-#include "libguile/dynwind.h"
-#include "libguile/eval.h"
-#include "libguile/filesys.h"
-#include "libguile/fluids.h"
-#include "libguile/frames.h"
-#include "libguile/list.h"
-#include "libguile/keywords.h"
-#include "libguile/modules.h"
-#include "libguile/numbers.h"
-#include "libguile/ports.h"
-#include "libguile/posix.h"
-#include "libguile/private-options.h"
-#include "libguile/srcprop.h"
-#include "libguile/stacks.h"
-#include "libguile/strings.h"
-#include "libguile/strports.h"
-#include "libguile/struct.h"
-#include "libguile/symbols.h"
-#include "libguile/throw.h"
-#include "libguile/variable.h"
+#include "backtrace.h"
+#include "deprecation.h"
+#include "dynwind.h"
+#include "eval.h"
+#include "filesys.h"
+#include "fluids.h"
+#include "frames.h"
+#include "list.h"
+#include "keywords.h"
+#include "modules.h"
+#include "numbers.h"
+#include "ports.h"
+#include "posix.h"
+#include "private-options.h"
+#include "srcprop.h"
+#include "stacks.h"
+#include "strings.h"
+#include "strports.h"
+#include "struct.h"
+#include "symbols.h"
+#include "throw.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"
 }
diff --git a/libguile/bitvectors.c b/libguile/bitvectors.c
index 62f597753..c2e7ae3bd 100644
--- a/libguile/bitvectors.c
+++ b/libguile/bitvectors.c
@@ -25,17 +25,17 @@
 
 #include <string.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/boolean.h"
-#include "libguile/array-handle.h"
-#include "libguile/bitvectors.h"
-#include "libguile/generalized-vectors.h"
-#include "libguile/numbers.h"
-#include "libguile/list.h"
-#include "libguile/arrays.h"
-#include "libguile/ports.h"
-#include "libguile/srfi-4.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "boolean.h"
+#include "array-handle.h"
+#include "bitvectors.h"
+#include "generalized-vectors.h"
+#include "numbers.h"
+#include "list.h"
+#include "arrays.h"
+#include "ports.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"
 }
diff --git a/libguile/boolean.c b/libguile/boolean.c
index 57486cb8d..4521c8669 100644
--- 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 "libguile/error.h"
+#include "boolean.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"
 }
 
diff --git a/libguile/bytevectors.c b/libguile/bytevectors.c
index 37515fef1..c2a959740 100644
--- a/libguile/bytevectors.c
+++ b/libguile/bytevectors.c
@@ -36,22 +36,22 @@
 
 #include <gmp.h>
 
-#include "libguile/boolean.h"
-#include "libguile/gsubr.h"
-#include "libguile/dynwind.h"
-#include "libguile/extensions.h"
-#include "libguile/bytevectors.h"
-#include "libguile/generalized-vectors.h"
-#include "libguile/list.h"
-#include "libguile/numbers.h"
-#include "libguile/pairs.h"
-#include "libguile/ports.h"
-#include "libguile/strings.h"
-#include "libguile/symbols.h"
-#include "libguile/arrays.h"
-#include "libguile/array-handle.h"
-#include "libguile/uniform.h"
-#include "libguile/srfi-4.h"
+#include "boolean.h"
+#include "gsubr.h"
+#include "dynwind.h"
+#include "extensions.h"
+#include "bytevectors.h"
+#include "generalized-vectors.h"
+#include "list.h"
+#include "numbers.h"
+#include "pairs.h"
+#include "ports.h"
+#include "strings.h"
+#include "symbols.h"
+#include "arrays.h"
+#include "array-handle.h"
+#include "uniform.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"
 }
diff --git a/libguile/chars.c b/libguile/chars.c
index d3f312753..6d36957bc 100644
--- a/libguile/chars.c
+++ b/libguile/chars.c
@@ -29,13 +29,13 @@
 #include <unicase.h>
 #include <unictype.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/boolean.h"
-#include "libguile/chars.h"
-#include "libguile/numbers.h"
-#include "libguile/pairs.h"
-#include "libguile/symbols.h"
-#include "libguile/srfi-14.h"
+#include "gsubr.h"
+#include "boolean.h"
+#include "chars.h"
+#include "numbers.h"
+#include "pairs.h"
+#include "symbols.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"
 }
 
diff --git a/libguile/chooks.c b/libguile/chooks.c
index 5f6dbcf4e..9ec469e4c 100644
--- a/libguile/chooks.c
+++ b/libguile/chooks.c
@@ -25,8 +25,8 @@
 
 #include <stdio.h>
 
-#include "libguile/gc.h"
-#include "libguile/chooks.h"
+#include "gc.h"
+#include "chooks.h"
 
 
 /* C level hooks
diff --git a/libguile/continuations.c b/libguile/continuations.c
index 634fc9f33..a5459c018 100644
--- a/libguile/continuations.c
+++ b/libguile/continuations.c
@@ -30,26 +30,26 @@
 #include <ucontext.h>
 #endif
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/boolean.h"
-#include "libguile/async.h"
-#include "libguile/backtrace.h"
-#include "libguile/debug.h"
-#include "libguile/init.h"
-#include "libguile/list.h"
-#include "libguile/numbers.h"
-#include "libguile/smob.h"
-#include "libguile/stackchk.h"
-#include "libguile/stacks.h"
-#include "libguile/ports.h"
-#include "libguile/dynstack.h"
-#include "libguile/eval.h"
-#include "libguile/symbols.h"
-#include "libguile/vm.h"
-#include "libguile/instructions.h"
-
-#include "libguile/continuations.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "boolean.h"
+#include "async.h"
+#include "backtrace.h"
+#include "debug.h"
+#include "init.h"
+#include "list.h"
+#include "numbers.h"
+#include "smob.h"
+#include "stackchk.h"
+#include "stacks.h"
+#include "ports.h"
+#include "dynstack.h"
+#include "eval.h"
+#include "symbols.h"
+#include "vm.h"
+#include "instructions.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"
 }
diff --git a/libguile/control.c b/libguile/control.c
index da8e29d82..f954aefd0 100644
--- a/libguile/control.c
+++ b/libguile/control.c
@@ -22,16 +22,16 @@
 
 #include <alloca.h>
 
-#include "libguile/dynstack.h"
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/control.h"
-#include "libguile/extensions.h"
-#include "libguile/list.h"
-#include "libguile/programs.h"
-#include "libguile/threads.h"
-#include "libguile/instructions.h"
-#include "libguile/vm.h"
+#include "dynstack.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "control.h"
+#include "extensions.h"
+#include "list.h"
+#include "programs.h"
+#include "threads.h"
+#include "instructions.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,
diff --git a/libguile/debug-malloc.c b/libguile/debug-malloc.c
index bf18292d7..5e224da93 100644
--- 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 "libguile/alist.h"
-#include "libguile/numbers.h"
-#include "libguile/strings.h"
+#include "gsubr.h"
+#include "alist.h"
+#include "numbers.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"
 }
 
diff --git a/libguile/debug.c b/libguile/debug.c
index cc3862f5b..3146a7f91 100644
--- a/libguile/debug.c
+++ b/libguile/debug.c
@@ -35,35 +35,35 @@
 # include <windows.h>
 #endif
 
-#include "libguile/gsubr.h"
-#include "libguile/async.h"
-#include "libguile/eval.h"
-#include "libguile/list.h"
-#include "libguile/stackchk.h"
-#include "libguile/throw.h"
-#include "libguile/macros.h"
-#include "libguile/smob.h"
-#include "libguile/struct.h"
-#include "libguile/pairs.h"
-#include "libguile/procprop.h"
-#include "libguile/srcprop.h"
-#include "libguile/alist.h"
-#include "libguile/continuations.h"
-#include "libguile/strports.h"
-#include "libguile/read.h"
-#include "libguile/feature.h"
-#include "libguile/dynwind.h"
-#include "libguile/modules.h"
-#include "libguile/ports.h"
-#include "libguile/fluids.h"
-#include "libguile/programs.h"
-#include "libguile/memoize.h"
-#include "libguile/variable.h"
-#include "libguile/vm.h"
-
-#include "libguile/debug.h"
-
-#include "libguile/private-options.h"
+#include "gsubr.h"
+#include "async.h"
+#include "eval.h"
+#include "list.h"
+#include "stackchk.h"
+#include "throw.h"
+#include "macros.h"
+#include "smob.h"
+#include "struct.h"
+#include "pairs.h"
+#include "procprop.h"
+#include "srcprop.h"
+#include "alist.h"
+#include "continuations.h"
+#include "strports.h"
+#include "read.h"
+#include "feature.h"
+#include "dynwind.h"
+#include "modules.h"
+#include "ports.h"
+#include "fluids.h"
+#include "programs.h"
+#include "memoize.h"
+#include "variable.h"
+#include "vm.h"
+
+#include "debug.h"
+
+#include "private-options.h"
 
 
 
@@ -221,5 +221,5 @@ scm_init_debug ()
 
   scm_add_feature ("debug-extensions");
 
-#include "libguile/debug.x"
+#include "debug.x"
 }
diff --git a/libguile/deprecated.c b/libguile/deprecated.c
index b534b6515..f9cbdf037 100644
--- a/libguile/deprecated.c
+++ b/libguile/deprecated.c
@@ -22,8 +22,8 @@
 
 #define SCM_BUILDING_DEPRECATED_CODE
 
-#include "libguile/deprecation.h"
-#include "libguile/deprecated.h"
+#include "deprecation.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 */
diff --git a/libguile/deprecation.c b/libguile/deprecation.c
index cb6481405..d2116eb34 100644
--- a/libguile/deprecation.c
+++ b/libguile/deprecation.c
@@ -27,16 +27,16 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
+#include "gsubr.h"
+#include "pairs.h"
 
-#include "libguile/deprecation.h"
-#include "libguile/list.h"
-#include "libguile/strings.h"
-#include "libguile/ports.h"
-#include "libguile/threads.h"
+#include "deprecation.h"
+#include "list.h"
+#include "strings.h"
+#include "ports.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"
 }
diff --git a/libguile/dynl.c b/libguile/dynl.c
index 846df408e..d2cf78b24 100644
--- 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 "libguile/libpath.h"
-#include "libguile/dynl.h"
-#include "libguile/smob.h"
-#include "libguile/keywords.h"
-#include "libguile/list.h"
-#include "libguile/ports.h"
-#include "libguile/strings.h"
-#include "libguile/deprecation.h"
-#include "libguile/dynwind.h"
-#include "libguile/foreign.h"
-#include "libguile/threads.h"
-#include "libguile/gc.h"
+#include "gsubr.h"
+#include "libpath.h"
+#include "dynl.h"
+#include "smob.h"
+#include "keywords.h"
+#include "list.h"
+#include "ports.h"
+#include "strings.h"
+#include "deprecation.h"
+#include "dynwind.h"
+#include "foreign.h"
+#include "threads.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"
 }
diff --git a/libguile/dynstack.c b/libguile/dynstack.c
index cf10c689b..31c8ff059 100644
--- a/libguile/dynstack.c
+++ b/libguile/dynstack.c
@@ -26,11 +26,11 @@
 #include <assert.h>
 #include <setjmp.h>
 
-#include "libguile/control.h"
-#include "libguile/eval.h"
-#include "libguile/fluids.h"
-#include "libguile/dynstack.h"
-#include "libguile/variable.h"
+#include "control.h"
+#include "eval.h"
+#include "fluids.h"
+#include "dynstack.h"
+#include "variable.h"
 
 
 
diff --git a/libguile/dynwind.c b/libguile/dynwind.c
index bfd46749a..153d24c82 100644
--- a/libguile/dynwind.c
+++ b/libguile/dynwind.c
@@ -26,15 +26,15 @@
 
 #include <assert.h>
 
-#include "libguile/boolean.h"
-#include "libguile/dynstack.h"
-#include "libguile/eval.h"
-#include "libguile/threads.h"
-#include "libguile/pairs.h"
-#include "libguile/ports.h"
-#include "libguile/variable.h"
+#include "boolean.h"
+#include "dynstack.h"
+#include "eval.h"
+#include "threads.h"
+#include "pairs.h"
+#include "ports.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"
 }
diff --git a/libguile/eq.c b/libguile/eq.c
index 544f4dd0c..3241f010e 100644
--- a/libguile/eq.c
+++ b/libguile/eq.c
@@ -27,26 +27,26 @@
 #include <string.h>
 #endif
 
-#include "libguile/gsubr.h"
-#include "libguile/boolean.h"
-#include "libguile/array-map.h"
-#include "libguile/async.h"
-#include "libguile/bitvectors.h"
-#include "libguile/bytevectors.h"
-#include "libguile/eq.h"
-#include "libguile/eval.h"
-#include "libguile/foreign.h"
-#include "libguile/generalized-arrays.h"
-#include "libguile/goops.h"
-#include "libguile/hashtab.h"
-#include "libguile/pairs.h"
-#include "libguile/private-options.h"
-#include "libguile/smob.h"
-#include "libguile/stackchk.h"
-#include "libguile/strorder.h"
-#include "libguile/struct.h"
-#include "libguile/syntax.h"
-#include "libguile/vectors.h"
+#include "gsubr.h"
+#include "boolean.h"
+#include "array-map.h"
+#include "async.h"
+#include "bitvectors.h"
+#include "bytevectors.h"
+#include "eq.h"
+#include "eval.h"
+#include "foreign.h"
+#include "generalized-arrays.h"
+#include "goops.h"
+#include "hashtab.h"
+#include "pairs.h"
+#include "private-options.h"
+#include "smob.h"
+#include "stackchk.h"
+#include "strorder.h"
+#include "struct.h"
+#include "syntax.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"
 }
 
diff --git a/libguile/error.c b/libguile/error.c
index ea253b25c..83b17e585 100644
--- a/libguile/error.c
+++ b/libguile/error.c
@@ -28,18 +28,18 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/async.h"
-#include "libguile/dynwind.h"
-#include "libguile/list.h"
-#include "libguile/modules.h"
-#include "libguile/numbers.h"
-#include "libguile/pairs.h"
-#include "libguile/strings.h"
-#include "libguile/symbols.h"
-#include "libguile/throw.h"
-
-#include "libguile/error.h"
+#include "gsubr.h"
+#include "async.h"
+#include "dynwind.h"
+#include "list.h"
+#include "modules.h"
+#include "numbers.h"
+#include "pairs.h"
+#include "strings.h"
+#include "symbols.h"
+#include "throw.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 "libguile/error.x"
+#include "cpp-E.c"
+#include "error.x"
 }
 
diff --git a/libguile/eval.c b/libguile/eval.c
index f794911bb..0d45ef984 100644
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -26,46 +26,46 @@
 #include <alloca.h>
 #include <stdarg.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/boolean.h"
-#include "libguile/alist.h"
-#include "libguile/async.h"
-#include "libguile/continuations.h"
-#include "libguile/control.h"
-#include "libguile/debug.h"
-#include "libguile/deprecation.h"
-#include "libguile/dynwind.h"
-#include "libguile/eq.h"
-#include "libguile/eval.h"
-#include "libguile/expand.h"
-#include "libguile/feature.h"
-#include "libguile/fluids.h"
-#include "libguile/goops.h"
-#include "libguile/hash.h"
-#include "libguile/hashtab.h"
-#include "libguile/keywords.h"
-#include "libguile/list.h"
-#include "libguile/macros.h"
-#include "libguile/memoize.h"
-#include "libguile/modules.h"
-#include "libguile/numbers.h"
-#include "libguile/ports.h"
-#include "libguile/print.h"
-#include "libguile/private-options.h"
-#include "libguile/procprop.h"
-#include "libguile/programs.h"
-#include "libguile/smob.h"
-#include "libguile/srcprop.h"
-#include "libguile/stackchk.h"
-#include "libguile/strings.h"
-#include "libguile/symbols.h"
-#include "libguile/threads.h"
-#include "libguile/throw.h"
-#include "libguile/values.h"
-#include "libguile/variable.h"
-#include "libguile/vectors.h"
-#include "libguile/vm.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "boolean.h"
+#include "alist.h"
+#include "async.h"
+#include "continuations.h"
+#include "control.h"
+#include "debug.h"
+#include "deprecation.h"
+#include "dynwind.h"
+#include "eq.h"
+#include "eval.h"
+#include "expand.h"
+#include "feature.h"
+#include "fluids.h"
+#include "goops.h"
+#include "hash.h"
+#include "hashtab.h"
+#include "keywords.h"
+#include "list.h"
+#include "macros.h"
+#include "memoize.h"
+#include "modules.h"
+#include "numbers.h"
+#include "ports.h"
+#include "print.h"
+#include "private-options.h"
+#include "procprop.h"
+#include "programs.h"
+#include "smob.h"
+#include "srcprop.h"
+#include "stackchk.h"
+#include "strings.h"
+#include "symbols.h"
+#include "threads.h"
+#include "throw.h"
+#include "values.h"
+#include "variable.h"
+#include "vectors.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"
 }
diff --git a/libguile/evalext.c b/libguile/evalext.c
index 7f5a420ed..957fe0d0a 100644
--- a/libguile/evalext.c
+++ b/libguile/evalext.c
@@ -23,16 +23,16 @@
 # include <config.h>
 #endif
 
-#include "libguile/gsubr.h"
-#include "libguile/eval.h"
-#include "libguile/list.h"
-#include "libguile/fluids.h"
-#include "libguile/modules.h"
-#include "libguile/pairs.h"
-#include "libguile/symbols.h"
-#include "libguile/variable.h"
+#include "gsubr.h"
+#include "eval.h"
+#include "list.h"
+#include "fluids.h"
+#include "modules.h"
+#include "pairs.h"
+#include "symbols.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"
 }
diff --git a/libguile/expand.c b/libguile/expand.c
index a73d74f62..2a63d333d 100644
--- a/libguile/expand.c
+++ b/libguile/expand.c
@@ -23,26 +23,26 @@
 #  include <config.h>
 #endif
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/boolean.h"
-#include "libguile/alist.h"
-#include "libguile/continuations.h"
-#include "libguile/eq.h"
-#include "libguile/expand.h"
-#include "libguile/hashtab.h"
-#include "libguile/keywords.h"
-#include "libguile/list.h"
-#include "libguile/macros.h"
-#include "libguile/modules.h"
-#include "libguile/ports.h"
-#include "libguile/print.h"
-#include "libguile/srcprop.h"
-#include "libguile/strings.h"
-#include "libguile/symbols.h"
-#include "libguile/throw.h"
-#include "libguile/variable.h"
-#include "libguile/vectors.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "boolean.h"
+#include "alist.h"
+#include "continuations.h"
+#include "eq.h"
+#include "expand.h"
+#include "hashtab.h"
+#include "keywords.h"
+#include "list.h"
+#include "macros.h"
+#include "modules.h"
+#include "ports.h"
+#include "print.h"
+#include "srcprop.h"
+#include "strings.h"
+#include "symbols.h"
+#include "throw.h"
+#include "variable.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"
 }
diff --git a/libguile/extensions.c b/libguile/extensions.c
index 5fbc4205d..58d5c2253 100644
--- a/libguile/extensions.c
+++ b/libguile/extensions.c
@@ -25,13 +25,13 @@
 
 #include <string.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/dynl.h"
-#include "libguile/dynwind.h"
-#include "libguile/extensions.h"
-#include "libguile/gc.h"
-#include "libguile/strings.h"
-#include "libguile/threads.h"
+#include "gsubr.h"
+#include "dynl.h"
+#include "dynwind.h"
+#include "extensions.h"
+#include "gc.h"
+#include "strings.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"
 }
diff --git a/libguile/fdes-finalizers.c b/libguile/fdes-finalizers.c
index 6e7e7c847..d202c9f4a 100644
--- a/libguile/fdes-finalizers.c
+++ b/libguile/fdes-finalizers.c
@@ -21,16 +21,16 @@
 # include <config.h>
 #endif
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/boolean.h"
-#include "libguile/extensions.h"
-#include "libguile/eval.h"
-#include "libguile/hashtab.h"
-#include "libguile/list.h"
-#include "libguile/numbers.h"
-#include "libguile/threads.h"
-#include "libguile/fdes-finalizers.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "boolean.h"
+#include "extensions.h"
+#include "eval.h"
+#include "hashtab.h"
+#include "list.h"
+#include "numbers.h"
+#include "threads.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
diff --git a/libguile/feature.c b/libguile/feature.c
index cd030fd43..30ce5bfd4 100644
--- a/libguile/feature.c
+++ b/libguile/feature.c
@@ -27,15 +27,15 @@
 #include <string.h>
 #endif
 
-#include "libguile/gsubr.h"
-#include "libguile/modules.h"
-#include "libguile/pairs.h"
-#include "libguile/strings.h"
-#include "libguile/fluids.h"
-#include "libguile/symbols.h"
-#include "libguile/variable.h"
+#include "gsubr.h"
+#include "modules.h"
+#include "pairs.h"
+#include "strings.h"
+#include "fluids.h"
+#include "symbols.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"
 }
diff --git a/libguile/filesys.c b/libguile/filesys.c
index 6b3f8ad7b..5f1297735 100644
--- a/libguile/filesys.c
+++ b/libguile/filesys.c
@@ -79,29 +79,29 @@
 # include <sys/sendfile.h>
 #endif
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/boolean.h"
-#include "libguile/async.h"
-#include "libguile/dynwind.h"
-#include "libguile/fdes-finalizers.h"
-#include "libguile/feature.h"
-#include "libguile/filesys.h"
-#include "libguile/fports.h"
-#include "libguile/iselect.h"
-#include "libguile/list.h"
-#include "libguile/load.h"	/* for scm_i_mirror_backslashes */
-#include "libguile/modules.h"
-#include "libguile/numbers.h"
-#include "libguile/ports-internal.h"
-#include "libguile/ports.h"
-#include "libguile/posix.h"
-#include "libguile/smob.h"
-#include "libguile/srfi-13.h"
-#include "libguile/strings.h"
-#include "libguile/symbols.h"
-#include "libguile/syscalls.h"
-#include "libguile/vectors.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "boolean.h"
+#include "async.h"
+#include "dynwind.h"
+#include "fdes-finalizers.h"
+#include "feature.h"
+#include "filesys.h"
+#include "fports.h"
+#include "iselect.h"
+#include "list.h"
+#include "load.h"	/* for scm_i_mirror_backslashes */
+#include "modules.h"
+#include "numbers.h"
+#include "ports-internal.h"
+#include "ports.h"
+#include "posix.h"
+#include "smob.h"
+#include "srfi-13.h"
+#include "strings.h"
+#include "symbols.h"
+#include "syscalls.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"
 }
diff --git a/libguile/finalizers.c b/libguile/finalizers.c
index dc03d01cf..46c66efe5 100644
--- a/libguile/finalizers.c
+++ b/libguile/finalizers.c
@@ -30,13 +30,13 @@
 
 #include <full-write.h>
 
-#include "libguile/async.h"
-#include "libguile/bdw-gc.h"
-#include "libguile/finalizers.h"
-#include "libguile/gc.h"
-#include "libguile/gsubr.h"
-#include "libguile/init.h"
-#include "libguile/threads.h"
+#include "async.h"
+#include "bdw-gc.h"
+#include "finalizers.h"
+#include "gc.h"
+#include "gsubr.h"
+#include "init.h"
+#include "threads.h"
 
 
 
diff --git a/libguile/fluids.c b/libguile/fluids.c
index dd28e3228..e10289d14 100644
--- a/libguile/fluids.c
+++ b/libguile/fluids.c
@@ -24,22 +24,22 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/alist.h"
-#include "libguile/atomics-internal.h"
-#include "libguile/bdw-gc.h"
-#include "libguile/cache-internal.h"
-#include "libguile/deprecation.h"
-#include "libguile/dynwind.h"
-#include "libguile/eval.h"
-#include "libguile/fluids.h"
-#include "libguile/hashtab.h"
-#include "libguile/list.h"
-#include "libguile/ports.h"
-#include "libguile/print.h"
-#include "libguile/weak-table.h"
-#include "libguile/variable.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "alist.h"
+#include "atomics-internal.h"
+#include "bdw-gc.h"
+#include "cache-internal.h"
+#include "deprecation.h"
+#include "dynwind.h"
+#include "eval.h"
+#include "fluids.h"
+#include "hashtab.h"
+#include "list.h"
+#include "ports.h"
+#include "print.h"
+#include "weak-table.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"
 }
diff --git a/libguile/foreign-object.c b/libguile/foreign-object.c
index 08e28a92b..d5224f4d0 100644
--- a/libguile/foreign-object.c
+++ b/libguile/foreign-object.c
@@ -22,18 +22,18 @@
 #  include <config.h>
 #endif
 
-#include "libguile/eval.h"
-#include "libguile/extensions.h"
-#include "libguile/finalizers.h"
-#include "libguile/foreign-object.h"
-#include "libguile/goops.h"
-#include "libguile/gsubr.h"
-#include "libguile/list.h"
-#include "libguile/modules.h"
-#include "libguile/numbers.h"
-#include "libguile/procs.h"
-#include "libguile/threads.h"
-#include "libguile/variable.h"
+#include "eval.h"
+#include "extensions.h"
+#include "finalizers.h"
+#include "foreign-object.h"
+#include "goops.h"
+#include "gsubr.h"
+#include "list.h"
+#include "modules.h"
+#include "numbers.h"
+#include "procs.h"
+#include "threads.h"
+#include "variable.h"
 
 
 
diff --git a/libguile/foreign.c b/libguile/foreign.c
index 36972e6a5..ec1033773 100644
--- a/libguile/foreign.c
+++ b/libguile/foreign.c
@@ -28,26 +28,26 @@
 #include <assert.h>
 #include <errno.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/boolean.h"
-#include "libguile/bytevectors.h"
-#include "libguile/dynwind.h"
-#include "libguile/eq.h"
-#include "libguile/eval.h"
-#include "libguile/extensions.h"
-#include "libguile/finalizers.h"
-#include "libguile/foreign.h"
-#include "libguile/keywords.h"
-#include "libguile/numbers.h"
-#include "libguile/list.h"
-#include "libguile/instructions.h"
-#include "libguile/modules.h"
-#include "libguile/pairs.h"
-#include "libguile/ports.h"
-#include "libguile/stacks.h"
-#include "libguile/symbols.h"
-#include "libguile/threads.h"
-#include "libguile/weak-table.h"
+#include "gsubr.h"
+#include "boolean.h"
+#include "bytevectors.h"
+#include "dynwind.h"
+#include "eq.h"
+#include "eval.h"
+#include "extensions.h"
+#include "finalizers.h"
+#include "foreign.h"
+#include "keywords.h"
+#include "numbers.h"
+#include "list.h"
+#include "instructions.h"
+#include "modules.h"
+#include "pairs.h"
+#include "ports.h"
+#include "stacks.h"
+#include "symbols.h"
+#include "threads.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));
diff --git a/libguile/fports.c b/libguile/fports.c
index 5092f7dab..e90732c29 100644
--- a/libguile/fports.c
+++ b/libguile/fports.c
@@ -46,28 +46,28 @@
 
 #include <full-write.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/boolean.h"
-#include "libguile/async.h"
-#include "libguile/dynwind.h"
-#include "libguile/extensions.h"
-#include "libguile/fdes-finalizers.h"
-#include "libguile/fluids.h"
-#include "libguile/filesys.h"
-#include "libguile/fports.h"
-#include "libguile/gc.h"
-#include "libguile/hashtab.h"
-#include "libguile/keywords.h"
-#include "libguile/modules.h"
-#include "libguile/numbers.h"
-#include "libguile/ports-internal.h"
-#include "libguile/posix.h"
-#include "libguile/read.h"
-#include "libguile/strings.h"
-#include "libguile/symbols.h"
-#include "libguile/syscalls.h"
-#include "libguile/variable.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "boolean.h"
+#include "async.h"
+#include "dynwind.h"
+#include "extensions.h"
+#include "fdes-finalizers.h"
+#include "fluids.h"
+#include "filesys.h"
+#include "fports.h"
+#include "gc.h"
+#include "hashtab.h"
+#include "keywords.h"
+#include "modules.h"
+#include "numbers.h"
+#include "ports-internal.h"
+#include "posix.h"
+#include "read.h"
+#include "strings.h"
+#include "symbols.h"
+#include "syscalls.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
diff --git a/libguile/frames.c b/libguile/frames.c
index a7f337ae7..d15c80959 100644
--- 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,
diff --git a/libguile/gc-malloc.c b/libguile/gc-malloc.c
index 6dad48931..e778080ef 100644
--- 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 "libguile/stime.h"
-#include "libguile/stackchk.h"
-#include "libguile/struct.h"
-#include "libguile/smob.h"
-#include "libguile/arrays.h"
-#include "libguile/async.h"
-#include "libguile/ports.h"
-#include "libguile/strings.h"
-#include "libguile/vectors.h"
-#include "libguile/hashtab.h"
-
-#include "libguile/deprecation.h"
-#include "libguile/gc.h"
+#include "eval.h"
+#include "stime.h"
+#include "stackchk.h"
+#include "struct.h"
+#include "smob.h"
+#include "arrays.h"
+#include "async.h"
+#include "ports.h"
+#include "strings.h"
+#include "vectors.h"
+#include "hashtab.h"
+
+#include "deprecation.h"
+#include "gc.h"
 
 #ifdef GUILE_DEBUG_MALLOC
-#include "libguile/debug-malloc.h"
+#include "debug-malloc.h"
 #endif
 
 #include <unistd.h>
diff --git a/libguile/gc.c b/libguile/gc.c
index fc7ca6938..fb7475040 100644
--- a/libguile/gc.c
+++ b/libguile/gc.c
@@ -23,8 +23,8 @@
 #  include <config.h>
 #endif
 
-#include "libguile/gen-scmconfig.h"
-#include "libguile/pairs.h"
+#include "gen-scmconfig.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 "libguile/eval.h"
-#include "libguile/stime.h"
-#include "libguile/stackchk.h"
-#include "libguile/struct.h"
-#include "libguile/smob.h"
-#include "libguile/arrays.h"
-#include "libguile/async.h"
-#include "libguile/ports.h"
-#include "libguile/hooks.h"
-#include "libguile/list.h"
-#include "libguile/modules.h"
-#include "libguile/numbers.h"
-#include "libguile/simpos.h"
-#include "libguile/strings.h"
-#include "libguile/symbols.h"
-#include "libguile/vectors.h"
-#include "libguile/hashtab.h"
-
-#include "libguile/deprecation.h"
-#include "libguile/gc.h"
-#include "libguile/dynwind.h"
-
-#include "libguile/bdw-gc.h"
+#include "gsubr.h"
+#include "eval.h"
+#include "stime.h"
+#include "stackchk.h"
+#include "struct.h"
+#include "smob.h"
+#include "arrays.h"
+#include "async.h"
+#include "ports.h"
+#include "hooks.h"
+#include "list.h"
+#include "modules.h"
+#include "numbers.h"
+#include "simpos.h"
+#include "strings.h"
+#include "symbols.h"
+#include "vectors.h"
+#include "hashtab.h"
+
+#include "deprecation.h"
+#include "gc.h"
+#include "dynwind.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"
 }
 
 
diff --git a/libguile/gen-scmconfig.c b/libguile/gen-scmconfig.c
index 65e7f6f09..2de5797cf 100644
--- 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
diff --git a/libguile/generalized-arrays.c b/libguile/generalized-arrays.c
index 94d23c8b4..7eab6c273 100644
--- 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 "libguile/pairs.h"
-#include "libguile/array-handle.h"
-#include "libguile/generalized-arrays.h"
-#include "libguile/list.h"
-#include "libguile/numbers.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "array-handle.h"
+#include "generalized-arrays.h"
+#include "list.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"
 }
diff --git a/libguile/generalized-vectors.c b/libguile/generalized-vectors.c
index 76d6f34d3..b9faa0c6a 100644
--- a/libguile/generalized-vectors.c
+++ b/libguile/generalized-vectors.c
@@ -24,10 +24,10 @@
 #  include <config.h>
 #endif
 
-#include "libguile/gsubr.h"
-#include "libguile/error.h"
+#include "gsubr.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"
 }
diff --git a/libguile/gettext.c b/libguile/gettext.c
index 3420fe4de..c72f01740 100644
--- a/libguile/gettext.c
+++ b/libguile/gettext.c
@@ -21,13 +21,13 @@
 # include <config.h>
 #endif
 
-#include "libguile/gsubr.h"
-#include "libguile/feature.h"
-#include "libguile/strings.h"
-#include "libguile/numbers.h"
-#include "libguile/dynwind.h"
+#include "gsubr.h"
+#include "feature.h"
+#include "strings.h"
+#include "numbers.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"
 }
 
diff --git a/libguile/goops.c b/libguile/goops.c
index 6ae8dc647..e5d62444d 100644
--- a/libguile/goops.c
+++ b/libguile/goops.c
@@ -28,33 +28,33 @@
 # include <config.h>
 #endif
 
-#include "libguile/boolean.h"
-#include "libguile/async.h"
-#include "libguile/chars.h"
-#include "libguile/dynwind.h"
-#include "libguile/eval.h"
-#include "libguile/extensions.h"
-#include "libguile/foreign.h"
-#include "libguile/gsubr.h"
-#include "libguile/hashtab.h"
-#include "libguile/keywords.h"
-#include "libguile/macros.h"
-#include "libguile/modules.h"
-#include "libguile/numbers.h"
-#include "libguile/pairs.h"
-#include "libguile/ports.h"
-#include "libguile/ports-internal.h"
-#include "libguile/procprop.h"
-#include "libguile/programs.h"
-#include "libguile/smob.h"
-#include "libguile/strings.h"
-#include "libguile/strports.h"
-#include "libguile/symbols.h"
-#include "libguile/variable.h"
-#include "libguile/vectors.h"
-#include "libguile/weak-table.h"
-
-#include "libguile/goops.h"
+#include "boolean.h"
+#include "async.h"
+#include "chars.h"
+#include "dynwind.h"
+#include "eval.h"
+#include "extensions.h"
+#include "foreign.h"
+#include "gsubr.h"
+#include "hashtab.h"
+#include "keywords.h"
+#include "macros.h"
+#include "modules.h"
+#include "numbers.h"
+#include "pairs.h"
+#include "ports.h"
+#include "ports-internal.h"
+#include "procprop.h"
+#include "programs.h"
+#include "smob.h"
+#include "strings.h"
+#include "strports.h"
+#include "symbols.h"
+#include "variable.h"
+#include "vectors.h"
+#include "weak-table.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));
diff --git a/libguile/gsubr.c b/libguile/gsubr.c
index 8fb15e545..42d356de5 100644
--- a/libguile/gsubr.c
+++ b/libguile/gsubr.c
@@ -25,16 +25,16 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-#include "libguile/foreign.h"
-#include "libguile/frames.h"
-#include "libguile/gsubr.h"
-#include "libguile/instructions.h"
-#include "libguile/modules.h"
-#include "libguile/numbers.h"
-#include "libguile/private-options.h"
-#include "libguile/programs.h"
-#include "libguile/srfi-4.h"
-#include "libguile/symbols.h"
+#include "foreign.h"
+#include "frames.h"
+#include "gsubr.h"
+#include "instructions.h"
+#include "modules.h"
+#include "numbers.h"
+#include "private-options.h"
+#include "programs.h"
+#include "srfi-4.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"
 }
diff --git a/libguile/guardians.c b/libguile/guardians.c
index 95942676e..08b8aa142 100644
--- a/libguile/guardians.c
+++ b/libguile/guardians.c
@@ -49,22 +49,22 @@
 # include <config.h>
 #endif
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/boolean.h"
-
-#include "libguile/bdw-gc.h"
-#include "libguile/deprecation.h"
-#include "libguile/eval.h"
-#include "libguile/guardians.h"
-#include "libguile/hashtab.h"
-#include "libguile/list.h"
-#include "libguile/numbers.h"
-#include "libguile/ports.h"
-#include "libguile/print.h"
-#include "libguile/smob.h"
-#include "libguile/threads.h"
-#include "libguile/weak-vector.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "boolean.h"
+
+#include "bdw-gc.h"
+#include "deprecation.h"
+#include "eval.h"
+#include "guardians.h"
+#include "hashtab.h"
+#include "list.h"
+#include "numbers.h"
+#include "ports.h"
+#include "print.h"
+#include "smob.h"
+#include "threads.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"
 }
diff --git a/libguile/guile.c b/libguile/guile.c
index 08b738f23..2ab310348 100644
--- 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)
 {
diff --git a/libguile/hash.c b/libguile/hash.c
index 9fb7300b7..e9540b230 100644
--- a/libguile/hash.c
+++ b/libguile/hash.c
@@ -31,19 +31,19 @@
 #include <string.h>
 #include <unistr.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/chars.h"
-#include "libguile/foreign.h"
-#include "libguile/pairs.h"
-#include "libguile/ports.h"
-#include "libguile/numbers.h"
-#include "libguile/strings.h"
-#include "libguile/struct.h"
-#include "libguile/symbols.h"
-#include "libguile/syntax.h"
-#include "libguile/vectors.h"
-
-#include "libguile/hash.h"
+#include "gsubr.h"
+#include "chars.h"
+#include "foreign.h"
+#include "pairs.h"
+#include "ports.h"
+#include "numbers.h"
+#include "strings.h"
+#include "struct.h"
+#include "symbols.h"
+#include "syntax.h"
+#include "vectors.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"
 }
 
diff --git a/libguile/hashtab.c b/libguile/hashtab.c
index 27036ae00..c5510e018 100644
--- a/libguile/hashtab.c
+++ b/libguile/hashtab.c
@@ -27,21 +27,21 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/alist.h"
-#include "libguile/boolean.h"
-#include "libguile/bdw-gc.h"
-#include "libguile/eq.h"
-#include "libguile/eval.h"
-#include "libguile/hash.h"
-#include "libguile/hashtab.h"
-#include "libguile/list.h"
-#include "libguile/numbers.h"
-#include "libguile/ports.h"
-#include "libguile/procs.h"
-#include "libguile/vectors.h"
-#include "libguile/weak-table.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "alist.h"
+#include "boolean.h"
+#include "bdw-gc.h"
+#include "eq.h"
+#include "eval.h"
+#include "hash.h"
+#include "hashtab.h"
+#include "list.h"
+#include "numbers.h"
+#include "ports.h"
+#include "procs.h"
+#include "vectors.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"
 }
diff --git a/libguile/hooks.c b/libguile/hooks.c
index 5c50861d1..c8963b9e7 100644
--- a/libguile/hooks.c
+++ b/libguile/hooks.c
@@ -24,19 +24,19 @@
 #endif
 
 #include <stdio.h>
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/boolean.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "boolean.h"
 
-#include "libguile/eval.h"
-#include "libguile/list.h"
-#include "libguile/numbers.h"
-#include "libguile/ports.h"
-#include "libguile/procprop.h"
-#include "libguile/smob.h"
-#include "libguile/strings.h"
+#include "eval.h"
+#include "list.h"
+#include "numbers.h"
+#include "ports.h"
+#include "procprop.h"
+#include "smob.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"
 }
diff --git a/libguile/i18n.c b/libguile/i18n.c
index 24fa8d2b9..309545204 100644
--- a/libguile/i18n.c
+++ b/libguile/i18n.c
@@ -22,24 +22,24 @@
 
 #include <alloca.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/boolean.h"
-#include "libguile/extensions.h"
-#include "libguile/feature.h"
-#include "libguile/i18n.h"
-#include "libguile/list.h"
-#include "libguile/strings.h"
-#include "libguile/chars.h"
-#include "libguile/modules.h"
-#include "libguile/numbers.h"
-#include "libguile/dynwind.h"
-#include "libguile/syscalls.h"
-#include "libguile/smob.h"
-#include "libguile/symbols.h"
-#include "libguile/values.h"
-#include "libguile/variable.h"
-#include "libguile/threads.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "boolean.h"
+#include "extensions.h"
+#include "feature.h"
+#include "i18n.h"
+#include "list.h"
+#include "strings.h"
+#include "chars.h"
+#include "modules.h"
+#include "numbers.h"
+#include "dynwind.h"
+#include "syscalls.h"
+#include "smob.h"
+#include "symbols.h"
+#include "values.h"
+#include "variable.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
diff --git a/libguile/init.c b/libguile/init.c
index 0fca62bc0..6a4f2160e 100644
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -33,121 +33,121 @@
 
 
 /* Everybody has an init function.  */
-#include "libguile/alist.h"
-#include "libguile/async.h"
-#include "libguile/atomic.h"
-#include "libguile/backtrace.h"
-#include "libguile/bitvectors.h"
-#include "libguile/boolean.h"
-#include "libguile/bytevectors.h"
-#include "libguile/chars.h"
-#include "libguile/control.h"
-#include "libguile/continuations.h"
-#include "libguile/debug.h"
+#include "alist.h"
+#include "async.h"
+#include "atomic.h"
+#include "backtrace.h"
+#include "bitvectors.h"
+#include "boolean.h"
+#include "bytevectors.h"
+#include "chars.h"
+#include "control.h"
+#include "continuations.h"
+#include "debug.h"
 #ifdef GUILE_DEBUG_MALLOC
-#include "libguile/debug-malloc.h"
+#include "debug-malloc.h"
 #endif
-#include "libguile/deprecation.h"
-#include "libguile/dynl.h"
-#include "libguile/dynwind.h"
-#include "libguile/eq.h"
-#include "libguile/error.h"
-#include "libguile/eval.h"
-#include "libguile/evalext.h"
-#include "libguile/expand.h"
-#include "libguile/fdes-finalizers.h"
-#include "libguile/feature.h"
-#include "libguile/filesys.h"
-#include "libguile/finalizers.h"
-#include "libguile/fluids.h"
-#include "libguile/foreign.h"
-#include "libguile/fports.h"
-#include "libguile/frames.h"
-#include "libguile/gc.h"
-#include "libguile/generalized-arrays.h"
-#include "libguile/generalized-vectors.h"
-#include "libguile/goops.h"
-#include "libguile/gsubr.h"
-#include "libguile/hash.h"
-#include "libguile/hashtab.h"
-#include "libguile/hooks.h"
-#include "libguile/gettext.h"
-#include "libguile/i18n.h"
-#include "libguile/instructions.h"
-#include "libguile/intrinsics.h"
-#include "libguile/ioext.h"
-#include "libguile/keywords.h"
-#include "libguile/list.h"
-#include "libguile/load.h"
-#include "libguile/macros.h"
-#include "libguile/mallocs.h"
-#include "libguile/memoize.h"
-#include "libguile/modules.h"
-#include "libguile/net_db.h"
-#include "libguile/numbers.h"
-#include "libguile/loader.h"
-#include "libguile/objprop.h"
-#include "libguile/options.h"
-#include "libguile/pairs.h"
-#include "libguile/poll.h"
-#include "libguile/ports.h"
-#include "libguile/posix.h"
+#include "deprecation.h"
+#include "dynl.h"
+#include "dynwind.h"
+#include "eq.h"
+#include "error.h"
+#include "eval.h"
+#include "evalext.h"
+#include "expand.h"
+#include "fdes-finalizers.h"
+#include "feature.h"
+#include "filesys.h"
+#include "finalizers.h"
+#include "fluids.h"
+#include "foreign.h"
+#include "fports.h"
+#include "frames.h"
+#include "gc.h"
+#include "generalized-arrays.h"
+#include "generalized-vectors.h"
+#include "goops.h"
+#include "gsubr.h"
+#include "hash.h"
+#include "hashtab.h"
+#include "hooks.h"
+#include "gettext.h"
+#include "i18n.h"
+#include "instructions.h"
+#include "intrinsics.h"
+#include "ioext.h"
+#include "keywords.h"
+#include "list.h"
+#include "load.h"
+#include "macros.h"
+#include "mallocs.h"
+#include "memoize.h"
+#include "modules.h"
+#include "net_db.h"
+#include "numbers.h"
+#include "loader.h"
+#include "objprop.h"
+#include "options.h"
+#include "pairs.h"
+#include "poll.h"
+#include "ports.h"
+#include "posix.h"
 #ifdef ENABLE_REGEX
-#include "libguile/regex-posix.h"
+#include "regex-posix.h"
 #endif
-#include "libguile/print.h"
-#include "libguile/procprop.h"
-#include "libguile/procs.h"
-#include "libguile/programs.h"
-#include "libguile/promises.h"
-#include "libguile/array-map.h"
-#include "libguile/random.h"
-#include "libguile/rdelim.h"
-#include "libguile/read.h"
-#include "libguile/rw.h"
-#include "libguile/scmsigs.h"
-#include "libguile/script.h"
-#include "libguile/simpos.h"
-#include "libguile/smob.h"
-#include "libguile/socket.h"
-#include "libguile/sort.h"
-#include "libguile/srcprop.h"
-#include "libguile/stackchk.h"
-#include "libguile/stacks.h"
-#include "libguile/stime.h"
-#include "libguile/strings.h"
-#include "libguile/srfi-1.h"
-#include "libguile/srfi-4.h"
-#include "libguile/srfi-13.h"
-#include "libguile/srfi-14.h"
-#include "libguile/srfi-60.h"
-#include "libguile/strorder.h"
-#include "libguile/strports.h"
-#include "libguile/struct.h"
-#include "libguile/symbols.h"
-#include "libguile/syntax.h"
-#include "libguile/throw.h"
-#include "libguile/arrays.h"
-#include "libguile/trees.h"
-#include "libguile/unicode.h"
-#include "libguile/values.h"
-#include "libguile/variable.h"
-#include "libguile/vectors.h"
-#include "libguile/version.h"
-#include "libguile/vm.h"
-#include "libguile/vports.h"
-#include "libguile/guardians.h"
-#include "libguile/extensions.h"
-#include "libguile/uniform.h"
-#include "libguile/deprecated.h"
-#include "libguile/weak-set.h"
-#include "libguile/weak-table.h"
-#include "libguile/weak-vector.h"
-#include "libguile/foreign-object.h"
-#include "libguile/r6rs-ports.h"
-
-#include "libguile/init.h"
-#include "libguile/private-options.h"
+#include "print.h"
+#include "procprop.h"
+#include "procs.h"
+#include "programs.h"
+#include "promises.h"
+#include "array-map.h"
+#include "random.h"
+#include "rdelim.h"
+#include "read.h"
+#include "rw.h"
+#include "scmsigs.h"
+#include "script.h"
+#include "simpos.h"
+#include "smob.h"
+#include "socket.h"
+#include "sort.h"
+#include "srcprop.h"
+#include "stackchk.h"
+#include "stacks.h"
+#include "stime.h"
+#include "strings.h"
+#include "srfi-1.h"
+#include "srfi-4.h"
+#include "srfi-13.h"
+#include "srfi-14.h"
+#include "srfi-60.h"
+#include "strorder.h"
+#include "strports.h"
+#include "struct.h"
+#include "symbols.h"
+#include "syntax.h"
+#include "throw.h"
+#include "arrays.h"
+#include "trees.h"
+#include "unicode.h"
+#include "values.h"
+#include "variable.h"
+#include "vectors.h"
+#include "version.h"
+#include "vm.h"
+#include "vports.h"
+#include "guardians.h"
+#include "extensions.h"
+#include "uniform.h"
+#include "deprecated.h"
+#include "weak-set.h"
+#include "weak-table.h"
+#include "weak-vector.h"
+#include "foreign-object.h"
+#include "r6rs-ports.h"
+
+#include "init.h"
+#include "private-options.h"
 
 #ifdef HAVE_STRING_H
 #include <string.h>
diff --git a/libguile/inline.c b/libguile/inline.c
index e0c3dc9ab..f9268133c 100644
--- 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 "libguile/array-handle.h"
-#include "libguile/smob.h"
-#include "libguile/pairs.h"
-#include "libguile/ports.h"
-#include "libguile/strings.h"
+#include "gc.h"
+#include "array-handle.h"
+#include "smob.h"
+#include "pairs.h"
+#include "ports.h"
+#include "strings.h"
diff --git a/libguile/instructions.c b/libguile/instructions.c
index 91af5f68a..0b00fff8c 100644
--- 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 "libguile/numbers.h"
-#include "libguile/pairs.h"
-#include "libguile/symbols.h"
+#include "list.h"
+#include "numbers.h"
+#include "pairs.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
 }
diff --git a/libguile/intrinsics.c b/libguile/intrinsics.c
index 177fff0af..d910b6fad 100644
--- 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
 }
diff --git a/libguile/ioext.c b/libguile/ioext.c
index f6ccd0338..de69655b1 100644
--- a/libguile/ioext.c
+++ b/libguile/ioext.c
@@ -27,22 +27,22 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/async.h"
-#include "libguile/dynwind.h"
-#include "libguile/extensions.h"
-#include "libguile/fdes-finalizers.h"
-#include "libguile/feature.h"
-#include "libguile/fports.h"
-#include "libguile/hashtab.h"
-#include "libguile/ioext.h"
-#include "libguile/numbers.h"
-#include "libguile/ports-internal.h"
-#include "libguile/ports.h"
-#include "libguile/strings.h"
-#include "libguile/syscalls.h"
-#include "libguile/weak-set.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "async.h"
+#include "dynwind.h"
+#include "extensions.h"
+#include "fdes-finalizers.h"
+#include "feature.h"
+#include "fports.h"
+#include "hashtab.h"
+#include "ioext.h"
+#include "numbers.h"
+#include "ports-internal.h"
+#include "ports.h"
+#include "strings.h"
+#include "syscalls.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 
diff --git a/libguile/keywords.c b/libguile/keywords.c
index eb07ba7fa..0762d2892 100644
--- a/libguile/keywords.c
+++ b/libguile/keywords.c
@@ -26,18 +26,18 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/async.h"
-#include "libguile/list.h"
-#include "libguile/pairs.h"
-#include "libguile/ports.h"
-#include "libguile/smob.h"
-#include "libguile/dynwind.h"
-#include "libguile/hashtab.h"
-#include "libguile/strings.h"
-#include "libguile/symbols.h"
-
-#include "libguile/keywords.h"
+#include "gsubr.h"
+#include "async.h"
+#include "list.h"
+#include "pairs.h"
+#include "ports.h"
+#include "smob.h"
+#include "dynwind.h"
+#include "hashtab.h"
+#include "strings.h"
+#include "symbols.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"
 }
 
diff --git a/libguile/list.c b/libguile/list.c
index 7c6ee56ca..6975f5c7c 100644
--- a/libguile/list.c
+++ b/libguile/list.c
@@ -23,15 +23,15 @@
 # include <config.h>
 #endif
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/boolean.h"
-#include "libguile/numbers.h"
-#include "libguile/procs.h"
-#include "libguile/eq.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "boolean.h"
+#include "numbers.h"
+#include "procs.h"
+#include "eq.h"
 
-#include "libguile/list.h"
-#include "libguile/eval.h"
+#include "list.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"
 }
diff --git a/libguile/load.c b/libguile/load.c
index 37b807145..fb247d809 100644
--- a/libguile/load.c
+++ b/libguile/load.c
@@ -27,34 +27,34 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/boolean.h"
-#include "libguile/alist.h"
-#include "libguile/chars.h"
-#include "libguile/dynwind.h"
-#include "libguile/eq.h"
-#include "libguile/strports.h"
-#include "libguile/backtrace.h"
-#include "libguile/keywords.h"
-#include "libguile/eval.h"
-#include "libguile/filesys.h"
-#include "libguile/fports.h"
-#include "libguile/libpath.h"
-#include "libguile/list.h"
-#include "libguile/loader.h"
-#include "libguile/modules.h"
-#include "libguile/pairs.h"
-#include "libguile/read.h"
-#include "libguile/srfi-13.h"
-#include "libguile/strings.h"
-#include "libguile/symbols.h"
-#include "libguile/throw.h"
-#include "libguile/variable.h"
-
-#include "libguile/load.h"
-#include "libguile/fluids.h"
-
-#include "libguile/vm.h" /* for load-compiled/vm */
+#include "gsubr.h"
+#include "boolean.h"
+#include "alist.h"
+#include "chars.h"
+#include "dynwind.h"
+#include "eq.h"
+#include "strports.h"
+#include "backtrace.h"
+#include "keywords.h"
+#include "eval.h"
+#include "filesys.h"
+#include "fports.h"
+#include "libpath.h"
+#include "list.h"
+#include "loader.h"
+#include "modules.h"
+#include "pairs.h"
+#include "read.h"
+#include "srfi-13.h"
+#include "strings.h"
+#include "symbols.h"
+#include "throw.h"
+#include "variable.h"
+
+#include "load.h"
+#include "fluids.h"
+
+#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
diff --git a/libguile/loader.c b/libguile/loader.c
index 63b1d2b95..e537ea82e 100644
--- 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,
diff --git a/libguile/macros.c b/libguile/macros.c
index a0f3d5ea7..21915cc05 100644
--- a/libguile/macros.c
+++ b/libguile/macros.c
@@ -22,19 +22,19 @@
 # include <config.h>
 #endif
 
-#include "libguile/gsubr.h"
-#include "libguile/boolean.h"
-#include "libguile/modules.h"
-#include "libguile/ports.h"
-#include "libguile/print.h"
-#include "libguile/procs.h"
-#include "libguile/random.h"
-#include "libguile/smob.h"
-#include "libguile/symbols.h"
-#include "libguile/macros.h"
-#include "libguile/variable.h"
+#include "gsubr.h"
+#include "boolean.h"
+#include "modules.h"
+#include "ports.h"
+#include "print.h"
+#include "procs.h"
+#include "random.h"
+#include "smob.h"
+#include "symbols.h"
+#include "macros.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);
diff --git a/libguile/mallocs.c b/libguile/mallocs.c
index b07c49b03..8ab46df12 100644
--- a/libguile/mallocs.c
+++ b/libguile/mallocs.c
@@ -26,10 +26,10 @@
 
 #include <stdlib.h>
 
-#include "libguile/ports.h"
-#include "libguile/smob.h"
+#include "ports.h"
+#include "smob.h"
 
-#include "libguile/mallocs.h"
+#include "mallocs.h"
 
 #include <unistd.h>
 
diff --git a/libguile/memoize.c b/libguile/memoize.c
index 7edde18ee..56ac6e7c9 100644
--- a/libguile/memoize.c
+++ b/libguile/memoize.c
@@ -27,28 +27,28 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/boolean.h"
-#include "libguile/alist.h"
-#include "libguile/continuations.h"
-#include "libguile/dynstack.h"
-#include "libguile/eq.h"
-#include "libguile/expand.h"
-#include "libguile/list.h"
-#include "libguile/macros.h"
-#include "libguile/memoize.h"
-#include "libguile/modules.h"
-#include "libguile/numbers.h"
-#include "libguile/srcprop.h"
-#include "libguile/ports.h"
-#include "libguile/print.h"
-#include "libguile/strings.h"
-#include "libguile/symbols.h"
-#include "libguile/throw.h"
-#include "libguile/threads.h"
-#include "libguile/variable.h"
-#include "libguile/vectors.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "boolean.h"
+#include "alist.h"
+#include "continuations.h"
+#include "dynstack.h"
+#include "eq.h"
+#include "expand.h"
+#include "list.h"
+#include "macros.h"
+#include "memoize.h"
+#include "modules.h"
+#include "numbers.h"
+#include "srcprop.h"
+#include "ports.h"
+#include "print.h"
+#include "strings.h"
+#include "symbols.h"
+#include "throw.h"
+#include "threads.h"
+#include "variable.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);
diff --git a/libguile/modules.c b/libguile/modules.c
index 0a307e53e..40779293a 100644
--- a/libguile/modules.c
+++ b/libguile/modules.c
@@ -24,24 +24,24 @@
 
 #include <stdarg.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/boolean.h"
-
-#include "libguile/eval.h"
-#include "libguile/list.h"
-#include "libguile/smob.h"
-#include "libguile/procprop.h"
-#include "libguile/vectors.h"
-#include "libguile/keywords.h"
-#include "libguile/hashtab.h"
-#include "libguile/struct.h"
-#include "libguile/symbols.h"
-#include "libguile/variable.h"
-#include "libguile/fluids.h"
-#include "libguile/deprecation.h"
-
-#include "libguile/modules.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "boolean.h"
+
+#include "eval.h"
+#include "list.h"
+#include "smob.h"
+#include "procprop.h"
+#include "vectors.h"
+#include "keywords.h"
+#include "hashtab.h"
+#include "struct.h"
+#include "symbols.h"
+#include "variable.h"
+#include "fluids.h"
+#include "deprecation.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 ();
diff --git a/libguile/net_db.c b/libguile/net_db.c
index 311615e45..2e357a24c 100644
--- 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 "libguile/pairs.h"
-#include "libguile/boolean.h"
-#include "libguile/feature.h"
-#include "libguile/list.h"
-#include "libguile/modules.h"
-#include "libguile/numbers.h"
-#include "libguile/strings.h"
-#include "libguile/vectors.h"
-#include "libguile/dynwind.h"
-#include "libguile/symbols.h"
-#include "libguile/throw.h"
-
-#include "libguile/net_db.h"
-#include "libguile/socket.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "boolean.h"
+#include "feature.h"
+#include "list.h"
+#include "modules.h"
+#include "numbers.h"
+#include "strings.h"
+#include "vectors.h"
+#include "dynwind.h"
+#include "symbols.h"
+#include "throw.h"
+
+#include "net_db.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"
 }
diff --git a/libguile/null-threads.c b/libguile/null-threads.c
index 46a16739b..0b2c0feb0 100644
--- 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;
 
diff --git a/libguile/numbers.c b/libguile/numbers.c
index 566fb762d..3f5490cf3 100644
--- a/libguile/numbers.c
+++ b/libguile/numbers.c
@@ -59,23 +59,23 @@
 
 #include <stdarg.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/boolean.h"
-#include "libguile/feature.h"
-#include "libguile/pairs.h"
-#include "libguile/ports.h"
-#include "libguile/finalizers.h"
-#include "libguile/smob.h"
-#include "libguile/strings.h"
-#include "libguile/modules.h"
-#include "libguile/bdw-gc.h"
-#include "libguile/goops.h"
-#include "libguile/values.h"
-
-#include "libguile/numbers.h"
-#include "libguile/deprecation.h"
-
-#include "libguile/eq.h"
+#include "gsubr.h"
+#include "boolean.h"
+#include "feature.h"
+#include "pairs.h"
+#include "ports.h"
+#include "finalizers.h"
+#include "smob.h"
+#include "strings.h"
+#include "modules.h"
+#include "bdw-gc.h"
+#include "goops.h"
+#include "values.h"
+
+#include "numbers.h"
+#include "deprecation.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"
 }
diff --git a/libguile/objprop.c b/libguile/objprop.c
index 5baa6e5bf..e93624b83 100644
--- a/libguile/objprop.c
+++ b/libguile/objprop.c
@@ -22,13 +22,13 @@
 # include <config.h>
 #endif
 
-#include "libguile/gsubr.h"
-#include "libguile/alist.h"
-#include "libguile/async.h"
-#include "libguile/hashtab.h"
-#include "libguile/objprop.h"
-#include "libguile/pairs.h"
-#include "libguile/weak-table.h"
+#include "gsubr.h"
+#include "alist.h"
+#include "async.h"
+#include "hashtab.h"
+#include "objprop.h"
+#include "pairs.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"
 }
 
diff --git a/libguile/options.c b/libguile/options.c
index 38afb4e9d..8906b4250 100644
--- a/libguile/options.c
+++ b/libguile/options.c
@@ -22,15 +22,15 @@
 # include <config.h>
 #endif
 
-#include "libguile/pairs.h"
-#include "libguile/boolean.h"
-#include "libguile/list.h"
-#include "libguile/mallocs.h"
-#include "libguile/numbers.h"
-#include "libguile/strings.h"
-#include "libguile/symbols.h"
+#include "pairs.h"
+#include "boolean.h"
+#include "list.h"
+#include "mallocs.h"
+#include "numbers.h"
+#include "strings.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"
 }
diff --git a/libguile/pairs.c b/libguile/pairs.c
index 648b04ae6..76afd069f 100644
--- a/libguile/pairs.c
+++ b/libguile/pairs.c
@@ -23,9 +23,9 @@
 # include <config.h>
 #endif
 
-#include "libguile/boolean.h"
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
+#include "boolean.h"
+#include "gsubr.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 "libguile/strings.h"
+#include "ports.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);
diff --git a/libguile/poll.c b/libguile/poll.c
index 1668b40ad..cdda329af 100644
--- a/libguile/poll.c
+++ b/libguile/poll.c
@@ -28,18 +28,18 @@
 #include <errno.h>
 #include <poll.h>
 
-#include "libguile/async.h"
-#include "libguile/bytevectors.h"
-#include "libguile/error.h"
-#include "libguile/extensions.h"
-#include "libguile/gsubr.h"
-#include "libguile/modules.h"
-#include "libguile/numbers.h"
-#include "libguile/ports-internal.h"
-#include "libguile/syscalls.h"
-#include "libguile/vectors.h"
-
-#include "libguile/poll.h"
+#include "async.h"
+#include "bytevectors.h"
+#include "error.h"
+#include "extensions.h"
+#include "gsubr.h"
+#include "modules.h"
+#include "numbers.h"
+#include "ports-internal.h"
+#include "syscalls.h"
+#include "vectors.h"
+
+#include "poll.h"
 
 
 
diff --git a/libguile/ports.c b/libguile/ports.c
index 80f487fb4..ada61363c 100644
--- a/libguile/ports.c
+++ b/libguile/ports.c
@@ -38,38 +38,38 @@
 #include <unistr.h>
 #include <striconveh.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/boolean.h"
-#include "libguile/async.h"
-#include "libguile/atomics-internal.h"
-#include "libguile/deprecation.h"
-#include "libguile/eval.h"
-#include "libguile/fports.h"  /* direct access for seek and truncate */
-#include "libguile/goops.h"
-#include "libguile/smob.h"
-#include "libguile/chars.h"
-#include "libguile/dynwind.h"
-#include "libguile/extensions.h"
-#include "libguile/finalizers.h"
-#include "libguile/keywords.h"
-#include "libguile/hashtab.h"
-#include "libguile/strings.h"
-#include "libguile/mallocs.h"
-#include "libguile/modules.h"
-#include "libguile/numbers.h"
-#include "libguile/ports.h"
-#include "libguile/ports-internal.h"
-#include "libguile/private-options.h"
-#include "libguile/procs.h"
-#include "libguile/symbols.h"
-#include "libguile/syscalls.h"
-#include "libguile/variable.h"
-#include "libguile/vectors.h"
-#include "libguile/weak-set.h"
-#include "libguile/fluids.h"
-#include "libguile/eq.h"
-#include "libguile/alist.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "boolean.h"
+#include "async.h"
+#include "atomics-internal.h"
+#include "deprecation.h"
+#include "eval.h"
+#include "fports.h"  /* direct access for seek and truncate */
+#include "goops.h"
+#include "smob.h"
+#include "chars.h"
+#include "dynwind.h"
+#include "extensions.h"
+#include "finalizers.h"
+#include "keywords.h"
+#include "hashtab.h"
+#include "strings.h"
+#include "mallocs.h"
+#include "modules.h"
+#include "numbers.h"
+#include "ports.h"
+#include "ports-internal.h"
+#include "private-options.h"
+#include "procs.h"
+#include "symbols.h"
+#include "syscalls.h"
+#include "variable.h"
+#include "vectors.h"
+#include "weak-set.h"
+#include "fluids.h"
+#include "eq.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);
 
diff --git a/libguile/posix-w32.c b/libguile/posix-w32.c
index 6f7f019fb..438d2c2e1 100644
--- 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 "libguile/threads.h"   /* for scm_i_scm_pthread_mutex_lock */
+#include "gc.h"        /* for scm_*alloc, scm_strdup */
+#include "threads.h"   /* for scm_i_scm_pthread_mutex_lock */
 
 /*
  * Get name and information about current kernel.
diff --git a/libguile/posix.c b/libguile/posix.c
index a14c02414..2c4845180 100644
--- a/libguile/posix.c
+++ b/libguile/posix.c
@@ -62,30 +62,30 @@
 #include <io.h>
 #endif
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/async.h"
-#include "libguile/dynwind.h"
-#include "libguile/extensions.h"
-#include "libguile/finalizers.h"
-#include "libguile/fports.h"
-#include "libguile/list.h"
-#include "libguile/bitvectors.h"
-#include "libguile/scmsigs.h"
-#include "libguile/feature.h"
-#include "libguile/modules.h"
-#include "libguile/numbers.h"
-#include "libguile/strings.h"
-#include "libguile/srfi-13.h"
-#include "libguile/srfi-14.h"
-#include "libguile/symbols.h"
-#include "libguile/syscalls.h"
-#include "libguile/vectors.h"
-#include "libguile/values.h"
-
-#include "libguile/posix.h"
-#include "libguile/gettext.h"
-#include "libguile/threads.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "async.h"
+#include "dynwind.h"
+#include "extensions.h"
+#include "finalizers.h"
+#include "fports.h"
+#include "list.h"
+#include "bitvectors.h"
+#include "scmsigs.h"
+#include "feature.h"
+#include "modules.h"
+#include "numbers.h"
+#include "strings.h"
+#include "srfi-13.h"
+#include "srfi-14.h"
+#include "symbols.h"
+#include "syscalls.h"
+#include "vectors.h"
+#include "values.h"
+
+#include "posix.h"
+#include "gettext.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 "libguile/posix.x"
+#include "cpp-SIG.c"
+#include "posix.x"
 
 #ifdef HAVE_FORK
   scm_add_feature ("fork");
diff --git a/libguile/print.c b/libguile/print.c
index 41459a440..5e08fc178 100644
--- a/libguile/print.c
+++ b/libguile/print.c
@@ -30,45 +30,45 @@
 #include <uniconv.h>
 #include <unictype.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/boolean.h"
-#include "libguile/chars.h"
-#include "libguile/continuations.h"
-#include "libguile/smob.h"
-#include "libguile/control.h"
-#include "libguile/eval.h"
-#include "libguile/foreign.h"
-#include "libguile/goops.h"
-#include "libguile/hashtab.h"
-#include "libguile/weak-set.h"
-#include "libguile/weak-table.h"
-#include "libguile/fluids.h"
-#include "libguile/keywords.h"
-#include "libguile/atomic.h"
-#include "libguile/bitvectors.h"
-#include "libguile/arrays.h"
-#include "libguile/weak-vector.h"
-#include "libguile/macros.h"
-#include "libguile/procprop.h"
-#include "libguile/read.h"
-#include "libguile/programs.h"
-#include "libguile/alist.h"
-#include "libguile/struct.h"
-#include "libguile/ports.h"
-#include "libguile/ports-internal.h"
-#include "libguile/strings.h"
-#include "libguile/strports.h"
-#include "libguile/symbols.h"
-#include "libguile/syntax.h"
-#include "libguile/variable.h"
-#include "libguile/vectors.h"
-#include "libguile/numbers.h"
-#include "libguile/vm.h"
-
-#include "libguile/print.h"
-
-#include "libguile/private-options.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "boolean.h"
+#include "chars.h"
+#include "continuations.h"
+#include "smob.h"
+#include "control.h"
+#include "eval.h"
+#include "foreign.h"
+#include "goops.h"
+#include "hashtab.h"
+#include "weak-set.h"
+#include "weak-table.h"
+#include "fluids.h"
+#include "keywords.h"
+#include "atomic.h"
+#include "bitvectors.h"
+#include "arrays.h"
+#include "weak-vector.h"
+#include "macros.h"
+#include "procprop.h"
+#include "read.h"
+#include "programs.h"
+#include "alist.h"
+#include "struct.h"
+#include "ports.h"
+#include "ports-internal.h"
+#include "strings.h"
+#include "strports.h"
+#include "symbols.h"
+#include "syntax.h"
+#include "variable.h"
+#include "vectors.h"
+#include "numbers.h"
+#include "vm.h"
+
+#include "print.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 =
diff --git a/libguile/procprop.c b/libguile/procprop.c
index 2a2b8fcb1..b154072ea 100644
--- a/libguile/procprop.c
+++ b/libguile/procprop.c
@@ -23,24 +23,24 @@
 # include <config.h>
 #endif
 
-#include "libguile/pairs.h"
-#include "libguile/boolean.h"
-
-#include "libguile/alist.h"
-#include "libguile/eval.h"
-#include "libguile/list.h"
-#include "libguile/procs.h"
-#include "libguile/gsubr.h"
-#include "libguile/numbers.h"
-#include "libguile/smob.h"
-#include "libguile/symbols.h"
-#include "libguile/threads.h"
-#include "libguile/vectors.h"
-#include "libguile/weak-table.h"
-#include "libguile/programs.h"
-#include "libguile/vm-builtins.h"
-
-#include "libguile/procprop.h"
+#include "pairs.h"
+#include "boolean.h"
+
+#include "alist.h"
+#include "eval.h"
+#include "list.h"
+#include "procs.h"
+#include "gsubr.h"
+#include "numbers.h"
+#include "smob.h"
+#include "symbols.h"
+#include "threads.h"
+#include "vectors.h"
+#include "weak-table.h"
+#include "programs.h"
+#include "vm-builtins.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 ();
 }
 
diff --git a/libguile/procs.c b/libguile/procs.c
index 9200ee65a..ca16a4bab 100644
--- 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 "libguile/strings.h"
-#include "libguile/vectors.h"
-#include "libguile/smob.h"
-#include "libguile/struct.h"
-#include "libguile/deprecation.h"
-#include "libguile/procprop.h"
-#include "libguile/symbols.h"
-#include "libguile/loader.h"
-#include "libguile/programs.h"
+#include "goops.h"
+#include "strings.h"
+#include "vectors.h"
+#include "smob.h"
+#include "struct.h"
+#include "deprecation.h"
+#include "procprop.h"
+#include "symbols.h"
+#include "loader.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"
 }
diff --git a/libguile/programs.c b/libguile/programs.c
index bc5cb1bc0..1f23aa95e 100644
--- 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
 }
diff --git a/libguile/promises.c b/libguile/promises.c
index c94e45469..38b69320a 100644
--- a/libguile/promises.c
+++ b/libguile/promises.c
@@ -25,37 +25,37 @@
 
 #include <alloca.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/alist.h"
-#include "libguile/async.h"
-#include "libguile/continuations.h"
-#include "libguile/debug.h"
-#include "libguile/deprecation.h"
-#include "libguile/dynwind.h"
-#include "libguile/eq.h"
-#include "libguile/eval.h"
-#include "libguile/feature.h"
-#include "libguile/fluids.h"
-#include "libguile/goops.h"
-#include "libguile/hash.h"
-#include "libguile/hashtab.h"
-#include "libguile/list.h"
-#include "libguile/macros.h"
-#include "libguile/memoize.h"
-#include "libguile/modules.h"
-#include "libguile/ports.h"
-#include "libguile/print.h"
-#include "libguile/procprop.h"
-#include "libguile/procs.h"
-#include "libguile/programs.h"
-#include "libguile/smob.h"
-#include "libguile/srcprop.h"
-#include "libguile/stackchk.h"
-#include "libguile/strings.h"
-#include "libguile/threads.h"
-#include "libguile/throw.h"
-#include "libguile/values.h"
-#include "libguile/promises.h"
+#include "gsubr.h"
+#include "alist.h"
+#include "async.h"
+#include "continuations.h"
+#include "debug.h"
+#include "deprecation.h"
+#include "dynwind.h"
+#include "eq.h"
+#include "eval.h"
+#include "feature.h"
+#include "fluids.h"
+#include "goops.h"
+#include "hash.h"
+#include "hashtab.h"
+#include "list.h"
+#include "macros.h"
+#include "memoize.h"
+#include "modules.h"
+#include "ports.h"
+#include "print.h"
+#include "procprop.h"
+#include "procs.h"
+#include "programs.h"
+#include "smob.h"
+#include "srcprop.h"
+#include "stackchk.h"
+#include "strings.h"
+#include "threads.h"
+#include "throw.h"
+#include "values.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");
 }
diff --git a/libguile/r6rs-ports.c b/libguile/r6rs-ports.c
index c3c70036d..26db9fe42 100644
--- 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 "libguile/boolean.h"
-#include "libguile/bytevectors.h"
-#include "libguile/chars.h"
-#include "libguile/eval.h"
-#include "libguile/extensions.h"
-#include "libguile/procs.h"
-#include "libguile/numbers.h"
-#include "libguile/r6rs-ports.h"
-#include "libguile/strings.h"
-#include "libguile/smob.h"
-#include "libguile/symbols.h"
-#include "libguile/values.h"
-#include "libguile/vectors.h"
-#include "libguile/ports-internal.h"
+#include "gsubr.h"
+#include "boolean.h"
+#include "bytevectors.h"
+#include "chars.h"
+#include "eval.h"
+#include "extensions.h"
+#include "procs.h"
+#include "numbers.h"
+#include "r6rs-ports.h"
+#include "strings.h"
+#include "smob.h"
+#include "symbols.h"
+#include "values.h"
+#include "vectors.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"
 }
diff --git a/libguile/random.c b/libguile/random.c
index d7901d61a..30364c1c1 100644
--- a/libguile/random.c
+++ b/libguile/random.c
@@ -32,25 +32,25 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/smob.h"
-#include "libguile/generalized-arrays.h"
-#include "libguile/list.h"
-#include "libguile/numbers.h"
-#include "libguile/feature.h"
-#include "libguile/modules.h"
-#include "libguile/numbers.h"
-#include "libguile/pairs.h"
-#include "libguile/stime.h"
-#include "libguile/strings.h"
-#include "libguile/symbols.h"
-#include "libguile/arrays.h"
-#include "libguile/srfi-4.h"
-#include "libguile/variable.h"
-#include "libguile/vectors.h"
-#include "libguile/generalized-vectors.h"
-
-#include "libguile/random.h"
+#include "gsubr.h"
+#include "smob.h"
+#include "generalized-arrays.h"
+#include "list.h"
+#include "numbers.h"
+#include "feature.h"
+#include "modules.h"
+#include "numbers.h"
+#include "pairs.h"
+#include "stime.h"
+#include "strings.h"
+#include "symbols.h"
+#include "arrays.h"
+#include "srfi-4.h"
+#include "variable.h"
+#include "vectors.h"
+#include "generalized-vectors.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");
 }
diff --git a/libguile/rdelim.c b/libguile/rdelim.c
index 817b5f141..ee6228053 100644
--- a/libguile/rdelim.c
+++ b/libguile/rdelim.c
@@ -20,9 +20,9 @@
 #  include <config.h>
 #endif
 
-#include "libguile/boolean.h"
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
+#include "boolean.h"
+#include "gsubr.h"
+#include "pairs.h"
 
 #include <stdio.h>
 
@@ -30,15 +30,15 @@
 #include <string.h>
 #endif
 
-#include "libguile/chars.h"
-#include "libguile/list.h"
-#include "libguile/modules.h"
-#include "libguile/numbers.h"
-#include "libguile/ports.h"
-#include "libguile/rdelim.h"
-#include "libguile/strings.h"
-#include "libguile/srfi-13.h"
-#include "libguile/strports.h"
+#include "chars.h"
+#include "list.h"
+#include "modules.h"
+#include "numbers.h"
+#include "ports.h"
+#include "rdelim.h"
+#include "strings.h"
+#include "srfi-13.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;
 }
diff --git a/libguile/read.c b/libguile/read.c
index c5a10c1a6..72151c4a6 100644
--- a/libguile/read.c
+++ b/libguile/read.c
@@ -33,36 +33,36 @@
 #include <c-ctype.h>
 #include <alloca.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/boolean.h"
-#include "libguile/bytevectors.h"
-#include "libguile/chars.h"
-#include "libguile/eval.h"
-#include "libguile/arrays.h"
-#include "libguile/bitvectors.h"
-#include "libguile/keywords.h"
-#include "libguile/alist.h"
-#include "libguile/srcprop.h"
-#include "libguile/hashtab.h"
-#include "libguile/hash.h"
-#include "libguile/eq.h"
-#include "libguile/fluids.h"
-#include "libguile/modules.h"
-#include "libguile/numbers.h"
-#include "libguile/ports.h"
-#include "libguile/ports-internal.h"
-#include "libguile/fports.h"
-#include "libguile/strings.h"
-#include "libguile/strports.h"
-#include "libguile/variable.h"
-#include "libguile/vectors.h"
-#include "libguile/srfi-4.h"
-#include "libguile/srfi-13.h"
-#include "libguile/symbols.h"
-
-#include "libguile/read.h"
-#include "libguile/private-options.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "boolean.h"
+#include "bytevectors.h"
+#include "chars.h"
+#include "eval.h"
+#include "arrays.h"
+#include "bitvectors.h"
+#include "keywords.h"
+#include "alist.h"
+#include "srcprop.h"
+#include "hashtab.h"
+#include "hash.h"
+#include "eq.h"
+#include "fluids.h"
+#include "modules.h"
+#include "numbers.h"
+#include "ports.h"
+#include "ports-internal.h"
+#include "fports.h"
+#include "strings.h"
+#include "strports.h"
+#include "variable.h"
+#include "vectors.h"
+#include "srfi-4.h"
+#include "srfi-13.h"
+#include "symbols.h"
+
+#include "read.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"
 }
diff --git a/libguile/regex-posix.c b/libguile/regex-posix.c
index b70a1f165..17768770d 100644
--- 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 "libguile/pairs.h"
+#include "gsubr.h"
+#include "pairs.h"
 
 #include <regex.h>
 
@@ -44,19 +44,19 @@
 #include <wchar.h>
 #endif
 
-#include "libguile/async.h"
-#include "libguile/list.h"
-#include "libguile/modules.h"
-#include "libguile/numbers.h"
-#include "libguile/smob.h"
-#include "libguile/symbols.h"
-#include "libguile/vectors.h"
-#include "libguile/strports.h"
-#include "libguile/ports.h"
-#include "libguile/feature.h"
-#include "libguile/strings.h"
+#include "async.h"
+#include "list.h"
+#include "modules.h"
+#include "numbers.h"
+#include "smob.h"
+#include "symbols.h"
+#include "vectors.h"
+#include "strports.h"
+#include "ports.h"
+#include "feature.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");
 }
diff --git a/libguile/rw.c b/libguile/rw.c
index 725750b33..d8c0c2de0 100644
--- a/libguile/rw.c
+++ b/libguile/rw.c
@@ -27,17 +27,17 @@
 #include <errno.h>
 #include <string.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/async.h"
-#include "libguile/fports.h"
-#include "libguile/numbers.h"
-#include "libguile/ports.h"
-#include "libguile/rw.h"
-#include "libguile/strings.h"
-#include "libguile/modules.h"
-#include "libguile/strports.h"
-#include "libguile/syscalls.h"
-#include "libguile/ports-internal.h"
+#include "gsubr.h"
+#include "async.h"
+#include "fports.h"
+#include "numbers.h"
+#include "ports.h"
+#include "rw.h"
+#include "strings.h"
+#include "modules.h"
+#include "strports.h"
+#include "syscalls.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;
 }
diff --git a/libguile/scmsigs.c b/libguile/scmsigs.c
index cfeca9308..3fef0c777 100644
--- a/libguile/scmsigs.c
+++ b/libguile/scmsigs.c
@@ -41,24 +41,24 @@
 
 #include <full-write.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/boolean.h"
-
-#include "libguile/async.h"
-#include "libguile/dynwind.h"
-#include "libguile/feature.h"
-#include "libguile/eval.h"
-#include "libguile/list.h"
-#include "libguile/modules.h"
-#include "libguile/numbers.h"
-#include "libguile/procs.h"
-#include "libguile/variable.h"
-#include "libguile/vectors.h"
-#include "libguile/syscalls.h"
-#include "libguile/threads.h"
-
-#include "libguile/scmsigs.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "boolean.h"
+
+#include "async.h"
+#include "dynwind.h"
+#include "feature.h"
+#include "eval.h"
+#include "list.h"
+#include "modules.h"
+#include "numbers.h"
+#include "procs.h"
+#include "variable.h"
+#include "vectors.h"
+#include "syscalls.h"
+#include "threads.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"
 }
 
diff --git a/libguile/script.c b/libguile/script.c
index 71899fd13..08f2aa0c7 100644
--- a/libguile/script.c
+++ b/libguile/script.c
@@ -30,18 +30,18 @@
 #include <ctype.h>
 #include <uniconv.h>
 
-#include "libguile/pairs.h"
-#include "libguile/eval.h"
-#include "libguile/feature.h"
-#include "libguile/fluids.h"
-#include "libguile/load.h"
-#include "libguile/modules.h"
-#include "libguile/read.h"
-#include "libguile/script.h"
-#include "libguile/strings.h"
-#include "libguile/strports.h"
-#include "libguile/version.h"
-#include "libguile/vm.h"
+#include "pairs.h"
+#include "eval.h"
+#include "feature.h"
+#include "fluids.h"
+#include "load.h"
+#include "modules.h"
+#include "read.h"
+#include "script.h"
+#include "strings.h"
+#include "strports.h"
+#include "version.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"
 }
diff --git a/libguile/simpos.c b/libguile/simpos.c
index d1bee8208..fb5294986 100644
--- 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 "libguile/gsubr.h"
+#include "boolean.h"
+#include "gsubr.h"
 
-#include "libguile/numbers.h"
-#include "libguile/strings.h"
-#include "libguile/simpos.h"
+#include "numbers.h"
+#include "strings.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"
 }
 
diff --git a/libguile/smob.c b/libguile/smob.c
index e397689c1..653bd2ee5 100644
--- a/libguile/smob.c
+++ b/libguile/smob.c
@@ -27,18 +27,18 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include "libguile/async.h"
-#include "libguile/goops.h"
-#include "libguile/gsubr.h"
-#include "libguile/finalizers.h"
-#include "libguile/instructions.h"
-#include "libguile/numbers.h"
-#include "libguile/ports.h"
-#include "libguile/programs.h"
-
-#include "libguile/smob.h"
-
-#include "libguile/bdw-gc.h"
+#include "async.h"
+#include "goops.h"
+#include "gsubr.h"
+#include "finalizers.h"
+#include "instructions.h"
+#include "numbers.h"
+#include "ports.h"
+#include "programs.h"
+
+#include "smob.h"
+
+#include "bdw-gc.h"
 #include <gc/gc_mark.h>
 
 
diff --git a/libguile/socket.c b/libguile/socket.c
index 220308a19..0803b163e 100644
--- a/libguile/socket.c
+++ b/libguile/socket.c
@@ -46,24 +46,24 @@
 
 #include <gmp.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/async.h"
-#include "libguile/arrays.h"
-#include "libguile/bytevectors.h"
-#include "libguile/feature.h"
-#include "libguile/fports.h"
-#include "libguile/list.h"
-#include "libguile/modules.h"
-#include "libguile/numbers.h"
-#include "libguile/strings.h"
-#include "libguile/symbols.h"
-#include "libguile/vectors.h"
-#include "libguile/dynwind.h"
-#include "libguile/srfi-13.h"
-#include "libguile/syscalls.h"
-
-#include "libguile/socket.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "async.h"
+#include "arrays.h"
+#include "bytevectors.h"
+#include "feature.h"
+#include "fports.h"
+#include "list.h"
+#include "modules.h"
+#include "numbers.h"
+#include "strings.h"
+#include "symbols.h"
+#include "vectors.h"
+#include "dynwind.h"
+#include "srfi-13.h"
+#include "syscalls.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"
 }
 
diff --git a/libguile/sort.c b/libguile/sort.c
index 2cf9badae..9122dcf2d 100644
--- a/libguile/sort.c
+++ b/libguile/sort.c
@@ -39,20 +39,20 @@
 # include <config.h>
 #endif
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/boolean.h"
-#include "libguile/eval.h"
-#include "libguile/arrays.h"
-#include "libguile/array-map.h"
-#include "libguile/feature.h"
-#include "libguile/generalized-arrays.h"
-#include "libguile/list.h"
-#include "libguile/vectors.h"
-#include "libguile/async.h"
-#include "libguile/dynwind.h"
-
-#include "libguile/sort.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "boolean.h"
+#include "eval.h"
+#include "arrays.h"
+#include "array-map.h"
+#include "feature.h"
+#include "generalized-arrays.h"
+#include "list.h"
+#include "vectors.h"
+#include "async.h"
+#include "dynwind.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");
 }
diff --git a/libguile/srcprop.c b/libguile/srcprop.c
index d25f98254..b1dd4f9e4 100644
--- a/libguile/srcprop.c
+++ b/libguile/srcprop.c
@@ -24,25 +24,25 @@
 
 #include <errno.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/async.h"
-#include "libguile/smob.h"
-#include "libguile/alist.h"
-#include "libguile/debug.h"
-#include "libguile/hashtab.h"
-#include "libguile/hash.h"
-#include "libguile/keywords.h"
-#include "libguile/list.h"
-#include "libguile/modules.h"
-#include "libguile/numbers.h"
-#include "libguile/ports.h"
-#include "libguile/gc.h"
-#include "libguile/symbols.h"
-#include "libguile/weak-table.h"
-
-#include "libguile/srcprop.h"
-#include "libguile/private-options.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "async.h"
+#include "smob.h"
+#include "alist.h"
+#include "debug.h"
+#include "hashtab.h"
+#include "hash.h"
+#include "keywords.h"
+#include "list.h"
+#include "modules.h"
+#include "numbers.h"
+#include "ports.h"
+#include "gc.h"
+#include "symbols.h"
+#include "weak-table.h"
+
+#include "srcprop.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"
 }
 
diff --git a/libguile/srfi-1.c b/libguile/srfi-1.c
index 450c69671..2377f7bbe 100644
--- a/libguile/srfi-1.c
+++ b/libguile/srfi-1.c
@@ -24,18 +24,18 @@
 # include <config.h>
 #endif
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/boolean.h"
-#include "libguile/eq.h"
-
-#include "libguile/list.h"
-#include "libguile/eval.h"
-#include "libguile/procs.h"
-#include "libguile/srfi-1.h"
-#include "libguile/values.h"
-#include "libguile/vectors.h"
-#include "libguile/extensions.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "boolean.h"
+#include "eq.h"
+
+#include "list.h"
+#include "eval.h"
+#include "procs.h"
+#include "srfi-1.h"
+#include "values.h"
+#include "vectors.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
 }
 
diff --git a/libguile/srfi-13.c b/libguile/srfi-13.c
index 8375e5b0e..38d5f0ec4 100644
--- 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 "libguile/pairs.h"
-#include <libguile/deprecation.h>
-#include "libguile/eval.h"
-#include "libguile/error.h"
-#include "libguile/hash.h"
-#include "libguile/list.h"
-#include "libguile/numbers.h"
-#include "libguile/procs.h"
-#include "libguile/srfi-13.h"
-#include "libguile/srfi-14.h"
-#include "libguile/symbols.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "deprecation.h"
+#include "eval.h"
+#include "error.h"
+#include "hash.h"
+#include "list.h"
+#include "numbers.h"
+#include "procs.h"
+#include "srfi-13.h"
+#include "srfi-14.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.  */
diff --git a/libguile/srfi-14.c b/libguile/srfi-14.c
index 65feacb8c..681fa1b7d 100644
--- 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 "libguile/pairs.h"
-#include "libguile/boolean.h"
-#include "libguile/chars.h"
-#include "libguile/eval.h"
-#include "libguile/list.h"
-#include "libguile/ports.h"
-#include "libguile/modules.h"
-#include "libguile/numbers.h"
-#include "libguile/procs.h"
-#include "libguile/smob.h"
-#include "libguile/srfi-14.h"
-#include "libguile/strings.h"
-#include "libguile/symbols.h"
-#include "libguile/values.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "boolean.h"
+#include "chars.h"
+#include "eval.h"
+#include "list.h"
+#include "ports.h"
+#include "modules.h"
+#include "numbers.h"
+#include "procs.h"
+#include "smob.h"
+#include "srfi-14.h"
+#include "strings.h"
+#include "symbols.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.  */
diff --git a/libguile/srfi-4.c b/libguile/srfi-4.c
index ce81b86f9..59d8b8a2d 100644
--- a/libguile/srfi-4.c
+++ b/libguile/srfi-4.c
@@ -24,19 +24,19 @@
 
 #include <string.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/boolean.h"
-#include "libguile/bdw-gc.h"
-#include "libguile/srfi-4.h"
-#include "libguile/bytevectors.h"
-#include "libguile/error.h"
-#include "libguile/eval.h"
-#include "libguile/extensions.h"
-#include "libguile/generalized-vectors.h"
-#include "libguile/modules.h"
-#include "libguile/numbers.h"
-#include "libguile/uniform.h"
-#include "libguile/variable.h"
+#include "gsubr.h"
+#include "boolean.h"
+#include "bdw-gc.h"
+#include "srfi-4.h"
+#include "bytevectors.h"
+#include "error.h"
+#include "eval.h"
+#include "extensions.h"
+#include "generalized-vectors.h"
+#include "modules.h"
+#include "numbers.h"
+#include "uniform.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.  */
diff --git a/libguile/srfi-60.c b/libguile/srfi-60.c
index 96fbcee6e..2974a2c24 100644
--- a/libguile/srfi-60.c
+++ b/libguile/srfi-60.c
@@ -24,16 +24,16 @@
 # include <config.h>
 #endif
 
-#include "libguile/boolean.h"
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/eq.h"
+#include "boolean.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "eq.h"
 
-#include "libguile/extensions.h"
-#include "libguile/list.h"
-#include "libguile/numbers.h"
+#include "extensions.h"
+#include "list.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
 }
diff --git a/libguile/stackchk.c b/libguile/stackchk.c
index c0f6249de..cb55ef4ae 100644
--- a/libguile/stackchk.c
+++ b/libguile/stackchk.c
@@ -23,13 +23,13 @@
 # include <config.h>
 #endif
 
-#include "libguile/gsubr.h"
-#include "libguile/numbers.h"
-#include "libguile/ports.h"
-#include "libguile/threads.h"
-#include "libguile/dynwind.h"
+#include "gsubr.h"
+#include "numbers.h"
+#include "ports.h"
+#include "threads.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"
 }
diff --git a/libguile/stacks.c b/libguile/stacks.c
index 4001a2e63..690de5730 100644
--- a/libguile/stacks.c
+++ b/libguile/stacks.c
@@ -23,27 +23,27 @@
 # include <config.h>
 #endif
 
-#include "libguile/gsubr.h"
-#include "libguile/boolean.h"
-#include "libguile/control.h"
-#include "libguile/eval.h"
-#include "libguile/debug.h"
-#include "libguile/continuations.h"
-#include "libguile/fluids.h"
-#include "libguile/list.h"
-#include "libguile/struct.h"
-#include "libguile/macros.h"
-#include "libguile/numbers.h"
-#include "libguile/pairs.h"
-#include "libguile/procprop.h"
-#include "libguile/modules.h"
-#include "libguile/strings.h"
-#include "libguile/symbols.h"
-#include "libguile/vm.h" /* to capture vm stacks */
-#include "libguile/frames.h" /* vm frames */
-
-#include "libguile/stacks.h"
-#include "libguile/private-options.h"
+#include "gsubr.h"
+#include "boolean.h"
+#include "control.h"
+#include "eval.h"
+#include "debug.h"
+#include "continuations.h"
+#include "fluids.h"
+#include "list.h"
+#include "struct.h"
+#include "macros.h"
+#include "numbers.h"
+#include "pairs.h"
+#include "procprop.h"
+#include "modules.h"
+#include "strings.h"
+#include "symbols.h"
+#include "vm.h" /* to capture vm stacks */
+#include "frames.h" /* vm frames */
+
+#include "stacks.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"
 }
diff --git a/libguile/stime.c b/libguile/stime.c
index 246482342..99cc3e8ee 100644
--- a/libguile/stime.c
+++ b/libguile/stime.c
@@ -49,19 +49,19 @@
 #include <strftime.h>
 #include <unistr.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/boolean.h"
-#include "libguile/async.h"
-#include "libguile/feature.h"
-#include "libguile/modules.h"
-#include "libguile/numbers.h"
-#include "libguile/strings.h"
-#include "libguile/vectors.h"
-#include "libguile/dynwind.h"
-#include "libguile/strings.h"
-
-#include "libguile/stime.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "boolean.h"
+#include "async.h"
+#include "feature.h"
+#include "modules.h"
+#include "numbers.h"
+#include "strings.h"
+#include "vectors.h"
+#include "dynwind.h"
+#include "strings.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"
 }
 
diff --git a/libguile/strings.c b/libguile/strings.c
index 797341d26..851dd5016 100644
--- a/libguile/strings.c
+++ b/libguile/strings.c
@@ -35,19 +35,19 @@
 
 #include "striconveh.h"
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/chars.h"
-#include "libguile/strings.h"
-#include "libguile/numbers.h"
-#include "libguile/ports.h"
-#include "libguile/ports-internal.h"
-#include "libguile/error.h"
-#include "libguile/generalized-vectors.h"
-#include "libguile/deprecation.h"
-#include "libguile/symbols.h"
-#include "libguile/threads.h"
-#include "libguile/private-options.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "chars.h"
+#include "strings.h"
+#include "numbers.h"
+#include "ports.h"
+#include "ports-internal.h"
+#include "error.h"
+#include "generalized-vectors.h"
+#include "deprecation.h"
+#include "symbols.h"
+#include "threads.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"
 }
 
diff --git a/libguile/strorder.c b/libguile/strorder.c
index a7301ceeb..18e2b4043 100644
--- a/libguile/strorder.c
+++ b/libguile/strorder.c
@@ -22,15 +22,15 @@
 # include <config.h>
 #endif
 
-#include "libguile/gsubr.h"
-#include "libguile/boolean.h"
-#include "libguile/chars.h"
-#include "libguile/pairs.h"
-#include "libguile/strings.h"
-#include "libguile/symbols.h"
+#include "gsubr.h"
+#include "boolean.h"
+#include "chars.h"
+#include "pairs.h"
+#include "strings.h"
+#include "symbols.h"
 
-#include "libguile/strorder.h"
-#include "libguile/srfi-13.h"
+#include "strorder.h"
+#include "srfi-13.h"
 
 
 SCM_C_INLINE_KEYWORD static SCM
@@ -341,6 +341,6 @@ SCM scm_string_ci_geq_p (SCM s1, SCM s2)
 void
 scm_init_strorder ()
 {
-#include "libguile/strorder.x"
+#include "strorder.x"
 }
 
diff --git a/libguile/strports.c b/libguile/strports.c
index 8d89a9fc8..5a0526c8f 100644
--- a/libguile/strports.c
+++ b/libguile/strports.c
@@ -24,27 +24,27 @@
 #  include <config.h>
 #endif
 
-#include "libguile/gsubr.h"
+#include "gsubr.h"
 
 #include <stdio.h>
 #include <unistd.h>
 
-#include "libguile/bytevectors.h"
-#include "libguile/eval.h"
-#include "libguile/keywords.h"
-#include "libguile/ports.h"
-#include "libguile/procs.h"
-#include "libguile/read.h"
-#include "libguile/strings.h"
-#include "libguile/symbols.h"
-#include "libguile/syscalls.h"
-#include "libguile/modules.h"
-#include "libguile/deprecation.h"
-#include "libguile/srfi-4.h"
-#include "libguile/threads.h"
-#include "libguile/variable.h"
-
-#include "libguile/strports.h"
+#include "bytevectors.h"
+#include "eval.h"
+#include "keywords.h"
+#include "ports.h"
+#include "procs.h"
+#include "read.h"
+#include "strings.h"
+#include "symbols.h"
+#include "syscalls.h"
+#include "modules.h"
+#include "deprecation.h"
+#include "srfi-4.h"
+#include "threads.h"
+#include "variable.h"
+
+#include "strports.h"
 
 #ifdef HAVE_STRING_H
 #include <string.h>
@@ -401,6 +401,6 @@ scm_init_strports ()
 {
   scm_string_port_type = scm_make_string_port_type ();
 
-#include "libguile/strports.x"
+#include "strports.x"
 }
 
diff --git a/libguile/struct.c b/libguile/struct.c
index 3eb58d9aa..18ca966ea 100644
--- a/libguile/struct.c
+++ b/libguile/struct.c
@@ -28,33 +28,33 @@
 
 #define SCM_BUILDING_DEPRECATED_CODE
 
-#include "libguile/gsubr.h"
-#include "libguile/boolean.h"
-#include "libguile/async.h"
-#include "libguile/chars.h"
-#include "libguile/deprecation.h"
-#include "libguile/eval.h"
-#include "libguile/finalizers.h"
-#include "libguile/goops.h"
-#include "libguile/modules.h"
-#include "libguile/numbers.h"
-#include "libguile/alist.h"
-#include "libguile/hashtab.h"
-#include "libguile/pairs.h"
-#include "libguile/ports.h"
-#include "libguile/strings.h"
-#include "libguile/srfi-13.h"
-#include "libguile/symbols.h"
-
-#include "libguile/struct.h"
-
-#include "libguile/eq.h"
+#include "gsubr.h"
+#include "boolean.h"
+#include "async.h"
+#include "chars.h"
+#include "deprecation.h"
+#include "eval.h"
+#include "finalizers.h"
+#include "goops.h"
+#include "modules.h"
+#include "numbers.h"
+#include "alist.h"
+#include "hashtab.h"
+#include "pairs.h"
+#include "ports.h"
+#include "strings.h"
+#include "srfi-13.h"
+#include "symbols.h"
+
+#include "struct.h"
+
+#include "eq.h"
 
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
 
-#include "libguile/bdw-gc.h"
+#include "bdw-gc.h"
 
 
 
@@ -842,5 +842,5 @@ scm_init_struct ()
   scm_c_define ("vtable-index-printer",
 		scm_from_int (scm_vtable_index_instance_printer));
   scm_c_define ("vtable-offset-user", scm_from_int (scm_vtable_offset_user));
-#include "libguile/struct.x"
+#include "struct.x"
 }
diff --git a/libguile/symbols.c b/libguile/symbols.c
index e7207a295..55951bc04 100644
--- a/libguile/symbols.c
+++ b/libguile/symbols.c
@@ -25,29 +25,29 @@
 
 #include <unistr.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/boolean.h"
-#include "libguile/chars.h"
-#include "libguile/eval.h"
-#include "libguile/hash.h"
-#include "libguile/list.h"
-#include "libguile/smob.h"
-#include "libguile/strorder.h"
-#include "libguile/variable.h"
-#include "libguile/alist.h"
-#include "libguile/fluids.h"
-#include "libguile/numbers.h"
-#include "libguile/strings.h"
-#include "libguile/vectors.h"
-#include "libguile/weak-set.h"
-#include "libguile/modules.h"
-#include "libguile/read.h"
-#include "libguile/srfi-13.h"
-
-#include "libguile/symbols.h"
-
-#include "libguile/private-options.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "boolean.h"
+#include "chars.h"
+#include "eval.h"
+#include "hash.h"
+#include "list.h"
+#include "smob.h"
+#include "strorder.h"
+#include "variable.h"
+#include "alist.h"
+#include "fluids.h"
+#include "numbers.h"
+#include "strings.h"
+#include "vectors.h"
+#include "weak-set.h"
+#include "modules.h"
+#include "read.h"
+#include "srfi-13.h"
+
+#include "symbols.h"
+
+#include "private-options.h"
 
 
 #ifdef HAVE_STRING_H
@@ -560,7 +560,7 @@ scm_symbols_prehistory ()
 void
 scm_init_symbols ()
 {
-#include "libguile/symbols.x"
+#include "symbols.x"
 
   default_gensym_prefix = scm_from_latin1_string (" g");
 }
diff --git a/libguile/syntax.c b/libguile/syntax.c
index 879fd90b0..c577b3b82 100644
--- a/libguile/syntax.c
+++ b/libguile/syntax.c
@@ -22,14 +22,14 @@
 # include <config.h>
 #endif
 
-#include "libguile/gsubr.h"
-#include "libguile/keywords.h"
-#include "libguile/eval.h"
-#include "libguile/modules.h"
-#include "libguile/ports.h"
-#include "libguile/syntax.h"
-#include "libguile/threads.h"
-#include "libguile/variable.h"
+#include "gsubr.h"
+#include "keywords.h"
+#include "eval.h"
+#include "modules.h"
+#include "ports.h"
+#include "syntax.h"
+#include "threads.h"
+#include "variable.h"
 
 
 
@@ -112,6 +112,6 @@ scm_i_syntax_print (SCM obj, SCM port, scm_print_state *pstate)
 void
 scm_init_syntax ()
 {
-#include "libguile/syntax.x"
+#include "syntax.x"
 }
 
diff --git a/libguile/threads.c b/libguile/threads.c
index 8bd32e66a..cec6a4cab 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -37,34 +37,34 @@
 # include <pthread_np.h>
 #endif
 
-#include "libguile/bdw-gc.h"
-#include "libguile/pairs.h"
+#include "bdw-gc.h"
+#include "pairs.h"
 #include <gc/gc_mark.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/boolean.h"
-#include "libguile/deprecation.h"
-#include "libguile/extensions.h"
-#include "libguile/hashtab.h"
-#include "libguile/eval.h"
-#include "libguile/list.h"
-#include "libguile/async.h"
-#include "libguile/modules.h"
-#include "libguile/numbers.h"
-#include "libguile/ports.h"
-#include "libguile/threads.h"
-#include "libguile/dynwind.h"
-#include "libguile/iselect.h"
-#include "libguile/fluids.h"
-#include "libguile/continuations.h"
-#include "libguile/gc.h"
-#include "libguile/gc-inline.h"
-#include "libguile/init.h"
-#include "libguile/scmsigs.h"
-#include "libguile/strings.h"
-#include "libguile/symbols.h"
-#include "libguile/variable.h"
-#include "libguile/vm.h"
+#include "gsubr.h"
+#include "boolean.h"
+#include "deprecation.h"
+#include "extensions.h"
+#include "hashtab.h"
+#include "eval.h"
+#include "list.h"
+#include "async.h"
+#include "modules.h"
+#include "numbers.h"
+#include "ports.h"
+#include "threads.h"
+#include "dynwind.h"
+#include "iselect.h"
+#include "fluids.h"
+#include "continuations.h"
+#include "gc.h"
+#include "gc-inline.h"
+#include "init.h"
+#include "scmsigs.h"
+#include "strings.h"
+#include "symbols.h"
+#include "variable.h"
+#include "vm.h"
 
 
 
@@ -1801,7 +1801,7 @@ scm_t_bits scm_tc16_condvar;
 static void
 scm_init_ice_9_threads (void *unused)
 {
-#include "libguile/threads.x"
+#include "threads.x"
 
   cancel_thread_var =
     scm_module_variable (scm_current_module (),
diff --git a/libguile/throw.c b/libguile/throw.c
index 7174443c7..c0f42977a 100644
--- a/libguile/throw.c
+++ b/libguile/throw.c
@@ -26,31 +26,31 @@
 #include <alloca.h>
 #include <stdio.h>
 #include <unistdio.h>
-#include "libguile/pairs.h"
-#include "libguile/boolean.h"
-#include "libguile/smob.h"
-#include "libguile/eval.h"
-#include "libguile/eq.h"
-#include "libguile/gsubr.h"
-#include "libguile/control.h"
-#include "libguile/deprecation.h"
-#include "libguile/backtrace.h"
-#include "libguile/debug.h"
-#include "libguile/list.h"
-#include "libguile/modules.h"
-#include "libguile/numbers.h"
-#include "libguile/stackchk.h"
-#include "libguile/stacks.h"
-#include "libguile/fluids.h"
-#include "libguile/ports.h"
-#include "libguile/vm.h"
-#include "libguile/throw.h"
-#include "libguile/init.h"
-#include "libguile/strings.h"
-#include "libguile/symbols.h"
-#include "libguile/variable.h"
-
-#include "libguile/private-options.h"
+#include "pairs.h"
+#include "boolean.h"
+#include "smob.h"
+#include "eval.h"
+#include "eq.h"
+#include "gsubr.h"
+#include "control.h"
+#include "deprecation.h"
+#include "backtrace.h"
+#include "debug.h"
+#include "list.h"
+#include "modules.h"
+#include "numbers.h"
+#include "stackchk.h"
+#include "stacks.h"
+#include "fluids.h"
+#include "ports.h"
+#include "vm.h"
+#include "throw.h"
+#include "init.h"
+#include "strings.h"
+#include "symbols.h"
+#include "variable.h"
+
+#include "private-options.h"
 
 
 /* Pleasantly enough, the guts of catch are defined in Scheme, in terms
@@ -682,5 +682,5 @@ scm_init_throw ()
                                    SCM_BOOL_F,
                                    SCM_BOOL_F);
 
-#include "libguile/throw.x"
+#include "throw.x"
 }
diff --git a/libguile/trees.c b/libguile/trees.c
index 90ba52a76..a6ca53d95 100644
--- a/libguile/trees.c
+++ b/libguile/trees.c
@@ -23,14 +23,14 @@
 # include <config.h>
 #endif
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/eq.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "eq.h"
 
-#include "libguile/list.h"
-#include "libguile/vectors.h"
-#include "libguile/srcprop.h"
-#include "libguile/trees.h"
+#include "list.h"
+#include "vectors.h"
+#include "srcprop.h"
+#include "trees.h"
 
 #include <stdarg.h>
 
@@ -206,5 +206,5 @@ copy_tree (struct t_trace *const hare,
 void
 scm_init_trees ()
 {
-#include "libguile/trees.x"
+#include "trees.x"
 }
diff --git a/libguile/unicode.c b/libguile/unicode.c
index d788851b2..d71fee5c1 100644
--- a/libguile/unicode.c
+++ b/libguile/unicode.c
@@ -27,12 +27,12 @@
 #include <unictype.h>
 #include <uniname.h>
 
-#include "libguile/chars.h"
-#include "libguile/gsubr.h"
-#include "libguile/extensions.h"
-#include <libguile/strings.h>
+#include "chars.h"
+#include "gsubr.h"
+#include "extensions.h"
+#include "strings.h"
 
-#include "libguile/unicode.h"
+#include "unicode.h"
 
 
 
@@ -78,7 +78,7 @@ static void
 scm_load_unicode (void)
 {
 #ifndef SCM_MAGIC_SNARFER
-#include "libguile/unicode.x"
+#include "unicode.x"
 #endif
 }
 
diff --git a/libguile/uniform.c b/libguile/uniform.c
index 2110d6aa1..6a2941e71 100644
--- a/libguile/uniform.c
+++ b/libguile/uniform.c
@@ -23,7 +23,7 @@
 #  include <config.h>
 #endif
 
-#include "libguile/uniform.h"
+#include "uniform.h"
 
 
 const size_t scm_i_array_element_type_sizes[SCM_ARRAY_ELEMENT_TYPE_LAST + 1] = {
@@ -84,5 +84,5 @@ scm_array_handle_uniform_writable_elements (scm_t_array_handle *h)
 void
 scm_init_uniform (void)
 {
-#include "libguile/uniform.x"
+#include "uniform.x"
 }
diff --git a/libguile/values.c b/libguile/values.c
index 99c88ee33..07a12fe81 100644
--- a/libguile/values.c
+++ b/libguile/values.c
@@ -21,18 +21,18 @@
 # include <config.h>
 #endif
 
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/eval.h"
-#include "libguile/feature.h"
-#include "libguile/gc.h"
-#include "libguile/list.h"
-#include "libguile/numbers.h"
-#include "libguile/ports.h"
-#include "libguile/strings.h"
-#include "libguile/struct.h"
-
-#include "libguile/values.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "eval.h"
+#include "feature.h"
+#include "gc.h"
+#include "list.h"
+#include "numbers.h"
+#include "ports.h"
+#include "strings.h"
+#include "struct.h"
+
+#include "values.h"
 
 SCM scm_values_vtable;
 
@@ -147,5 +147,5 @@ scm_init_values (void)
 
   scm_add_feature ("values");
 
-#include "libguile/values.x"
+#include "values.x"
 }
diff --git a/libguile/variable.c b/libguile/variable.c
index cfe23e538..5eb2b0261 100644
--- a/libguile/variable.c
+++ b/libguile/variable.c
@@ -23,15 +23,15 @@
 # include <config.h>
 #endif
 
-#include "libguile/boolean.h"
-#include "libguile/gsubr.h"
-#include "libguile/eq.h"
-#include "libguile/list.h"
-#include "libguile/ports.h"
-#include "libguile/smob.h"
-#include "libguile/deprecation.h"
-
-#include "libguile/variable.h"
+#include "boolean.h"
+#include "gsubr.h"
+#include "eq.h"
+#include "list.h"
+#include "ports.h"
+#include "smob.h"
+#include "deprecation.h"
+
+#include "variable.h"
 
 
 void
@@ -139,5 +139,5 @@ SCM_DEFINE (scm_variable_bound_p, "variable-bound?", 1, 0, 0,
 void
 scm_init_variable ()
 {
-#include "libguile/variable.x"
+#include "variable.x"
 }
diff --git a/libguile/vectors.c b/libguile/vectors.c
index d5c00b81d..c0f5b9caa 100644
--- a/libguile/vectors.c
+++ b/libguile/vectors.c
@@ -23,18 +23,18 @@
 # include <config.h>
 #endif
 
-#include "libguile/boolean.h"
-#include "libguile/gsubr.h"
-#include "libguile/pairs.h"
-#include "libguile/eq.h"
-#include "libguile/list.h"
-#include "libguile/numbers.h"
+#include "boolean.h"
+#include "gsubr.h"
+#include "pairs.h"
+#include "eq.h"
+#include "list.h"
+#include "numbers.h"
 
-#include "libguile/vectors.h"
-#include "libguile/array-handle.h"
-#include "libguile/generalized-vectors.h"
+#include "vectors.h"
+#include "array-handle.h"
+#include "generalized-vectors.h"
 
-#include "libguile/bdw-gc.h"
+#include "bdw-gc.h"
 
 
 
@@ -437,6 +437,6 @@ SCM_VECTOR_IMPLEMENTATION (SCM_ARRAY_ELEMENT_TYPE_SCM, scm_make_vector)
 void
 scm_init_vectors ()
 {
-#include "libguile/vectors.x"
+#include "vectors.x"
 }
 
diff --git a/libguile/version.c b/libguile/version.c
index 9b4e0bba7..364afd9c6 100644
--- a/libguile/version.c
+++ b/libguile/version.c
@@ -23,11 +23,11 @@
 #endif
 
 #include <stdio.h>
-#include "libguile/gsubr.h"
-#include "libguile/strings.h"
-#include "libguile/numbers.h"
+#include "gsubr.h"
+#include "strings.h"
+#include "numbers.h"
 
-#include "libguile/version.h"
+#include "version.h"
 
 
 #define SCM_TMP_MACRO_MKSTR(x) #x
@@ -116,5 +116,5 @@ SCM_DEFINE (scm_effective_version, "effective-version", 0, 0, 0,
 void
 scm_init_version ()
 {
-#include "libguile/version.x"
+#include "version.x"
 }
diff --git a/libguile/vm.c b/libguile/vm.c
index 8c26b7c28..66ae223cf 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -34,42 +34,42 @@
 #include <sys/mman.h>
 #endif
 
-#include "libguile/bdw-gc.h"
-#include "libguile/pairs.h"
+#include "bdw-gc.h"
+#include "pairs.h"
 #include <gc/gc_mark.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/atomic.h"
-#include "libguile/atomics-internal.h"
-#include "libguile/cache-internal.h"
-#include "libguile/control.h"
-#include "libguile/eval.h"
-#include "libguile/values.h"
-#include "libguile/async.h"
-#include "libguile/keywords.h"
-#include "libguile/dynwind.h"
-#include "libguile/extensions.h"
-#include "libguile/foreign.h"
-#include "libguile/alist.h"
-#include "libguile/modules.h"
-#include "libguile/numbers.h"
-#include "libguile/procprop.h"
-#include "libguile/list.h"
-#include "libguile/stackchk.h"
-#include "libguile/hooks.h"
-#include "libguile/smob.h"
-#include "libguile/frames.h"
-#include "libguile/gc-inline.h"
-#include "libguile/instructions.h"
-#include "libguile/intrinsics.h"
-#include "libguile/loader.h"
-#include "libguile/ports.h"
-#include "libguile/programs.h"
-#include "libguile/simpos.h"
-#include "libguile/symbols.h"
-#include "libguile/vectors.h"
-#include "libguile/vm.h"
-#include "libguile/vm-builtins.h"
+#include "gsubr.h"
+#include "atomic.h"
+#include "atomics-internal.h"
+#include "cache-internal.h"
+#include "control.h"
+#include "eval.h"
+#include "values.h"
+#include "async.h"
+#include "keywords.h"
+#include "dynwind.h"
+#include "extensions.h"
+#include "foreign.h"
+#include "alist.h"
+#include "modules.h"
+#include "numbers.h"
+#include "procprop.h"
+#include "list.h"
+#include "stackchk.h"
+#include "hooks.h"
+#include "smob.h"
+#include "frames.h"
+#include "gc-inline.h"
+#include "instructions.h"
+#include "intrinsics.h"
+#include "loader.h"
+#include "ports.h"
+#include "programs.h"
+#include "simpos.h"
+#include "symbols.h"
+#include "vectors.h"
+#include "vm.h"
+#include "vm-builtins.h"
 
 #if (defined __GNUC__)
 # define SCM_NOINLINE __attribute__ ((__noinline__))
@@ -1536,6 +1536,6 @@ void
 scm_init_vm (void)
 {
 #ifndef SCM_MAGIC_SNARFER
-#include "libguile/vm.x"
+#include "vm.x"
 #endif
 }
diff --git a/libguile/vports.c b/libguile/vports.c
index bf01e6958..c7a7464fd 100644
--- a/libguile/vports.c
+++ b/libguile/vports.c
@@ -27,18 +27,18 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/boolean.h"
-#include "libguile/eval.h"
-#include "libguile/chars.h"
-#include "libguile/ports.h"
-#include "libguile/ports-internal.h"
-#include "libguile/fports.h"
-#include "libguile/numbers.h"
-#include "libguile/strings.h"
-#include "libguile/vectors.h"
-
-#include "libguile/vports.h"
+#include "gsubr.h"
+#include "boolean.h"
+#include "eval.h"
+#include "chars.h"
+#include "ports.h"
+#include "ports-internal.h"
+#include "fports.h"
+#include "numbers.h"
+#include "strings.h"
+#include "vectors.h"
+
+#include "vports.h"
 
 #ifdef HAVE_STRING_H
 #include <string.h>
@@ -248,5 +248,5 @@ scm_init_vports ()
 {
   scm_soft_port_type = scm_make_sfptob ();
 
-#include "libguile/vports.x"
+#include "vports.x"
 }
diff --git a/libguile/weak-set.c b/libguile/weak-set.c
index e54915168..ec9fb9c43 100644
--- a/libguile/weak-set.c
+++ b/libguile/weak-set.c
@@ -25,16 +25,16 @@
 #include <assert.h>
 #include <string.h>
 
-#include "libguile/pairs.h"
-#include "libguile/finalizers.h"
-#include "libguile/hash.h"
-#include "libguile/eval.h"
-#include "libguile/ports.h"
-#include "libguile/threads.h"
-#include "libguile/bdw-gc.h"
+#include "pairs.h"
+#include "finalizers.h"
+#include "hash.h"
+#include "eval.h"
+#include "ports.h"
+#include "threads.h"
+#include "bdw-gc.h"
 
-#include "libguile/weak-list.h"
-#include "libguile/weak-set.h"
+#include "weak-list.h"
+#include "weak-set.h"
 
 
 /* Weak Sets
@@ -898,7 +898,7 @@ scm_weak_set_map_to_list (SCM proc, SCM set)
 void
 scm_init_weak_set ()
 {
-#include "libguile/weak-set.x"
+#include "weak-set.x"
 
   scm_i_register_async_gc_callback (vacuum_all_weak_sets);
 }
diff --git a/libguile/weak-table.c b/libguile/weak-table.c
index 840f14124..97e32a701 100644
--- a/libguile/weak-table.c
+++ b/libguile/weak-table.c
@@ -24,21 +24,21 @@
 
 #include <assert.h>
 
-#include "libguile/bdw-gc.h"
-#include "libguile/pairs.h"
+#include "bdw-gc.h"
+#include "pairs.h"
 #include <gc/gc_typed.h>
 
-#include "libguile/gsubr.h"
-#include "libguile/alist.h"
-#include "libguile/finalizers.h"
-#include "libguile/hash.h"
-#include "libguile/eval.h"
-#include "libguile/numbers.h"
-#include "libguile/ports.h"
-#include "libguile/procs.h"
-#include "libguile/threads.h"
-#include "libguile/weak-list.h"
-#include "libguile/weak-table.h"
+#include "gsubr.h"
+#include "alist.h"
+#include "finalizers.h"
+#include "hash.h"
+#include "eval.h"
+#include "numbers.h"
+#include "ports.h"
+#include "procs.h"
+#include "threads.h"
+#include "weak-list.h"
+#include "weak-table.h"
 
 
 /* Weak Tables
@@ -836,7 +836,7 @@ scm_weak_table_prehistory (void)
 void
 scm_init_weak_table ()
 {
-#include "libguile/weak-table.x"
+#include "weak-table.x"
 
   scm_i_register_async_gc_callback (vacuum_all_weak_tables);
 }
diff --git a/libguile/weak-vector.c b/libguile/weak-vector.c
index 8d6639a4c..c613f5ef4 100644
--- a/libguile/weak-vector.c
+++ b/libguile/weak-vector.c
@@ -26,13 +26,13 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "libguile/boolean.h"
-#include "libguile/gsubr.h"
-#include "libguile/extensions.h"
-#include "libguile/list.h"
-#include "libguile/pairs.h"
-#include "libguile/vectors.h"
-#include "libguile/weak-vector.h"
+#include "boolean.h"
+#include "gsubr.h"
+#include "extensions.h"
+#include "list.h"
+#include "pairs.h"
+#include "vectors.h"
+#include "weak-vector.h"
 
 
 
@@ -255,7 +255,7 @@ static void
 scm_init_weak_vector_builtins (void)
 {
 #ifndef SCM_MAGIC_SNARFER
-#include "libguile/weak-vector.x"
+#include "weak-vector.x"
 #endif
 }