diff --git a/code/lispinit.lisp b/code/lispinit.lisp
index 91c9dcd19d63e11ee522d14c47948e88f8e65759..aeffb0015a1fcc042e983306070fbc45a9d615fd 100644
--- a/code/lispinit.lisp
+++ b/code/lispinit.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/lispinit.lisp,v 1.33 1992/04/12 00:24:12 wlott Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/lispinit.lisp,v 1.33.1.1 1993/02/04 12:14:33 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -49,7 +49,7 @@
 		    *before-gc-hooks* *after-gc-hooks*
 		    unix::*interrupts-enabled*
 		    unix::*interrupt-pending*
-		    c::*type-system-initialized*))
+		    *type-system-initialized*))
 
 
 ;;;; Random magic specials.
@@ -90,7 +90,7 @@
   (setf *after-gc-hooks* nil)
   (setf unix::*interrupts-enabled* t)
   (setf unix::*interrupt-pending* nil)
-  (setf c::*type-system-initialized* nil)
+  (setf *type-system-initialized* nil)
   (%primitive print "In initial-function, and running.")
 
   ;; Many top-level forms call INFO, (SETF INFO).
@@ -100,6 +100,8 @@
   (print-and-call fdefn-init)
 
   ;; Some of the random top-level forms call Make-Array, which calls Subtypep
+  (print-and-call typedef-init)
+  (print-and-call class-init)
   (print-and-call type-init)
 
   (let ((funs (nreverse *lisp-initialization-functions*)))
@@ -130,7 +132,7 @@
 
   ;; Only do this after top level forms have run, 'cause thats where
   ;; deftypes are.
-  (setf c::*type-system-initialized* t)
+  (setf *type-system-initialized* t)
 
   (print-and-call os-init)
   (print-and-call filesys-init)