* *.[hc]: add Emacs magic at the end of file, to ensure GNU

 	indentation style.

184 files changed, 1075 insertions, 956 deletions

diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index db56eafaa..01e6a4c56 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-19  Michael Livshin  <mlivshin@bigfoot.com>
+
+	* *.[hc]: add Emacs magic at the end of file, to ensure GNU
+ 	indentation style.
+
 2000-03-19  Mikael Djurfeldt  <mdj@thalamus.nada.kth.se>
 
 	* threads.h: Added #include "libguile/throw.h".  (Thanks to
diff --git a/libguile/__scm.h b/libguile/__scm.h
index 889572bbb..a8e030806 100644
--- a/libguile/__scm.h
+++ b/libguile/__scm.h
@@ -547,3 +547,9 @@ extern struct errdesc scm_errmsgs[];
 
 
 #endif  /* __SCMH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/_scm.h b/libguile/_scm.h
index 1abeed791..6ed63c033 100644
--- a/libguile/_scm.h
+++ b/libguile/_scm.h
@@ -139,3 +139,9 @@
 
 #endif  /* _SCMH */
 
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/alist.c b/libguile/alist.c
index 17b92a12b..4e11781cd 100644
--- a/libguile/alist.c
+++ b/libguile/alist.c
@@ -394,3 +394,9 @@ scm_init_alist ()
 #include "alist.x"
 }
 
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/alist.h b/libguile/alist.h
index f04610a7a..0d6de15c5 100644
--- a/libguile/alist.h
+++ b/libguile/alist.h
@@ -67,3 +67,9 @@ extern SCM scm_assoc_remove_x (SCM alist, SCM key);
 extern void scm_init_alist (void);
 
 #endif  /* ALISTH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/alloca.c b/libguile/alloca.c
index 55e2a861f..1f9b29d07 100644
--- a/libguile/alloca.c
+++ b/libguile/alloca.c
@@ -492,3 +492,9 @@ i00afunc (long address)
 
 #endif /* no alloca */
 #endif /* not GCC version 2 */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/arbiters.c b/libguile/arbiters.c
index 7decd486e..efab09848 100644
--- a/libguile/arbiters.c
+++ b/libguile/arbiters.c
@@ -130,3 +130,9 @@ scm_init_arbiters ()
                                               scm_markcdr, NULL, prinarb, NULL);
 #include "arbiters.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/arbiters.h b/libguile/arbiters.h
index d7a0ccaa5..8da0a0bee 100644
--- a/libguile/arbiters.h
+++ b/libguile/arbiters.h
@@ -54,3 +54,9 @@ extern SCM scm_release_arbiter (SCM arb);
 extern void scm_init_arbiters (void);
 
 #endif  /* ARBITERSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/async.c b/libguile/async.c
index 6a31a0958..39d6f6296 100644
--- a/libguile/async.c
+++ b/libguile/async.c
@@ -474,3 +474,9 @@ scm_init_async ()
 
 #include "async.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/async.h b/libguile/async.h
index 1b2981fbf..b1be78295 100644
--- a/libguile/async.h
+++ b/libguile/async.h
@@ -82,3 +82,9 @@ extern SCM scm_mask_signals (void);
 extern void scm_init_async (void);
 
 #endif  /* ASYNCH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/backtrace.c b/libguile/backtrace.c
index 16b6a4793..f3927d5f4 100644
--- a/libguile/backtrace.c
+++ b/libguile/backtrace.c
@@ -642,3 +642,9 @@ scm_init_backtrace ()
 
 #include "backtrace.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/backtrace.h b/libguile/backtrace.h
index af9f137ee..44012f6a8 100644
--- a/libguile/backtrace.h
+++ b/libguile/backtrace.h
@@ -63,3 +63,9 @@ SCM scm_set_print_params_x (SCM params);
 void scm_init_backtrace (void);
 
 #endif /* BACKTRACEH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/boolean.c b/libguile/boolean.c
index 7b4267b30..a2353459e 100644
--- a/libguile/boolean.c
+++ b/libguile/boolean.c
@@ -79,3 +79,9 @@ scm_init_boolean ()
 #include "boolean.x"
 }
 
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/boolean.h b/libguile/boolean.h
index fe2184823..8408a968a 100644
--- a/libguile/boolean.h
+++ b/libguile/boolean.h
@@ -73,3 +73,9 @@ extern SCM scm_boolean_p (SCM obj);
 extern void scm_init_boolean (void);
 
 #endif  /* BOOLEANH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/chars.c b/libguile/chars.c
index bfa96ef0f..a7d8d195a 100644
--- a/libguile/chars.c
+++ b/libguile/chars.c
@@ -400,3 +400,9 @@ scm_init_chars ()
 #include "chars.x"
 }
 
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/chars.h b/libguile/chars.h
index 1cf0f01d7..45850faeb 100644
--- a/libguile/chars.h
+++ b/libguile/chars.h
@@ -92,3 +92,9 @@ extern int scm_downcase (unsigned int c);
 extern void scm_init_chars (void);
 
 #endif  /* SCM_CHARSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/continuations.c b/libguile/continuations.c
index 6c7a537d7..08248ff50 100644
--- a/libguile/continuations.c
+++ b/libguile/continuations.c
@@ -208,3 +208,9 @@ scm_init_continuations ()
 #include "continuations.x"
 }
 
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/continuations.h b/libguile/continuations.h
index e1b494cb2..b29994547 100644
--- a/libguile/continuations.h
+++ b/libguile/continuations.h
@@ -76,3 +76,9 @@ extern SCM scm_call_continuation (SCM cont, SCM val);
 extern void scm_init_continuations (void);
 
 #endif  /* CONTINUATIONSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/coop-defs.h b/libguile/coop-defs.h
index e1631109d..30516c3ab 100644
--- a/libguile/coop-defs.h
+++ b/libguile/coop-defs.h
@@ -283,3 +283,9 @@ do { \
 #define SCM_SET_THREAD_LOCAL_DATA(ptr) (coop_global_curr->data = (ptr))
 
 #endif /* COOP_DEFSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/coop-threads.c b/libguile/coop-threads.c
index 7d4b73570..cf28fc4dd 100644
--- a/libguile/coop-threads.c
+++ b/libguile/coop-threads.c
@@ -467,3 +467,9 @@ scm_signal_condition_variable (SCM c)
   coop_condition_variable_signal (SCM_CONDVAR_DATA (c));
   return SCM_BOOL_T;
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/coop-threads.h b/libguile/coop-threads.h
index 435fb6b8a..5dd0fcbda 100644
--- a/libguile/coop-threads.h
+++ b/libguile/coop-threads.h
@@ -122,3 +122,9 @@ extern coop_q_t coop_global_allq;	/* A queue of all threads. */
 extern coop_t *coop_global_curr;       	/* Currently-executing thread. */
 
 #endif /* COOP_THREADSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/coop.c b/libguile/coop.c
index f676ea0c0..5d9ae5deb 100644
--- a/libguile/coop.c
+++ b/libguile/coop.c
@@ -40,7 +40,7 @@
  * If you do not wish that, delete this exception notice.  */
 
 
-/* $Id: coop.c,v 1.18 2000-03-12 01:48:04 mdj Exp $ */
+/* $Id: coop.c,v 1.19 2000-03-19 19:01:10 cmm Exp $ */
 
 /* Cooperative thread library, based on QuickThreads */
 
@@ -739,3 +739,9 @@ scm_thread_usleep (unsigned long usec)
 }
 
 #endif /* GUILE_ISELECT */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/cpp_errno.c b/libguile/cpp_errno.c
index 8ee25bad9..32556a36c 100644
--- a/libguile/cpp_errno.c
+++ b/libguile/cpp_errno.c
@@ -1,3 +1,9 @@
 /* this file is processed by gcc with special options to extract
    a list of errno codes.  */
 #include <errno.h>
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/cpp_signal.c b/libguile/cpp_signal.c
index eb4ed9667..e740ba564 100644
--- a/libguile/cpp_signal.c
+++ b/libguile/cpp_signal.c
@@ -1,3 +1,9 @@
 /* this file is processed by gcc with special options to extract
    a list of signal numbers.  */
 #include <signal.h>
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/debug.c b/libguile/debug.c
index ad32953ee..f9001df3e 100644
--- a/libguile/debug.c
+++ b/libguile/debug.c
@@ -642,3 +642,9 @@ scm_init_debug ()
 
 #include "debug.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/debug.h b/libguile/debug.h
index 685800c63..bae78b406 100644
--- a/libguile/debug.h
+++ b/libguile/debug.h
@@ -216,3 +216,9 @@ extern SCM scm_debug_hang (SCM obj);
 #endif /*GUILE_DEBUG*/
 
 #endif /* DEBUGH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/dynl.c b/libguile/dynl.c
index c3f2d2b51..69f2050d2 100644
--- a/libguile/dynl.c
+++ b/libguile/dynl.c
@@ -561,3 +561,9 @@ scm_init_dynamic_linking ()
 #include "dynl.x"
   kw_global = scm_make_keyword_from_dash_symbol (sym_global);
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/dynl.h b/libguile/dynl.h
index a271a3d87..69b2ae8ae 100644
--- a/libguile/dynl.h
+++ b/libguile/dynl.h
@@ -61,3 +61,9 @@ SCM scm_dynamic_args_call (SCM symb, SCM dobj, SCM args);
 void scm_init_dynamic_linking (void);
 
 #endif  /* LIBGUILE_DYNL_H */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/dynwind.c b/libguile/dynwind.c
index 3816a9812..304ba7711 100644
--- a/libguile/dynwind.c
+++ b/libguile/dynwind.c
@@ -273,3 +273,9 @@ scm_init_dynwind ()
                                          NULL, scm_free0, printguards, NULL);
 #include "dynwind.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/dynwind.h b/libguile/dynwind.h
index 247f24ddb..80251c945 100644
--- a/libguile/dynwind.h
+++ b/libguile/dynwind.h
@@ -64,3 +64,9 @@ extern SCM scm_wind_chain (void);
 #endif /*GUILE_DEBUG*/
 
 #endif  /* DYNWINDH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/eq.c b/libguile/eq.c
index 1273a76ac..73e5f1fa8 100644
--- a/libguile/eq.c
+++ b/libguile/eq.c
@@ -207,3 +207,9 @@ scm_init_eq ()
 #include "eq.x"
 }
 
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/eq.h b/libguile/eq.h
index 82977c0e3..f2c6616b9 100644
--- a/libguile/eq.h
+++ b/libguile/eq.h
@@ -53,3 +53,9 @@ extern SCM scm_equal_p (SCM x, SCM y);
 extern void scm_init_eq (void);
 
 #endif  /* EQH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/error.c b/libguile/error.c
