diff --git a/SWIG/Lib/guile/guile_gh.swg b/SWIG/Lib/guile/guile_gh.swg
index ddc394c19..4d95f4b76 100644
--- a/SWIG/Lib/guile/guile_gh.swg
+++ b/SWIG/Lib/guile/guile_gh.swg
@@ -1,15 +1,7 @@
-%runtime %{
-#define SWIG_malloc(size) \
-  SCM_MUST_MALLOC(size)
-#define SWIG_free(mem) \
-  scm_must_free(mem)
-#define SWIG_ConvertPtr(s, result, type, flags) \
-  SWIG_Guile_GetPtr(s, result, type)
-#define SWIG_MustGetPtr(s, type, argnum, flags) \
-  SWIG_Guile_MustGetPtr(s, type, argnum, FUNC_NAME)
-#define SWIG_NewPointerObj(ptr, type, owner) \
-  SWIG_Guile_MakePtr((void*)ptr, type)
-%}
+/* -*- c -*-
+   This SWIG interface file is processed if the Guile module is run
+   with gh_ flavor.
+*/
 
 %runtime "guile_gh_run.swg"
 %include "guile.i"
diff --git a/SWIG/Lib/guile/guile_gh_run.swg b/SWIG/Lib/guile/guile_gh_run.swg
index 29a217468..a7ae2af4a 100644
--- a/SWIG/Lib/guile/guile_gh_run.swg
+++ b/SWIG/Lib/guile/guile_gh_run.swg
@@ -15,6 +15,17 @@
 extern "C" {
 #endif
 
+#define SWIG_malloc(size) \
+  SCM_MUST_MALLOC(size)
+#define SWIG_free(mem) \
+  scm_must_free(mem)
+#define SWIG_ConvertPtr(s, result, type, flags) \
+  SWIG_Guile_GetPtr(s, result, type)
+#define SWIG_MustGetPtr(s, type, argnum, flags) \
+  SWIG_Guile_MustGetPtr(s, type, argnum, FUNC_NAME)
+#define SWIG_NewPointerObj(ptr, type, owner) \
+  SWIG_Guile_MakePtr((void*)ptr, type)
+  
 #if defined(SWIG_NOINCLUDE)
 #	define SWIGSTATIC
 #elif defined(SWIG_GLOBAL)
diff --git a/SWIG/Lib/guile/guile_scm.swg b/SWIG/Lib/guile/guile_scm.swg
index 8b37ccc12..245370ccb 100644
--- a/SWIG/Lib/guile/guile_scm.swg
+++ b/SWIG/Lib/guile/guile_scm.swg
@@ -1,15 +1,7 @@
-%runtime %{
-#define SWIG_malloc(size) \
-  SCM_MUST_MALLOC(size)
-#define SWIG_free(mem) \
-  scm_must_free(mem)
-#define SWIG_ConvertPtr(s, result, type, flags) \
-  SWIG_Guile_ConvertPtr(s, result, type, flags)
-#define SWIG_MustGetPtr(s, type, argnum, flags) \
-  SWIG_Guile_MustGetPtr(s, type, argnum, flags, FUNC_NAME)
-#define SWIG_NewPointerObj(ptr, type, owner) \
-  SWIG_Guile_NewPointerObj((void*)ptr, type, owner)
-%}
+/* -*- c -*-
+   This SWIG interface file is processed if the Guile module is run
+   with SCM_ flavor.
+*/
 
 %runtime "common.swg"
 %runtime "guile_scm_run.swg"