* Renamed header macros to the SCM_<filename>_H format.

55 files changed, 470 insertions, 416 deletions

diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 8f754125b..140c5c587 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,37 @@
+2001-08-31  Dirk Herrmann  <D.Herrmann@tu-bs.de>
+
+	* _scm.h (_SCMH, SCM__SCM_H), alist.h (ALISTH, SCM_ALIST_H),
+	arbiters.h (ARBITERSH, SCM_ARBITERS_H), backtrace.h (BACKTRACEH,
+	SCM_BACKTRACE_H), boolean.h (BOOLEANH, SCM_BOOLEAN_H), chars.h
+	(SCM_CHARSH, SCM_CHARS_H), coop-defs.h (COOP_DEFSH,
+	SCM_COOP_DEFS_H), coop-threads.h (COOP_THREADSH,
+	SCM_COOP_THREADS_H), debug-malloc.h (DEBUGMALLOCH,
+	SCM_DEBUG_MALLOC_H), dynwind.h (DYNWINDH, SCM_DYNWIND_H),
+	environments.h (ENVIRONMENTS_H, SCM_ENVIRONMENTS_H), eq.h (EQH,
+	SCM_EQ_H), evalext.h (EVALEXTH, SCM_EVALEXT_H), extensions.h
+	(LIBGUILE_EXTENSIONS_H, SCM_EXTENSIONS_H), feature.h (FEATUREH,
+	SCM_FEATURE_H), gdbint.h (GDBINTH, SCM_GDBINT_H), guardians.h
+	(SCM_GUARDIANH, SCM_GUARDIANS_H), hash.h (HASHH, SCM_HASH_H),
+	hashtab.h (HASHTABH, SCM_HASHTAB_H), init.h (INITH, SCM_INIT_H),
+	ioext.h (IOEXTH, SCM_IOEXT_H), iselect.h (ISELECTH,
+	SCM_ISELECT_H), keywords.h (KEYWORDSH, SCM_KEYWORDS_H), lang.h
+	(LANGH, SCM_LANG_H), mallocs.h (MALLOCSH, SCM_MALLOCS_H), net_db.h
+	(SCM_NETDBH, SCM_NET_DB_H), objprop.h (OBJPROPH, SCM_OBJPROP_H),
+	posix.h (POSIXH, SCM_POSIX_H), procprop.h (PROCPROPH,
+	SCM_PROCPROP_H), properties.h (PROPERTIES_H, SCM_PROPERTIES_H),
+	ramap.h (RAMAPH, SCM_RAMAP_H), rdelim.h (SCM_RDELIM,
+	SCM_RDELIM_H), read.h (READH, SCM_READ_H), rw.h (SCM_RW,
+	SCM_RW_H), scmsigs.h (SCMSIGSH, SCM_SCMSIGS_H), script.h (SCRIPTH,
+	SCM_SCRIPT_H), simpos.h (SIMPOSH, SCM_SIMPOS_H), socket.h
+	(SCM_SOCKETH, SCM_SOCKET_H), sort.h (SORTH, SCM_SORT_H),
+	stackchk.h (STACKCHKH, SCM_STACKCHK_H), stime.h (STIMEH,
+	SCM_STIME_H), strop.h (STROPH, SCM_STROP_H), strorder.h
+	(STRORDERH, SCM_STRORDER_H), threads.h (THREADSH, SCM_THREADS_H),
+	throw.h (THROWH, SCM_THROW_H), version.h (VERSIONH,
+	SCM_VERSION_H), vports.h (VPORTSH, SCM_VPORTS_H): Renamed
+	the macros that are defined to inhibit double inclusion of the
+	same headers to the SCM_<filename>_H format.
+
 2001-08-27  Marius Vollmer  <mvo@zagadka.ping.de>
 
 	* ports.c, ports.h, fprots.c, gc.c, ioext.c: Replaced
diff --git a/libguile/_scm.h b/libguile/_scm.h
index d155f9441..1ee482b35 100644
--- a/libguile/_scm.h
+++ b/libguile/_scm.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef _SCMH
-#define _SCMH
-/*	Copyright (C) 1995,1996, 2000, 2001 Free Software Foundation, Inc.
- * 
+#ifndef SCM__SCM_H
+#define SCM__SCM_H
+
+/* Copyright (C) 1995,1996,2000,2001 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,
@@ -42,6 +43,7 @@
  * 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/__scm.h"
@@ -128,8 +130,7 @@
 #define max(A,B) ((A) >= (B) ? (A) : (B))
 #endif
 
-#endif  /* _SCMH */
-
+#endif  /* SCM__SCM_H */
 
 /*
   Local Variables:
diff --git a/libguile/alist.h b/libguile/alist.h
index 9005ae18a..bf8b4562e 100644
--- a/libguile/alist.h
+++ b/libguile/alist.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef ALISTH
-#define ALISTH
-/*	Copyright (C) 1995,1996, 2000 Free Software Foundation, Inc.
- * 
+#ifndef SCM_ALIST_H
+#define SCM_ALIST_H
+
+/* Copyright (C) 1995,1996,2000 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,
@@ -42,6 +43,7 @@
  * 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/__scm.h"
@@ -66,7 +68,7 @@ extern SCM scm_assv_remove_x (SCM alist, SCM key);
 extern SCM scm_assoc_remove_x (SCM alist, SCM key);
 extern void scm_init_alist (void);
 
-#endif  /* ALISTH */
+#endif  /* SCM_ALIST_H */
 
 /*
   Local Variables:
diff --git a/libguile/arbiters.h b/libguile/arbiters.h
index b7f282ae0..7cda145c7 100644
--- a/libguile/arbiters.h
+++ b/libguile/arbiters.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef ARBITERSH
-#define ARBITERSH
-/*	Copyright (C) 1995,1996, 2000 Free Software Foundation, Inc.
- * 
+#ifndef SCM_ARBITERS_H
+#define SCM_ARBITERS_H
+
+/* Copyright (C) 1995,1996,2000 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,
@@ -42,6 +43,7 @@
  * 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/__scm.h"
@@ -53,7 +55,7 @@ extern SCM scm_try_arbiter (SCM arb);
 extern SCM scm_release_arbiter (SCM arb);
 extern void scm_init_arbiters (void);
 
-#endif  /* ARBITERSH */
+#endif  /* SCM_ARBITERS_H */
 
 /*
   Local Variables:
diff --git a/libguile/async.h b/libguile/async.h
index 15a1841cb..ed2d7c416 100644
--- a/libguile/async.h
+++ b/libguile/async.h
@@ -2,7 +2,8 @@
 
 #ifndef SCM_ASYNC_H
 #define SCM_ASYNC_H
-/* Copyright (C) 1995, 96, 97, 98, 2000, 2001 Free Software Foundation, Inc.
+
+/* Copyright (C) 1995,1996,1997,1998,2000,2001 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
diff --git a/libguile/backtrace.h b/libguile/backtrace.h
index db0cd8dc5..0c0b7417b 100644
--- a/libguile/backtrace.h
+++ b/libguile/backtrace.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef BACKTRACEH
-#define BACKTRACEH
-/*	Copyright (C) 1996, 1998, 1999, 2000, 2001 Free Software Foundation
- * 
+#ifndef SCM_BACKTRACE_H
+#define SCM_BACKTRACE_H
+
+/* Copyright (C) 1996,1998,1999,2000,2001 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,
@@ -45,6 +46,7 @@
  *
  * The author can be reached at djurfeldt@nada.kth.se
  * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN */
