* alist.c, arbiters.c, async.c, backtrace.c, boolean.c, chars.c,

continuations.c, debug-malloc.c, debug.c, dynl.c, dynwind.c,
environments.c, eq.c, error.c, eval.c, evalext.c, feature.c,
filesys.c, fluids.c, fports.c, gc.c, goops.c, guardians.c, hash.c,
hashtab.c, hooks.c, ioext.c, iselect.c, keywords.c, lang.c,
list.c, load.c, macros.c, modules.c, net_db.c, numbers.c,
objects.c, objprop.c, options.c, pairs.c, ports.c, posix.c,
print.c, procprop.c, procs.c, properties.c, ramap.c, random.c,
read.c, regex-posix.c, root.c, scmsigs.c, script.c, simpos.c,
socket.c, sort.c, srcprop.c, stackchk.c, stacks.c, stime.c,
strings.c, strop.c, strorder.c, strports.c, struct.c, symbols.c,
tag.c, threads.c, throw.c, unif.c, variable.c, vectors.c,
version.c, vports.c, weaks.c: Makes sure the snarfer output
inclusion is disabled when the snarfer is run on the file.  Thanks
to Lars J. Aas!

* Makefile.am: Install guile-procedures.txt in version-specific
directory to enable multiple installed guile versions.  Suggested
by Karl M. Hegbloom <karlheg@debian.org, patch by Matthias Koeppe.

77 files changed, 175 insertions, 1 deletions

diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index b284072c1..30eb1ca35 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,25 @@
+2000-11-17  Marius Vollmer  <mvo@zagadka.ping.de>
+
+	* alist.c, arbiters.c, async.c, backtrace.c, boolean.c, chars.c,
+	continuations.c, debug-malloc.c, debug.c, dynl.c, dynwind.c,
+	environments.c, eq.c, error.c, eval.c, evalext.c, feature.c,
+	filesys.c, fluids.c, fports.c, gc.c, goops.c, guardians.c, hash.c,
+	hashtab.c, hooks.c, ioext.c, iselect.c, keywords.c, lang.c,
+	list.c, load.c, macros.c, modules.c, net_db.c, numbers.c,
+	objects.c, objprop.c, options.c, pairs.c, ports.c, posix.c,
+	print.c, procprop.c, procs.c, properties.c, ramap.c, random.c,
+	read.c, regex-posix.c, root.c, scmsigs.c, script.c, simpos.c,
+	socket.c, sort.c, srcprop.c, stackchk.c, stacks.c, stime.c,
+	strings.c, strop.c, strorder.c, strports.c, struct.c, symbols.c,
+	tag.c, threads.c, throw.c, unif.c, variable.c, vectors.c,
+	version.c, vports.c, weaks.c: Makes sure the snarfer output
+	inclusion is disabled when the snarfer is run on the file.  Thanks
+	to Lars J. Aas!
+
+	* Makefile.am: Install guile-procedures.txt in version-specific
+	directory to enable multiple installed guile versions.  Suggested
+	by Karl M. Hegbloom <karlheg@debian.org, patch by Matthias Koeppe.
+
 2000-11-13  Gary Houston  <ghouston@arglist.com>
 
 	* fports.c: include gc.h.
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 0d63b5c8b..b85f86373 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -200,7 +200,8 @@ guile-procedures.txt: guile.texi
 	rm -f $@
 	makeinfo --force -o $@ $< || test -f $@
 
-pkgdata_DATA = guile-procedures.txt
+schemelibdir = $(pkgdatadir)/$(VERSION)
+schemelib_DATA = guile-procedures.txt
 
 ## Add -MG to make the .x magic work with auto-dep code.
 MKDEP = gcc -M -MG $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
