diff --git a/admin/ldefs-clean.el b/admin/ldefs-clean.el
index 91512b4bbb7..33bc9e529fa 100644
--- a/admin/ldefs-clean.el
+++ b/admin/ldefs-clean.el
@@ -57,6 +57,9 @@
 
 
 (defun ldefs-clean ()
-  (find-file "../lisp/ldefs-boot-auto.temp")
+  ;; Remove CR characters produced on MS-DOS/MS-Windows systems.
+  (let ((coding-system-for-read 'utf-8-dos))
+    (find-file "../lisp/ldefs-boot-auto.temp"))
   (ldefs-clean-up)
-  (write-file "ldefs-boot-auto.el"))
+  (let ((coding-system-for-write 'utf-8-unix))
+    (write-file "ldefs-boot-auto.el")))
diff --git a/lisp/ldefs-boot-manual.el b/lisp/ldefs-boot-manual.el
index 2f6e3fd2094..06b9738d5ee 100644
--- a/lisp/ldefs-boot-manual.el
+++ b/lisp/ldefs-boot-manual.el
@@ -16,6 +16,9 @@
 (autoload 'dos-convert-standard-filename "dos-fns.el" nil nil nil)
 (autoload 'w32-convert-standard-filename "w32-fns.el" nil nil nil)
 
+;; This is needed on MS-Windows only, and won't be in
+;; ldefs-boot-auto.el on other platforms.
+(autoload 'image-type "image" nil nil nil)
 
 (load "ldefs-boot-auto.el")