+
 
 
 #include "libguile/__scm.h"
@@ -63,7 +65,7 @@ SCM scm_set_print_params_x (SCM params);
 
 void scm_init_backtrace (void);
 
-#endif /* BACKTRACEH */
+#endif  /* SCM_BACKTRACE_H */
 
 /*
   Local Variables:
diff --git a/libguile/boolean.h b/libguile/boolean.h
index bc80e9f82..a4328fd48 100644
--- a/libguile/boolean.h
+++ b/libguile/boolean.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef BOOLEANH
-#define BOOLEANH
-/*	Copyright (C) 1995,1996, 2000 Free Software Foundation, Inc.
- * 
+#ifndef SCM_BOOLEAN_H
+#define SCM_BOOLEAN_H
+
+/* Copyright (C) 1995,1996,2000 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,
@@ -42,7 +43,9 @@
  * 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/__scm.h"
 
 
@@ -74,7 +77,7 @@ extern SCM scm_not (SCM x);
 extern SCM scm_boolean_p (SCM obj);
 extern void scm_init_boolean (void);
 
-#endif  /* BOOLEANH */
+#endif  /* SCM_BOOLEAN_H */
 
 /*
   Local Variables:
diff --git a/libguile/chars.h b/libguile/chars.h
index 65cc079d2..fa24a374a 100644
--- a/libguile/chars.h
+++ b/libguile/chars.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef SCM_CHARSH
-#define SCM_CHARSH
-/*	Copyright (C) 1995,1996, 2000, 2001 Free Software Foundation, Inc.
- * 
+#ifndef SCM_CHARS_H
+#define SCM_CHARS_H
+
+/* Copyright (C) 1995,1996,2000,2001 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,
@@ -42,6 +43,7 @@
  * 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/__scm.h"
@@ -87,7 +89,7 @@ extern int scm_upcase (unsigned int c);
 extern int scm_downcase (unsigned int c);
 extern void scm_init_chars (void);
 
-#endif  /* SCM_CHARSH */
+#endif  /* SCM_CHARS_H */
 
 /*
   Local Variables:
diff --git a/libguile/coop-defs.h b/libguile/coop-defs.h
index 6a54c5ca0..302230ebe 100644
--- a/libguile/coop-defs.h
+++ b/libguile/coop-defs.h
@@ -1,20 +1,20 @@
 /* classes: h_files */
 
-#ifndef COOP_DEFSH
-#define COOP_DEFSH
+#ifndef SCM_COOP_DEFS_H
+#define SCM_COOP_DEFS_H
 
 /* Copyright (C) 1996,1997,1998,1999,2000,2001 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,
@@ -272,7 +272,7 @@ do { \
 #define SCM_THREAD_LOCAL_DATA (coop_global_curr->data)
 #define SCM_SET_THREAD_LOCAL_DATA(ptr) (coop_global_curr->data = (ptr))
 
-#endif /* COOP_DEFSH */
+#endif  /* SCM_COOP_DEFS_H */
 
 /*
   Local Variables:
diff --git a/libguile/coop-threads.h b/libguile/coop-threads.h
index 11cb392d5..ffc1ef120 100644
--- a/libguile/coop-threads.h
+++ b/libguile/coop-threads.h
@@ -1,20 +1,20 @@
 /* classes: h_files */
 
-#ifndef COOP_THREADSH
-#define COOP_THREADSH
+#ifndef SCM_COOP_THREADS_H
+#define SCM_COOP_THREADS_H
 
-/*	Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
- * 
+/* Copyright (C) 1996,1997,1998,2000 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,
@@ -43,6 +43,7 @@
  * 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.  */
+
 
 
 /* This file is only included by coop-threads.c while coop-defs.h is
@@ -121,7 +122,7 @@ extern coop_q_t coop_tmp_queue;
 extern coop_q_t coop_global_allq;	/* A queue of all threads. */
 extern coop_t *coop_global_curr;       	/* Currently-executing thread. */
 
-#endif /* COOP_THREADSH */
+#endif  /* SCM_COOP_THREADS_H */
 
 /*
   Local Variables:
diff --git a/libguile/debug-malloc.h b/libguile/debug-malloc.h
index 29e465bc0..1d646fcb9 100644
--- a/libguile/debug-malloc.h
+++ b/libguile/debug-malloc.h
@@ -1,8 +1,9 @@
 /* classes: h_files */
 