diff --git a/libguile/alist.c b/libguile/alist.c
index 31a9aabda..cd4f182ff 100644
--- a/libguile/alist.c
+++ b/libguile/alist.c
@@ -406,7 +406,9 @@ SCM_DEFINE (scm_assoc_remove_x, "assoc-remove!", 2, 0, 0,
 void
 scm_init_alist ()
 {
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/alist.x"
+#endif
 }
 
 
diff --git a/libguile/arbiters.c b/libguile/arbiters.c
index 414cbffa6..69e68d7f3 100644
--- a/libguile/arbiters.c
+++ b/libguile/arbiters.c
@@ -128,7 +128,9 @@ scm_init_arbiters ()
 {
   scm_tc16_arbiter = scm_make_smob_type_mfpe ("arbiter", 0,
                                               scm_markcdr, NULL, prinarb, NULL);
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/arbiters.x"
+#endif
 }
 
 /*
diff --git a/libguile/async.c b/libguile/async.c
index 62008a39b..79baedda9 100644
--- a/libguile/async.c
+++ b/libguile/async.c
@@ -462,7 +462,9 @@ scm_init_async ()
   tc16_async = scm_make_smob_type ("async", 0);
   scm_set_smob_mark (tc16_async, mark_async);
 
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/async.x"
+#endif
 }
 
 /*
diff --git a/libguile/backtrace.c b/libguile/backtrace.c
index 6c2b4e3d8..9b279e15a 100644
--- a/libguile/backtrace.c
+++ b/libguile/backtrace.c
@@ -637,7 +637,9 @@ scm_init_backtrace ()
   SCM f = scm_make_fluid ();
   scm_the_last_stack_fluid = scm_sysintern ("the-last-stack", f);
 
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/backtrace.x"
+#endif
 }
 
 /*
diff --git a/libguile/boolean.c b/libguile/boolean.c
index 6807d16b1..9fd89a611 100644
--- a/libguile/boolean.c
+++ b/libguile/boolean.c
@@ -76,7 +76,9 @@ SCM_DEFINE (scm_boolean_p, "boolean?", 1, 0, 0,
 void
 scm_init_boolean ()
 {
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/boolean.x"
+#endif
 }
 
 
diff --git a/libguile/chars.c b/libguile/chars.c
index f0c0637c1..38257012b 100644
--- a/libguile/chars.c
+++ b/libguile/chars.c
@@ -407,7 +407,9 @@ int scm_n_charnames = sizeof (scm_charnames) / sizeof (char *);
 void
 scm_init_chars ()
 {
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/chars.x"
+#endif
 }
 
 
diff --git a/libguile/continuations.c b/libguile/continuations.c
index 419a2f01b..2a3780074 100644
--- a/libguile/continuations.c
+++ b/libguile/continuations.c
@@ -235,7 +235,9 @@ scm_call_continuation (SCM cont, SCM val)
 void
 scm_init_continuations ()
 {
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/continuations.x"
+#endif
 }
 
 
diff --git a/libguile/debug-malloc.c b/libguile/debug-malloc.c
index a7c5974a3..d0fba532e 100644
--- a/libguile/debug-malloc.c
+++ b/libguile/debug-malloc.c
@@ -256,5 +256,8 @@ scm_debug_malloc_prehistory ()
 void
 scm_init_debug_malloc ()
 {
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/debug-malloc.x"
+#endif
 }
+
diff --git a/libguile/debug.c b/libguile/debug.c
index 72e7c2d53..93cbf6aa9 100644
--- a/libguile/debug.c
+++ b/libguile/debug.c
@@ -642,7 +642,9 @@ scm_init_debug ()
 #endif
   scm_add_feature ("debug-extensions");
 
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/debug.x"
+#endif
 }
 
 /*
diff --git a/libguile/dynl.c b/libguile/dynl.c
index 9d3346f1f..f9e984d6d 100644
--- a/libguile/dynl.c
+++ b/libguile/dynl.c
@@ -511,7 +511,9 @@ scm_init_dynamic_linking ()
   scm_set_smob_mark (scm_tc16_dynamic_obj, mark_dynl_obj);
   scm_set_smob_print (scm_tc16_dynamic_obj, print_dynl_obj);
   sysdep_dynl_init ();
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/dynl.x"
+#endif
 }
 
 /*
diff --git a/libguile/dynwind.c b/libguile/dynwind.c
index 7a3f5437d..b131c0a8d 100644
--- a/libguile/dynwind.c
+++ b/libguile/dynwind.c
@@ -273,7 +273,9 @@ scm_init_dynwind ()
 {
   tc16_guards = scm_make_smob_type_mfpe ("guards", 0,
                                          NULL, scm_free0, printguards, NULL);
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/dynwind.x"
+#endif
 }
 
 /*
diff --git a/libguile/environments.c b/libguile/environments.c
index ced455be7..d577e50ad 100644
--- a/libguile/environments.c
+++ b/libguile/environments.c
@@ -2317,7 +2317,9 @@ scm_environments_prehistory ()
 void
 scm_init_environments ()
 {
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/environments.x"
+#endif
 }
 
 
diff --git a/libguile/eq.c b/libguile/eq.c
index 596a1ed30..275fa717f 100644
--- a/libguile/eq.c
+++ b/libguile/eq.c
@@ -205,7 +205,9 @@ SCM_DEFINE1 (scm_equal_p, "equal?", scm_tc7_rpsubr,
 void
 scm_init_eq ()
 {
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/eq.x"
+#endif
 }
 
 
diff --git a/libguile/error.c b/libguile/error.c
index 69f680ee5..56454c844 100644
--- a/libguile/error.c
+++ b/libguile/error.c
@@ -362,7 +362,9 @@ void
 scm_init_error ()
 {
 #include "libguile/cpp_err_symbols.c"
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/error.x"
+#endif
 }
 
 
diff --git a/libguile/eval.c b/libguile/eval.c
index 5fa006362..18d0c315d 100644
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -3983,7 +3983,9 @@ scm_init_eval ()
   scm_sym_trace = SCM_CAR (scm_sysintern ("trace", SCM_UNDEFINED));
 #endif
 
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/eval.x"
+#endif
 
   scm_add_feature ("delay");
 }
diff --git a/libguile/evalext.c b/libguile/evalext.c
index 124320503..b9e0130c3 100644
--- a/libguile/evalext.c
+++ b/libguile/evalext.c
@@ -148,7 +148,9 @@ void
 scm_init_evalext ()
 {
   scm_make_synt (scm_s_set_x, scm_makmmacro, scm_m_generalized_set_x);
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/evalext.x"
+#endif
 }
 
 /*
diff --git a/libguile/feature.c b/libguile/feature.c
index 3829153ce..bd9c94aed 100644
--- a/libguile/feature.c
+++ b/libguile/feature.c
@@ -129,7 +129,9 @@ scm_init_feature()
   
   scm_sysintern ("char-code-limit", SCM_MAKINUM (SCM_CHAR_CODE_LIMIT));
 
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/feature.x"
+#endif
 }
 
 /*
diff --git a/libguile/filesys.c b/libguile/filesys.c
index e8e62b1d5..eeb9611c8 100644
--- a/libguile/filesys.c
+++ b/libguile/filesys.c
@@ -1478,7 +1478,9 @@ scm_sysintern ("F_SETOWN", scm_long2num (F_SETOWN));
 scm_sysintern ("FD_CLOEXEC", scm_long2num (FD_CLOEXEC));
 #endif
 
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/filesys.x"
+#endif
 }
 
 /*
diff --git a/libguile/fluids.c b/libguile/fluids.c
index 425956d41..b7e09c39c 100644
--- a/libguile/fluids.c
+++ b/libguile/fluids.c
@@ -260,7 +260,9 @@ scm_init_fluids ()
 {
   scm_tc16_fluid = scm_make_smob_type_mfpe ("fluid", 0,
                                            NULL, NULL, print_fluid, NULL);
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/fluids.x"
+#endif
 }
 
 /*
diff --git a/libguile/fports.c b/libguile/fports.c
index 9438bbd0d..69bf89603 100644
--- a/libguile/fports.c
+++ b/libguile/fports.c
@@ -745,7 +745,9 @@ scm_make_fptob ()
 void
 scm_init_fports ()
 {
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/fports.x"
+#endif
   scm_sysintern ("_IOFBF", SCM_MAKINUM (_IOFBF));
   scm_sysintern ("_IOLBF", SCM_MAKINUM (_IOLBF));
   scm_sysintern ("_IONBF", SCM_MAKINUM (_IONBF));
diff --git a/libguile/gc.c b/libguile/gc.c
index 222553d3a..26c1c0c2a 100644
--- a/libguile/gc.c
+++ b/libguile/gc.c
@@ -2590,7 +2590,9 @@ scm_init_gc ()
 
   scm_c_hook_add (&scm_after_gc_c_hook, mark_gc_async, NULL, 0);
 
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/gc.x"
+#endif
 }
 
 /*
diff --git a/libguile/goops.c b/libguile/goops.c
index 485d067a3..1c4cb1087 100644
--- a/libguile/goops.c
+++ b/libguile/goops.c
@@ -2718,7 +2718,9 @@ scm_init_goops (void)
 
   goops_rstate = scm_c_make_rstate ("GOOPS", 5);
 
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/goops.x"
+#endif
 
   list_of_no_method = scm_permanent_object (SCM_LIST1 (sym_no_method));
 
diff --git a/libguile/guardians.c b/libguile/guardians.c
index ba092a86e..edaa8c8f8 100644
--- a/libguile/guardians.c
+++ b/libguile/guardians.c
@@ -334,7 +334,9 @@ scm_init_guardian()
   scm_c_hook_add (&scm_before_mark_c_hook, scm_guardian_gc_init, 0, 0);
   scm_c_hook_add (&scm_before_sweep_c_hook, scm_guardian_zombify, 0, 0);
 
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/guardians.x"
+#endif
 }
 
 /*
diff --git a/libguile/hash.c b/libguile/hash.c
index baf95532c..78ea1ab0f 100644
--- a/libguile/hash.c
+++ b/libguile/hash.c
@@ -252,7 +252,9 @@ SCM_DEFINE (scm_hash, "hash", 2, 0, 0,
 void
 scm_init_hash ()
 {
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/hash.x"
+#endif
 }
 
 
diff --git a/libguile/hashtab.c b/libguile/hashtab.c
index 0d3588910..1efb64781 100644
--- a/libguile/hashtab.c
+++ b/libguile/hashtab.c
@@ -558,7 +558,9 @@ scm_internal_hash_fold (SCM (*fn) (), void *closure, SCM init, SCM table)
 void
 scm_init_hashtab ()
 {
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/hashtab.x"
+#endif
 }
 
 /*
diff --git a/libguile/hooks.c b/libguile/hooks.c
index 14609cb5e..a507f3367 100644
--- a/libguile/hooks.c
+++ b/libguile/hooks.c
@@ -354,7 +354,9 @@ scm_init_hooks ()
   scm_set_smob_mark (scm_tc16_hook, scm_markcdr);
   scm_set_smob_print (scm_tc16_hook, print_hook);
 
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/hooks.x"
+#endif
 }
 
 /*
diff --git a/libguile/ioext.c b/libguile/ioext.c
index 6193679c1..b88dfa21b 100644
--- a/libguile/ioext.c
+++ b/libguile/ioext.c
@@ -562,7 +562,9 @@ scm_init_ioext ()
 {
   scm_add_feature ("i/o-extensions");
 
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/ioext.x"
+#endif
 }
 
 
diff --git a/libguile/iselect.c b/libguile/iselect.c
index ea0be94f0..d18213c4c 100644
--- a/libguile/iselect.c
+++ b/libguile/iselect.c
@@ -627,7 +627,9 @@ scm_init_iselect ()
   timeout0.tv_usec = 0;
 #endif
   init_bc (0x80, 0, 0);
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/iselect.x"
+#endif
 }
 
 #endif /* GUILE_ISELECT */
diff --git a/libguile/keywords.c b/libguile/keywords.c
index 45a40baca..017b6fc51 100644
--- a/libguile/keywords.c
+++ b/libguile/keywords.c
@@ -134,7 +134,9 @@ scm_init_keywords ()
                                              scm_markcdr, NULL, prin_keyword, NULL);
 
   scm_keyword_obarray = scm_make_vector (SCM_MAKINUM (256), SCM_EOL);
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/keywords.x"
+#endif
 }
 
 
