diff --git a/code/error.lisp b/code/error.lisp
index fcb790b80ab50fe6e958cb36d37782f136b3eabb..e05778c1a8000f6ceccde69b5e45e62cbc5034cb 100644
--- a/code/error.lisp
+++ b/code/error.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/error.lisp,v 1.79 2004/03/26 18:22:54 emarsden Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/error.lisp,v 1.80 2005/09/09 19:36:34 pmai Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -22,7 +22,8 @@
 (export '(layout-invalid condition-function-name simple-control-error
 	  simple-file-error simple-program-error simple-parse-error
           simple-style-warning simple-undefined-function
-	  stack-overflow heap-overflow))
+          #+stack-checking stack-overflow
+          #+heap-overflow-check heap-overflow))
 
 (in-package "LISP")
 (export '(break error warn cerror
diff --git a/code/exports.lisp b/code/exports.lisp
index acdde5a39edda2f27887838feb7bb3c29e56f037..ba9567df890e3daa1673f26c5006880b1be671a3 100644
--- a/code/exports.lisp
+++ b/code/exports.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/exports.lisp,v 1.245 2005/06/13 14:29:24 rtoy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/exports.lisp,v 1.246 2005/09/09 19:36:34 pmai Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -1180,7 +1180,7 @@
   (:import-from "SYSTEM" "MAKE-INDENTING-STREAM" "INDENTING-STREAM-P"  "BINARY-TEXT-STREAM")
   (:export   "*AFTER-GC-HOOKS*" "*AFTER-SAVE-INITIALIZATIONS*"
 	     "DEBUG"
-	     "FLOATING-POINT-INEXACT"
+	     "FLOATING-POINT-INEXACT" "FLOAT-ACCURACY"
 	     "*ALL-MODIFIER-NAMES*" "*ANSI-DEFSTRUCT-OPTIONS-P*"
 	     "*AUTOLOAD-TRANSLATIONS*"
 	     "*BACKUP-EXTENSION*" "*BEFORE-GC-HOOKS*"
diff --git a/code/interr.lisp b/code/interr.lisp
index 6a593b962a2acffdf59e85a00d44d7928ebbdfc3..1af99126c194cbb1900e8b80074aa4b1eadc8c2a 100644
--- a/code/interr.lisp
+++ b/code/interr.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/interr.lisp,v 1.43 2003/10/24 02:56:59 toy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/interr.lisp,v 1.44 2005/09/09 19:36:34 pmai Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -18,8 +18,9 @@
 (in-package "KERNEL")
 
 (export '(infinite-error-protect find-caller-name *maximum-error-depth*
-	  red-zone-hit yellow-zone-hit
-	  dynamic-space-overflow-error-hit dynamic-space-overflow-warning-hit))
+	  #+stack-checking red-zone-hit #+stack-checking yellow-zone-hit
+          #+heap-overflow-check dynamic-space-overflow-error-hit
+          #+heap-overflow-check dynamic-space-overflow-warning-hit))