-#ifndef DEBUGMALLOCH
-#define DEBUGMALLOCH
-/* Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+#ifndef SCM_DEBUG_MALLOC_H
+#define SCM_DEBUG_MALLOC_H
+
+/* Copyright (C) 2000,2001 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
@@ -58,7 +59,7 @@ extern SCM scm_malloc_stats (void);
 extern void scm_debug_malloc_prehistory (void);
 extern void scm_init_debug_malloc (void);
 
-#endif  /* DEBUGMALLOCH */
+#endif  /* SCM_DEBUG_MALLOC_H */
 
 /*
   Local Variables:
diff --git a/libguile/dynwind.h b/libguile/dynwind.h
index f956ea456..d7ac926f3 100644
--- a/libguile/dynwind.h
+++ b/libguile/dynwind.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef DYNWINDH
-#define DYNWINDH
-/*	Copyright (C) 1995, 1996, 1998, 1999, 2000 Free Software Foundation, Inc.
- * 
+#ifndef SCM_DYNWIND_H
+#define SCM_DYNWIND_H
+
+/* Copyright (C) 1995,1996,1998,1999,2000 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,
@@ -42,7 +43,9 @@
  * 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/__scm.h"
 
 
@@ -65,7 +68,7 @@ extern void scm_swap_bindings (SCM vars, SCM vals);
 extern SCM scm_wind_chain (void);
 #endif /*GUILE_DEBUG*/
 
-#endif  /* DYNWINDH */
+#endif  /* SCM_DYNWIND_H */
 
 /*
   Local Variables:
diff --git a/libguile/environments.h b/libguile/environments.h
index 2103b383f..77f866d2f 100644
--- a/libguile/environments.h
+++ b/libguile/environments.h
@@ -1,8 +1,9 @@
 /* classes: h_files */
 
-#ifndef ENVIRONMENTS_H
-#define ENVIRONMENTS_H
-/* Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+#ifndef SCM_ENVIRONMENTS_H
+#define SCM_ENVIRONMENTS_H
+
+/* Copyright (C) 1999,2000 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
@@ -42,6 +43,7 @@
  * 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/__scm.h"
@@ -201,9 +203,7 @@ extern SCM scm_export_environment_set_private_x (SCM env, SCM private);
 extern SCM scm_export_environment_signature (SCM env);
 extern SCM scm_export_environment_set_signature_x (SCM env, SCM signature);
 
-
-#endif
-
+#endif  /* SCM_ENVIRONMENTS_H */
 
 /*
   Local Variables:
diff --git a/libguile/eq.h b/libguile/eq.h
index 2bfcd2d8b..6fbfe3e1b 100644
--- a/libguile/eq.h
+++ b/libguile/eq.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef EQH
-#define EQH
-/*	Copyright (C) 1995,1996, 2000 Free Software Foundation, Inc.
- * 
+#ifndef SCM_EQ_H
+#define SCM_EQ_H
+
+/* Copyright (C) 1995,1996,2000 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,
@@ -42,7 +43,9 @@
  * 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/__scm.h"
 
 
@@ -52,7 +55,7 @@ extern SCM scm_eqv_p (SCM x, SCM y);
 extern SCM scm_equal_p (SCM x, SCM y);
 extern void scm_init_eq (void);
 
-#endif  /* EQH */
+#endif  /* SCM_EQ_H */
 
 /*
   Local Variables:
diff --git a/libguile/evalext.h b/libguile/evalext.h
index 3fafa6e5e..bac8c0eaa 100644
--- a/libguile/evalext.h
+++ b/libguile/evalext.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef EVALEXTH
-#define EVALEXTH
-/*	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
- * 
+#ifndef SCM_EVALEXT_H
+#define SCM_EVALEXT_H
+
+/* Copyright (C) 1998,1999,2000 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,
@@ -42,6 +43,7 @@
  * 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/__scm.h"
@@ -53,7 +55,7 @@ extern SCM scm_definedp (SCM sym, SCM env);
 extern SCM scm_m_undefine (SCM x, SCM env);
 extern void scm_init_evalext (void);
 
-#endif  /* EVALEXTH */
+#endif  /* SCM_EVALEXT_H */
 
 /*
   Local Variables:
diff --git a/libguile/extensions.h b/libguile/extensions.h
index f42b85535..184ab0e23 100644
--- a/libguile/extensions.h
+++ b/libguile/extensions.h
@@ -1,15 +1,20 @@
-/*	Copyright (C) 2001 Free Software Foundation, Inc.
- * 
+/* classes: h_files */
+
+#ifndef SCM_EXTENSIONS_H
+#define SCM_EXTENSIONS_H
+
+/* Copyright (C) 2001 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,
@@ -38,10 +43,8 @@
  * 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.  */
-
 
-#ifndef LIBGUILE_EXTENSIONS_H
-#define LIBGUILE_EXTENSIONS_H
+
 
 #include "libguile/__scm.h"
 
@@ -55,7 +58,7 @@ extern SCM scm_load_extension (SCM lib, SCM init);
 
 void scm_init_extensions (void);
 
-#endif  /* LIBGUILE_EXTENSIONS_H */
+#endif  /* SCM_EXTENSIONS_H */
 
 /*
   Local Variables:
diff --git a/libguile/feature.h b/libguile/feature.h
index dcde6803f..bbda02c53 100644
--- a/libguile/feature.h
+++ b/libguile/feature.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef FEATUREH
-#define FEATUREH
-/*	Copyright (C) 1995, 1996, 1999, 2000, 2001 Free Software Foundation, Inc.
- * 
+#ifndef SCM_FEATURE_H
+#define SCM_FEATURE_H
+
+/* Copyright (C) 1995,1996,1999,2000,2001 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,
@@ -52,7 +53,7 @@ extern SCM scm_program_arguments (void);
 extern void scm_set_program_arguments (int argc, char **argv, char *first);
 extern void scm_init_feature (void);
 
-#endif  /* FEATUREH */
+#endif  /* SCM_FEATURE_H */
 
 /*
   Local Variables:
diff --git a/libguile/gdb_interface.h b/libguile/gdb_interface.h
index ad3e3af5f..ad93b463e 100644
--- a/libguile/gdb_interface.h
+++ b/libguile/gdb_interface.h
@@ -1,3 +1,7 @@
+/* classes: h_files */
+
+#ifndef GDB_INTERFACE_H
+#define GDB_INTERFACE_H
 /* Simple interpreter interface for GDB, the GNU debugger.
    Copyright (C) 1996, 2000, 2001 Free Software Foundation
 
@@ -44,9 +48,6 @@ If you do not wish that, delete this exception notice.
 The author can be reached at djurfeldt@nada.kth.se
 Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN  */
 