diff --git a/libguile/lang.c b/libguile/lang.c
index 5182ea619..e2c00d177 100644
--- a/libguile/lang.c
+++ b/libguile/lang.c
@@ -150,7 +150,9 @@ SCM_DEFINE1 (scm_nil_eq, "nil-eq", scm_tc7_rpsubr,
 void
 scm_init_lang ()
 {
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/lang.x"
+#endif
   scm_make_synt ("nil-while", scm_makacro, scm_m_while);
 }
 
diff --git a/libguile/list.c b/libguile/list.c
index d4305ee1f..5b0458ff7 100644
--- a/libguile/list.c
+++ b/libguile/list.c
@@ -827,7 +827,9 @@ SCM_DEFINE (scm_delete1_x, "delete1!", 2, 0, 0,
 void
 scm_init_list ()
 {
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/list.x"
+#endif
 }
 
 /*
diff --git a/libguile/load.c b/libguile/load.c
index ca84cc454..54df73186 100644
--- a/libguile/load.c
+++ b/libguile/load.c
@@ -517,7 +517,9 @@ scm_init_load ()
 
   init_build_info ();
 
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/load.x"
+#endif
 }
 
 /*
diff --git a/libguile/macros.c b/libguile/macros.c
index 16562fcb9..977abd41d 100644
--- a/libguile/macros.c
+++ b/libguile/macros.c
@@ -181,7 +181,9 @@ scm_init_macros ()
 {
   scm_tc16_macro = scm_make_smob_type_mfpe ("macro", 0,
                                            scm_markcdr, NULL, NULL, NULL);
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/macros.x"
+#endif
 }
 
 /*
diff --git a/libguile/modules.c b/libguile/modules.c
index 04ba8546d..9b06432d9 100644
--- a/libguile/modules.c
+++ b/libguile/modules.c
@@ -269,7 +269,9 @@ SCM_DEFINE (scm_standard_eval_closure, "standard-eval-closure", 1, 0, 0,
 void
 scm_init_modules ()
 {
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/modules.x"
+#endif
   module_make_local_var_x = scm_sysintern ("module-make-local-var!",
 					   SCM_UNDEFINED);
   scm_eval_closure_tag = scm_make_smob_type ("eval-closure", 0);
diff --git a/libguile/net_db.c b/libguile/net_db.c
index c29597979..9e92c7071 100644
--- a/libguile/net_db.c
+++ b/libguile/net_db.c
@@ -569,7 +569,9 @@ scm_init_net_db ()
 #endif
 
   scm_add_feature ("net-db");
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/net_db.x"
+#endif
 }
 
 /*
diff --git a/libguile/numbers.c b/libguile/numbers.c
index a1491b8b7..08dc14e0b 100644
--- a/libguile/numbers.c
+++ b/libguile/numbers.c
@@ -4374,7 +4374,9 @@ scm_init_numbers ()
     scm_dblprec = scm_dblprec - 1;
   }
 #endif /* DBL_DIG */
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/numbers.x"
+#endif
 }
 
 /*
diff --git a/libguile/objects.c b/libguile/objects.c
index 5fe685349..3838a9c8c 100644
--- a/libguile/objects.c
+++ b/libguile/objects.c
@@ -484,7 +484,9 @@ scm_init_objects ()
   SCM_SET_CLASS_DESTRUCTOR (et, scm_struct_free_entity);
   scm_sysintern ("<entity>", et);
 
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/objects.x"
+#endif
 }
 
 /*
diff --git a/libguile/objprop.c b/libguile/objprop.c
index 1a485b2d6..04b3106d8 100644
--- a/libguile/objprop.c
+++ b/libguile/objprop.c
@@ -121,7 +121,9 @@ void
 scm_init_objprop ()
 {
   scm_object_whash = scm_make_weak_key_hash_table (SCM_MAKINUM (511));
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/objprop.x"
+#endif
 }
 
 
diff --git a/libguile/options.c b/libguile/options.c
index 030cc2f7b..051286d5c 100644
--- a/libguile/options.c
+++ b/libguile/options.c
@@ -233,7 +233,9 @@ void
 scm_init_options ()
 {
   protected_objects = scm_permanent_object (scm_cons (SCM_UNDEFINED, SCM_EOL));
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/options.x"
+#endif
 }
 
 /*
diff --git a/libguile/pairs.c b/libguile/pairs.c
index 1b885c789..26ab6330f 100644
--- a/libguile/pairs.c
+++ b/libguile/pairs.c
@@ -171,7 +171,9 @@ scm_init_pairs ()
   for (subnr = 0; cxrs [subnr]; subnr++)
     scm_make_subr(cxrs [subnr], scm_tc7_cxr, NULL);
 
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/pairs.x"
+#endif
 }
 
 
diff --git a/libguile/ports.c b/libguile/ports.c
index d868e2971..03284f879 100644
--- a/libguile/ports.c
+++ b/libguile/ports.c
@@ -1441,7 +1441,9 @@ scm_init_ports ()
 
   scm_tc16_void_port = scm_make_port_type ("void", fill_input_void_port, 
 					   write_void_port);
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/ports.x"
+#endif
 }
 
 /*
diff --git a/libguile/posix.c b/libguile/posix.c
index 8dfd4175e..fb7d39308 100644
--- a/libguile/posix.c
+++ b/libguile/posix.c
@@ -1314,7 +1314,9 @@ scm_sysintern ("PIPE_BUF", scm_long2num (PIPE_BUF));
 #endif
 
 #include "libguile/cpp_sig_symbols.c"
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/posix.x"
+#endif
 }
 
 /*
diff --git a/libguile/print.c b/libguile/print.c
index a7408491e..ec80fc21b 100644
--- a/libguile/print.c
+++ b/libguile/print.c
@@ -1149,7 +1149,9 @@ scm_init_print ()
   scm_set_smob_mark (scm_tc16_port_with_ps, scm_markcdr);
   scm_set_smob_print (scm_tc16_port_with_ps, print_port_with_ps);
   
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/print.x"
+#endif
 }
 
 /*
diff --git a/libguile/procprop.c b/libguile/procprop.c
index b2e76bbb7..cd458eb99 100644
--- a/libguile/procprop.c
+++ b/libguile/procprop.c
@@ -247,7 +247,9 @@ SCM_DEFINE (scm_set_procedure_property_x, "set-procedure-property!", 3, 0, 0,
 void
 scm_init_procprop ()
 {
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/procprop.x"
+#endif
 }
 
 
diff --git a/libguile/procs.c b/libguile/procs.c
index f979cd097..1e48c3cff 100644
--- a/libguile/procs.c
+++ b/libguile/procs.c
@@ -390,7 +390,9 @@ scm_init_subr_table ()
 void
 scm_init_procs ()
 {
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/procs.x"
+#endif
 }
 
 /*
diff --git a/libguile/properties.c b/libguile/properties.c
index cc5941d9f..5da889138 100644
--- a/libguile/properties.c
+++ b/libguile/properties.c
@@ -145,7 +145,9 @@ void
 scm_init_properties ()
 {
   scm_properties_whash = scm_make_weak_key_hash_table (SCM_MAKINUM (511));
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/properties.x"
+#endif
 }
 
 
diff --git a/libguile/ramap.c b/libguile/ramap.c
index 6aa7efbfd..b360dee29 100644
--- a/libguile/ramap.c
+++ b/libguile/ramap.c
@@ -2049,7 +2049,9 @@ scm_init_ramap ()
   init_raprocs (ra_asubrs);
   scm_make_subr (s_array_equal_p, scm_tc7_rpsubr, scm_array_equal_p);
   scm_smobs[0x0ff & (scm_tc16_array >> 8)].equalp = scm_raequal;
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/ramap.x"
+#endif
   scm_add_feature (s_scm_array_for_each);
 }
 
diff --git a/libguile/random.c b/libguile/random.c
index 4ff289f4b..dd9a75e29 100644
--- a/libguile/random.c
+++ b/libguile/random.c
@@ -584,7 +584,9 @@ scm_init_random ()
     for (i = m >> 1; i < m; ++i)
       scm_masktab[i] = m - 1;
   
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/random.x"
+#endif
 
   /* Check that the assumptions about bits per bignum digit are correct. */
 #if SIZEOF_INT == 4
diff --git a/libguile/read.c b/libguile/read.c
index 367decb11..8b23fb4bd 100644
--- a/libguile/read.c
+++ b/libguile/read.c
@@ -806,7 +806,9 @@ scm_init_read ()
     SCM_CDRLOC (scm_sysintern ("read-hash-procedures", SCM_EOL));
 
   scm_init_opts (scm_read_options, scm_read_opts, SCM_N_READ_OPTIONS);
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/read.x"
+#endif
 }
 
 /*
diff --git a/libguile/regex-posix.c b/libguile/regex-posix.c
index 9c79e23c5..6866fb071 100644
--- a/libguile/regex-posix.c
+++ b/libguile/regex-posix.c
@@ -293,7 +293,9 @@ scm_init_regex_posix ()
   scm_sysintern ("regexp/notbol", scm_long2num (REG_NOTBOL));
   scm_sysintern ("regexp/noteol", scm_long2num (REG_NOTEOL));
 
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/regex-posix.x"
+#endif
 
   scm_add_feature ("regex");
 }
diff --git a/libguile/root.c b/libguile/root.c
index 821d6f1a6..86eee6452 100644
--- a/libguile/root.c
+++ b/libguile/root.c
@@ -443,7 +443,9 @@ scm_init_root ()
   scm_set_smob_mark (scm_tc16_root, mark_root);
   scm_set_smob_print (scm_tc16_root, print_root);
 
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/root.x"
+#endif
 }
 
 /*
diff --git a/libguile/scmsigs.c b/libguile/scmsigs.c
index 6d49e8e99..795367a29 100644
--- a/libguile/scmsigs.c
+++ b/libguile/scmsigs.c
@@ -543,7 +543,9 @@ scm_init_scmsigs ()
   scm_sysintern ("SA_RESTART", scm_long2num (SA_RESTART));
 #endif
 
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/scmsigs.x"
+#endif
 }
 
 
diff --git a/libguile/script.c b/libguile/script.c
index 2ab76161e..e031991d4 100644
--- a/libguile/script.c
+++ b/libguile/script.c
@@ -652,7 +652,9 @@ scm_shell (int argc, char **argv)
 void
 scm_init_script ()
 {
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/script.x"
+#endif
 }
 
 /*
diff --git a/libguile/simpos.c b/libguile/simpos.c
index d21c81d7e..041fe70d1 100644
--- a/libguile/simpos.c
+++ b/libguile/simpos.c
@@ -133,7 +133,9 @@ SCM_DEFINE (scm_primitive_exit, "primitive-exit", 0, 1, 0,
 void
 scm_init_simpos ()
 {
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/simpos.x"
+#endif
 }
 
 
diff --git a/libguile/socket.c b/libguile/socket.c
index ae799d963..3365f3ee4 100644
--- a/libguile/socket.c
+++ b/libguile/socket.c
@@ -976,7 +976,9 @@ scm_init_socket ()
   scm_add_feature ("socket");
   scm_init_addr_buffer ();
 
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/socket.x"
+#endif
 }
 
 
diff --git a/libguile/sort.c b/libguile/sort.c
index 154a9e2d3..e25f19cd9 100644
--- a/libguile/sort.c
+++ b/libguile/sort.c
@@ -924,7 +924,9 @@ SCM_DEFINE (scm_sort_list, "sort-list", 2, 0, 0,
 void
 scm_init_sort ()
 {
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/sort.x"
+#endif
 
   scm_add_feature ("sort");
 }
diff --git a/libguile/srcprop.c b/libguile/srcprop.c
index 0ac089cfd..ca3907408 100644
--- a/libguile/srcprop.c
+++ b/libguile/srcprop.c
@@ -334,7 +334,9 @@ scm_init_srcprop ()
   scm_sym_breakpoint = SCM_CAR (scm_sysintern ("breakpoint", SCM_UNDEFINED));
 
   scm_sysintern ("source-whash", scm_source_whash);
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/srcprop.x"
+#endif
 }
 
 void
diff --git a/libguile/stackchk.c b/libguile/stackchk.c
index a2b0e4dcd..3b31ff263 100644
--- a/libguile/stackchk.c
+++ b/libguile/stackchk.c
@@ -104,7 +104,9 @@ scm_stack_report ()
 void
 scm_init_stackchk ()
 {
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/stackchk.x"
+#endif
 }
 
 /*
diff --git a/libguile/stacks.c b/libguile/stacks.c
index 3b0535202..c048d94cd 100644
--- a/libguile/stacks.c
+++ b/libguile/stacks.c
@@ -743,7 +743,9 @@ scm_init_stacks ()
 						       SCM_EOL)));
   scm_set_struct_vtable_name_x (scm_stack_type,
 				SCM_CAR (scm_intern0 ("stack")));
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/stacks.x"
+#endif
 }
 
 /*
diff --git a/libguile/stime.c b/libguile/stime.c
index 19c428dec..e5a524fcb 100644
--- a/libguile/stime.c
+++ b/libguile/stime.c
@@ -712,7 +712,9 @@ scm_init_stime()
   if (!scm_my_base) scm_my_base = mytime();
 
   scm_add_feature ("current-time");
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/stime.x"
+#endif
 }
 
 
diff --git a/libguile/strings.c b/libguile/strings.c
index 4b8d115e8..0427efcef 100644
--- a/libguile/strings.c
+++ b/libguile/strings.c
@@ -392,7 +392,9 @@ SCM_DEFINE (scm_make_shared_substring, "make-shared-substring", 1, 2, 0,
 void
 scm_init_strings ()
 {
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/strings.x"
+#endif
 }
 
 
diff --git a/libguile/strop.c b/libguile/strop.c
index 1ecf4258c..fb192c0a1 100644
--- a/libguile/strop.c
+++ b/libguile/strop.c
@@ -477,7 +477,9 @@ SCM_DEFINE (scm_string_ci_to_symbol, "string-ci->symbol", 1, 0, 0,
 void
 scm_init_strop ()
 {
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/strop.x"
+#endif
 }
 
 /*
diff --git a/libguile/strorder.c b/libguile/strorder.c
index c370aca77..ddb83a19d 100644
--- a/libguile/strorder.c
+++ b/libguile/strorder.c
@@ -256,7 +256,9 @@ SCM_DEFINE1 (scm_string_ci_geq_p, "string-ci>=?", scm_tc7_rpsubr,
 void
 scm_init_strorder ()
 {
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/strorder.x"
+#endif
 }
 
 
diff --git a/libguile/strports.c b/libguile/strports.c
index 8717e9843..5a52165fd 100644
--- a/libguile/strports.c
+++ b/libguile/strports.c
@@ -432,7 +432,9 @@ scm_make_stptob ()
 void
 scm_init_strports ()
 {
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/strports.x"
+#endif
 }
 
 
diff --git a/libguile/struct.c b/libguile/struct.c
index a47358516..20bddc79f 100644
--- a/libguile/struct.c
+++ b/libguile/struct.c
@@ -825,7 +825,9 @@ scm_init_struct ()
   scm_sysintern ("vtable-index-vtable", SCM_MAKINUM (scm_vtable_index_vtable));
   scm_sysintern ("vtable-index-printer", SCM_MAKINUM (scm_vtable_index_printer));
   scm_sysintern ("vtable-offset-user", SCM_MAKINUM (scm_vtable_offset_user));
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/struct.x"
+#endif
 }
 
 /*
diff --git a/libguile/symbols.c b/libguile/symbols.c
index 9dd80dd87..48c438d45 100644
--- a/libguile/symbols.c
+++ b/libguile/symbols.c
@@ -908,7 +908,9 @@ scm_init_symbols ()
 {
   gensym_counter = 0;
   gentemp_counter = 0;
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/symbols.x"
+#endif
 }
 
 /*
diff --git a/libguile/tag.c b/libguile/tag.c
index ed60a0d1c..db385905f 100644
--- a/libguile/tag.c
+++ b/libguile/tag.c
@@ -218,7 +218,9 @@ SCM_DEFINE (scm_tag, "tag", 1, 0, 0,
 void
 scm_init_tag ()
 {
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/tag.x"
+#endif
 }
 
 
diff --git a/libguile/threads.c b/libguile/threads.c
index 5685a8907..8bedc5453 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -146,7 +146,9 @@ scm_init_threads (SCM_STACKITEM *i)
   scm_tc16_mutex = scm_make_smob_type ("mutex", sizeof (coop_m));
   scm_tc16_condvar = scm_make_smob_type ("condition-variable", sizeof (coop_c));
                                         
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/threads.x"
+#endif
   /* Initialize implementation specific details of the threads support */
   scm_threads_init (i);
 }
