diff --git a/code/fwrappers.lisp b/code/fwrappers.lisp
index f2bbe654d6e2a67f01993652646a0cec51e3f081..c113aaa9656ea03c6a0e0632ae06b9e28e7a75fa 100644
--- a/code/fwrappers.lisp
+++ b/code/fwrappers.lisp
@@ -27,7 +27,7 @@
 ;;; USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 ;;; DAMAGE.
 
-(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/fwrappers.lisp,v 1.4 2003/08/20 16:54:00 gerd Exp $")
+(ext:file-comment "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/fwrappers.lisp,v 1.5 2004/01/09 04:34:17 toy Rel $")
 
 (in-package :fwrappers)
 
@@ -214,7 +214,6 @@
 				    `(%call-next-function))))
 		     ,@body))))))))
 
-  #+pcl
   (defun uses-vars-p (body optionals keys rest env)
     "First value is true if BODY refers to any of the variables in
      OPTIONALS, KEYS or REST, which are what KERNEL:PARSE-LAMBDA-LIST
@@ -242,12 +241,7 @@
 		 form))
 	  (walker:walk-form body env #'walk)
 	  (values used-p rest-used-p)))))
-
-  #-pcl
-  (defun uses-vars-p (&rest args)
-    "Dummy for cases where CMUCL is compiled without PCL."
-    (declare (ignore args))
-    t))
+  )
 
 
 ;;;
diff --git a/pcl/defsys.lisp b/pcl/defsys.lisp
index 96a89fe9cebf460eb9f3145d7f63583e1c4b307d..b84c8623ddb95ad6e14968e49f09870b3803891b 100644
--- a/pcl/defsys.lisp
+++ b/pcl/defsys.lisp
@@ -25,7 +25,7 @@
 ;;; *************************************************************************
 
 (file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/defsys.lisp,v 1.34 2003/06/18 09:23:09 gerd Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/defsys.lisp,v 1.35 2004/01/09 04:34:17 toy Exp $")
 ;;;
 ;;; Some support stuff for compiling and loading PCL.  It would be nice if
 ;;; there was some portable make-system we could all agree to share for a
@@ -66,7 +66,7 @@
 ;;; 
 (defvar *the-pcl-package* (find-package :pcl))
 
-(defvar *pcl-system-date* "$Date: 2003/06/18 09:23:09 $")
+(defvar *pcl-system-date* "$Date: 2004/01/09 04:34:17 $")
 
 (setf (getf ext:*herald-items* :pcl)
       `("    CLOS based on Gerd's PCL " ,(subseq *pcl-system-date* 7 26)))
@@ -454,10 +454,11 @@ and load your system with:
   ;;                                          
   (
    (pkg             t            t            ())
-   (walk            (pkg)        (pkg)        ())
+   ;;(walk            (pkg)        (pkg)        ())
    (macros          t            t            ())
    (low             (pkg macros) t            (macros))
-   (info            (pkg walk)   t            (macros))
+   ;;(info            (pkg walk)   t            (macros))
+   (info            (pkg)   t            (macros))
    
    (fin         t                                   t (low))
    (defclass    t                                   t (low info))
diff --git a/tools/worldcom.lisp b/tools/worldcom.lisp
index 88a43434dc0d4f83f21e46983470272ecd891517..35598e23746d3aa6dcdf0dff1062f0953cf0a2e4 100644
--- a/tools/worldcom.lisp
+++ b/tools/worldcom.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/worldcom.lisp,v 1.90 2003/09/08 16:07:04 toy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/worldcom.lisp,v 1.91 2004/01/09 04:34:18 toy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -107,6 +107,7 @@
 (comf "target:code/globals")
 (comf "target:code/kernel")
 (comf "target:code/lispinit")
+(comf "target:pcl/walk")
 (comf "target:code/fwrappers")
 (comf "target:code/fdefinition")
 
diff --git a/tools/worldload.lisp b/tools/worldload.lisp
index 33636da151b3e947b4c116051919ff064717d4d0..aa97a4665d6fc5fe8ba218df381ef36eef2b603f 100644
--- a/tools/worldload.lisp
+++ b/tools/worldload.lisp
@@ -6,7 +6,7 @@
 ;;; If you want to use this code or any part of CMU Common Lisp, please contact
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/worldload.lisp,v 1.101 2003/06/18 09:23:08 gerd Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/worldload.lisp,v 1.102 2004/01/09 04:34:18 toy Exp $
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -113,6 +113,7 @@
 (maybe-byte-load "code:describe")
 #+random-mt19937 (maybe-byte-load "code:rand-mt19937")
 #-random-mt19937 (maybe-byte-load "code:rand")
+(maybe-byte-load "target:pcl/walk")
 (maybe-byte-load "code:fwrappers")
 (maybe-byte-load "code:ntrace")
 #-runtime (maybe-byte-load "code:profile")