-#ifndef GDB_INTERFACE_H
-#define GDB_INTERFACE_H
-
 /* This is the header file for GDB's interpreter interface.  The
    interpreter must supply definitions of all symbols declared in this
    file.
@@ -169,7 +170,7 @@ extern int gdb_print (GDB_TYPE value);
 
 extern int gdb_binding (GDB_TYPE name, GDB_TYPE value);
 
-#endif /* GDB_INTERFACE_H */
+#endif  /* GDB_INTERFACE_H */
 
 /*
   Local Variables:
diff --git a/libguile/gdbint.h b/libguile/gdbint.h
index 623bf93ec..70bf8b484 100644
--- a/libguile/gdbint.h
+++ b/libguile/gdbint.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef GDBINTH
-#define GDBINTH
-/*	Copyright (C) 1996, 2000 Free Software Foundation
- * 
+#ifndef SCM_GDBINT_H
+#define SCM_GDBINT_H
+
+/* Copyright (C) 1996,2000 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,
@@ -45,6 +46,7 @@
  *
  * The author can be reached at djurfeldt@nada.kth.se
  * Mikael Djurfeldt, SANS/NADA KTH, 10044 STOCKHOLM, SWEDEN */
+
 
 
 #include "libguile/__scm.h"
@@ -55,7 +57,7 @@ extern int scm_print_carefully_p;
 
 extern void scm_init_gdbint (void);
 
-#endif /* GDBINTH */
+#endif  /* SCM_GDBINT_H */
 
 /*
   Local Variables:
diff --git a/libguile/guardians.h b/libguile/guardians.h
index 4a0489d03..344fac7af 100644
--- a/libguile/guardians.h
+++ b/libguile/guardians.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef SCM_GUARDIANH
-#define SCM_GUARDIANH
-/*	Copyright (C) 1998, 2000, 2001 Free Software Foundation, Inc.
- * 
+#ifndef SCM_GUARDIANS_H
+#define SCM_GUARDIANS_H
+
+/* Copyright (C) 1998,2000,2001 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,
@@ -42,6 +43,7 @@
  * 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/__scm.h"
@@ -58,7 +60,7 @@ SCM scm_get_one_zombie (SCM guardian);
 
 void scm_init_guardians (void);
 
-#endif /* !SCM_GUARDIANH */
+#endif  /* SCM_GUARDIANS_H */
 
 /*
   Local Variables:
diff --git a/libguile/hash.h b/libguile/hash.h
index 5b2d5bb80..fc3b00b61 100644
--- a/libguile/hash.h
+++ b/libguile/hash.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef HASHH
-#define HASHH
-/*	Copyright (C) 1995,1996, 2000 Free Software Foundation, Inc.
- * 
+#ifndef SCM_HASH_H
+#define SCM_HASH_H
+
+/* Copyright (C) 1995,1996,2000 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,
@@ -42,6 +43,7 @@
  * 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/__scm.h"
@@ -58,7 +60,7 @@ extern unsigned long scm_ihash (SCM obj, unsigned long n);
 extern SCM scm_hash (SCM obj, SCM n);
 extern void scm_init_hash (void);
 
-#endif  /* HASHH */
+#endif  /* SCM_HASH_H */
 
 /*
   Local Variables:
diff --git a/libguile/hashtab.h b/libguile/hashtab.h
index c7594a344..6e969570b 100644
--- a/libguile/hashtab.h
+++ b/libguile/hashtab.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef HASHTABH
-#define HASHTABH
-/*	Copyright (C) 1995, 1996, 1999, 2000, 2001 Free Software Foundation, Inc.
- * 
+#ifndef SCM_HASHTAB_H
+#define SCM_HASHTAB_H
+
+/* Copyright (C) 1995,1996,1999,2000,2001 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,
@@ -42,7 +43,9 @@
  * 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/__scm.h"
 
 
@@ -85,7 +88,7 @@ extern SCM scm_hashx_remove_x (SCM hash, SCM assoc, SCM del, SCM table, SCM obj)
 extern SCM scm_hash_fold (SCM proc, SCM init, SCM hash);
 extern void scm_init_hashtab (void);
 
-#endif  /* HASHTABH */
+#endif  /* SCM_HASHTAB_H */
 
 /*
   Local Variables:
diff --git a/libguile/init.h b/libguile/init.h
index 4367e1a1c..4e95fb557 100644
--- a/libguile/init.h
+++ b/libguile/init.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef INITH
-#define INITH
-/*	Copyright (C) 1995,1996,1997, 2000 Free Software Foundation, Inc.
- * 
+#ifndef SCM_INIT_H
+#define SCM_INIT_H
+
+/* Copyright (C) 1995,1996,1997,2000 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,
@@ -42,6 +43,7 @@
  * 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/__scm.h"
@@ -59,7 +61,7 @@ extern void scm_boot_guile (int argc, char **argv,
 
 extern void scm_load_startup_files (void);
 
-#endif  /* INITH */
+#endif  /* SCM_INIT_H */
 
 /*
   Local Variables:
diff --git a/libguile/ioext.h b/libguile/ioext.h
index c6b4712ac..5cb5e2394 100644
--- a/libguile/ioext.h
+++ b/libguile/ioext.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef IOEXTH
-#define IOEXTH
-/*	Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
- * 
+#ifndef SCM_IOEXT_H
+#define SCM_IOEXT_H
+
+/* Copyright (C) 1995,1996,1997,1998,2000,2001 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,
@@ -42,6 +43,7 @@
  * 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/__scm.h"
@@ -59,7 +61,7 @@ extern SCM scm_primitive_move_to_fdes (SCM port, SCM fd);
 extern SCM scm_fdes_to_ports (SCM fd);
 extern void scm_init_ioext (void);
 
-#endif  /* IOEXTH */
+#endif  /* SCM_IOEXT_H */
 
 /*
   Local Variables:
diff --git a/libguile/iselect.h b/libguile/iselect.h
index 4a7971864..bbacf3036 100644
--- a/libguile/iselect.h
+++ b/libguile/iselect.h
@@ -1,20 +1,20 @@
 /* classes: h_files */
 
-#ifndef ISELECTH
-#define ISELECTH
+#ifndef SCM_ISELECT_H
+#define SCM_ISELECT_H
 
