diff --git a/lisp/bindings.el b/lisp/bindings.el
index ec9b219fc09..14ab69b8f02 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -230,6 +230,7 @@ mnemonics of the following coding systems:
     (:propertize ("" (:eval (if (frame-parameter nil 'client) "@" "")))
 		 help-echo ,(purecopy "emacsclient frame")))
   "Mode line construct for identifying emacsclient frames.")
+;; Autoload if this file no longer dumped.
 ;;;###autoload
 (put 'mode-line-client 'risky-local-variable t)
 
diff --git a/lisp/font-core.el b/lisp/font-core.el
index db07aa011c4..f92d1e38306 100644
--- a/lisp/font-core.el
+++ b/lisp/font-core.el
@@ -66,6 +66,8 @@ Other variables include that for syntactic keyword fontification,
 functions, `font-lock-fontify-buffer-function',
 `font-lock-unfontify-buffer-function', `font-lock-fontify-region-function',
 `font-lock-unfontify-region-function', and `font-lock-inhibit-thing-lock'.")
+;; Autoload if this file no longer dumped.
+;;;###autoload
 (put 'font-lock-defaults 'risky-local-variable t)
 
 (defvar font-lock-function 'font-lock-default-function
diff --git a/lisp/format.el b/lisp/format.el
index 6c7524891e4..2c368b8f9c7 100644
--- a/lisp/format.el
+++ b/lisp/format.el
@@ -139,6 +139,7 @@ MODE-FN, if specified, is called when visiting a file with that format.
 
 PRESERVE, if non-nil, means that `format-write-file' should not remove
           this format from `buffer-file-format'.")
+;; Autoload if this file no longer dumped.
 ;;;###autoload
 (put 'format-alist 'risky-local-variable t)
 
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 48c8d2b0818..df1c06ec272 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1411,6 +1411,7 @@ This function is called with no argument.")
 Each element has the form:
    (INPUT-METHOD LANGUAGE-ENV ACTIVATE-FUNC TITLE DESCRIPTION ARGS...)
 See the function `register-input-method' for the meanings of the elements.")
+;; Autoload if this file no longer dumped.
 ;;;###autoload
 (put 'input-method-alist 'risky-local-variable t)