diff --git a/libguile/continuations.c b/libguile/continuations.c
index 48d758b9d..678628a08 100644
--- a/libguile/continuations.c
+++ b/libguile/continuations.c
@@ -68,7 +68,7 @@ scm_make_cont (answer)
   SCM_NEWCELL (cont);
   *answer = cont;
   SCM_DEFER_INTS;
-  SCM_SETJMPBUF (cont, scm_must_malloc ((long) sizeof (regs), s_cont));
+  SCM_SETJMPBUF (cont, scm_must_malloc ((long) sizeof (scm_contregs), s_cont));
   SCM_CAR (cont) = scm_tc7_contin;
   SCM_DYNENV (cont) = scm_dynwinds;
   SCM_THROW_VALUE = SCM_EOL;
@@ -98,7 +98,7 @@ scm_make_cont (answer)
   SCM_FLUSH_REGISTER_WINDOWS;
   j = scm_stack_size (SCM_BASE (scm_rootcont));
   SCM_SETJMPBUF (cont,
-	     scm_must_malloc ((long) (sizeof (regs) + j * sizeof (SCM_STACKITEM)),
+	     scm_must_malloc ((long) (sizeof (scm_contregs) + j * sizeof (SCM_STACKITEM)),
 			      s_cont));
   SCM_SETLENGTH (cont, j, scm_tc7_contin);
   SCM_DYNENV (cont) = scm_dynwinds;
@@ -109,7 +109,7 @@ scm_make_cont (answer)
 #ifndef SCM_STACK_GROWS_UP
   src -= SCM_LENGTH (cont);
 #endif /* ndef SCM_STACK_GROWS_UP */
-  dst = (SCM_STACKITEM *) (SCM_CHARS (cont) + sizeof (regs));
+  dst = (SCM_STACKITEM *) (SCM_CHARS (cont) + sizeof (scm_contregs));
   for (j = SCM_LENGTH (cont); 0 <= --j;)
     *dst++ = *src++;
 #endif /* def CHEAP_CONTINUATIONS */
@@ -165,7 +165,7 @@ scm_dynthrow (a)
     grow_throw (a);
 #endif /* def SCM_STACK_GROWS_UP */
   SCM_FLUSH_REGISTER_WINDOWS;
-  src = (SCM_STACKITEM *) (SCM_CHARS (cont) + sizeof (regs));
+  src = (SCM_STACKITEM *) (SCM_CHARS (cont) + sizeof (scm_contregs));
   for (j = SCM_LENGTH (cont); 0 <= --j;)
     *dst++ = *src++;
 #ifdef sparc			/* clear out stack up to this stackframe */
diff --git a/libguile/continuations.h b/libguile/continuations.h
index e34b17014..0bd18296e 100644
--- a/libguile/continuations.h
+++ b/libguile/continuations.h
@@ -58,15 +58,15 @@ typedef struct
 #ifdef DEBUG_EXTENSIONS
   struct scm_debug_frame *dframe;
 #endif
-} regs;
+} scm_contregs;
 
-#define SCM_JMPBUF(x) (((regs *)SCM_CHARS(x))->jmpbuf)
+#define SCM_JMPBUF(x) (((scm_contregs *)SCM_CHARS(x))->jmpbuf)
 #define SCM_SETJMPBUF SCM_SETCDR
-#define SCM_DYNENV(x) (((regs *)SCM_CHARS(x))->dynenv)
-#define SCM_THROW_VALUE(x) (((regs *)SCM_CHARS(x))->throw_value)
-#define SCM_BASE(x) (((regs *)SCM_CHARS(x))->base)
-#define SCM_SEQ(x) (((regs *)SCM_CHARS(x))->seq)
-#define SCM_DFRAME(x) (((regs *)SCM_CHARS(x))->dframe)
+#define SCM_DYNENV(x) (((scm_contregs *)SCM_CHARS(x))->dynenv)
+#define SCM_THROW_VALUE(x) (((scm_contregs *)SCM_CHARS(x))->throw_value)
+#define SCM_BASE(x) (((scm_contregs *)SCM_CHARS(x))->base)
+#define SCM_SEQ(x) (((scm_contregs *)SCM_CHARS(x))->seq)
+#define SCM_DFRAME(x) (((scm_contregs *)SCM_CHARS(x))->dframe)
 
 
 
diff --git a/libguile/gc.c b/libguile/gc.c
index 28e86e4e0..a19492450 100644
--- a/libguile/gc.c
+++ b/libguile/gc.c
@@ -575,7 +575,7 @@ gc_mark_nimp:
 	(ptr) break;
       SCM_SETGC8MARK (ptr);
       scm_mark_locations (SCM_VELTS (ptr),
-	       (scm_sizet) (SCM_LENGTH (ptr) + sizeof (regs) / sizeof (SCM_STACKITEM)));
+	       (scm_sizet) (SCM_LENGTH (ptr) + sizeof (scm_contregs) / sizeof (SCM_STACKITEM)));
       break;
     case scm_tc7_bvect:
     case scm_tc7_byvect:
@@ -1064,7 +1064,7 @@ scm_gc_sweep ()
 	    case scm_tc7_contin:
 	      if SCM_GC8MARKP (scmptr)
 		goto c8mrkcontinue;
-	      m += SCM_LENGTH (scmptr) * sizeof (SCM_STACKITEM) + sizeof (regs);
+	      m += SCM_LENGTH (scmptr) * sizeof (SCM_STACKITEM) + sizeof (scm_contregs);
 	      goto freechars;
 	    case scm_tc7_ssymbol:
 	      if SCM_GC8MARKP(scmptr)
diff --git a/libguile/root.c b/libguile/root.c
index 5e8a5e33b..9b620dd1e 100644
--- a/libguile/root.c
+++ b/libguile/root.c
@@ -191,7 +191,7 @@ cwdr (proc, a1, args, handler, stack_start)
     SCM_NEWCELL (new_rootcont);
     SCM_REDEFER_INTS;
     SCM_SETJMPBUF (new_rootcont,
-		   scm_must_malloc ((long) sizeof (regs),
+		   scm_must_malloc ((long) sizeof (scm_contregs),
 				    "inferior root continuation"));
     SCM_CAR (new_rootcont) = scm_tc7_contin;
     SCM_DYNENV (new_rootcont) = SCM_EOL;