diff --git a/src/compiler/main.lisp b/src/compiler/main.lisp
index 544ccb04acd3a150d0b689a328ffa983d11e5d95..be5f2917390f2febb7a7c145c68bd01cf499c54d 100644
--- a/src/compiler/main.lisp
+++ b/src/compiler/main.lisp
@@ -1210,11 +1210,10 @@
       (if (atom form)
 	  (convert-and-maybe-compile form path)
 	  (case (car form)
-	    ((make-package shadow shadowing-import export
-	      unexport use-package unuse-package import
-	      old-in-package %in-package %defpackage)
+	    ((%in-package %defpackage)
 	     (process-cold-load-form form path t))
-	    ((error cerror break signal)
+	    ((error cerror break signal make-package use-package unuse-package shadow
+	      shadowing-import export unexport import)
 	     (process-cold-load-form form path nil))
 	    (kernel:%compiler-defstruct
 	     (convert-and-maybe-compile form path)
diff --git a/src/contrib/defsystem/defsystem.lisp b/src/contrib/defsystem/defsystem.lisp
index 2d7f0eaf9476f5c8bf36585c3313150677abba7d..ae23dbc368cd4f9c8d39b83d76bf8403933606f1 100644
--- a/src/contrib/defsystem/defsystem.lisp
+++ b/src/contrib/defsystem/defsystem.lisp
@@ -1035,7 +1035,10 @@
 ;;; Here I add the proper defpackage for CMU
 #+:CMU
 (defpackage "MAKE" (:use "COMMON-LISP" "CONDITIONS")
-  (:nicknames "MK"))
+  (:nicknames "MK")
+  (:export "DEFSYSTEM" "COMPILE-SYSTEM" "LOAD-SYSTEM"
+	   "DEFINE-LANGUAGE" "*MULTIPLE-LISP-SUPPORT*"
+	   "FIND-SYSTEM"))
 
 #+:sbcl
 (defpackage "MAKE" (:use "COMMON-LISP")
diff --git a/src/tools/hemcom.lisp b/src/tools/hemcom.lisp
index ee56f5cd046209441f872521ed9bfacf15cc2486..949f3e00c465065ef73d3bb5bd43990611378e2f 100644
--- a/src/tools/hemcom.lisp
+++ b/src/tools/hemcom.lisp
@@ -32,6 +32,94 @@
 		:nicknames '("HI")
 		:use '("LISP" "EXTENSIONS" "SYSTEM")))
 
+(defpackage "HEMLOCK-INTERNALS"
+  (:nicknames "HI")
+  (:export
+   "*BUFFER-LIST*" "*BUFFER-NAMES*" "*CHARACTER-ATTRIBUTE-NAMES*"
+   "*COMMAND-NAMES*" "*CREATE-INITIAL-WINDOWS-HOOK*" "*CREATE-WINDOW-HOOK*"
+   "*DELETE-WINDOW-HOOK*" "*ECHO-AREA-BUFFER*" "*ECHO-AREA-STREAM*"
+   "*ECHO-AREA-WINDOW*" "*EDITOR-INPUT*" "*GLOBAL-VARIABLE-NAMES*"
+   "*INPUT-TRANSCRIPT*" "*INVOKE-HOOK*" "*KEY-EVENT-HISTORY*"
+   "*LAST-KEY-EVENT-TYPED*" "*LOGICAL-KEY-EVENT-NAMES*" "*MODE-NAMES*"
+   "*PARSE-DEFAULT*" "*PARSE-DEFAULT-STRING*" "*PARSE-HELP*"
+   "*PARSE-INPUT-REGION*" "*PARSE-PROMPT*" "*PARSE-STARTING-MARK*"
+   "*PARSE-STRING-TABLES*" "*PARSE-TYPE*" "*PARSE-VALUE-MUST-EXIST*"
+   "*PARSE-VERIFICATION-FUNCTION*" "*PRINT-REGION*"
+   "*RANDOM-TYPEOUT-BUFFERS*" "*RANDOM-TYPEOUT-HOOK*" "*REAL-EDITOR-INPUT*"
+   "*WINDOW-LIST*" "ABORT-RECURSIVE-EDIT" "ADD-HOOK"
+   "AFTER-EDITOR-INITIALIZATIONS" "BIND-KEY" "BLANK-AFTER-P"
+   "BLANK-BEFORE-P" "BLANK-LINE-P" "BUFFER" "BUFFER-DELETE-HOOK"
+   "BUFFER-END" "BUFFER-END-MARK" "BUFFER-MAJOR-MODE" "BUFFER-MINOR-MODE"
+   "BUFFER-MODELINE-FIELD-P" "BUFFER-MODELINE-FIELDS" "BUFFER-MODES"
+   "BUFFER-MODIFIED" "BUFFER-NAME" "BUFFER-PATHNAME" "BUFFER-POINT"
+   "BUFFER-REGION" "BUFFER-SIGNATURE" "BUFFER-START" "BUFFER-START-MARK"
+   "BUFFER-VARIABLES" "BUFFER-WINDOWS" "BUFFER-WRITABLE" "BUFFER-WRITE-DATE"
+   "BUFFERP" "CENTER-WINDOW" "CHARACTER-ATTRIBUTE"
+   "CHARACTER-ATTRIBUTE-DOCUMENTATION" "CHARACTER-ATTRIBUTE-HOOKS"
+   "CHARACTER-ATTRIBUTE-NAME" "CHARACTER-ATTRIBUTE-P" "CHARACTER-OFFSET"
+   "CLEAR-ECHO-AREA" "CLEAR-EDITOR-INPUT" "CLRSTRING" "COMMAND"
+   "COMMAND-BINDINGS" "COMMAND-CASE" "COMMAND-DOCUMENTATION"
+   "COMMAND-FUNCTION" "COMMAND-NAME" "COMMANDP" "COMPLETE-STRING"
+   "COPY-MARK" "COPY-REGION" "COUNT-CHARACTERS" "COUNT-LINES"
+   "CURRENT-BUFFER" "CURRENT-POINT" "CURRENT-VARIABLE-TABLES"
+   "CURRENT-WINDOW" "CURSORPOS-TO-MARK" "DEFATTRIBUTE" "DEFAULT-FONT"
+   "DEFCOMMAND" "DEFHVAR" "DEFINE-LOGICAL-KEY-EVENT" "DEFINE-TTY-FONT"
+   "DEFMODE" "DELETE-AND-SAVE-REGION" "DELETE-BUFFER" "DELETE-CHARACTERS"
+   "DELETE-FONT-MARK" "DELETE-KEY-BINDING" "DELETE-LINE-FONT-MARKS"
+   "DELETE-MARK" "DELETE-REGION" "DELETE-STRING" "DELETE-VARIABLE"
+   "DELETE-WINDOW" "DIRECTORYP" "DISPLAYED-P" "DO-ALPHA-CHARS" "DO-STRINGS"
+   "EDITOR-DESCRIBE-FUNCTION" "EDITOR-ERROR" "EDITOR-ERROR-FORMAT-ARGUMENTS"
+   "EDITOR-ERROR-FORMAT-STRING" "EDITOR-FINISH-OUTPUT" "EDITOR-SLEEP"
+   "EMPTY-LINE-P" "END-LINE-P" "ENTER-WINDOW-AUTORAISE" "EXIT-HEMLOCK"
+   "EXIT-RECURSIVE-EDIT" "FETCH-CUT-STRING" "FILTER-REGION" "FIND-AMBIGUOUS"
+   "FIND-ATTRIBUTE" "FIND-CONTAINING" "FIND-PATTERN" "FIRST-LINE-P"
+   "FONT-MARK" "FUN-DEFINED-FROM-PATHNAME" "GET-COMMAND" "GET-KEY-EVENT"
+   "GETSTRING" "HANDLE-LISP-ERRORS" "HEMLOCK-BOUND-P"
+   "HEMLOCK-OUTPUT-STREAM" "HEMLOCK-OUTPUT-STREAM-P" "HEMLOCK-REGION-STREAM"
+   "HEMLOCK-REGION-STREAM-P" "HLET" "IN-RECURSIVE-EDIT" "INPUT-WAITING"
+   "INSERT-CHARACTER" "INSERT-REGION" "INSERT-STRING" "INVOKE-HOOK"
+   "KEY-TRANSLATION" "LAST-COMMAND-TYPE" "LAST-KEY-EVENT-CURSORPOS"
+   "LAST-LINE-P" "LINE" "LINE-BUFFER" "LINE-CHARACTER" "LINE-END"
+   "LINE-LENGTH" "LINE-NEXT" "LINE-OFFSET" "LINE-PLIST" "LINE-PREVIOUS"
+   "LINE-SIGNATURE" "LINE-START" "LINE-STRING" "LINE-TO-REGION" "LINE<"
+   "LINE<=" "LINE>" "LINE>=" "LINEP" "LINES-RELATED" "LISTEN-EDITOR-INPUT"
+   "LOGICAL-KEY-EVENT-DOCUMENTATION" "LOGICAL-KEY-EVENT-KEY-EVENTS"
+   "LOGICAL-KEY-EVENT-NAME" "LOGICAL-KEY-EVENT-P" "LOUD-MESSAGE"
+   "MAKE-BUFFER" "MAKE-COMMAND" "MAKE-EMPTY-REGION"
+   "MAKE-HEMLOCK-OUTPUT-STREAM" "MAKE-HEMLOCK-REGION-STREAM"
+   "MAKE-KBDMAC-STREAM" "MAKE-MODELINE-FIELD" "MAKE-RING"
+   "MAKE-STRING-TABLE" "MAKE-WINDOW" "MAKE-XWINDOW-LIKE-HWINDOW"
+   "MAP-BINDINGS" "MARK" "MARK-AFTER" "MARK-BEFORE" "MARK-CHARPOS"
+   "MARK-COLUMN" "MARK-KIND" "MARK-LINE" "MARK-TO-CURSORPOS" "MARK/="
+   "MARK<" "MARK<=" "MARK=" "MARK>" "MARK>=" "MARKP"
+   "MERGE-RELATIVE-PATHNAMES" "MESSAGE" "MODE-DOCUMENTATION" "MODE-MAJOR-P"
+   "MODE-VARIABLES" "MODELINE-FIELD" "MODELINE-FIELD-FUNCTION"
+   "MODELINE-FIELD-NAME" "MODELINE-FIELD-P" "MODELINE-FIELD-WIDTH"
+   "MODIFY-KBDMAC-STREAM" "MOVE-FONT-MARK" "MOVE-MARK" "MOVE-TO-COLUMN"
+   "MOVE-TO-POSITION" "NEW-SEARCH-PATTERN" "NEXT-CHARACTER" "NEXT-WINDOW"
+   "NINSERT-REGION" "PAUSE-HEMLOCK" "PREFIX-ARGUMENT" "PREVIOUS-CHARACTER"
+   "PREVIOUS-WINDOW" "PROMPT-FOR-BUFFER" "PROMPT-FOR-EXPRESSION"
+   "PROMPT-FOR-FILE" "PROMPT-FOR-INTEGER" "PROMPT-FOR-KEY"
+   "PROMPT-FOR-KEY-EVENT" "PROMPT-FOR-KEYWORD" "PROMPT-FOR-STRING"
+   "PROMPT-FOR-VARIABLE" "PROMPT-FOR-Y-OR-N" "PROMPT-FOR-YES-OR-NO"
+   "READ-FILE" "RECURSIVE-EDIT" "REDISPLAY" "REDISPLAY-ALL" "REGION"
+   "REGION-BOUNDS" "REGION-END" "REGION-START" "REGION-TO-STRING" "REGIONP"
+   "REMOVE-HOOK" "REMOVE-SCHEDULED-EVENT" "REPLACE-PATTERN" "REPROMPT"
+   "REVERSE-FIND-ATTRIBUTE" "RING" "RING-LENGTH" "RING-POP" "RING-PUSH"
+   "RING-REF" "RINGP" "ROTATE-RING" "SAME-LINE-P" "SCHEDULE-EVENT"
+   "SCROLL-WINDOW" "SEARCH-CHAR-CODE-LIMIT" "SEARCH-PATTERN"
+   "SEARCH-PATTERN-P" "SET-REGION-BOUNDS" "SETV" "SHADOW-ATTRIBUTE"
+   "SHOW-MARK" "START-LINE-P" "STORE-CUT-STRING" "STRING-TABLE"
+   "STRING-TABLE-P" "STRING-TABLE-SEPARATOR" "STRING-TO-REGION"
+   "STRING-TO-VARIABLE" "SYNTAX-CHAR-CODE-LIMIT" "UNGET-KEY-EVENT"
+   "UNSHADOW-ATTRIBUTE" "UPDATE-MODELINE-FIELD" "UPDATE-MODELINE-FIELDS"
+   "USE-BUFFER" "VALUE" "VARIABLE-DOCUMENTATION" "VARIABLE-HOOKS"
+   "VARIABLE-NAME" "VARIABLE-VALUE" "WINDOW" "WINDOW-BUFFER"
+   "WINDOW-DISPLAY-END" "WINDOW-DISPLAY-RECENTERING" "WINDOW-DISPLAY-START"
+   "WINDOW-FONT" "WINDOW-HEIGHT" "WINDOW-POINT" "WINDOW-WIDTH" "WINDOWP"
+   "WITH-INPUT-FROM-REGION" "WITH-MARK" "WITH-OUTPUT-TO-MARK"
+   "WITH-POP-UP-DISPLAY" "WITH-WRITABLE-BUFFER" "WRITE-FILE")))
+
 (unless (find-package "HEMLOCK")
   (make-package "HEMLOCK"
 		:nicknames '("ED")