-/*	Copyright (C) 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
- * 
+/* Copyright (C) 1997,1998,2000,2001 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,
@@ -42,8 +42,9 @@
  *
  * 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.  
- */
+ * If you do not wish that, delete this exception notice.  */
+
+
 
 #include "libguile/__scm.h"
 
@@ -103,7 +104,7 @@ extern void scm_init_iselect (void);
 
 #endif /* GUILE_ISELECT */
 
-#endif
+#endif  /* SCM_ISELECT_H */
 
 /*
   Local Variables:
diff --git a/libguile/keywords.h b/libguile/keywords.h
index 13ce8cb95..3ff94907d 100644
--- a/libguile/keywords.h
+++ b/libguile/keywords.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef KEYWORDSH
-#define KEYWORDSH
-/*	Copyright (C) 1995,1996,1999, 2000, 2001 Free Software Foundation, Inc.
- * 
+#ifndef SCM_KEYWORDS_H
+#define SCM_KEYWORDS_H
+
+/* Copyright (C) 1995,1996,1999,2000,2001 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,
@@ -63,7 +64,7 @@ extern SCM scm_keyword_p (SCM obj);
 extern SCM scm_keyword_dash_symbol (SCM keyword);
 extern void scm_init_keywords (void);
 
-#endif  /* KEYWORDSH */
+#endif  /* SCM_KEYWORDS_H */
 
 /*
   Local Variables:
diff --git a/libguile/lang.h b/libguile/lang.h
index f0514d0c6..0619e5221 100644
--- a/libguile/lang.h
+++ b/libguile/lang.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef LANGH
-#define LANGH
-/*	Copyright (C) 1998 Free Software Foundation, Inc.
- * 
+#ifndef SCM_LANG_H
+#define SCM_LANG_H
+
+/* Copyright (C) 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,
@@ -42,6 +43,7 @@
  * 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/__scm.h"
@@ -68,7 +70,7 @@ extern SCM scm_m_while (SCM exp, SCM env);
 extern SCM scm_nil_eq (SCM x, SCM y);
 extern void scm_init_lang (void);
 
-#endif  /* PAIRSH */
+#endif  /* SCM_LANG_H */
 
 /*
   Local Variables:
diff --git a/libguile/macros.h b/libguile/macros.h
index 2678d1c53..1a2203ab1 100644
--- a/libguile/macros.h
+++ b/libguile/macros.h
@@ -2,18 +2,19 @@
 
 #ifndef SCM_MACROS_H
 #define SCM_MACROS_H
+
 /* Copyright (C) 1998,2000,2001 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,
@@ -42,6 +43,7 @@
  * 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/__scm.h"
@@ -69,7 +71,7 @@ extern SCM scm_make_synt (const char *name,
                           SCM (*fcn) ());
 extern void scm_init_macros (void);
 
-#endif /* SCM_MACROS_H */
+#endif  /* SCM_MACROS_H */
 
 /*
   Local Variables:
diff --git a/libguile/mallocs.h b/libguile/mallocs.h
index f62c245ab..cb96af7f5 100644
--- a/libguile/mallocs.h
+++ b/libguile/mallocs.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef MALLOCSH
-#define MALLOCSH
-/*	Copyright (C) 1995, 2000 Free Software Foundation, Inc.
- * 
+#ifndef SCM_MALLOCS_H
+#define SCM_MALLOCS_H
+
+/* Copyright (C) 1995,2000 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,
@@ -42,7 +43,9 @@
  * 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/__scm.h"
 
 
@@ -57,7 +60,7 @@ extern scm_t_bits scm_tc16_malloc;
 extern SCM scm_malloc_obj (size_t n);
 extern void scm_init_mallocs (void);
 
-#endif  /* MALLOCSH */
+#endif  /* SCM_MALLOCS_H */
 
 /*
   Local Variables:
diff --git a/libguile/net_db.h b/libguile/net_db.h
index 56c04157f..db8f22005 100644
--- a/libguile/net_db.h
+++ b/libguile/net_db.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef SCM_NETDBH
-#define SCM_NETDBH
-/*	Copyright (C) 1995, 2000, 2001 Free Software Foundation, Inc.
- * 
+#ifndef SCM_NET_DB_H
+#define SCM_NET_DB_H
+
+/* Copyright (C) 1995,2000,2001 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,
@@ -42,12 +43,10 @@
  * 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/__scm.h"
 
 
 
+#include "libguile/__scm.h"
 
 
 
@@ -61,7 +60,7 @@ extern SCM scm_setproto (SCM arg);
 extern SCM scm_setserv (SCM arg);
 extern void scm_init_net_db (void);
 
-#endif  /* SCM_NETDBH */
+#endif  /* SCM_NET_DB_H */
 
 /*
   Local Variables:
diff --git a/libguile/objects.h b/libguile/objects.h
index a7afb4aa2..26d39af61 100644
--- a/libguile/objects.h
+++ b/libguile/objects.h
@@ -4,17 +4,17 @@
 #define SCM_OBJECTS_H
 
 /* Copyright (C) 1996,1999,2000,2001 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,
@@ -43,6 +43,7 @@
  * 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.  */
+
 
 
 /* This file and objects.c contains those minimal pieces of the Guile
@@ -240,7 +241,7 @@ extern SCM scm_i_make_class_object (SCM metaclass, SCM layout_string,
 				    unsigned long flags);
 extern void scm_init_objects (void);
 
-#endif /* SCM_OBJECTS_H */
+#endif  /* SCM_OBJECTS_H */
 
 /*
   Local Variables:
diff --git a/libguile/objprop.h b/libguile/objprop.h
index bc590fbe0..82afc2534 100644
--- a/libguile/objprop.h
+++ b/libguile/objprop.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef OBJPROPH
-#define OBJPROPH
-/*	Copyright (C) 1995, 2000, 2001 Free Software Foundation, Inc.
- * 
+#ifndef SCM_OBJPROP_H
+#define SCM_OBJPROP_H
+
+/* Copyright (C) 1995,2000,2001 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,
@@ -42,13 +43,10 @@
  * 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/__scm.h"
 
 
 
-
+#include "libguile/__scm.h"
 
 
 
@@ -58,7 +56,7 @@ extern SCM scm_object_property (SCM obj, SCM key);
 extern SCM scm_set_object_property_x (SCM obj, SCM key, SCM val);
 extern void scm_init_objprop (void);
 
-#endif  /* OBJPROPH */
+#endif  /* SCM_OBJPROP_H */
 
 /*
   Local Variables:
diff --git a/libguile/pairs.h b/libguile/pairs.h
index ff6bddc5b..2149b3918 100644
--- a/libguile/pairs.h
+++ b/libguile/pairs.h
@@ -2,18 +2,19 @@
 
 #ifndef SCM_PAIRS_H
 #define SCM_PAIRS_H
+
 /* Copyright (C) 1995,1996,2000,2001 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,
@@ -43,7 +44,6 @@
  * whether to permit this exception to apply to your modifications.
  * If you do not wish that, delete this exception notice.  */
 