index 07b6d8968..239bf3bb0 100644
--- a/libguile/error.c
+++ b/libguile/error.c
@@ -319,3 +319,9 @@ scm_init_error ()
 #include "error.x"
 }
 
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/error.h b/libguile/error.h
index 11924dcea..ac2a8d4da 100644
--- a/libguile/error.h
+++ b/libguile/error.h
@@ -87,3 +87,9 @@ extern SCM scm_wta (SCM arg, const char *pos, const char *s_subr);
 extern void scm_init_error (void);
 
 #endif  /* ERRORH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/eval.c b/libguile/eval.c
index 590ab13a1..f99a80e36 100644
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -3894,3 +3894,9 @@ scm_init_eval ()
 }
 
 #endif /* !DEVAL */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/eval.h b/libguile/eval.h
index cc1ecffcd..4d5ef02b9 100644
--- a/libguile/eval.h
+++ b/libguile/eval.h
@@ -227,3 +227,9 @@ extern SCM scm_eval_x (SCM obj);
 extern void scm_init_eval (void);
 
 #endif  /* EVALH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/evalext.c b/libguile/evalext.c
index c719670b5..447f6f90d 100644
--- a/libguile/evalext.c
+++ b/libguile/evalext.c
@@ -160,3 +160,9 @@ scm_init_evalext ()
   scm_make_synt (scm_s_set_x, scm_makmmacro, scm_m_generalized_set_x);
 #include "evalext.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/evalext.h b/libguile/evalext.h
index c1cd7b46f..cb09736bc 100644
--- a/libguile/evalext.h
+++ b/libguile/evalext.h
@@ -54,3 +54,9 @@ extern SCM scm_m_undefine (SCM x, SCM env);
 extern void scm_init_evalext (void);
 
 #endif  /* EVALEXTH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/feature.c b/libguile/feature.c
index a7c65563f..0e7daefe0 100644
--- a/libguile/feature.c
+++ b/libguile/feature.c
@@ -350,3 +350,9 @@ scm_init_feature()
 
 #include "feature.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/feature.h b/libguile/feature.h
index 5161db9c0..125e88324 100644
--- a/libguile/feature.h
+++ b/libguile/feature.h
@@ -76,3 +76,9 @@ extern SCM scm_hook_to_list (SCM hook);
 extern void scm_init_feature (void);
 
 #endif  /* FEATUREH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/filesys.c b/libguile/filesys.c
index ee8516a10..185038999 100644
--- a/libguile/filesys.c
+++ b/libguile/filesys.c
@@ -1464,3 +1464,9 @@ scm_sysintern ("FD_CLOEXEC", scm_long2num (FD_CLOEXEC));
 
 #include "filesys.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/filesys.h b/libguile/filesys.h
index 6d3ea1fcd..7573b6332 100644
--- a/libguile/filesys.h
+++ b/libguile/filesys.h
@@ -89,3 +89,9 @@ extern SCM scm_basename (SCM filename, SCM suffix);
 extern void scm_init_filesys (void);
 
 #endif  /* FILESYSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/fluids.c b/libguile/fluids.c
index fa3d926e0..752ef9c29 100644
--- a/libguile/fluids.c
+++ b/libguile/fluids.c
@@ -262,3 +262,9 @@ scm_init_fluids ()
                                            NULL, NULL, print_fluid, NULL);
 #include "fluids.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/fluids.h b/libguile/fluids.h
index d2f3d5dde..0058cfd86 100644
--- a/libguile/fluids.h
+++ b/libguile/fluids.h
@@ -107,3 +107,9 @@ void scm_swap_fluids_reverse (SCM fluids, SCM vals);
 void scm_init_fluids (void);
 
 #endif /* !FLUIDSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/fports.c b/libguile/fports.c
index 01ae5556f..36f37fab1 100644
--- a/libguile/fports.c
+++ b/libguile/fports.c
@@ -735,3 +735,9 @@ scm_init_fports ()
   scm_sysintern ("_IOLBF", SCM_MAKINUM (_IOLBF));
   scm_sysintern ("_IONBF", SCM_MAKINUM (_IONBF));
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/fports.h b/libguile/fports.h
index d490f3b83..455c293c5 100644
--- a/libguile/fports.h
+++ b/libguile/fports.h
@@ -79,3 +79,9 @@ extern SCM scm_fdes_to_port (int fdes, char *mode, SCM name);
 extern void scm_init_fports (void);
 
 #endif  /* FPORTSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/fsu-pthreads.h b/libguile/fsu-pthreads.h