diff --git a/libguile/throw.c b/libguile/throw.c
index dfcb4c44d..d0abcb8a0 100644
--- a/libguile/throw.c
+++ b/libguile/throw.c
@@ -706,7 +706,9 @@ scm_init_throw ()
 					     NULL,
 					     print_lazy_catch,
 					     NULL);
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/throw.x"
+#endif
 }
 
 /*
diff --git a/libguile/unif.c b/libguile/unif.c
index 6d9fc67e7..a4119be8e 100644
--- a/libguile/unif.c
+++ b/libguile/unif.c
@@ -2557,7 +2557,9 @@ scm_init_unif ()
 					    scm_raprin1,
 					    scm_array_equal_p);
   scm_add_feature ("array");
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/unif.x"
+#endif
 }
 
 /*
diff --git a/libguile/variable.c b/libguile/variable.c
index 4dcfc0e67..304ea009b 100644
--- a/libguile/variable.c
+++ b/libguile/variable.c
@@ -235,7 +235,9 @@ scm_init_variable ()
   scm_tc16_variable = scm_make_smob_type_mfpe ("variable", 0,
                                               scm_markvar, NULL, prin_var, var_equal);
   anonymous_variable_sym = SCM_CAR (scm_sysintern ("anonymous-variable", SCM_UNDEFINED));
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/variable.x"
+#endif
 }
 
 
diff --git a/libguile/vectors.c b/libguile/vectors.c
index 1281ddcd5..9dd7d8b66 100644
--- a/libguile/vectors.c
+++ b/libguile/vectors.c
@@ -407,7 +407,9 @@ SCM_DEFINE (scm_vector_move_right_x, "vector-move-right!", 5, 0, 0,
 void
 scm_init_vectors ()
 {
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/vectors.x"
+#endif
 }
 
 
diff --git a/libguile/version.c b/libguile/version.c
index 053df21f2..98c8691e9 100644
--- a/libguile/version.c
+++ b/libguile/version.c
@@ -100,7 +100,9 @@ SCM_DEFINE (scm_version, "version", 0, 0, 0,
 void
 scm_init_version ()
 {
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/version.x"
+#endif
 }
 
 /*
diff --git a/libguile/vports.c b/libguile/vports.c
index 877da5c40..512d55862 100644
--- a/libguile/vports.c
+++ b/libguile/vports.c
@@ -211,7 +211,9 @@ scm_make_sfptob ()
 void
 scm_init_vports ()
 {
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/vports.x"
+#endif
 }
 
 /*
diff --git a/libguile/weaks.c b/libguile/weaks.c
index 4d7d5a091..1d803401b 100644
--- a/libguile/weaks.c
+++ b/libguile/weaks.c
@@ -327,7 +327,9 @@ scm_weaks_prehistory ()
 void
 scm_init_weaks ()
 {
+#ifndef SCM_MAGIC_SNARFER
 #include "libguile/weaks.x"
+#endif
 }