-
 
 
 #include "libguile/__scm.h"
diff --git a/libguile/print.h b/libguile/print.h
index 5d8e3e06d..754f307b1 100644
--- a/libguile/print.h
+++ b/libguile/print.h
@@ -2,18 +2,19 @@
 
 #ifndef SCM_PRINT_H
 #define SCM_PRINT_H
+
 /* Copyright (C) 1995,1996,1998,2000,2001 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,
@@ -122,6 +123,7 @@ extern void scm_init_print (void);
 #ifdef GUILE_DEBUG
 extern SCM scm_current_pstate (void);
 #endif 
+
 #endif  /* SCM_PRINT_H */
 
 /*
diff --git a/libguile/procprop.h b/libguile/procprop.h
index 98331465a..f5db1d4bf 100644
--- a/libguile/procprop.h
+++ b/libguile/procprop.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef PROCPROPH
-#define PROCPROPH
-/*	Copyright (C) 1995,1996,1998, 2000 Free Software Foundation, Inc.
- * 
+#ifndef SCM_PROCPROP_H
+#define SCM_PROCPROP_H
+
+/* Copyright (C) 1995,1996,1998,2000 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,
@@ -42,6 +43,7 @@
  * 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/__scm.h"
@@ -61,7 +63,7 @@ extern SCM scm_procedure_property (SCM p, SCM k);
 extern SCM scm_set_procedure_property_x (SCM p, SCM k, SCM v);
 extern void scm_init_procprop (void);
 
-#endif  /* PROCPROPH */
+#endif  /* SCM_PROCPROP_H */
 
 /*
   Local Variables:
diff --git a/libguile/properties.h b/libguile/properties.h
index 1a3298626..2c59c03d0 100644
--- a/libguile/properties.h
+++ b/libguile/properties.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef PROPERTIES_H
-#define PROPERTIES_H
-/*	Copyright (C) 1995,1996,1998, 2000 Free Software Foundation, Inc.
- * 
+#ifndef SCM_PROPERTIES_H
+#define SCM_PROPERTIES_H
+
+/* Copyright (C) 1995,1996,1998,2000 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,
@@ -42,6 +43,7 @@
  * 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/__scm.h"
@@ -53,7 +55,7 @@ SCM scm_primitive_property_del_x (SCM prop, SCM obj);
 
 void scm_init_properties (void);
 
-#endif  /* PROPERTIES_H */
+#endif  /* SCM_PROPERTIES_H */
 
 /*
   Local Variables:
diff --git a/libguile/ramap.h b/libguile/ramap.h
index a71cfca86..c9c4e17c0 100644
--- a/libguile/ramap.h
+++ b/libguile/ramap.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef RAMAPH
-#define RAMAPH
-/*	Copyright (C) 1995,1996,1997, 2000 Free Software Foundation, Inc.
- * 
+#ifndef SCM_RAMAP_H
+#define SCM_RAMAP_H
+
+/* Copyright (C) 1995,1996,1997,2000 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,
@@ -42,6 +43,7 @@
  * 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/__scm.h"
@@ -71,7 +73,7 @@ extern SCM scm_raequal (SCM ra0, SCM ra1);
 extern SCM scm_array_equal_p (SCM ra0, SCM ra1);
 extern void scm_init_ramap (void);
 
-#endif  /* RAMAPH */
+#endif  /* SCM_RAMAP_H */
 
 /*
   Local Variables:
diff --git a/libguile/rdelim.h b/libguile/rdelim.h
index 3b1039bdc..6a987cc7d 100644
--- a/libguile/rdelim.h
+++ b/libguile/rdelim.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef SCM_RDELIM
-#define SCM_RDELIM
-/*	Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
- * 
+#ifndef SCM_RDELIM_H
+#define SCM_RDELIM_H
+
+/* Copyright (C) 1995,1996,1997,1998,2000,2001 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,
@@ -42,6 +43,7 @@
  * 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/__scm.h"
@@ -54,7 +56,7 @@ extern SCM scm_init_rdelim_builtins (void);
 
 void scm_init_rdelim (void);
 
-#endif
+#endif  /* SCM_RDELIM_H */
 
 /*
   Local Variables:
diff --git a/libguile/read.h b/libguile/read.h
index 3362060e1..ccdc4a2c3 100644
--- a/libguile/read.h
+++ b/libguile/read.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef READH
-#define READH
-/*	Copyright (C) 1995,1996, 2000 Free Software Foundation, Inc.
- * 
+#ifndef SCM_READ_H
+#define SCM_READ_H
+
+/* Copyright (C) 1995,1996,2000 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,
@@ -42,6 +43,7 @@
  * 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/__scm.h"
@@ -89,7 +91,7 @@ extern SCM scm_lreadrecparen (SCM * tok_buf, SCM port, char *name, SCM *copy);
 extern SCM scm_read_hash_extend (SCM chr, SCM proc);
 extern void scm_init_read (void);
 
-#endif  /* READH */
+#endif  /* SCM_READ_H */
 
 /*
   Local Variables:
diff --git a/libguile/rw.h b/libguile/rw.h
index c2089d423..d9ad59026 100644
--- a/libguile/rw.h
+++ b/libguile/rw.h
@@ -1,14 +1,15 @@
 /* classes: h_files */
 