index a012b1eb2..e69de29bb 100644
--- a/libguile/fsu-pthreads.h
+++ b/libguile/fsu-pthreads.h
@@ -1,169 +0,0 @@
-/*	Copyright (C) 1995, 1996 Free Software Foundation, Inc.
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA
- *
- * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE.  If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way.  To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * If you write modifications of your own for GUILE, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.  */
-
-/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
-   gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
-
-
-#ifndef SCM_FSU_PTHREADS_H
-#define SCM_FSU_PTHREADS_H
-
-#define PTHREAD_KERNEL
-#include <pthread.h>
-
-/* Identify where the stack pointer can be found in a jmpbuf.
- */
-
-#if defined(__sparc_setjmp_h)
-#  define THREAD_SP machdep_data.machdep_state[2]
-#endif
-
-#if defined(linux)
-#  define THREAD_SP machdep_data.machdep_state[0].__sp
-#endif
-
-#if defined(sgi)
-#  define THREAD_SP machdep_data.machdep_state[JB_SP]
-#endif
-
-/*  ...define THREAD_SP for your architecture here...
- */
-
-#if !defined(THREAD_SP)
---> where is your stack pointer?
-#endif
-
-
-
-#define PTHREAD_MAX_PRIORITY 64
-
-
-
-/* Boost the priority of this thread so that it is the only
-   one running. PTHREAD_MAX_PRIORITY is reserved for this 
-   purpose */
-
-#define SCM_THREAD_CRITICAL_SECTION_START \
-  struct sched_param param; \
-  int previous_prio; \
-  int policy; \
-  pthread_getschedparam(pthread_self(), &policy, &param); \
-  previous_prio = param.prio; \
-  param.prio = PTHREAD_MAX_PRIORITY; \
-  pthread_setschedparam(pthread_self(), policy, &param)
-
-#define SCM_THREAD_CRITICAL_SECTION_END \
-  param.prio = previous_prio; \
-  pthread_setschedparam(pthread_self(), policy, &param)
-
-#define SCM_THREAD_INITIALIZE_STORAGE \
-  scm_threads_init_mit_pthreads ()
-
-
-
-#define SCM_NO_CRITICAL_SECTION_OWNER 0
-
-#define SCM_DEFER_INTS \
-do { \
-  SCM_IASSERT(scm_critical_section_owner != pthread_self()); \
-  pthread_mutex_lock(&scm_critical_section_mutex); \
-  scm_critical_section_owner = pthread_self(); \
-  scm_ints_disabled = 1; \
-} while (0)
-
-#define SCM_ALLOW_INTS \
-do { \
-  SCM_IASSERT(scm_critical_section_owner == pthread_self()); \
-  scm_ints_disabled = 0; \
-  scm_critical_section_owner = SCM_NO_CRITICAL_SECTION_OWNER; \
-  pthread_mutex_unlock(&scm_critical_section_mutex); \
-  SCM_CHECK_INTS; \
-} while (0)
-
-#define SCM_REDEFER_INTS \
-do { \
-  if ((scm_critical_section_owner != pthread_self()) || \
-      (scm_critical_section_owner == SCM_NO_CRITICAL_SECTION_OWNER)) \
-    { \
-      pthread_mutex_lock(&scm_critical_section_mutex); \
-      scm_critical_section_owner = pthread_self(); \
-    } \
-  ++scm_ints_disabled; \
-} while (0)
-
-#define SCM_REALLOW_INTS \
-do { \
-  SCM_IASSERT(scm_critical_section_owner == pthread_self()); \
-  --scm_ints_disabled; \
-  if (!scm_ints_disabled) \
-    { \
-      scm_critical_section_owner = SCM_NO_CRITICAL_SECTION_OWNER; \
-      pthread_mutex_unlock(&scm_critical_section_mutex); \
-      SCM_CHECK_INTS; \
-    } \
-} while (0)
-
-*fixme*
-#define scm_root ((scm_root_state *) pthread_self()->prots)
-#define scm_set_root(new_root) (pthread_self()->prots = (new_root))
-
-
-
-void scm_threads_init_mit_pthreads ();
-
-typedef struct QUEUE {
-  struct QUEUE *flink, *blink;
-} queue;
-
-extern pthread_mutex_t scm_critical_section_mutex;
-extern pthread_t scm_critical_section_owner;
-
-/* Key to thread specific data */
-extern pthread_key_t info_key;
-
-struct scm_pthread_create_info_type
-{
-  SCM thunk;
-  SCM error;
-  SCM *prots;
-} scm_pthread_create_info;
-
-#endif
diff --git a/libguile/gc.c b/libguile/gc.c
index 806f19ae0..cccb07a47 100644
--- a/libguile/gc.c
+++ b/libguile/gc.c
@@ -2600,3 +2600,9 @@ scm_init_gc ()
 {
 #include "gc.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/gc.h b/libguile/gc.h
index cb64d7d18..c1e82dbf2 100644
--- a/libguile/gc.h
+++ b/libguile/gc.h
@@ -139,3 +139,9 @@ extern int scm_init_storage (scm_sizet init_heap_size,
 #endif
 extern void scm_init_gc (void);
 #endif  /* GCH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/gdb_interface.h b/libguile/gdb_interface.h
index 2fcbf9507..e06c706a6 100644
--- a/libguile/gdb_interface.h
+++ b/libguile/gdb_interface.h
@@ -124,3 +124,9 @@ extern int gdb_print (GDB_TYPE value);
 extern int gdb_binding (GDB_TYPE name, GDB_TYPE value);
 
 #endif /* GDB_INTERFACE_H */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/gdbint.c b/libguile/gdbint.c
index 52df23c06..435afb559 100644
--- a/libguile/gdbint.c
+++ b/libguile/gdbint.c
@@ -326,3 +326,9 @@ scm_init_gdbint ()
 
   tok_buf = scm_permanent_object (scm_makstr (30L, 0));
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/gdbint.h b/libguile/gdbint.h
index 65f6ebfb9..c0983a584 100644
--- a/libguile/gdbint.h
+++ b/libguile/gdbint.h
@@ -56,3 +56,9 @@ extern int scm_print_carefully_p;
 extern void scm_init_gdbint (void);
 
 #endif /* GDBINTH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/gh.h b/libguile/gh.h
index 32e1d27d0..389174d75 100644
--- a/libguile/gh.h
+++ b/libguile/gh.h
@@ -246,3 +246,9 @@ void gh_newline (void);
 #endif
 
 #endif /* __GH_H */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/gh_data.c b/libguile/gh_data.c
index 39d467c63..ab837ef9e 100644
--- a/libguile/gh_data.c
+++ b/libguile/gh_data.c
@@ -692,3 +692,9 @@ gh_module_lookup (SCM vec, char *sname)
   else
     return SCM_UNDEFINED;
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/gh_eval.c b/libguile/gh_eval.c
index 468434a44..007e6a033 100644
--- a/libguile/gh_eval.c
+++ b/libguile/gh_eval.c
@@ -119,3 +119,9 @@ gh_eval_file_with_standard_handler (const char *scheme_code)
 {
   return gh_eval_file_with_catch (scheme_code, gh_standard_handler);
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/gh_funcs.c b/libguile/gh_funcs.c
index 179798582..8400334f4 100644
--- a/libguile/gh_funcs.c
+++ b/libguile/gh_funcs.c
@@ -167,3 +167,9 @@ gh_call3 (SCM proc, SCM arg1, SCM arg2, SCM arg3)
 {
   return scm_apply (proc, arg1, scm_cons2 (arg2, arg3, scm_listofnull));
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/gh_init.c b/libguile/gh_init.c
index 8661f3650..5b373b870 100644
--- a/libguile/gh_init.c
+++ b/libguile/gh_init.c
@@ -103,3 +103,9 @@ gh_standard_handler (void *data, SCM tag, SCM throw_args)
 
   return SCM_BOOL_F;
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/gh_io.c b/libguile/gh_io.c
index 9e19f4d47..28d8103a6 100644
--- a/libguile/gh_io.c
+++ b/libguile/gh_io.c
@@ -61,3 +61,9 @@ gh_newline ()
 {
   scm_newline (scm_current_output_port ());
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/gh_list.c b/libguile/gh_list.c
index 044176d41..5d85e5570 100644
--- a/libguile/gh_list.c
+++ b/libguile/gh_list.c
@@ -187,3 +187,9 @@ gh_set_cdr_x(SCM pair, SCM value)
 {
   return scm_set_cdr_x(pair, value);
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/gh_predicates.c b/libguile/gh_predicates.c
index 6d06fdb62..f7f2ad9be 100644
--- a/libguile/gh_predicates.c
+++ b/libguile/gh_predicates.c
@@ -135,3 +135,9 @@ gh_null_p(SCM l)
 {
   return (SCM_NFALSEP(scm_null_p(l)));
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/gh_test_c.c b/libguile/gh_test_c.c
index 9a2a71cb7..9b4e37eb9 100644
--- a/libguile/gh_test_c.c
+++ b/libguile/gh_test_c.c
@@ -245,3 +245,9 @@ c_vector_test (SCM s_length)
 
   return xvec;
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/gh_test_repl.c b/libguile/gh_test_repl.c
index ed9b57e21..7fd3939aa 100644
--- a/libguile/gh_test_repl.c
+++ b/libguile/gh_test_repl.c
@@ -163,3 +163,9 @@ c_vector_test (SCM s_length)
 
   return xvec;
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/gsubr.c b/libguile/gsubr.c
index 8d2a10723..db41d2098 100644
--- a/libguile/gsubr.c
+++ b/libguile/gsubr.c
@@ -212,3 +212,9 @@ scm_init_gsubr()
   scm_make_gsubr("gsubr-2-1-l", 2, 1, 1, gsubr_21l); /* example */
 #endif
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/gsubr.h b/libguile/gsubr.h
index 2a0c47de4..bf08f54f5 100644
--- a/libguile/gsubr.h
+++ b/libguile/gsubr.h
@@ -71,3 +71,9 @@ extern SCM scm_gsubr_apply (SCM args);
 extern void scm_init_gsubr (void);
 
 #endif  /* GSUBRH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/guardians.c b/libguile/guardians.c
index 4cc92c283..563ac0abb 100644
--- a/libguile/guardians.c
+++ b/libguile/guardians.c
@@ -276,3 +276,9 @@ scm_init_guardian()
 
 #include "guardians.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/guardians.h b/libguile/guardians.h
index 15345ccdf..eb8eda477 100644
--- a/libguile/guardians.h
+++ b/libguile/guardians.h
@@ -59,3 +59,9 @@ SCM scm_get_one_zombie (SCM guardian);
 void scm_init_guardian (void);
 
 #endif /* !SCM_GUARDIANH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/guile.c b/libguile/guile.c
index 868442377..2439be08e 100644
--- a/libguile/guile.c
+++ b/libguile/guile.c
@@ -76,3 +76,9 @@ main (int argc, char **argv)
   scm_boot_guile (argc, argv, inner_main, 0);
   return 0; /* never reached */
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/hash.c b/libguile/hash.c
index aee3144ae..4883aba2f 100644
--- a/libguile/hash.c
+++ b/libguile/hash.c
@@ -247,3 +247,9 @@ scm_init_hash ()
 #include "hash.x"
 }
 
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/hash.h b/libguile/hash.h
index 0ad0f3a5b..aa97f7ed6 100644
--- a/libguile/hash.h
+++ b/libguile/hash.h
@@ -58,3 +58,9 @@ extern SCM scm_hash (SCM obj, SCM n);
 extern void scm_init_hash (void);
 
 #endif  /* HASHH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/hashtab.c b/libguile/hashtab.c
index c78718f2d..f78d0b79a 100644
--- a/libguile/hashtab.c
+++ b/libguile/hashtab.c
@@ -565,3 +565,9 @@ scm_init_hashtab ()
 {
 #include "hashtab.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/hashtab.h b/libguile/hashtab.h
index 46fd91511..538bf6e76 100644
--- a/libguile/hashtab.h
+++ b/libguile/hashtab.h
@@ -84,3 +84,9 @@ extern SCM scm_hash_fold (SCM proc, SCM init, SCM hash);
 extern void scm_init_hashtab (void);
 
 #endif  /* HASHTABH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/inet_aton.c b/libguile/inet_aton.c
index 82b4e8852..af203abde 100644
--- a/libguile/inet_aton.c
+++ b/libguile/inet_aton.c
@@ -160,3 +160,9 @@ inet_aton(const char *cp_arg, struct in_addr *addr)
 		addr->s_addr = htonl(val);
 	return (1);
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/init.c b/libguile/init.c
index eb5936783..15535635f 100644
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -620,3 +620,9 @@ invoke_main_func (void *body_data)
   /* never reached */
   return SCM_UNDEFINED;
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/init.h b/libguile/init.h
index 16e2e2b83..412a47ed9 100644
--- a/libguile/init.h
+++ b/libguile/init.h
@@ -56,3 +56,9 @@ extern void scm_boot_guile (int argc, char **argv,
 extern void scm_load_startup_files (void);
 
 #endif  /* INITH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/ioext.c b/libguile/ioext.c
index 99aeef048..a529169e9 100644
--- a/libguile/ioext.c
+++ b/libguile/ioext.c
@@ -533,3 +533,9 @@ scm_init_ioext ()
 #include "ioext.x"
 }
 
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/ioext.h b/libguile/ioext.h
index 4e1b38eaf..95b2d1e3a 100644
--- a/libguile/ioext.h
+++ b/libguile/ioext.h
@@ -63,3 +63,9 @@ extern SCM scm_fdes_to_ports (SCM fd);
 extern void scm_init_ioext (void);
 
 #endif  /* IOEXTH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/iselect.c b/libguile/iselect.c
index 6874da8ef..585b90faf 100644
--- a/libguile/iselect.c
+++ b/libguile/iselect.c
@@ -693,3 +693,9 @@ scm_internal_select (int nfds,
   return coop_global_curr->retval;
 #endif /* GUILE_ISELECT */
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/iselect.h b/libguile/iselect.h
index ebf3327f8..eb87927c0 100644
--- a/libguile/iselect.h
+++ b/libguile/iselect.h
@@ -100,3 +100,9 @@ extern void scm_init_iselect (void);
 #endif /* GUILE_ISELECT */
 
 #endif
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/keywords.c b/libguile/keywords.c
index 6d032fcfa..d722e2de4 100644
--- a/libguile/keywords.c
+++ b/libguile/keywords.c
@@ -141,3 +141,9 @@ scm_init_keywords ()
 #include "keywords.x"
 }
 
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/keywords.h b/libguile/keywords.h
index 6270125cf..0eda0e8ac 100644
--- a/libguile/keywords.h
+++ b/libguile/keywords.h
@@ -65,3 +65,9 @@ extern SCM scm_keyword_dash_symbol (SCM keyword);
 extern void scm_init_keywords (void);
 
 #endif  /* KEYWORDSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/kw.h b/libguile/kw.h
index 763142d4a..e69de29bb 100644
--- a/libguile/kw.h
+++ b/libguile/kw.h
@@ -1,53 +0,0 @@
-/* classes: h_files */
-
-#ifndef KWH
-#define KWH
-/*	Copyright (C) 1995,1996,1999 Free Software Foundation, Inc.
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA
- *
- * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE.  If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way.  To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * If you write modifications of your own for GUILE, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.  */
-
-
-#include "libguile/keywords.h"
-
-
-
-extern int scm_tc16_kw;
-
-#endif  /* KWH */
diff --git a/libguile/lang.c b/libguile/lang.c
index 21cb6fb21..21bd3ff8d 100644
--- a/libguile/lang.c
+++ b/libguile/lang.c
@@ -153,3 +153,9 @@ scm_init_lang ()
 #include "lang.x"
   scm_make_synt ("nil-while", scm_makacro, scm_m_while);
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/lang.h b/libguile/lang.h
index f0d6bf7c9..4062c779f 100644
--- a/libguile/lang.h
+++ b/libguile/lang.h
@@ -69,3 +69,9 @@ extern SCM scm_nil_eq (SCM x, SCM y);
 extern void scm_init_lang (void);
 
 #endif  /* PAIRSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/libguile.h b/libguile/libguile.h
index c7cd9dfd3..e69de29bb 100644
--- a/libguile/libguile.h
+++ b/libguile/libguile.h
@@ -1,142 +0,0 @@
-#ifndef LIBGUILEH
-#define LIBGUILEH
-
-/*	Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA
- *
- * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE.  If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way.  To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * If you write modifications of your own for GUILE, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.  */
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "libguile/__scm.h"
-
-/* These files define typedefs used by later files, so they need to
-   come first.  */
-#include "libguile/print.h"
-#include "libguile/smob.h"
-#include "libguile/pairs.h"
-
-#include "libguile/alist.h"
-#include "libguile/arbiters.h"
-#include "libguile/async.h"
-#include "libguile/boolean.h"
-#include "libguile/chars.h"
-#include "libguile/continuations.h"
-#ifdef DEBUG_EXTENSIONS
-#include "libguile/backtrace.h"
-#include "libguile/debug.h"
-#include "libguile/stacks.h"
-#endif
-#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/feature.h"
-#include "libguile/filesys.h"
-#include "libguile/fluids.h"
-#include "libguile/fports.h"
-#include "libguile/gc.h"
-#include "libguile/gdbint.h"
-#include "libguile/gsubr.h"
-#include "libguile/guardians.h"
-#include "libguile/hash.h"
-#include "libguile/hashtab.h"
-#include "libguile/init.h"
-#include "libguile/ioext.h"
-#include "libguile/keywords.h"
-#include "libguile/kw.h"
-#include "libguile/list.h"
-#include "libguile/load.h"
-#include "libguile/macros.h"
-#include "libguile/mallocs.h"
-#include "libguile/modules.h"
-#include "libguile/net_db.h"
-#include "libguile/numbers.h"
-#include "libguile/objects.h"
-#include "libguile/objprop.h"
-#include "libguile/options.h"
-#include "libguile/ports.h"
-#include "libguile/posix.h"
-#include "libguile/procprop.h"
-#include "libguile/procs.h"
-#include "libguile/ramap.h"
-#include "libguile/random.h"
-#include "libguile/read.h"
-#include "libguile/root.h"
-#include "libguile/scmsigs.h"
-#include "libguile/script.h"
-#include "libguile/simpos.h"
-#include "libguile/snarf.h"
-#include "libguile/socket.h"
-#include "libguile/sort.h"
-#include "libguile/srcprop.h"
-#include "libguile/stackchk.h"
-#include "libguile/stime.h"
-#include "libguile/strings.h"
-#include "libguile/strop.h"
-#include "libguile/strorder.h"
-#include "libguile/strports.h"
-#include "libguile/struct.h"
-#include "libguile/symbols.h"
-#include "libguile/tag.h"
-#include "libguile/tags.h"
-#include "libguile/throw.h"
-#include "libguile/unif.h"
-#include "libguile/validate.h"
-#include "libguile/variable.h"
-#include "libguile/vectors.h"
-#include "libguile/version.h"
-#include "libguile/vports.h"
-#include "libguile/weaks.h"
-#ifdef USE_THREADS
-#include "libguile/threads.h"
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-
-
-#endif  /* LIBGUILEH */
diff --git a/libguile/list.c b/libguile/list.c
index e9e30ec11..c5695991a 100644
--- a/libguile/list.c
+++ b/libguile/list.c
@@ -784,3 +784,9 @@ scm_init_list ()
 {
 #include "list.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/list.h b/libguile/list.h
index d9b3dea95..606cf495c 100644
--- a/libguile/list.h
+++ b/libguile/list.h
@@ -102,3 +102,9 @@ extern SCM scm_delete1_x (SCM item, SCM lst);
 extern void scm_init_list (void);
 
 #endif  /* LISTH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/load.c b/libguile/load.c
index f4355607d..450badda4 100644
--- a/libguile/load.c
+++ b/libguile/load.c
@@ -510,3 +510,9 @@ scm_init_load ()
 
 #include "load.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/load.h b/libguile/load.h
index 1800f2d29..73c8ee949 100644
--- a/libguile/load.h
+++ b/libguile/load.h
@@ -60,3 +60,9 @@ extern SCM scm_read_and_eval_x (SCM port);
 extern void scm_init_load (void);
 
 #endif  /* LOADH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/macros.c b/libguile/macros.c
index d3fd7b425..86dea1479 100644
--- a/libguile/macros.c
+++ b/libguile/macros.c
@@ -183,3 +183,9 @@ scm_init_macros ()
                                            scm_markcdr, NULL, NULL, NULL);
 #include "macros.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/macros.h b/libguile/macros.h
index beef5aa5e..3e8cd073e 100644
--- a/libguile/macros.h
+++ b/libguile/macros.h
@@ -65,3 +65,9 @@ extern SCM scm_make_synt (const char *name,
 extern void scm_init_macros (void);
 
 #endif /* MACROSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/mallocs.c b/libguile/mallocs.c
index 8cf331ade..00ef56956 100644
--- a/libguile/mallocs.c
+++ b/libguile/mallocs.c
@@ -89,3 +89,9 @@ scm_init_mallocs ()
   scm_tc16_malloc = scm_make_smob_type_mfpe ("malloc", 0,
                                             NULL, fmalloc, prinmalloc, NULL);
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/mallocs.h b/libguile/mallocs.h
index 99504c853..1f3240b63 100644
--- a/libguile/mallocs.h
+++ b/libguile/mallocs.h
@@ -58,3 +58,9 @@ extern SCM scm_malloc_obj (scm_sizet n);
 extern void scm_init_mallocs (void);
 
 #endif  /* MALLOCSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/memmove.c b/libguile/memmove.c
index 5efc30b23..adc7bd725 100644
--- a/libguile/memmove.c
+++ b/libguile/memmove.c
@@ -22,3 +22,9 @@ memmove (PTR s1, CPTR s2, size_t n)
   bcopy (s2, s1, n);
   return s1;
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/mit-pthreads.c b/libguile/mit-pthreads.c
index 7a8d4e7fe..e69de29bb 100644
--- a/libguile/mit-pthreads.c
+++ b/libguile/mit-pthreads.c
@@ -1,400 +0,0 @@
-/*	Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA
- *
- * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE.  If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way.  To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * If you write modifications of your own for GUILE, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.  */
-
-
-typedef struct scm_pthread_info {
-  queue q;		     /* the dequeue on which this structure exists */
-  			     /* reqired to be the first element */
-  pthread_t thread;	     /* the corresponding thread structure */
-  void *stack_top;	     /* the highest address in this thread's stack */
-  scm_root_state *root;      /* root for this thread */
-} scm_pthread_info;
-
-pthread_mutex_t scm_critical_section_mutex;
-pthread_t scm_critical_section_owner;
-
-static queue infos = { &infos, &infos };  /* the dequeue of info structures */
-
-/* Key to thread specific data */
-pthread_key_t info_key;
-
-size_t
-scm_threads_free_thread (SCM t)
-{
-  scm_must_free (SCM_THREAD_DATA (t));
-  return sizeof (pthread_t);
-}
-
-size_t
-scm_threads_free_mutex (SCM m)
-{
-  pthread_mutex_destroy (SCM_MUTEX_DATA (m));
-  scm_must_free (SCM_MUTEX_DATA (m));
-  return sizeof (pthread_mutex_t);
-}
-
-size_t
-scm_threads_free_condvar (SCM c)
-{
-  pthread_cond_destroy (SCM_CONDVAR_DATA (c));
-  scm_must_free (SCM_CONDVAR_DATA (c));
-  return sizeof (pthread_cond_t);
-}
-
-/* cleanup for info structure
- */
-static void
-scm_pthread_delete_info (void *ptr)
-{
-  scm_pthread_info *info = (scm_pthread_info *) ptr;
-  info->q.blink->flink = info->q.flink;
-  info->q.flink->blink = info->q.blink;
-  scm_must_free ((char *) info);
-}
-
-void
-scm_threads_init (SCM_STACKITEM *i)
-{
-  /*
-   * each info structure is made thread-specific, so that the cleanup
-   * mechanism can be used to reclaim the space in a timely fashion.
-   */
-  pthread_key_create (&info_key, scm_pthread_delete_info);
-
-  /* initialize various mutex variables */
-  pthread_mutex_init (&scm_critical_section_mutex, NULL);
-
-  /*
-   * create an info structure for the initial thread and push it onto
-   * the info dequeue
-   */
-  {
-    scm_pthread_info *info;
-    info = (scm_pthread_info *) scm_must_malloc (sizeof (scm_pthread_info),
-						 "threads_init");
-    infos.flink = infos.blink = &info->q;
-    info->q.flink = info->q.blink = &infos;
-    info->thread = pthread_initial;
-    info->stack_top = (void *) i;
-    pthread_setspecific(info_key, info);
-  }
-  /* The root state pointer gets initialized in init.c. */
-}
-
-/* given some thread, find the corresponding info
- */
-static scm_pthread_info *pthreads_find_info (pthread_t target)
-{
-  queue *ptr = infos.flink;
-
-  while (ptr != &infos)
-    {
-      scm_pthread_info *info = (scm_pthread_info *) ptr;
-
-      if (info->thread == target)
-        {
-          return (info);
-        }
-      ptr = ptr->flink;
-    }
-}
-
-void
-scm_threads_mark_stacks ()
-{
-  scm_pthread_info *info;
-  pthread_t thread;
-  int j;
-  
-  for (info = (scm_pthread_info *) infos.flink;
-       info != (scm_pthread_info *) &infos;
-       info = (scm_pthread_info *) info->q.flink)
-    {
-      thread = info->thread;
-      if (thread == pthread_run)
-	{
-	  /* Active thread */
-	  /* stack_len is long rather than sizet in order to guarantee
-	     that &stack_len is long aligned */
-#ifdef STACK_GROWS_UP
-	  long stack_len = ((SCM_STACKITEM *) (&thread) -
-			    (SCM_STACKITEM *) info->stack_top);
-	  
-	  /* Protect from the C stack.  This must be the first marking
-	   * done because it provides information about what objects
-	   * are "in-use" by the C code.   "in-use" objects are  those
-	   * for which the values from SCM_LENGTH and SCM_CHARS must remain
-	   * usable.   This requirement is stricter than a liveness
-	   * requirement -- in particular, it constrains the implementation
-	   * of scm_resizuve.
-	   */
-	  SCM_FLUSH_REGISTER_WINDOWS;
-	  /* This assumes that all registers are saved into the jmp_buf */
-	  setjmp (scm_save_regs_gc_mark);
-	  scm_mark_locations ((SCM_STACKITEM *) scm_save_regs_gc_mark,
-			      ((scm_sizet) sizeof scm_save_regs_gc_mark
-			       / sizeof (SCM_STACKITEM)));
-	  
-	  scm_mark_locations (((size_t) info->stack_top,
-			       (sizet) stack_len));
-#else
-	  long stack_len = ((SCM_STACKITEM *) info->stack_top -
-			    (SCM_STACKITEM *) (&thread));
-	  
-	  /* Protect from the C stack.  This must be the first marking
-	   * done because it provides information about what objects
-	   * are "in-use" by the C code.   "in-use" objects are  those
-	   * for which the values from SCM_LENGTH and SCM_CHARS must remain
-	   * usable.   This requirement is stricter than a liveness
-	   * requirement -- in particular, it constrains the implementation
-	   * of scm_resizuve.
-	   */
-	  SCM_FLUSH_REGISTER_WINDOWS;
-	  /* This assumes that all registers are saved into the jmp_buf */
-	  setjmp (scm_save_regs_gc_mark);
-	  scm_mark_locations ((SCM_STACKITEM *) scm_save_regs_gc_mark,
-			      ((scm_sizet) sizeof scm_save_regs_gc_mark
-			       / sizeof (SCM_STACKITEM)));
-	  
-	  scm_mark_locations ((SCM_STACKITEM *) &thread,
-			      stack_len);
-#endif
-	}
-      else
-	{
-	  /* Suspended thread */
-#ifdef STACK_GROWS_UP
-	  long stack_len = ((SCM_STACKITEM *) (thread->THREAD_SP) -
-			    (SCM_STACKITEM *) info->stack_top);
-	      
-	  scm_mark_locations ((size_t)info->stack_top,
-			      (sizet) stack_len);
-#else
-	  long stack_len = ((SCM_STACKITEM *) info->stack_top -
-			    (SCM_STACKITEM *) (thread->THREAD_SP));
-	      
-	  scm_mark_locations ((SCM_STACKITEM *) thread->machdep_data.machdep_state,
-			      ((scm_sizet) sizeof (*thread->machdep_data.machdep_state)
-			       / sizeof (SCM_STACKITEM)));
-	  scm_mark_locations ((SCM_STACKITEM *) (size_t) thread->THREAD_SP,
-			      stack_len);
-#endif
-	}
-
-      /* Mark this thread's root */
-      scm_gc_mark (((scm_root_state *) info->root) -> handle);
-    }
-}
-
-void *
-launch_thread (void *p)
-{
-  /* The thread object will be GC protected by being a member of the
-     list given as argument to launch_thread.  It will be marked
-     during the conservative sweep of the stack. */
-  SCM args = (SCM) p;
-  pthread_attr_setcleanup (&pthread_self () -> attr,
-			   NULL,
-			   SCM_ROOT_STATE (SCM_CAR (args)));
-  scm_call_with_dynamic_root (SCM_CADDR (args), SCM_CADDDR (args));
-  return NULL;
-}
-
-SCM
-scm_call_with_new_thread (SCM argl)
-{
-  SCM thread;
-
-  /* Check arguments. */
-  {
-    register SCM args = argl;
-    SCM thunk, handler;
-    SCM_ASSERT (SCM_NIMP (args),
-		scm_makfrom0str (s_call_with_new_thread),
-		SCM_WNA, NULL);
-    thunk = SCM_CAR (args);
-    SCM_ASSERT (SCM_NFALSEP (scm_thunk_p (thunk)),
-		thunk,
-		SCM_ARG1,
-		s_call_with_new_thread);
-    args = SCM_CDR (args);
-    SCM_ASSERT (SCM_NIMP (args),
-		scm_makfrom0str (s_call_with_new_thread),
-		SCM_WNA, NULL);
-    handler = SCM_CAR (args);
-    SCM_ASSERT (SCM_NFALSEP (scm_procedure_p (handler)),
-		handler,
-		SCM_ARG2,
-		s_call_with_new_thread);
-    SCM_ASSERT (SCM_NULLP (SCM_CDR (args)),
-		scm_makfrom0str (s_call_with_new_thread),
-		SCM_WNA, NULL);
-  }
-
-  /* Make new thread. */
-  {
-    pthread_attr_t attr;
-    pthread_t t;
-    scm_pthread_info *info = 
-      (scm_pthread_info *) scm_must_malloc (sizeof (scm_pthread_info),
-					    "pthread_info");
-    SCM root, old_winds;
-
-    /* Unwind wind chain. */
-    old_winds = scm_dynwinds;
-    scm_dowinds (SCM_EOL, scm_ilength (scm_root->dynwinds));
-
-    /* Allocate thread locals. */
-    root = scm_make_root (scm_root->handle);
-    /* Make thread. */
-    SCM_NEWCELL (thread);
-    SCM_DEFER_INTS;
-    SCM_SETCAR (thread, scm_tc16_thread);
-    argl = scm_cons2 (root, thread, argl);
-  
-    /* thread mustn't start until we've built the info struct */
-    pthread_kernel_lock++;
-
-    /* initialize and create the thread. */
-    pthread_attr_init (&attr);
-    pthread_attr_setschedpolicy (&attr, SCHED_RR);
-  
-    pthread_create (&t, &attr, launch_thread, (void *) argl);
-    pthread_attr_destroy (&attr);
-
-    /* push the info onto the dequeue */
-    info->q.flink = infos.flink;
-    info->q.blink = &infos;
-    infos.flink->blink = &info->q;
-    infos.flink = &info->q;
-    /* pthread_create filled in the initial SP -- profitons-en ! */
-    info->stack_top = (void *) (t->THREAD_SP);
-    info->thread = t;
-    info->root = SCM_ROOT_STATE (root);
-    SCM_SETCDR (thread, t);
-    SCM_ALLOW_INTS;
-    
-    /* we're now ready for the thread to begin */
-    pthread_kernel_lock--;
-
-    /* Return to old dynamic context. */
-    scm_dowinds (old_winds, - scm_ilength (old_winds));
-  }
-
-  return thread;
-}
-
-SCM
-scm_join_thread (SCM t)
-{
-  void *value;
-  pthread_join (SCM_THREAD_DATA (t), &value);
-  return SCM_BOOL_T;
-}
-
-SCM
-scm_yield ()
-{
-  pthread_yield ();
-  return SCM_BOOL_T;
-}
-
-SCM
-scm_make_mutex ()
-{
-  SCM m;
-  pthread_mutex_t *data = (pthread_mutex_t *) scm_must_malloc (sizeof (pthread_mutex_t), "mutex");
-  SCM_NEWSMOB (m,scm_tc16_mutex, data);
-  pthread_mutex_init (SCM_MUTEX_DATA (m), NULL);
-  return m;
-}
-
-SCM
-scm_lock_mutex (SCM m)
-{
-  SCM_ASSERT (SCM_MUTEXP (m), m, SCM_ARG1, s_lock_mutex);
-  pthread_mutex_lock (SCM_MUTEX_DATA (m));
-  return SCM_BOOL_T;
-}
-
-SCM
-scm_unlock_mutex (SCM m)
-{
-  SCM_ASSERT (SCM_MUTEXP (m), m, SCM_ARG1, s_unlock_mutex);
-  pthread_mutex_unlock (SCM_MUTEX_DATA (m));
-  return SCM_BOOL_T;
-}
-
-SCM
-scm_make_condition_variable ()
-{
-  SCM c;
-  pthread_cond_t *data = (pthread_cond_t *) scm_must_malloc (sizeof (pthread_cond_t), "condvar");
-  SCM_NEWSMOB (c, scm_tc16_condvar, data);
-  pthread_cond_init (SCM_CONDVAR_DATA (c), NULL);
-  return c;
-}
-
-SCM
-scm_wait_condition_variable (SCM c, SCM m)
-{
-  SCM_ASSERT (SCM_CONDVARP (c),
-	      c,
-	      SCM_ARG1,
-	      s_wait_condition_variable);
-  SCM_ASSERT (SCM_MUTEXP (m),
-	      m,
-	      SCM_ARG2,
-	      s_wait_condition_variable);
-  pthread_cond_wait (SCM_CONDVAR_DATA (m), SCM_MUTEX_DATA (c));
-  return SCM_BOOL_T;
-}
-
-SCM
-scm_signal_condition_variable (SCM c)
-{
-  SCM_ASSERT (SCM_CONDVARP (c),
-	      c,
-	      SCM_ARG1,
-	      s_signal_condition_variable);
-  pthread_cond_signal (SCM_CONDVAR_DATA (c));
-  return SCM_BOOL_T;
-}
diff --git a/libguile/mit-pthreads.h b/libguile/mit-pthreads.h
index ecd21cdd9..e69de29bb 100644
--- a/libguile/mit-pthreads.h
+++ b/libguile/mit-pthreads.h
@@ -1,190 +0,0 @@
-/* classes: h_files */
-
-#ifndef MIT_PTHREADSH
-#define MIT_PTHREADSH
-
-/*	Copyright (C) 1996 Free Software Foundation, Inc.
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA
- *
- * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE.  If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way.  To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * If you write modifications of your own for GUILE, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.  */
-
-/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
-   gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
-
-
-#include "libguile/__scm.h"
-
-#define PTHREAD_KERNEL
-#include <pthread.h>
-
-/* Identify where the stack pointer can be found in a jmpbuf.
- */
-
-/* Solaris 2.4 */
-#if defined(__sparc_setjmp_h)
-#  define THREAD_SP machdep_data.machdep_state[2]
-#endif
-
-/* Solaris 2.5 */
-#if defined(__sparc)
-#ifndef THREAD_SP
-#  define THREAD_SP machdep_data.machdep_state[2]
-#endif
-#endif
-
-#if defined(linux)
-#  define THREAD_SP machdep_data.machdep_state[0].__sp
-#endif
-
-#if defined(sgi)
-#  define THREAD_SP machdep_data.machdep_state[JB_SP]
-#endif
-
-/*  ...define THREAD_SP for your architecture here...
- */
-
-#if !defined(THREAD_SP)
---> where is your stack pointer?
-#endif
-
-
-
-/* Boost the priority of this thread so that it is the only
-   one running. PTHREAD_MAX_PRIORITY is reserved for this 
-   purpose */
-
-#define SCM_THREAD_CRITICAL_SECTION_START \
-  struct sched_param param; \
-  int previous_prio; \
-  int policy; \
-  pthread_getschedparam(pthread_self(), &policy, &param); \
-  previous_prio = param.prio; \
-  param.prio = PTHREAD_MAX_PRIORITY; \
-  pthread_setschedparam(pthread_self(), policy, &param)
-
-#define SCM_THREAD_CRITICAL_SECTION_END \
-  param.prio = previous_prio; \
-  pthread_setschedparam(pthread_self(), policy, &param)
-
-
-
-#if 1
-
-#define SCM_NO_CRITICAL_SECTION_OWNER 0
-
-#define SCM_THREAD_DEFER pthread_kernel_lock++
-#define SCM_THREAD_ALLOW pthread_kernel_lock--
-
-#define SCM_THREAD_REDEFER pthread_kernel_lock++
-#define SCM_THREAD_REALLOW_1 pthread_kernel_lock--
-#define SCM_THREAD_REALLOW_2 \
-do { \
-  scm_critical_section_owner = SCM_NO_CRITICAL_SECTION_OWNER; \
-  pthread_mutex_unlock(&scm_critical_section_mutex); \
-} while (0)
-
-#else
-
-#define SCM_NO_CRITICAL_SECTION_OWNER 0
-
-#define SCM_THREAD_DEFER \
-do { \
-  pthread_mutex_lock (&scm_critical_section_mutex); \
-  scm_critical_section_owner = pthread_self(); \
-} while (0) 
-
-#define SCM_THREAD_ALLOW \
-do { \
-  scm_critical_section_owner = SCM_NO_CRITICAL_SECTION_OWNER; \
-  pthread_mutex_unlock (&scm_critical_section_mutex); \
-} while (0)
-
-#define SCM_THREAD_REDEFER \
-do { \
-  if ((scm_critical_section_owner != pthread_self()) || \
-      (scm_critical_section_owner == SCM_NO_CRITICAL_SECTION_OWNER)) \
-    { \
-      pthread_mutex_lock(&scm_critical_section_mutex); \
-      scm_critical_section_owner = pthread_self(); \
-    } \
-} while (0)
-
-#define SCM_THREAD_REALLOW_1
-#define SCM_THREAD_REALLOW_2 \
-do { \
-  scm_critical_section_owner = SCM_NO_CRITICAL_SECTION_OWNER; \
-  pthread_mutex_unlock (&scm_critical_section_mutex); \
-} while (0)
-
-#endif
-
-#define SCM_THREAD_SWITCHING_CODE
-
-#define SCM_THREAD_LOCAL_DATA (pthread_self () -> attr.arg_attr)
-#define SCM_SET_THREAD_LOCAL_DATA(new_root) \
-do { \
-  pthread_t t = pthread_self (); \
-  void *r = (new_root); \
-  pthread_attr_setcleanup (&t -> attr, NULL, r); \
-  pthreads_find_info (t) -> root = r; \
-} while (0)
-
-
-
-
-void scm_threads_init_mit_pthreads ();
-
-typedef struct QUEUE {
-  struct QUEUE *flink, *blink;
-} queue;
-
-extern pthread_mutex_t scm_critical_section_mutex;
-extern pthread_t scm_critical_section_owner;
-
-/* Key to thread specific data */
-extern pthread_key_t info_key;
-
-struct scm_pthread_create_info_type
-{
-  SCM thunk;
-  SCM error;
-  SCM *prots;
-} scm_pthread_create_info;
-
-#endif /* MIT_PTHREADSH */
diff --git a/libguile/modules.c b/libguile/modules.c
index bcada07e3..f8d5b3714 100644
--- a/libguile/modules.c
+++ b/libguile/modules.c
@@ -198,3 +198,9 @@ scm_post_boot_init_modules ()
   resolve_module = scm_intern0 ("resolve-module");
   try_module_autoload = scm_intern0 ("try-module-autoload");
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/modules.h b/libguile/modules.h
index 3983f068a..7657af71b 100644
--- a/libguile/modules.h
+++ b/libguile/modules.h
@@ -63,3 +63,9 @@ extern void scm_init_modules (void);
 extern void scm_post_boot_init_modules (void);
 
 #endif  /* MODULESH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/net_db.c b/libguile/net_db.c
index 797d33d08..26e8b21f8 100644
--- a/libguile/net_db.c
+++ b/libguile/net_db.c
@@ -570,3 +570,9 @@ scm_init_net_db ()
   scm_add_feature ("net-db");
 #include "net_db.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/net_db.h b/libguile/net_db.h
index 7ea8620ff..9421808a8 100644
--- a/libguile/net_db.h
+++ b/libguile/net_db.h
@@ -67,3 +67,9 @@ extern SCM scm_setserv (SCM arg);
 extern void scm_init_net_db (void);
 
 #endif  /* NETDBH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/numbers.c b/libguile/numbers.c
index 8bd370958..2ec33c12d 100644
--- a/libguile/numbers.c
+++ b/libguile/numbers.c
@@ -4629,3 +4629,9 @@ scm_init_numbers ()
 #endif /* DBL_DIG */
 #include "numbers.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/numbers.h b/libguile/numbers.h
index b376446a2..da4b7a26c 100644
--- a/libguile/numbers.h
+++ b/libguile/numbers.h
@@ -389,3 +389,9 @@ extern unsigned long scm_num2ulong (SCM num, char *pos,
 extern void scm_init_numbers (void);
 
 #endif  /* NUMBERSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/objects.c b/libguile/objects.c
index 837a8f408..6421e1032 100644
--- a/libguile/objects.c
+++ b/libguile/objects.c
@@ -492,3 +492,9 @@ scm_init_objects ()
 
 #include "objects.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/objects.h b/libguile/objects.h
index dab20a467..1c863bd9f 100644
--- a/libguile/objects.h
+++ b/libguile/objects.h
@@ -240,3 +240,9 @@ extern SCM scm_i_make_class_object (SCM metaclass, SCM layout_string,
 extern void scm_init_objects (void);
 
 #endif /* OBJECTSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/objprop.c b/libguile/objprop.c
index b05ced8eb..1da9c1b99 100644
--- a/libguile/objprop.c
+++ b/libguile/objprop.c
@@ -124,3 +124,9 @@ scm_init_objprop ()
 #include "objprop.x"
 }
 
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/objprop.h b/libguile/objprop.h
index f04c140c2..2097f903c 100644
--- a/libguile/objprop.h
+++ b/libguile/objprop.h
@@ -60,3 +60,9 @@ extern SCM scm_set_object_property_x (SCM obj, SCM key, SCM val);
 extern void scm_init_objprop (void);
 
 #endif  /* OBJPROPH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/options.c b/libguile/options.c
index d8c2baae8..cc56c94c7 100644
--- a/libguile/options.c
+++ b/libguile/options.c
@@ -237,3 +237,9 @@ scm_init_options ()
   protected_objects = scm_permanent_object (scm_cons (SCM_UNDEFINED, SCM_EOL));
 #include "options.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/options.h b/libguile/options.h
index 5fefab060..57b552d38 100644
--- a/libguile/options.h
+++ b/libguile/options.h
@@ -74,3 +74,9 @@ extern void scm_init_opts (SCM (*func) (SCM), scm_option options[], int n);
 extern void scm_init_options (void);
 
 #endif /* OPTIONSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/pairs.c b/libguile/pairs.c
index 780f53734..1a090b075 100644
--- a/libguile/pairs.c
+++ b/libguile/pairs.c
@@ -167,3 +167,9 @@ scm_init_pairs ()
 #include "pairs.x"
 }
 
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/pairs.h b/libguile/pairs.h
index 30bea4f4f..8c36a2804 100644
--- a/libguile/pairs.h
+++ b/libguile/pairs.h
@@ -245,3 +245,9 @@ extern SCM scm_set_cdr_x (SCM pair, SCM value);
 extern void scm_init_pairs (void);
 
 #endif  /* PAIRSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/ports.c b/libguile/ports.c
index 58bfe4ee0..2215b4529 100644
--- a/libguile/ports.c
+++ b/libguile/ports.c
@@ -1376,3 +1376,9 @@ scm_init_ports ()
 					   write_void_port);
 #include "ports.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/ports.h b/libguile/ports.h
index 1183ecb4d..cb3426323 100644
--- a/libguile/ports.h
+++ b/libguile/ports.h
@@ -302,3 +302,9 @@ extern SCM scm_pt_member (SCM member);
 #endif /* GUILE_DEBUG */
 
 #endif  /* PORTSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/posix.c b/libguile/posix.c
index d8ee0d4cf..554a7297e 100644
--- a/libguile/posix.c
+++ b/libguile/posix.c
@@ -1325,3 +1325,9 @@ scm_sysintern ("PIPE_BUF", scm_long2num (PIPE_BUF));
 #include "cpp_sig_symbols.c"
 #include "posix.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/posix.h b/libguile/posix.h
index 4b4369315..2347df707 100644
--- a/libguile/posix.h
+++ b/libguile/posix.h
@@ -98,3 +98,9 @@ extern SCM scm_sync (void);
 extern void scm_init_posix (void);
 
 #endif  /* POSIXH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/print.c b/libguile/print.c
index 079c4a66c..1696a8d85 100644
--- a/libguile/print.c
+++ b/libguile/print.c
@@ -1121,3 +1121,9 @@ scm_init_print ()
   
 #include "print.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/print.h b/libguile/print.h
index f15d3303c..dbb61860b 100644
--- a/libguile/print.h
+++ b/libguile/print.h
@@ -127,3 +127,9 @@ extern void scm_init_print (void);
 extern SCM scm_current_pstate (void);
 #endif 
 #endif  /* PRINTH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/procprop.c b/libguile/procprop.c
index 419d8fe7a..999af9994 100644
--- a/libguile/procprop.c
+++ b/libguile/procprop.c
@@ -242,3 +242,9 @@ scm_init_procprop ()
 #include "procprop.x"
 }
 
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/procprop.h b/libguile/procprop.h
index 9ee393a2b..d59e9a062 100644
--- a/libguile/procprop.h
+++ b/libguile/procprop.h
@@ -62,3 +62,9 @@ extern SCM scm_set_procedure_property_x (SCM p, SCM k, SCM v);
 extern void scm_init_procprop (void);
 
 #endif  /* PROCPROPH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/procs.c b/libguile/procs.c
index 8b7614799..b90eace0a 100644
--- a/libguile/procs.c
+++ b/libguile/procs.c
@@ -394,3 +394,9 @@ scm_init_procs ()
 {
 #include "procs.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/procs.h b/libguile/procs.h
index 32516fe4b..8fe7fa1c6 100644
--- a/libguile/procs.h
+++ b/libguile/procs.h
@@ -199,3 +199,9 @@ extern SCM scm_make_cclo (SCM proc, SCM len);
 
 
 #endif  /* PROCSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/putenv.c b/libguile/putenv.c
index 11cbae51c..68f2a59b7 100644
--- a/libguile/putenv.c
+++ b/libguile/putenv.c
@@ -112,3 +112,9 @@ putenv (const char *string)
 
   return 0;
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/ramap.c b/libguile/ramap.c
index 2eca2332f..8ef9eedde 100644
--- a/libguile/ramap.c
+++ b/libguile/ramap.c
@@ -1997,3 +1997,9 @@ scm_init_ramap ()
 #include "ramap.x"
   scm_add_feature (s_scm_array_for_each);
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/ramap.h b/libguile/ramap.h
index 49df4acf2..b081593d2 100644
--- a/libguile/ramap.h
+++ b/libguile/ramap.h
@@ -72,3 +72,9 @@ extern SCM scm_array_equal_p (SCM ra0, SCM ra1);
 extern void scm_init_ramap (void);
 
 #endif  /* RAMAPH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/random.c b/libguile/random.c
index 2161635f1..16b810aad 100644
--- a/libguile/random.c
+++ b/libguile/random.c
@@ -601,3 +601,9 @@ scm_init_random ()
   
   scm_add_feature ("random");
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/random.h b/libguile/random.h
index 04651dcfe..d519d1ca6 100644
--- a/libguile/random.h
+++ b/libguile/random.h
@@ -127,3 +127,9 @@ extern SCM scm_random_exp (SCM state);
 extern void scm_init_random (void);
 
 #endif  /* RANDOMH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/read.c b/libguile/read.c
index 346705f1e..7af3b735d 100644
--- a/libguile/read.c
+++ b/libguile/read.c
@@ -787,3 +787,9 @@ scm_init_read ()
   scm_init_opts (scm_read_options, scm_read_opts, SCM_N_READ_OPTIONS);
 #include "read.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/read.h b/libguile/read.h
index 847f080ce..aab2b6b8e 100644
--- a/libguile/read.h
+++ b/libguile/read.h
@@ -90,3 +90,9 @@ extern SCM scm_read_hash_extend (SCM chr, SCM proc);
 extern void scm_init_read (void);
 
 #endif  /* READH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/regex-posix.c b/libguile/regex-posix.c
index 0cf3a8b59..2a1678be4 100644
--- a/libguile/regex-posix.c
+++ b/libguile/regex-posix.c
@@ -296,3 +296,9 @@ scm_init_regex_posix ()
 
   scm_add_feature ("regex");
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/regex-posix.h b/libguile/regex-posix.h
index fffbd249a..3750f2647 100644
--- a/libguile/regex-posix.h
+++ b/libguile/regex-posix.h
@@ -60,3 +60,9 @@ extern SCM scm_regexp_exec (SCM rx, SCM str, SCM start, SCM flags);
 extern void scm_init_regex_posix (void);
 
 #endif
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/root.c b/libguile/root.c
index 8b4ed1db0..4767527fd 100644
--- a/libguile/root.c
+++ b/libguile/root.c
@@ -446,3 +446,9 @@ scm_init_root ()
                                           
 #include "root.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/root.h b/libguile/root.h
index c9fc4a751..682cacae5 100644
--- a/libguile/root.h
+++ b/libguile/root.h
@@ -170,3 +170,9 @@ extern SCM scm_call_catching_errors (SCM (*thunk)(), SCM (*err_filter)(), void *
 extern void scm_init_root (void);
 
 #endif  /* ROOTH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/scmsigs.c b/libguile/scmsigs.c
index 7e63e7212..0a767603b 100644
--- a/libguile/scmsigs.c
+++ b/libguile/scmsigs.c
@@ -525,3 +525,9 @@ scm_init_scmsigs ()
 #include "scmsigs.x"
 }
 
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/scmsigs.h b/libguile/scmsigs.h
index 22ac5c054..a3bfd9b57 100644
--- a/libguile/scmsigs.h
+++ b/libguile/scmsigs.h
@@ -57,3 +57,9 @@ extern SCM scm_raise (SCM sig);
 extern void scm_init_scmsigs (void);
 
 #endif  /* SCMSIGSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/script.c b/libguile/script.c
index 064f50275..9e428f3b8 100644
--- a/libguile/script.c
+++ b/libguile/script.c
@@ -644,3 +644,9 @@ scm_init_script ()
 {
 #include "script.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/script.h b/libguile/script.h
index 33509b813..8593a6442 100644
--- a/libguile/script.h
+++ b/libguile/script.h
@@ -60,3 +60,9 @@ extern char *scm_usage_name;
 extern void scm_init_script (void);
 
 #endif  /* SCRIPTH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/simpos.c b/libguile/simpos.c
index 2d7bdbf88..841108ff3 100644
--- a/libguile/simpos.c
+++ b/libguile/simpos.c
@@ -138,3 +138,9 @@ scm_init_simpos ()
 #include "simpos.x"
 }
 
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/simpos.h b/libguile/simpos.h
index b3a5c949e..9e483403d 100644
--- a/libguile/simpos.h
+++ b/libguile/simpos.h
@@ -53,3 +53,9 @@ extern SCM scm_primitive_exit (SCM status);
 extern void scm_init_simpos (void);
 
 #endif  /* SIMPOSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/smob.c b/libguile/smob.c
index bb4f99b10..8ffae882b 100644
--- a/libguile/smob.c
+++ b/libguile/smob.c
@@ -278,3 +278,9 @@ scm_smob_prehistory ()
 
   scm_make_smob_type ("allocated", 0);
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/smob.h b/libguile/smob.h
index 4bdb816b1..f7a2433a0 100644
--- a/libguile/smob.h
+++ b/libguile/smob.h
@@ -174,3 +174,9 @@ extern void scm_smob_prehistory (void);
 extern long scm_newsmob (const scm_smobfuns *smob);
 
 #endif  /* SMOBH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/snarf.h b/libguile/snarf.h
index 12806108f..9115fe1dd 100644
--- a/libguile/snarf.h
+++ b/libguile/snarf.h
@@ -182,3 +182,9 @@ SCM_VCELL_INIT(c_name, scheme_name, scm_long2num(value))
 
 #endif /* LIBGUILE_SNARF_H */
 
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/socket.c b/libguile/socket.c
index 1bdc61e05..4e5cc3820 100644
--- a/libguile/socket.c
+++ b/libguile/socket.c
@@ -979,3 +979,9 @@ scm_init_socket ()
 #include "socket.x"
 }
 
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/socket.h b/libguile/socket.h
index 911670128..1a96ee348 100644
--- a/libguile/socket.h
+++ b/libguile/socket.h
@@ -70,3 +70,9 @@ extern SCM scm_sendto (SCM sockfd, SCM message, SCM fam, SCM address, SCM args_a
 extern void scm_init_socket (void);
 
 #endif  /* SOCKETH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/sort.c b/libguile/sort.c
index 70f6a1016..28decf028 100644
--- a/libguile/sort.c
+++ b/libguile/sort.c
@@ -953,3 +953,9 @@ scm_init_sort ()
 
   scm_add_feature ("sort");
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/sort.h b/libguile/sort.h
index cbf2f0347..701b5e4e2 100644
--- a/libguile/sort.h
+++ b/libguile/sort.h
@@ -67,3 +67,9 @@ extern void scm_init_sort (void);
 
 
 
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/srcprop.c b/libguile/srcprop.c
index 831fbe008..59c1fdc6e 100644
--- a/libguile/srcprop.c
+++ b/libguile/srcprop.c
@@ -351,3 +351,9 @@ scm_finish_srcprop ()
       ptr = next;
     }
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/srcprop.h b/libguile/srcprop.h
index c7de9a1e3..2d92044f4 100644
--- a/libguile/srcprop.h
+++ b/libguile/srcprop.h
@@ -135,3 +135,9 @@ extern void scm_finish_srcprop (void);
 extern void scm_init_srcprop (void);
 
 #endif /* SRCPROPH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/stackchk.c b/libguile/stackchk.c
index b7fc61d37..3f3633beb 100644
--- a/libguile/stackchk.c
+++ b/libguile/stackchk.c
@@ -106,3 +106,9 @@ scm_init_stackchk ()
 {
 #include "stackchk.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/stackchk.h b/libguile/stackchk.h
index 44d3d9309..18c6b50e5 100644
--- a/libguile/stackchk.h
+++ b/libguile/stackchk.h
@@ -90,3 +90,9 @@ extern void scm_stack_report (void);
 extern void scm_init_stackchk (void);
 
 #endif  /* STACKCHKH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/stacks.c b/libguile/stacks.c
index 2a1abeeae..355bd8fe4 100644
--- a/libguile/stacks.c
+++ b/libguile/stacks.c
@@ -755,3 +755,9 @@ scm_init_stacks ()
 				SCM_CAR (scm_intern0 ("stack")));
 #include "stacks.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/stacks.h b/libguile/stacks.h
index 747ebcc16..ca941e0db 100644
--- a/libguile/stacks.h
+++ b/libguile/stacks.h
@@ -139,3 +139,9 @@ SCM scm_frame_overflow_p (SCM frame);
 void scm_init_stacks (void);
 
 #endif /* STACKSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/stime.c b/libguile/stime.c
index 08ccadbc7..c408dd4d3 100644
--- a/libguile/stime.c
+++ b/libguile/stime.c
@@ -654,3 +654,9 @@ scm_init_stime()
 #include "stime.x"
 }
 
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/stime.h b/libguile/stime.h
index bb57ab631..64dc8ecad 100644
--- a/libguile/stime.h
+++ b/libguile/stime.h
@@ -61,3 +61,9 @@ extern SCM scm_strptime (SCM format, SCM string);
 extern void scm_init_stime (void);
 
 #endif  /* STIMEH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/strerror.c b/libguile/strerror.c
index ce7380d5f..0d05f4b32 100644
--- a/libguile/strerror.c
+++ b/libguile/strerror.c
@@ -31,3 +31,9 @@ strerror (int errnum)
     return sys_errlist[errnum];
   return (char *) "Unknown error";
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/strings.c b/libguile/strings.c
index f4bba65e2..783bfd4f9 100644
--- a/libguile/strings.c
+++ b/libguile/strings.c
@@ -380,3 +380,9 @@ scm_init_strings ()
 #include "strings.x"
 }
 
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/strings.h b/libguile/strings.h
index b91aba0c9..c4289da82 100644
--- a/libguile/strings.h
+++ b/libguile/strings.h
@@ -82,3 +82,9 @@ extern SCM scm_make_shared_substring (SCM str, SCM frm, SCM to);
 extern void scm_init_strings (void);
 
 #endif  /* STRINGSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/strop.c b/libguile/strop.c
index d220125f6..633553a00 100644
--- a/libguile/strop.c
+++ b/libguile/strop.c
@@ -494,3 +494,9 @@ scm_init_strop ()
 {
 #include "strop.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/strop.h b/libguile/strop.h
index 634b0a7f0..f5c988f7f 100644
--- a/libguile/strop.h
+++ b/libguile/strop.h
@@ -70,3 +70,9 @@ extern SCM scm_string_ci_to_symbol (SCM v);
 #define scm_substring_move_right_x scm_substring_move_x
 
 #endif  /* STROPH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/strorder.c b/libguile/strorder.c
index 4695b4279..edaff6dc2 100644
--- a/libguile/strorder.c
+++ b/libguile/strorder.c
@@ -236,3 +236,9 @@ scm_init_strorder ()
 #include "strorder.x"
 }
 
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/strorder.h b/libguile/strorder.h
index 7b45f8a94..0ee64ed0c 100644
--- a/libguile/strorder.h
+++ b/libguile/strorder.h
@@ -66,3 +66,9 @@ extern SCM scm_string_ci_geq_p (SCM s1, SCM s2);
 extern void scm_init_strorder (void);
 
 #endif  /* STRORDERH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/strports.c b/libguile/strports.c
index 1f4acec17..31d92f36d 100644
--- a/libguile/strports.c
+++ b/libguile/strports.c
@@ -425,3 +425,9 @@ scm_init_strports ()
 #include "strports.x"
 }
 
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/strports.h b/libguile/strports.h
index 5cdf910d7..14a9242c3 100644
--- a/libguile/strports.h
+++ b/libguile/strports.h
@@ -59,3 +59,9 @@ extern SCM scm_eval_string (SCM string);
 extern void scm_init_strports (void);
 
 #endif  /* STRPORTSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/struct.c b/libguile/struct.c
index 62e319de1..f6d8b9dd6 100644
--- a/libguile/struct.c
+++ b/libguile/struct.c
@@ -778,3 +778,9 @@ scm_init_struct ()
   scm_sysintern ("vtable-offset-user", SCM_MAKINUM (scm_vtable_offset_user));
 #include "struct.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/struct.h b/libguile/struct.h
index 9e7bfba47..f1a9e065e 100644
--- a/libguile/struct.h
+++ b/libguile/struct.h
@@ -120,3 +120,9 @@ extern void scm_print_struct (SCM exp, SCM port, scm_print_state *);
 extern void scm_init_struct (void);
 
 #endif  /* STRUCTH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/symbols.c b/libguile/symbols.c
index 5a9ea47a1..776f2f3e1 100644
--- a/libguile/symbols.c
+++ b/libguile/symbols.c
@@ -896,3 +896,9 @@ scm_init_symbols ()
   gensym_prefix = scm_permanent_object (scm_makfrom0str ("%%gensym"));
 #include "symbols.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/symbols.h b/libguile/symbols.h
index 5495d61e4..8f12f1329 100644
--- a/libguile/symbols.h
+++ b/libguile/symbols.h
@@ -144,3 +144,9 @@ extern void scm_init_symbols (void);
 extern int scm_can_use_top_level_lookup_closure_var;
 
 #endif  /* SYMBOLSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/tag.c b/libguile/tag.c
index 17dd260fb..d6044c71d 100644
--- a/libguile/tag.c
+++ b/libguile/tag.c
@@ -218,3 +218,9 @@ scm_init_tag ()
 #include "tag.x"
 }
 
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/tag.h b/libguile/tag.h
index e42730c6e..69afb3539 100644
--- a/libguile/tag.h
+++ b/libguile/tag.h
@@ -56,3 +56,9 @@ extern SCM scm_tag (SCM x);
 extern void scm_init_tag (void);
 
 #endif  /* TAGH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/tags.h b/libguile/tags.h
index 5288bd3ff..af0d1d578 100644
--- a/libguile/tags.h
+++ b/libguile/tags.h
@@ -582,3 +582,9 @@ extern char *scm_isymnames[];   /* defined in print.c */
 #define scm_tcs_symbols scm_tc7_ssymbol:case scm_tc7_msymbol
 
 #endif  /* TAGSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/threads.c b/libguile/threads.c
index b9c8974eb..e94b72b28 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -155,3 +155,9 @@ scm_init_threads (SCM_STACKITEM *i)
   /* Initialize implementation specific details of the threads support */
   scm_threads_init (i);
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/threads.h b/libguile/threads.h
index bbba34671..f210d9562 100644
--- a/libguile/threads.h
+++ b/libguile/threads.h
@@ -116,3 +116,9 @@ extern SCM scm_signal_condition_variable (SCM cond);
 #endif
 
 #endif  /* THREADSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/throw.c b/libguile/throw.c
index 8d303cff6..2976b8fae 100644
--- a/libguile/throw.c
+++ b/libguile/throw.c
@@ -734,3 +734,9 @@ scm_init_throw ()
 					     NULL);
 #include "throw.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/throw.h b/libguile/throw.h
index e0ef204bb..d8f6deda1 100644
--- a/libguile/throw.h
+++ b/libguile/throw.h
@@ -101,3 +101,9 @@ extern SCM scm_ithrow (SCM key, SCM args, int noreturn);
 extern SCM scm_throw (SCM key, SCM args);
 extern void scm_init_throw (void);
 #endif  /* THROWH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/unif.c b/libguile/unif.c
index 216482e5f..0bab178c0 100644
--- a/libguile/unif.c
+++ b/libguile/unif.c
@@ -2522,3 +2522,9 @@ scm_init_unif ()
   scm_add_feature ("array");
 #include "unif.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/unif.h b/libguile/unif.h
index 550909e21..86312b3fa 100644
--- a/libguile/unif.h
+++ b/libguile/unif.h
@@ -130,3 +130,9 @@ extern SCM scm_array_prototype (SCM ra);
 extern void scm_init_unif (void);
 
 #endif  /* UNIFH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/validate.h b/libguile/validate.h
index c22640d68..bc773f441 100644
--- a/libguile/validate.h
+++ b/libguile/validate.h
@@ -1,4 +1,4 @@
-/* $Id: validate.h,v 1.1 2000-03-03 00:11:46 gjb Exp $ */
+/* $Id: validate.h,v 1.2 2000-03-19 19:01:14 cmm Exp $ */
 /*	Copyright (C) 1999 Free Software Foundation, Inc.
  * 
  * This program is free software; you can redistribute it and/or modify
@@ -289,3 +289,9 @@
   do { SCM_ASSERT (SCM_VECTORP (v) && len == SCM_LENGTH(v), v, pos, FUNC_NAME); } while (0)
 
 #endif
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/variable.c b/libguile/variable.c
index 4d35bb4ff..f453ce3ce 100644
--- a/libguile/variable.c
+++ b/libguile/variable.c
@@ -238,3 +238,9 @@ scm_init_variable ()
 #include "variable.x"
 }
 
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/variable.h b/libguile/variable.h
index e69d86c39..8d4abc028 100644
--- a/libguile/variable.h
+++ b/libguile/variable.h
@@ -72,3 +72,9 @@ extern SCM scm_variable_bound_p (SCM var);
 extern void scm_init_variable (void);
 
 #endif  /* VARIABLEH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/vectors.c b/libguile/vectors.c
index d6d6eb5d8..f4e992e14 100644
--- a/libguile/vectors.c
+++ b/libguile/vectors.c
@@ -386,3 +386,9 @@ scm_init_vectors ()
     scm_make_subr (s_resizuve, scm_tc7_subr_2, scm_vector_set_length_x); */
 }
 
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/vectors.h b/libguile/vectors.h
index 7fd8df06a..6245fb02c 100644
--- a/libguile/vectors.h
+++ b/libguile/vectors.h
@@ -86,3 +86,9 @@ extern SCM scm_vector_move_right_x (SCM vec1, SCM start1, SCM end1,
 extern void scm_init_vectors (void);
 
 #endif  /* VECTORSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/version.c b/libguile/version.c
index 7efb68277..605c2d9a7 100644
--- a/libguile/version.c
+++ b/libguile/version.c
@@ -102,3 +102,9 @@ scm_init_version ()
 {
 #include "version.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/version.h b/libguile/version.h
index 147677204..7c9babf74 100644
--- a/libguile/version.h
+++ b/libguile/version.h
@@ -54,3 +54,9 @@ extern SCM scm_version (void);
 extern void scm_init_version (void);
 
 #endif  /* VERSIONH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/vports.c b/libguile/vports.c
index 70164ec74..3a7cd99cc 100644
--- a/libguile/vports.c
+++ b/libguile/vports.c
@@ -213,3 +213,9 @@ scm_init_vports ()
 {
 #include "vports.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/vports.h b/libguile/vports.h
index 0e8aad183..39209cb68 100644
--- a/libguile/vports.h
+++ b/libguile/vports.h
@@ -52,3 +52,9 @@ extern SCM scm_make_soft_port (SCM pv, SCM modes);
 extern void scm_init_vports (void);
 
 #endif  /* VPORTSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/weaks.c b/libguile/weaks.c
index 8ef6cb641..6816bfa5e 100644
--- a/libguile/weaks.c
+++ b/libguile/weaks.c
@@ -216,3 +216,9 @@ scm_init_weaks ()
 #include "weaks.x"
 }
 
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/
diff --git a/libguile/weaks.h b/libguile/weaks.h
index 26f9a0257..e450ab0df 100644
--- a/libguile/weaks.h
+++ b/libguile/weaks.h
@@ -73,3 +73,9 @@ extern SCM scm_doubly_weak_hash_table_p (SCM x);
 extern void scm_init_weaks (void);
 
 #endif  /* WEAKSH */
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/