-#ifndef SCM_RW
-#define SCM_RW
-/*	Copyright (C) 2001 Free Software Foundation, Inc.
- * 
+#ifndef SCM_RW_H
+#define SCM_RW_H
+
+/* Copyright (C) 2001 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
@@ -42,6 +43,7 @@
  * 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/__scm.h"
@@ -54,7 +56,7 @@ extern SCM scm_write_string_partial (SCM str, SCM port_or_fdes, SCM start,
 SCM scm_init_rw_builtins (void);
 void scm_init_rw (void);
 
-#endif
+#endif  /* SCM_RW_H */
 
 /*
   Local Variables:
diff --git a/libguile/scmsigs.h b/libguile/scmsigs.h
index 06fc129d5..5c9893e30 100644
--- a/libguile/scmsigs.h
+++ b/libguile/scmsigs.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef SCMSIGSH
-#define SCMSIGSH
-/*	Copyright (C) 1995,1996,1997,1998, 2000 Free Software Foundation, Inc.
- * 
+#ifndef SCM_SCMSIGS_H
+#define SCM_SCMSIGS_H
+
+/* Copyright (C) 1995,1996,1997,1998,2000 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,
@@ -42,7 +43,9 @@
  * 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/__scm.h"
 
 
@@ -60,7 +63,7 @@ extern SCM scm_usleep (SCM i);
 extern SCM scm_raise (SCM sig);
 extern void scm_init_scmsigs (void);
 
-#endif  /* SCMSIGSH */
+#endif  /* SCM_SCMSIGS_H */
 
 /*
   Local Variables:
diff --git a/libguile/script.h b/libguile/script.h
index 655307aa9..d71ddca92 100644
--- a/libguile/script.h
+++ b/libguile/script.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef SCRIPTH
-#define SCRIPTH
-/*	Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
- * 
+#ifndef SCM_SCRIPT_H
+#define SCM_SCRIPT_H
+
+/* Copyright (C) 1997,1998,2000 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,
@@ -42,7 +43,9 @@
  * 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/__scm.h"
 
 
@@ -59,7 +62,7 @@ extern void scm_shell (int argc, char **argv);
 extern char *scm_usage_name;
 extern void scm_init_script (void);
 
-#endif  /* SCRIPTH */
+#endif  /* SCM_SCRIPT_H */
 
 /*
   Local Variables:
diff --git a/libguile/simpos.h b/libguile/simpos.h
index bd843f975..4bae4e520 100644
--- a/libguile/simpos.h
+++ b/libguile/simpos.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef SIMPOSH
-#define SIMPOSH
-/*	Copyright (C) 1995,1996,1997,1998, 2000 Free Software Foundation, Inc.
- * 
+#ifndef SCM_SIMPOS_H
+#define SCM_SIMPOS_H
+
+/* Copyright (C) 1995,1996,1997,1998,2000 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,
@@ -42,7 +43,9 @@
  * 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/__scm.h"
 
 
@@ -52,7 +55,7 @@ extern SCM scm_getenv (SCM nam);
 extern SCM scm_primitive_exit (SCM status);
 extern void scm_init_simpos (void);
 
-#endif  /* SIMPOSH */
+#endif  /* SCM_SIMPOS_H */
 
 /*
   Local Variables:
diff --git a/libguile/socket.h b/libguile/socket.h
index f88b9229e..3d355796d 100644
--- a/libguile/socket.h
+++ b/libguile/socket.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef SCM_SOCKETH
-#define SCM_SOCKETH
-/*	Copyright (C) 1995, 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
- * 
+#ifndef SCM_SOCKET_H
+#define SCM_SOCKET_H
+
+/* Copyright (C) 1995,1996,1997,2000,2001 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,
@@ -42,6 +43,7 @@
  * 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/__scm.h"
@@ -77,7 +79,7 @@ extern SCM scm_recvfrom (SCM sockfd, SCM buff_or_size, SCM flags, SCM offset, SC
 extern SCM scm_sendto (SCM sockfd, SCM message, SCM fam, SCM address, SCM args_and_flags);
 extern void scm_init_socket (void);
 
-#endif  /* SCM_SOCKETH */
+#endif  /* SCM_SOCKET_H */
 
 /*
   Local Variables:
diff --git a/libguile/sort.h b/libguile/sort.h
index 6aa941c0b..ed98a3212 100644
--- a/libguile/sort.h
+++ b/libguile/sort.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef SORTH
-#define SORTH
-/*	Copyright (C) 1999, 2000 Free Software Foundation, Inc.
- * 
+#ifndef SCM_SORT_H
+#define SCM_SORT_H
+
+/* Copyright (C) 1999,2000 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,
@@ -42,6 +43,7 @@
  * 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/__scm.h"
@@ -63,10 +65,7 @@ extern SCM scm_sort_list (SCM ls, SCM less);
 extern SCM scm_sort_list_x (SCM ls, SCM less);
 extern void scm_init_sort (void);
 
-#endif  /* SORTH */
-
-
-
+#endif  /* SCM_SORT_H */
 
 /*
   Local Variables:
diff --git a/libguile/stackchk.h b/libguile/stackchk.h
index bdbe69009..8617e1ca2 100644
--- a/libguile/stackchk.h
+++ b/libguile/stackchk.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef STACKCHKH
-#define STACKCHKH
-/*	Copyright (C) 1995,1996,1998, 2000 Free Software Foundation, Inc.
- * 
+#ifndef SCM_STACKCHK_H
+#define SCM_STACKCHK_H
+
+/* Copyright (C) 1995,1996,1998,2000 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,
@@ -42,7 +43,9 @@
  * 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/__scm.h"
 
 #include "libguile/continuations.h"
@@ -89,7 +92,7 @@ extern long scm_stack_size (SCM_STACKITEM *start);
 extern void scm_stack_report (void);
 extern void scm_init_stackchk (void);
 
-#endif  /* STACKCHKH */
+#endif  /* SCM_STACKCHK_H */
 
 /*
   Local Variables:
diff --git a/libguile/stime.h b/libguile/stime.h
index eaea28847..788e85422 100644
--- a/libguile/stime.h
+++ b/libguile/stime.h
@@ -1,8 +1,9 @@
 /* classes: h_files */
 
-#ifndef STIMEH
-#define STIMEH
-/*	Copyright (C) 1995,1996,1997,1998, 2000 Free Software Foundation, Inc.
+#ifndef SCM_STIME_H
+#define SCM_STIME_H
+
+/* Copyright (C) 1995,1996,1997,1998,2000 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
@@ -42,6 +43,7 @@
  * 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/__scm.h"
@@ -61,7 +63,7 @@ extern SCM scm_strftime (SCM format, SCM stime);
 extern SCM scm_strptime (SCM format, SCM string);
 extern void scm_init_stime (void);
 
-#endif  /* STIMEH */
+#endif  /* SCM_STIME_H */
 
 /*
   Local Variables:
diff --git a/libguile/strop.h b/libguile/strop.h
index 14b079849..0f1ceb1a8 100644
--- a/libguile/strop.h
+++ b/libguile/strop.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef STROPH
-#define STROPH
-/*	Copyright (C) 1995,1996,1997, 2000, 2001 Free Software Foundation, Inc.
- * 
+#ifndef SCM_STROP_H
+#define SCM_STROP_H
+
+/* Copyright (C) 1995,1996,1997,2000,2001 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,
@@ -42,6 +43,7 @@
  * 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/__scm.h"
@@ -70,7 +72,7 @@ extern SCM scm_string_ci_to_symbol (SCM v);
 #define scm_substring_move_left_x scm_substring_move_x
 #define scm_substring_move_right_x scm_substring_move_x
 
-#endif  /* STROPH */
+#endif  /* SCM_STROP_H */
 
 /*
   Local Variables:
diff --git a/libguile/strorder.h b/libguile/strorder.h
index c145a1d94..3660c61a3 100644
--- a/libguile/strorder.h
+++ b/libguile/strorder.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef STRORDERH
-#define STRORDERH
-/*	Copyright (C) 1995,1996, 2000 Free Software Foundation, Inc.
- * 
+#ifndef SCM_STRORDER_H
+#define SCM_STRORDER_H
+
+/* Copyright (C) 1995,1996,2000 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,
@@ -42,14 +43,10 @@
  * 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/__scm.h"
 
 
 
-
-
+#include "libguile/__scm.h"
 
 
 
@@ -65,7 +62,7 @@ extern SCM scm_string_ci_gr_p (SCM s1, SCM s2);
 extern SCM scm_string_ci_geq_p (SCM s1, SCM s2);
 extern void scm_init_strorder (void);
 
-#endif  /* STRORDERH */
+#endif  /* SCM_STRORDER_H */
 
 /*
   Local Variables:
diff --git a/libguile/threads.h b/libguile/threads.h
index 1cc228594..223732a44 100644
--- a/libguile/threads.h
+++ b/libguile/threads.h
@@ -1,20 +1,20 @@
 /* classes: h_files */
 
-#ifndef THREADSH
-#define THREADSH
+#ifndef SCM_THREADS_H
+#define SCM_THREADS_H
 
-/* Copyright (C) 1996, 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
- * 
+/* Copyright (C) 1996,1997,1998,2000,2001 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,
@@ -104,7 +104,7 @@ extern SCM scm_signal_condition_variable (SCM cond);
 #include "libguile/coop-defs.h"
 #endif
 
-#endif  /* THREADSH */
+#endif  /* SCM_THREADS_H */
 
 /*
   Local Variables:
diff --git a/libguile/throw.h b/libguile/throw.h
index 1211cd926..6b6b3d79c 100644
--- a/libguile/throw.h
+++ b/libguile/throw.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef THROWH
-#define THROWH
-/*	Copyright (C) 1995,1996,1998, 2000 Free Software Foundation, Inc.
- * 
+#ifndef SCM_THROW_H
+#define SCM_THROW_H
+
+/* Copyright (C) 1995,1996,1998,2000 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,
@@ -42,6 +43,7 @@
  * 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/__scm.h"
@@ -100,7 +102,8 @@ 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 */
+
+#endif  /* SCM_THROW_H */
 
 /*
   Local Variables:
diff --git a/libguile/values.h b/libguile/values.h
index 1ddac9a71..2c2fce0ef 100644
--- a/libguile/values.h
+++ b/libguile/values.h
@@ -2,18 +2,19 @@
 
 #ifndef SCM_VALUES_H
 #define SCM_VALUES_H
-/*	Copyright (C) 2000, 2001 Free Software Foundation, Inc.
- * 
+
+/* Copyright (C) 2000,2001 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,
diff --git a/libguile/version.h b/libguile/version.h
index b95254632..e69de29bb 100644
--- a/libguile/version.h
+++ b/libguile/version.h
@@ -1,63 +0,0 @@
-/* classes: h_files */
-
-#ifndef VERSIONH
-#define VERSIONH
-/*	Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001 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/__scm.h"
-
-
-
-extern SCM scm_major_version (void);
-extern SCM scm_minor_version (void);
-extern SCM scm_micro_version (void);
-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.h b/libguile/vports.h
index 52e6b7a45..90c628fb5 100644
--- a/libguile/vports.h
+++ b/libguile/vports.h
@@ -1,19 +1,20 @@
 /* classes: h_files */
 
-#ifndef VPORTSH
-#define VPORTSH
-/*	Copyright (C) 1995,1996, 2000 Free Software Foundation, Inc.
- * 
+#ifndef SCM_VPORTS_H
+#define SCM_VPORTS_H
+
+/* Copyright (C) 1995,1996,2000 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,
@@ -42,6 +43,7 @@
  * 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/__scm.h"
@@ -51,7 +53,7 @@
 extern SCM scm_make_soft_port (SCM pv, SCM modes);
 extern void scm_init_vports (void);
 
-#endif  /* VPORTSH */
+#endif  /* SCM_VPORTS_H */
 
 /*
   Local Variables:
diff --git a/libguile/weaks.h b/libguile/weaks.h
index 4e561eec2..bfafba674 100644
--- a/libguile/weaks.h
+++ b/libguile/weaks.h
@@ -2,18 +2,19 @@
 
 #ifndef SCM_WEAKS_H
 #define SCM_WEAKS_H
-/* Copyright (C) 1995,1996,2000,2001 Free Software Foundation, Inc.   
- * 
+
+/* Copyright (C) 1995,1996,2000,2001 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,