57 files changed, 471 insertions, 411 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 58df7e08955..56bb83e0314 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,62 @@
+2011-04-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Make Emacs functions such as Fatom 'static' by default.
+        This makes it easier for human readers (and static analyzers)
+        to see whether these functions can be called from other modules.
+        DEFUN now defines a static function.  To make the function external
+        so that it can be used in other C modules, use the new macro DEFUE.
+        * lisp.h (DEFINE_FUNC): New macro, with the old contents of DEFUN.
+        (DEFUN): Rewrite in terms of DEFINE_FUNC.  It now generates a
+        static function definition.  Use DEFUE if you want an extern one.
+        (DEFUE, INFUN): New macros.
+        (Funibyte_char_to_multibyte, Fsyntax_table_p, Finit_image_library):
+        (Feval_region, Fbacktrace, Ffetch_bytecode, Fswitch_to_buffer):
+        (Ffile_executable_p, Fmake_symbolic_link, Fcommand_execute):
+        (Fget_process, Fdocumentation_property, Fbyte_code, Ffile_attributes):
+        Remove decls, since these functions are now static.
+        (Funintern, Fget_internal_run_time): New decls, since these functions
+        were already external.
+        * alloc.c, buffer.c, callint.c, callproc.c, casefiddle.c, casetab.c:
+        * ccl.c, character.c, chartab.c, cmds.c, coding.c, data.c, dispnew.c:
+        * doc.c, editfns.c, emacs.c, eval.c, fileio.c, filelock.c, floatfns.c:
+        * fns.c, font.c, fontset.c, frame.c, image.c, indent.c:
+        * keyboard.c, keymap.c, lread.c:
+        * macros.c, marker.c, menu.c, minibuf.c, print.c, process.c, search.c:
+        * syntax.c, term.c, terminal.c, textprop.c, undo.c:
+        * window.c, xdisp.c, xfaces.c, xfns.c, xmenu.c, xsettings.c:
+        Mark functions with DEFUE instead of DEFUN,
+        if they are used in other modules.
+        * buffer.c (Fset_buffer_major_mode, Fdelete_overlay): New forward
+        decls for now-static functions.
+        * buffer.h (Fdelete_overlay): Remove decl.
+        * callproc.c (Fgetenv_internal): Mark as internal.
+        * composite.c (Fremove_list_of_text_properties): Remove decl.
+        (Fcomposition_get_gstring): New forward static decl.
+        * composite.h (Fcomposite_get_gstring): Remove decl.
+        * dired.c (Ffile_attributes): New forward static decl.
+        * doc.c (Fdocumntation_property): New forward static decl.
+        * eval.c (Ffetch_bytecode): New forward static decl.
+        (Funintern): Remove extern decl; now in .h file where it belongs.
+        * fileio.c (Fmake_symbolic_link): New forward static decl.
+        * image.c (Finit_image_library): New forward static decl.
+        * insdel.c (Fcombine_after_change_execute): Make forward decl static.
+        * intervals.h (Fprevious_property_change):
+        (Fremove_list_of_text_properties): Remove decls.
+        * keyboard.c (Fthis_command_keys): Remove decl.
+        (Fcommand_execute): New forward static decl.
+        * keymap.c (Flookup_key): New forward static decl.
+        (Fcopy_keymap): Now static.
+        * keymap.h (Flookup_key): Remove decl.
+        * process.c (Fget_process): New forward static decl.
+        (Fprocess_datagram_address): Mark as internal.
+        * syntax.c (Fsyntax_table_p): New forward static decl.
+        (skip_chars): Remove duplicate decl.
+        * textprop.c (Fprevious_property_change): New forward static decl.
+        * window.c (Fset_window_fringes, Fset_window_scroll_bars):
+        Now internal.
+        (Fset_window_margins, Fset_window_vscroll): New forward static decls.
+        * window.h (Fset_window_vscroll, Fset_window_margins): Remove decls.
+
 2011-04-10  Paul Eggert  <eggert@cs.ucla.edu>
 
         * editfns.c (Fformat): Remove unreachable code.
diff --git a/src/alloc.c b/src/alloc.c
index 54c4760abab..1396586ba3e 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -2174,7 +2174,7 @@ compact_small_strings (void)
 }
 
 
-DEFUN ("make-string", Fmake_string, Smake_string, 2, 2, 0,
+DEFUE ("make-string", Fmake_string, Smake_string, 2, 2, 0,
        doc: /* Return a newly created string of length LENGTH, with INIT in each element.
 LENGTH must be an integer.
 INIT must be an integer that represents a character.  */)
@@ -2222,7 +2222,7 @@ INIT must be an integer that represents a character.  */)
 }
 
 
-DEFUN ("make-bool-vector", Fmake_bool_vector, Smake_bool_vector, 2, 2, 0,
+DEFUE ("make-bool-vector", Fmake_bool_vector, Smake_bool_vector, 2, 2, 0,
        doc: /* Return a new bool-vector of length LENGTH, using INIT for each element.
 LENGTH must be a number.  INIT matters only in whether it is t or nil.  */)
   (Lisp_Object length, Lisp_Object init)
@@ -2610,7 +2610,7 @@ free_cons (struct Lisp_Cons *ptr)
   cons_free_list = ptr;
 }
 
-DEFUN ("cons", Fcons, Scons, 2, 2, 0,
+DEFUE ("cons", Fcons, Scons, 2, 2, 0,
        doc: /* Create a new cons, give it CAR and CDR as components, and return it.  */)
   (Lisp_Object car, Lisp_Object cdr)
 {
@@ -2703,7 +2703,7 @@ list5 (Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3, Lisp_Object arg4, L
 }
 
 
-DEFUN ("list", Flist, Slist, 0, MANY, 0,
+DEFUE ("list", Flist, Slist, 0, MANY, 0,
        doc: /* Return a newly created list with specified arguments as elements.
 Any number of arguments, even zero arguments, are allowed.
 usage: (list &rest OBJECTS)  */)
@@ -2721,7 +2721,7 @@ usage: (list &rest OBJECTS)  */)
 }
 
 
-DEFUN ("make-list", Fmake_list, Smake_list, 2, 2, 0,
+DEFUE ("make-list", Fmake_list, Smake_list, 2, 2, 0,
        doc: /* Return a newly created list of length LENGTH, with each element being INIT.  */)
   (register Lisp_Object length, Lisp_Object init)
 {
@@ -2897,7 +2897,7 @@ allocate_process (void)
 }
 
 
-DEFUN ("make-vector", Fmake_vector, Smake_vector, 2, 2, 0,
+DEFUE ("make-vector", Fmake_vector, Smake_vector, 2, 2, 0,
        doc: /* Return a newly created vector of length LENGTH, with each element being INIT.
 See also the function `vector'.  */)
   (register Lisp_Object length, Lisp_Object init)
@@ -2919,7 +2919,7 @@ See also the function `vector'.  */)
 }
 
 
-DEFUN ("vector", Fvector, Svector, 0, MANY, 0,
+DEFUE ("vector", Fvector, Svector, 0, MANY, 0,
        doc: /* Return a newly created vector with specified arguments as elements.
 Any number of arguments, even zero arguments, are allowed.
 usage: (vector &rest OBJECTS)  */)
@@ -2938,7 +2938,7 @@ usage: (vector &rest OBJECTS)  */)
 }
 
 
-DEFUN ("make-byte-code", Fmake_byte_code, Smake_byte_code, 4, MANY, 0,
+DEFUE ("make-byte-code", Fmake_byte_code, Smake_byte_code, 4, MANY, 0,
        doc: /* Create a byte-code object with specified arguments as elements.
 The arguments should be the ARGLIST, bytecode-string BYTE-CODE, constant
 vector CONSTANTS, maximum stack size DEPTH, (optional) DOCSTRING,
@@ -3033,7 +3033,7 @@ init_symbol (void)
 }
 
 
-DEFUN ("make-symbol", Fmake_symbol, Smake_symbol, 1, 1, 0,
+DEFUE ("make-symbol", Fmake_symbol, Smake_symbol, 1, 1, 0,
        doc: /* Return a newly allocated uninterned symbol whose name is NAME.
 Its value and function definition are void, and its property list is nil.  */)
   (Lisp_Object name)
@@ -3196,7 +3196,7 @@ make_save_value (void *pointer, int integer)
   return val;
 }
 
-DEFUN ("make-marker", Fmake_marker, Smake_marker, 0, 0, 0,
+DEFUE ("make-marker", Fmake_marker, Smake_marker, 0, 0, 0,
        doc: /* Return a newly allocated marker which does not point at any place.  */)
   (void)
 {
@@ -3925,7 +3925,7 @@ static int max_live, max_zombies;
 
 static double avg_live;
 
-DEFUN ("gc-status", Fgc_status, Sgc_status, 0, 0, "",
+DEFUE ("gc-status", Fgc_status, Sgc_status, 0, 0, "",
        doc: /* Show information about live and zombie objects.  */)
   (void)
 {
@@ -4740,7 +4740,7 @@ make_pure_vector (EMACS_INT len)
 }
 
 
-DEFUN ("purecopy", Fpurecopy, Spurecopy, 1, 1, 0,
+DEFUE ("purecopy", Fpurecopy, Spurecopy, 1, 1, 0,
        doc: /* Make a copy of object OBJ in pure storage.
 Recursively copies contents of vectors and cons cells.
 Does not copy symbols.  Copies strings without text properties.  */)
@@ -4834,7 +4834,7 @@ inhibit_garbage_collection (void)
 }
 
 
-DEFUN ("garbage-collect", Fgarbage_collect, Sgarbage_collect, 0, 0, "",
+DEFUE ("garbage-collect", Fgarbage_collect, Sgarbage_collect, 0, 0, "",
        doc: /* Reclaim storage for Lisp objects no longer needed.
 Garbage collection happens automatically if you cons more than
 `gc-cons-threshold' bytes of Lisp data since previous garbage collection.
diff --git a/src/buffer.c b/src/buffer.c
index a0054e32d0a..a88afbb36e6 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -100,6 +100,8 @@ static char buffer_permanent_local_flags[MAX_PER_BUFFER_VARS];
 
 int last_per_buffer_idx;
 
+INFUN (Fset_buffer_major_mode, 1);
+INFUN (Fdelete_overlay, 1);
 static void call_overlay_mod_hooks (Lisp_Object list, Lisp_Object overlay,
                                     int after, Lisp_Object arg1,
                                     Lisp_Object arg2, Lisp_Object arg3);
@@ -157,7 +159,7 @@ nsberror (Lisp_Object spec)
   error ("Invalid buffer argument");
 }
 
-DEFUN ("buffer-live-p", Fbuffer_live_p, Sbuffer_live_p, 1, 1, 0,
+DEFUE ("buffer-live-p", Fbuffer_live_p, Sbuffer_live_p, 1, 1, 0,
        doc: /* Return non-nil if OBJECT is a buffer which has not been killed.
 Value is nil if OBJECT is not a buffer or if it has been killed.  */)
   (Lisp_Object object)
@@ -229,7 +231,7 @@ assoc_ignore_text_properties (register Lisp_Object key, Lisp_Object list)
   return Qnil;
 }
 
-DEFUN ("get-buffer", Fget_buffer, Sget_buffer, 1, 1, 0,
+DEFUE ("get-buffer", Fget_buffer, Sget_buffer, 1, 1, 0,
        doc: /* Return the buffer named BUFFER-OR-NAME.
 BUFFER-OR-NAME must be either a string or a buffer.  If BUFFER-OR-NAME
 is a string and there is no buffer with that name, return nil.  If
@@ -294,7 +296,7 @@ get_truename_buffer (register Lisp_Object filename)
 /* Incremented for each buffer created, to assign the buffer number. */
 int buffer_count;
 
-DEFUN ("get-buffer-create", Fget_buffer_create, Sget_buffer_create, 1, 1, 0,
+DEFUE ("get-buffer-create", Fget_buffer_create, Sget_buffer_create, 1, 1, 0,
        doc: /* Return the buffer specified by BUFFER-OR-NAME, creating a new one if needed.
 If BUFFER-OR-NAME is a string and a live buffer with that name exists,
 return that buffer.  If no such buffer exists, create a new buffer with
@@ -830,8 +832,8 @@ reset_buffer_local_variables (register struct buffer *b, int permanent_too)
    and set-visited-file-name ought to be able to use this to really
    rename the buffer properly.  */
 
-DEFUN ("generate-new-buffer-name", Fgenerate_new_buffer_name, Sgenerate_new_buffer_name,
-       1, 2, 0,
+DEFUE ("generate-new-buffer-name", Fgenerate_new_buffer_name,
+       Sgenerate_new_buffer_name, 1, 2, 0,
        doc: /* Return a string that is the name of no existing buffer based on NAME.
 If there is no live buffer named NAME, then return NAME.
 Otherwise modify name by appending `<NUMBER>', incrementing NUMBER
@@ -868,7 +870,7 @@ it is in the sequence to be tried) even if a buffer with that name exists.  */)
 }
 
 
-DEFUN ("buffer-name", Fbuffer_name, Sbuffer_name, 0, 1, 0,
+DEFUE ("buffer-name", Fbuffer_name, Sbuffer_name, 0, 1, 0,
        doc: /* Return the name of BUFFER, as a string.
 BUFFER defaults to the current buffer.
 Return nil if BUFFER has been killed.  */)
@@ -880,7 +882,7 @@ Return nil if BUFFER has been killed.  */)
   return BVAR (XBUFFER (buffer), name);
 }
 
-DEFUN ("buffer-file-name", Fbuffer_file_name, Sbuffer_file_name, 0, 1, 0,
+DEFUE ("buffer-file-name", Fbuffer_file_name, Sbuffer_file_name, 0, 1, 0,
        doc: /* Return name of file BUFFER is visiting, or nil if none.
 No argument or nil as argument means use the current buffer.  */)
   (register Lisp_Object buffer)
@@ -915,7 +917,7 @@ BUFFER defaults to the current buffer.  */)
   return base_buffer;
 }
 
-DEFUN ("buffer-local-value", Fbuffer_local_value,
+DEFUE ("buffer-local-value", Fbuffer_local_value,
        Sbuffer_local_value, 2, 2, 0,
        doc: /* Return the value of VARIABLE in BUFFER.
 If VARIABLE does not have a buffer-local binding in BUFFER, the value
@@ -1056,7 +1058,7 @@ No argument or nil as argument means use current buffer as BUFFER.  */)
   return result;
 }
 
-DEFUN ("buffer-modified-p", Fbuffer_modified_p, Sbuffer_modified_p,
+DEFUE ("buffer-modified-p", Fbuffer_modified_p, Sbuffer_modified_p,
        0, 1, 0,
        doc: /* Return t if BUFFER was modified since its file was last read or saved.
 No argument or nil as argument means use current buffer as BUFFER.  */)
@@ -1074,7 +1076,7 @@ No argument or nil as argument means use current buffer as BUFFER.  */)
   return BUF_SAVE_MODIFF (buf) < BUF_MODIFF (buf) ? Qt : Qnil;
 }
 
-DEFUN ("set-buffer-modified-p", Fset_buffer_modified_p, Sset_buffer_modified_p,
+DEFUE ("set-buffer-modified-p", Fset_buffer_modified_p, Sset_buffer_modified_p,
        1, 1, 0,
        doc: /* Mark current buffer as modified or unmodified according to FLAG.
 A non-nil FLAG means mark the buffer modified.  */)
@@ -1266,7 +1268,7 @@ This does not change the name of the visited file (if any).  */)
   return BVAR (current_buffer, name);
 }
 
-DEFUN ("other-buffer", Fother_buffer, Sother_buffer, 0, 3, 0,
+DEFUE ("other-buffer", Fother_buffer, Sother_buffer, 0, 3, 0,
        doc: /* Return most recently selected buffer other than BUFFER.
 Buffers not visible in windows are preferred to visible buffers,
 unless optional second argument VISIBLE-OK is non-nil.
@@ -1276,7 +1278,6 @@ If no other buffer exists, the buffer `*scratch*' is returned.
 If BUFFER is omitted or nil, some interesting buffer is returned.  */)
   (register Lisp_Object buffer, Lisp_Object visible_ok, Lisp_Object frame)
 {
-  Lisp_Object Fset_buffer_major_mode (Lisp_Object buffer);
   register Lisp_Object tail, buf, notsogood, tem, pred, add_ons;
   notsogood = Qnil;
 
@@ -1341,7 +1342,7 @@ If BUFFER is omitted or nil, some interesting buffer is returned.  */)
   return buf;
 }
 
-DEFUN ("buffer-enable-undo", Fbuffer_enable_undo, Sbuffer_enable_undo,
+DEFUE ("buffer-enable-undo", Fbuffer_enable_undo, Sbuffer_enable_undo,
        0, 1, "",
        doc: /* Start keeping undo information for buffer BUFFER.
 No argument or nil as argument means do this for the current buffer.  */)
@@ -1370,7 +1371,7 @@ Hook to be run (by `run-hooks', which see) when a buffer is killed.\n\
 The buffer being killed will be current while the hook is running.\n\
 See `kill-buffer'."
  */
-DEFUN ("kill-buffer", Fkill_buffer, Skill_buffer, 0, 1, "bKill buffer: ",
+DEFUE ("kill-buffer", Fkill_buffer, Skill_buffer, 0, 1, "bKill buffer: ",
        doc: /* Kill buffer BUFFER-OR-NAME.
 The argument may be a buffer or the name of an existing buffer.
 Argument nil or omitted means kill the current buffer.  Return t if the
@@ -1789,7 +1790,7 @@ messing with the window-buffer correspondences.  */)
     return switch_to_buffer_1 (buffer_or_name, norecord);
 }
 
-DEFUN ("current-buffer", Fcurrent_buffer, Scurrent_buffer, 0, 0, 0,
+DEFUE ("current-buffer", Fcurrent_buffer, Scurrent_buffer, 0, 0, 0,
        doc: /* Return the current buffer as a Lisp object.  */)
   (void)
 {
@@ -1899,7 +1900,7 @@ set_buffer_temp (struct buffer *b)
   fetch_buffer_markers (b);
 }
 
-DEFUN ("set-buffer", Fset_buffer, Sset_buffer, 1, 1, 0,
+DEFUE ("set-buffer", Fset_buffer, Sset_buffer, 1, 1, 0,
        doc: /* Make buffer BUFFER-OR-NAME current for editing operations.
 BUFFER-OR-NAME may be a buffer or the name of an existing buffer.  See
 also `save-excursion' when you want to make a buffer current
@@ -1928,7 +1929,7 @@ set_buffer_if_live (Lisp_Object buffer)
   return Qnil;
 }
 
-DEFUN ("barf-if-buffer-read-only", Fbarf_if_buffer_read_only,
+DEFUE ("barf-if-buffer-read-only", Fbarf_if_buffer_read_only,
                                    Sbarf_if_buffer_read_only, 0, 0, 0,
        doc: /* Signal a `buffer-read-only' error if the current buffer is read-only.  */)
   (void)
@@ -2001,7 +2002,7 @@ its frame, iconify that frame.  */)
   return Qnil;
 }
 
-DEFUN ("erase-buffer", Ferase_buffer, Serase_buffer, 0, 0, "*",
+DEFUE ("erase-buffer", Ferase_buffer, Serase_buffer, 0, 0, "*",
        doc: /* Delete the entire contents of the current buffer.
 Any narrowing restriction in effect (see `narrow-to-region') is removed,
 so the buffer is truly empty after this.  */)
@@ -2212,7 +2213,7 @@ DEFUN ("buffer-swap-text", Fbuffer_swap_text, Sbuffer_swap_text,
   return Qnil;
 }
 
-DEFUN ("set-buffer-multibyte", Fset_buffer_multibyte, Sset_buffer_multibyte,
+DEFUE ("set-buffer-multibyte", Fset_buffer_multibyte, Sset_buffer_multibyte,
        1, 1, 0,
        doc: /* Set the multibyte flag of the current buffer to FLAG.
 If FLAG is t, this makes the buffer a multibyte buffer.
@@ -2501,8 +2502,8 @@ current buffer is cleared.  */)
   return flag;
 }
 
-DEFUN ("kill-all-local-variables", Fkill_all_local_variables, Skill_all_local_variables,
-       0, 0, 0,
+DEFUE ("kill-all-local-variables", Fkill_all_local_variables,
+       Skill_all_local_variables, 0, 0, 0,
        doc: /* Switch to Fundamental mode by killing current buffer's local variables.
 Most local variable bindings are eliminated so that the default values
 become effective once more.  Also, the syntax table is set from
@@ -3900,7 +3901,7 @@ DEFUN ("delete-overlay", Fdelete_overlay, Sdelete_overlay, 1, 1, 0,
 
 /* Overlay dissection functions.  */
 
-DEFUN ("overlay-start", Foverlay_start, Soverlay_start, 1, 1, 0,
+DEFUE ("overlay-start", Foverlay_start, Soverlay_start, 1, 1, 0,
        doc: /* Return the position at which OVERLAY starts.  */)
   (Lisp_Object overlay)
 {
@@ -3909,7 +3910,7 @@ DEFUN ("overlay-start", Foverlay_start, Soverlay_start, 1, 1, 0,
   return (Fmarker_position (OVERLAY_START (overlay)));
 }
 
-DEFUN ("overlay-end", Foverlay_end, Soverlay_end, 1, 1, 0,
+DEFUE ("overlay-end", Foverlay_end, Soverlay_end, 1, 1, 0,
        doc: /* Return the position at which OVERLAY ends.  */)
   (Lisp_Object overlay)
 {
@@ -3999,7 +4000,7 @@ end of the buffer.  */)
   return result;
 }
 
-DEFUN ("next-overlay-change", Fnext_overlay_change, Snext_overlay_change,
+DEFUE ("next-overlay-change", Fnext_overlay_change, Snext_overlay_change,
        1, 1, 0,
        doc: /* Return the next position after POS where an overlay starts or ends.
 If there are no overlay boundaries from POS to (point-max),
@@ -4040,7 +4041,7 @@ the value is (point-max).  */)
   return make_number (endpos);
 }
 
-DEFUN ("previous-overlay-change", Fprevious_overlay_change,
+DEFUE ("previous-overlay-change", Fprevious_overlay_change,
        Sprevious_overlay_change, 1, 1, 0,
        doc: /* Return the previous position before POS where an overlay starts or ends.
 If there are no overlay boundaries from (point-min) to POS,
@@ -4109,7 +4110,7 @@ for positions far away from POS).  */)
   return Qnil;
 }
 
-DEFUN ("overlay-get", Foverlay_get, Soverlay_get, 2, 2, 0,
+DEFUE ("overlay-get", Foverlay_get, Soverlay_get, 2, 2, 0,
        doc: /* Get the property of overlay OVERLAY with property name PROP.  */)
   (Lisp_Object overlay, Lisp_Object prop)
 {
diff --git a/src/buffer.h b/src/buffer.h
index d80875a0811..2963aa382ca 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -917,7 +917,6 @@ extern void mmap_set_vars (int);
 EXFUN (Fbuffer_live_p, 1);
 EXFUN (Fbuffer_name, 1);
 EXFUN (Fnext_overlay_change, 1);
-EXFUN (Fdelete_overlay, 1);
 EXFUN (Fbuffer_local_value, 2);
 
 extern Lisp_Object Qbefore_change_functions;
diff --git a/src/callint.c b/src/callint.c
index 047fbcdb467..1de1f607878 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -851,7 +851,7 @@ invoke it.  If KEYS is omitted or nil, the return value of
   }
 }
 
-DEFUN ("prefix-numeric-value", Fprefix_numeric_value, Sprefix_numeric_value,
+DEFUE ("prefix-numeric-value", Fprefix_numeric_value, Sprefix_numeric_value,
        1, 1, 0,
        doc: /* Return numeric meaning of raw prefix argument RAW.
 A raw prefix argument is what you get from `(interactive "P")'.
diff --git a/src/callproc.c b/src/callproc.c
index eb2a2268fe1..ec6afcde3a3 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -96,7 +96,7 @@ int synch_process_retcode;
 /* Nonzero if this is termination due to exit.  */
 static int call_process_exited;
 
-EXFUN (Fgetenv_internal, 2);
+INFUN (Fgetenv_internal, 2);
 
 static Lisp_Object
 call_process_kill (Lisp_Object fdpid)
@@ -152,7 +152,7 @@ call_process_cleanup (Lisp_Object arg)
   return Qnil;
 }
 
-DEFUN ("call-process", Fcall_process, Scall_process, 1, MANY, 0,
+DEFUE ("call-process", Fcall_process, Scall_process, 1, MANY, 0,
        doc: /* Call PROGRAM synchronously in separate process.
 The remaining arguments are optional.
 The program's input comes from file INFILE (nil means `/dev/null').
diff --git a/src/casefiddle.c b/src/casefiddle.c
index 9f286d73a5e..7a220c81865 100644
--- a/src/casefiddle.c
+++ b/src/casefiddle.c
@@ -148,7 +148,7 @@ casify_object (enum case_action flag, Lisp_Object obj)
     }
 }
 
-DEFUN ("upcase", Fupcase, Supcase, 1, 1, 0,
+DEFUE ("upcase", Fupcase, Supcase, 1, 1, 0,
        doc: /* Convert argument to upper case and return that.
 The argument may be a character or string.  The result has the same type.
 The argument object is not altered--the value is a copy.
@@ -158,7 +158,7 @@ See also `capitalize', `downcase' and `upcase-initials'.  */)
   return casify_object (CASE_UP, obj);
 }
 
-DEFUN ("downcase", Fdowncase, Sdowncase, 1, 1, 0,
+DEFUE ("downcase", Fdowncase, Sdowncase, 1, 1, 0,
        doc: /* Convert argument to lower case and return that.
 The argument may be a character or string.  The result has the same type.
 The argument object is not altered--the value is a copy.  */)
@@ -180,7 +180,7 @@ The argument object is not altered--the value is a copy.  */)
 
 /* Like Fcapitalize but change only the initials.  */
 
-DEFUN ("upcase-initials", Fupcase_initials, Supcase_initials, 1, 1, 0,
+DEFUE ("upcase-initials", Fupcase_initials, Supcase_initials, 1, 1, 0,
        doc: /* Convert the initial of each word in the argument to upper case.
 Do not change the other letters of each word.
 The argument may be a character or string.  The result has the same type.
@@ -301,7 +301,7 @@ casify_region (enum case_action flag, Lisp_Object b, Lisp_Object e)
     }
 }
 
-DEFUN ("upcase-region", Fupcase_region, Supcase_region, 2, 2, "r",
+DEFUE ("upcase-region", Fupcase_region, Supcase_region, 2, 2, "r",
        doc: /* Convert the region to upper case.  In programs, wants two arguments.
 These arguments specify the starting and ending character numbers of
 the region to operate on.  When used as a command, the text between
@@ -338,7 +338,7 @@ character positions to operate on.  */)
 
 /* Like Fcapitalize_region but change only the initials.  */
 
-DEFUN ("upcase-initials-region", Fupcase_initials_region,
+DEFUE ("upcase-initials-region", Fupcase_initials_region,
        Supcase_initials_region, 2, 2, "r",
        doc: /* Upcase the initial of each word in the region.
 Subsequent letters of each word are not changed.
diff --git a/src/casetab.c b/src/casetab.c
index 9a1accf6940..7acefbceba9 100644
--- a/src/casetab.c
+++ b/src/casetab.c
@@ -79,7 +79,7 @@ This is the one used for new buffers.  */)
 
 static Lisp_Object set_case_table (Lisp_Object table, int standard);
 
-DEFUN ("set-case-table", Fset_case_table, Sset_case_table, 1, 1, 0,
+DEFUE ("set-case-table", Fset_case_table, Sset_case_table, 1, 1, 0,
        doc: /* Select a new case table for the current buffer.
 A case table is a char-table which maps characters
 to their lower-case equivalents.  It also has three \"extra\" slots
@@ -101,7 +101,8 @@ EQUIVALENCES is a map that cyclicly permutes each equivalence class
   return set_case_table (table, 0);
 }
 
-DEFUN ("set-standard-case-table", Fset_standard_case_table, Sset_standard_case_table, 1, 1, 0,
+DEFUE ("set-standard-case-table", Fset_standard_case_table,
+       Sset_standard_case_table, 1, 1, 0,
        doc: /* Select a new standard case table for new buffers.
 See `set-case-table' for more info on case tables.  */)
   (Lisp_Object table)
diff --git a/src/ccl.c b/src/ccl.c
index 39b9bc32f09..2f7c4b07319 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -1953,7 +1953,7 @@ check_ccl_update (struct ccl_program *ccl)
 }
 
 
-DEFUN ("ccl-program-p", Fccl_program_p, Sccl_program_p, 1, 1, 0,
+DEFUE ("ccl-program-p", Fccl_program_p, Sccl_program_p, 1, 1, 0,
        doc: /* Return t if OBJECT is a CCL program name or a compiled CCL program code.
 See the documentation of `define-ccl-program' for the detail of CCL program.  */)
   (Lisp_Object object)
diff --git a/src/character.c b/src/character.c
index bac9f6af81e..636601c7452 100644
--- a/src/character.c
+++ b/src/character.c
@@ -307,7 +307,7 @@ If the multibyte character does not represent a byte, return -1.  */)
     }
 }
 
-DEFUN ("char-width", Fchar_width, Schar_width, 1, 1, 0,
+DEFUE ("char-width", Fchar_width, Schar_width, 1, 1, 0,
        doc: /* Return width of CHAR when displayed in the current buffer.
 The width is measured by how many columns it occupies on the screen.
 Tab is taken to occupy `tab-width' columns.
@@ -886,7 +886,7 @@ string_escape_byte8 (Lisp_Object string)
 }
 
 
-DEFUN ("string", Fstring, Sstring, 0, MANY, 0,
+DEFUE ("string", Fstring, Sstring, 0, MANY, 0,
        doc: /*
 Concatenate all the argument characters and make the result a string.
 usage: (string &rest CHARACTERS)  */)
diff --git a/src/chartab.c b/src/chartab.c
index 7a0a3aabbb6..50c3fd7cb73 100644
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -54,7 +54,7 @@ const int chartab_bits[4] =
   (((c) - (min_char)) >> chartab_bits[(depth)])
 
 
-DEFUN ("make-char-table", Fmake_char_table, Smake_char_table, 1, 2, 0,
+DEFUE ("make-char-table", Fmake_char_table, Smake_char_table, 1, 2, 0,
        doc: /* Return a newly created char-table, with purpose PURPOSE.
 Each element is initialized to INIT, which defaults to nil.
 
@@ -459,7 +459,7 @@ then the actual applicable value is inherited from the parent char-table
   return XCHAR_TABLE (char_table)->parent;
 }
 
-DEFUN ("set-char-table-parent", Fset_char_table_parent, Sset_char_table_parent,
+DEFUE ("set-char-table-parent", Fset_char_table_parent, Sset_char_table_parent,
        2, 2, 0,
        doc: /* Set the parent char-table of CHAR-TABLE to PARENT.
 Return PARENT.  PARENT must be either nil or another char-table.  */)
@@ -483,7 +483,7 @@ Return PARENT.  PARENT must be either nil or another char-table.  */)
   return parent;
 }
 
-DEFUN ("char-table-extra-slot", Fchar_table_extra_slot, Schar_table_extra_slot,
+DEFUE ("char-table-extra-slot", Fchar_table_extra_slot, Schar_table_extra_slot,
        2, 2, 0,
        doc: /* Return the value of CHAR-TABLE's extra-slot number N.  */)
   (Lisp_Object char_table, Lisp_Object n)
@@ -497,7 +497,7 @@ DEFUN ("char-table-extra-slot", Fchar_table_extra_slot, Schar_table_extra_slot,
   return XCHAR_TABLE (char_table)->extras[XINT (n)];
 }
 
-DEFUN ("set-char-table-extra-slot", Fset_char_table_extra_slot,
+DEFUE ("set-char-table-extra-slot", Fset_char_table_extra_slot,
        Sset_char_table_extra_slot,
        3, 3, 0,
        doc: /* Set CHAR-TABLE's extra-slot number N to VALUE.  */)
@@ -541,7 +541,7 @@ a cons of character codes (for characters in the range), or a character code.  *
   return val;
 }
 
-DEFUN ("set-char-table-range", Fset_char_table_range, Sset_char_table_range,
+DEFUE ("set-char-table-range", Fset_char_table_range, Sset_char_table_range,
        3, 3, 0,
        doc: /* Set the value in CHAR-TABLE for a range of characters RANGE to VALUE.
 RANGE should be t (for all characters), nil (for the default value),
@@ -626,7 +626,7 @@ optimize_sub_char_table (Lisp_Object table, Lisp_Object test)
   return (optimizable ? elt : table);
 }
 
-DEFUN ("optimize-char-table", Foptimize_char_table, Soptimize_char_table,
+DEFUE ("optimize-char-table", Foptimize_char_table, Soptimize_char_table,
        1, 2, 0,
        doc: /* Optimize CHAR-TABLE.
 TEST is the comparison function used to decide whether two entries are
diff --git a/src/cmds.c b/src/cmds.c
index 1cf7ff24fec..60318225831 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -47,7 +47,7 @@ DEFUN ("forward-point", Fforward_point, Sforward_point, 1, 1, 0,
   return make_number (PT + XINT (n));
 }
 
-DEFUN ("forward-char", Fforward_char, Sforward_char, 0, 1, "^p",
+DEFUE ("forward-char", Fforward_char, Sforward_char, 0, 1, "^p",
        doc: /* Move point N characters forward (backward if N is negative).
 On reaching end or beginning of buffer, stop and signal error.
 
@@ -104,7 +104,7 @@ right or to the left on the screen.  This is in contrast with
   return Fforward_char (n);
 }
 
-DEFUN ("forward-line", Fforward_line, Sforward_line, 0, 1, "^p",
+DEFUE ("forward-line", Fforward_line, Sforward_line, 0, 1, "^p",
        doc: /* Move N lines forward (backward if N is negative).
 Precisely, if point is on line I, move to the start of line I + N
 \("start of line" in the logical order).
@@ -174,7 +174,7 @@ instead.  For instance, `(forward-line 0)' does the same thing as
   return Qnil;
 }
 
-DEFUN ("end-of-line", Fend_of_line, Send_of_line, 0, 1, "^p",
+DEFUE ("end-of-line", Fend_of_line, Send_of_line, 0, 1, "^p",
        doc: /* Move point to end of current line (in the logical order).
 With argument N not nil or 1, move forward N - 1 lines first.
 If point reaches the beginning or end of buffer, it stops there.
diff --git a/src/coding.c b/src/coding.c
index 711ada59c85..13fcb7fb8a5 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -7991,7 +7991,7 @@ preferred_coding_system (void)
 #ifdef emacs
 /*** 8. Emacs Lisp library functions ***/
 
-DEFUN ("coding-system-p", Fcoding_system_p, Scoding_system_p, 1, 1, 0,
+DEFUE ("coding-system-p", Fcoding_system_p, Scoding_system_p, 1, 1, 0,
        doc: /* Return t if OBJECT is nil or a coding-system.
 See the documentation of `define-coding-system' for information
 about coding-system objects.  */)
@@ -8006,7 +8006,7 @@ about coding-system objects.  */)
   return Qt;
 }
 
-DEFUN ("read-non-nil-coding-system", Fread_non_nil_coding_system,
+DEFUE ("read-non-nil-coding-system", Fread_non_nil_coding_system,
        Sread_non_nil_coding_system, 1, 1, 0,
        doc: /* Read a coding system from the minibuffer, prompting with string PROMPT.  */)
   (Lisp_Object prompt)
@@ -8021,7 +8021,7 @@ DEFUN ("read-non-nil-coding-system", Fread_non_nil_coding_system,
   return (Fintern (val, Qnil));
 }
 
-DEFUN ("read-coding-system", Fread_coding_system, Sread_coding_system, 1, 2, 0,
+DEFUE ("read-coding-system", Fread_coding_system, Sread_coding_system, 1, 2, 0,
        doc: /* Read a coding system from the minibuffer, prompting with string PROMPT.
 If the user enters null input, return second argument DEFAULT-CODING-SYSTEM.
 Ignores case when completing coding systems (all Emacs coding systems
@@ -8041,7 +8041,7 @@ are lower-case).  */)
   return (SCHARS (val) == 0 ? Qnil : Fintern (val, Qnil));
 }
 
-DEFUN ("check-coding-system", Fcheck_coding_system, Scheck_coding_system,
+DEFUE ("check-coding-system", Fcheck_coding_system, Scheck_coding_system,
        1, 1, 0,
        doc: /* Check validity of CODING-SYSTEM.
 If valid, return CODING-SYSTEM, else signal a `coding-system-error' error.
@@ -8976,7 +8976,7 @@ code_convert_string_norecord (Lisp_Object string, Lisp_Object coding_system,
 }
 
 
-DEFUN ("decode-coding-string", Fdecode_coding_string, Sdecode_coding_string,
+DEFUE ("decode-coding-string", Fdecode_coding_string, Sdecode_coding_string,
        2, 4, 0,
        doc: /* Decode STRING which is encoded in CODING-SYSTEM, and return the result.
 
@@ -9250,7 +9250,7 @@ DEFUN ("keyboard-coding-system",
 }
 
 
-DEFUN ("find-operation-coding-system", Ffind_operation_coding_system,
+DEFUE ("find-operation-coding-system", Ffind_operation_coding_system,
        Sfind_operation_coding_system,  1, MANY, 0,
        doc: /* Choose a coding system for an operation based on the target name.
 The value names a pair of coding systems: (DECODING-SYSTEM . ENCODING-SYSTEM).
@@ -10093,7 +10093,7 @@ DEFUN ("define-coding-system-alias", Fdefine_coding_system_alias,
   return Qnil;
 }
 
-DEFUN ("coding-system-base", Fcoding_system_base, Scoding_system_base,
+DEFUE ("coding-system-base", Fcoding_system_base, Scoding_system_base,
        1, 1, 0,
        doc: /* Return the base of CODING-SYSTEM.
 Any alias or subsidiary coding system is not a base coding system.  */)
@@ -10136,7 +10136,7 @@ DEFUN ("coding-system-aliases", Fcoding_system_aliases, Scoding_system_aliases,
   return AREF (spec, 1);
 }
 
-DEFUN ("coding-system-eol-type", Fcoding_system_eol_type,
+DEFUE ("coding-system-eol-type", Fcoding_system_eol_type,
        Scoding_system_eol_type, 1, 1, 0,
        doc: /* Return eol-type of CODING-SYSTEM.
 An eol-type is an integer 0, 1, 2, or a vector of coding systems.
diff --git a/src/composite.c b/src/composite.c
index c18f9e8b56e..367606f5142 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -158,7 +158,7 @@ Lisp_Object Qauto_composition_function;
    auto-compositions.  */
 #define MAX_AUTO_COMPOSITION_LOOKBACK 3
 
-EXFUN (Fremove_list_of_text_properties, 4);
+INFUN (Fcomposition_get_gstring, 4);
 
 /* Temporary variable used in macros COMPOSITION_XXX.  */
 Lisp_Object composition_temp;
diff --git a/src/composite.h b/src/composite.h
index cfb5db0dc6a..1f708e93b8e 100644
--- a/src/composite.h
+++ b/src/composite.h
@@ -328,6 +328,4 @@ extern int composition_update_it (struct composition_it *,
 
 extern EMACS_INT composition_adjust_point (EMACS_INT, EMACS_INT);
 
-EXFUN (Fcomposition_get_gstring, 4);
-
 #endif /* not EMACS_COMPOSITE_H */
diff --git a/src/data.c b/src/data.c
index 4b9d2ec0387..25e260c8686 100644
--- a/src/data.c
+++ b/src/data.c
@@ -462,7 +462,7 @@ DEFUN ("floatp", Ffloatp, Sfloatp, 1, 1, 0,
 
 /* Extract and set components of lists */
 
-DEFUN ("car", Fcar, Scar, 1, 1, 0,
+DEFUE ("car", Fcar, Scar, 1, 1, 0,
        doc: /* Return the car of LIST.  If arg is nil, return nil.
 Error if arg is not nil and not a cons cell.  See also `car-safe'.
 
@@ -473,14 +473,14 @@ Lisp concepts such as car, cdr, cons cell and list.  */)
   return CAR (list);
 }
 
-DEFUN ("car-safe", Fcar_safe, Scar_safe, 1, 1, 0,
+DEFUE ("car-safe", Fcar_safe, Scar_safe, 1, 1, 0,
        doc: /* Return the car of OBJECT if it is a cons cell, or else nil.  */)
   (Lisp_Object object)
 {
   return CAR_SAFE (object);
 }
 
-DEFUN ("cdr", Fcdr, Scdr, 1, 1, 0,
+DEFUE ("cdr", Fcdr, Scdr, 1, 1, 0,
        doc: /* Return the cdr of LIST.  If arg is nil, return nil.
 Error if arg is not nil and not a cons cell.  See also `cdr-safe'.
 
@@ -491,14 +491,14 @@ Lisp concepts such as cdr, car, cons cell and list.  */)
   return CDR (list);
 }
 
-DEFUN ("cdr-safe", Fcdr_safe, Scdr_safe, 1, 1, 0,
+DEFUE ("cdr-safe", Fcdr_safe, Scdr_safe, 1, 1, 0,
        doc: /* Return the cdr of OBJECT if it is a cons cell, or else nil.  */)
   (Lisp_Object object)
 {
   return CDR_SAFE (object);
 }
 
-DEFUN ("setcar", Fsetcar, Ssetcar, 2, 2, 0,
+DEFUE ("setcar", Fsetcar, Ssetcar, 2, 2, 0,
        doc: /* Set the car of CELL to be NEWCAR.  Returns NEWCAR.  */)
   (register Lisp_Object cell, Lisp_Object newcar)
 {
@@ -508,7 +508,7 @@ DEFUN ("setcar", Fsetcar, Ssetcar, 2, 2, 0,
   return newcar;
 }
 
-DEFUN ("setcdr", Fsetcdr, Ssetcdr, 2, 2, 0,
+DEFUE ("setcdr", Fsetcdr, Ssetcdr, 2, 2, 0,
        doc: /* Set the cdr of CELL to be NEWCDR.  Returns NEWCDR.  */)
   (register Lisp_Object cell, Lisp_Object newcdr)
 {
@@ -520,7 +520,7 @@ DEFUN ("setcdr", Fsetcdr, Ssetcdr, 2, 2, 0,
 
 /* Extract and set components of symbols */
 
-DEFUN ("boundp", Fboundp, Sboundp, 1, 1, 0,
+DEFUE ("boundp", Fboundp, Sboundp, 1, 1, 0,
        doc: /* Return t if SYMBOL's value is not void.  */)
   (register Lisp_Object symbol)
 {
@@ -558,7 +558,7 @@ DEFUN ("boundp", Fboundp, Sboundp, 1, 1, 0,
   return (EQ (valcontents, Qunbound) ? Qnil : Qt);
 }
 
-DEFUN ("fboundp", Ffboundp, Sfboundp, 1, 1, 0,
+DEFUE ("fboundp", Ffboundp, Sfboundp, 1, 1, 0,
        doc: /* Return t if SYMBOL's function definition is not void.  */)
   (register Lisp_Object symbol)
 {
@@ -590,7 +590,7 @@ Return SYMBOL.  */)
   return symbol;
 }
 
-DEFUN ("symbol-function", Fsymbol_function, Ssymbol_function, 1, 1, 0,
+DEFUE ("symbol-function", Fsymbol_function, Ssymbol_function, 1, 1, 0,
        doc: /* Return SYMBOL's function definition.  Error if that is void.  */)
   (register Lisp_Object symbol)
 {
@@ -608,7 +608,7 @@ DEFUN ("symbol-plist", Fsymbol_plist, Ssymbol_plist, 1, 1, 0,
   return XSYMBOL (symbol)->plist;
 }
 
-DEFUN ("symbol-name", Fsymbol_name, Ssymbol_name, 1, 1, 0,
+DEFUE ("symbol-name", Fsymbol_name, Ssymbol_name, 1, 1, 0,
        doc: /* Return SYMBOL's name, a string.  */)
   (register Lisp_Object symbol)
 {
@@ -619,7 +619,7 @@ DEFUN ("symbol-name", Fsymbol_name, Ssymbol_name, 1, 1, 0,
   return name;
 }
 
-DEFUN ("fset", Ffset, Sfset, 2, 2, 0,
+DEFUE ("fset", Ffset, Sfset, 2, 2, 0,
        doc: /* Set SYMBOL's function definition to DEFINITION, and return DEFINITION.  */)
   (register Lisp_Object symbol, Lisp_Object definition)
 {
@@ -706,7 +706,7 @@ SUBR must be a built-in function.  */)
   return make_string (name, strlen (name));
 }
 
-DEFUN ("interactive-form", Finteractive_form, Sinteractive_form, 1, 1, 0,
+DEFUE ("interactive-form", Finteractive_form, Sinteractive_form, 1, 1, 0,
        doc: /* Return the interactive form of CMD or nil if none.
 If CMD is not a command, the return value is nil.
 Value, if non-nil, is a list \(interactive SPEC).  */)
@@ -1049,7 +1049,7 @@ find_symbol_value (Lisp_Object symbol)
     }
 }
 
-DEFUN ("symbol-value", Fsymbol_value, Ssymbol_value, 1, 1, 0,
+DEFUE ("symbol-value", Fsymbol_value, Ssymbol_value, 1, 1, 0,
        doc: /* Return SYMBOL's value.  Error if that is void.  */)
   (Lisp_Object symbol)
 {
@@ -1062,7 +1062,7 @@ DEFUN ("symbol-value", Fsymbol_value, Ssymbol_value, 1, 1, 0,
   xsignal1 (Qvoid_variable, symbol);
 }
 
-DEFUN ("set", Fset, Sset, 2, 2, 0,
+DEFUE ("set", Fset, Sset, 2, 2, 0,
        doc: /* Set SYMBOL's value to NEWVAL, and return NEWVAL.  */)
   (register Lisp_Object symbol, Lisp_Object newval)
 {
@@ -1308,7 +1308,7 @@ default_value (Lisp_Object symbol)
     }
 }
 
-DEFUN ("default-boundp", Fdefault_boundp, Sdefault_boundp, 1, 1, 0,
+DEFUE ("default-boundp", Fdefault_boundp, Sdefault_boundp, 1, 1, 0,
        doc: /* Return t if SYMBOL has a non-void default value.
 This is the value that is seen in buffers that do not have their own values
 for this variable.  */)
@@ -1320,7 +1320,7 @@ for this variable.  */)
   return (EQ (value, Qunbound) ? Qnil : Qt);
 }
 
-DEFUN ("default-value", Fdefault_value, Sdefault_value, 1, 1, 0,
+DEFUE ("default-value", Fdefault_value, Sdefault_value, 1, 1, 0,
        doc: /* Return SYMBOL's default value.
 This is the value that is seen in buffers that do not have their own values
 for this variable.  The default value is meaningful for variables with
@@ -1336,7 +1336,7 @@ local bindings in certain buffers.  */)
   xsignal1 (Qvoid_variable, symbol);
 }
 
-DEFUN ("set-default", Fset_default, Sset_default, 2, 2, 0,
+DEFUE ("set-default", Fset_default, Sset_default, 2, 2, 0,
        doc: /* Set SYMBOL's default value to VALUE.  SYMBOL and VALUE are evaluated.
 The default value is seen in buffers that do not have their own values
 for this variable.  */)
@@ -1479,8 +1479,8 @@ make_blv (struct Lisp_Symbol *sym, int forwarded, union Lisp_Val_Fwd valcontents
   return blv;
 }
 
-DEFUN ("make-variable-buffer-local", Fmake_variable_buffer_local, Smake_variable_buffer_local,
-       1, 1, "vMake Variable Buffer Local: ",
+DEFUE ("make-variable-buffer-local", Fmake_variable_buffer_local,
+       Smake_variable_buffer_local, 1, 1, "vMake Variable Buffer Local: ",
        doc: /* Make VARIABLE become buffer-local whenever it is set.
 At any time, the value for the current buffer is in effect,
 unless the variable has never been set in this buffer,
@@ -1550,7 +1550,7 @@ The function `default-value' gets the default value and `set-default' sets it.
   return variable;
 }
 
-DEFUN ("make-local-variable", Fmake_local_variable, Smake_local_variable,
+DEFUE ("make-local-variable", Fmake_local_variable, Smake_local_variable,
        1, 1, "vMake Local Variable: ",
        doc: /* Make VARIABLE have a separate value in the current buffer.
 Other buffers will continue to share a common default value.
@@ -1810,7 +1810,7 @@ frame-local bindings).  */)
   return variable;
 }
 
-DEFUN ("local-variable-p", Flocal_variable_p, Slocal_variable_p,
+DEFUE ("local-variable-p", Flocal_variable_p, Slocal_variable_p,
        1, 2, 0,
        doc: /* Non-nil if VARIABLE has a local binding in buffer BUFFER.
 BUFFER defaults to the current buffer.  */)
@@ -1955,7 +1955,8 @@ If the current binding is global (the default), the value is nil.  */)
 #if 0
 extern struct terminal *get_terminal (Lisp_Object display, int);
 
-DEFUN ("terminal-local-value", Fterminal_local_value, Sterminal_local_value, 2, 2, 0,
+DEFUE ("terminal-local-value", Fterminal_local_value,
+       Sterminal_local_value, 2, 2, 0,
        doc: /* Return the terminal-local value of SYMBOL on TERMINAL.
 If SYMBOL is not a terminal-local variable, then return its normal
 value, like `symbol-value'.
@@ -1972,7 +1973,8 @@ selected frame's terminal device).  */)
   return result;
 }
 
-DEFUN ("set-terminal-local-value", Fset_terminal_local_value, Sset_terminal_local_value, 3, 3, 0,
+DEFUE ("set-terminal-local-value", Fset_terminal_local_value,
+       Sset_terminal_local_value, 3, 3, 0,
        doc: /* Set the terminal-local binding of SYMBOL on TERMINAL to VALUE.
 If VARIABLE is not a terminal-local variable, then set its normal
 binding, like `set'.
@@ -2024,7 +2026,7 @@ indirect_function (register Lisp_Object object)
   return hare;
 }
 
-DEFUN ("indirect-function", Findirect_function, Sindirect_function, 1, 2, 0,
+DEFUE ("indirect-function", Findirect_function, Sindirect_function, 1, 2, 0,
        doc: /* Return the function at the end of OBJECT's function chain.
 If OBJECT is not a symbol, just return it.  Otherwise, follow all
 function indirections to find the final function binding and return it.
@@ -2052,7 +2054,7 @@ function chain of symbols.  */)
 
 /* Extract and set vector and string elements */
 
-DEFUN ("aref", Faref, Saref, 2, 2, 0,
+DEFUE ("aref", Faref, Saref, 2, 2, 0,
        doc: /* Return the element of ARRAY at index IDX.
 ARRAY may be a vector, a string, a char-table, a bool-vector,
 or a byte-code object.  IDX starts at 0.  */)
@@ -2107,7 +2109,7 @@ or a byte-code object.  IDX starts at 0.  */)
     }
 }
 
-DEFUN ("aset", Faset, Saset, 3, 3, 0,
+DEFUE ("aset", Faset, Saset, 3, 3, 0,
        doc: /* Store into the element of ARRAY at index IDX the value NEWELT.
 Return NEWELT.  ARRAY may be a vector, a string, a char-table or a
 bool-vector.  IDX starts at 0.  */)
@@ -2270,21 +2272,21 @@ DEFUN ("=", Feqlsign, Seqlsign, 2, 2, 0,
   return arithcompare (num1, num2, equal);
 }
 
-DEFUN ("<", Flss, Slss, 2, 2, 0,
+DEFUE ("<", Flss, Slss, 2, 2, 0,
        doc: /* Return t if first arg is less than second arg.  Both must be numbers or markers.  */)
   (register Lisp_Object num1, Lisp_Object num2)
 {
   return arithcompare (num1, num2, less);
 }
 
-DEFUN (">", Fgtr, Sgtr, 2, 2, 0,
+DEFUE (">", Fgtr, Sgtr, 2, 2, 0,
        doc: /* Return t if first arg is greater than second arg.  Both must be numbers or markers.  */)
   (register Lisp_Object num1, Lisp_Object num2)
 {
   return arithcompare (num1, num2, grtr);
 }
 
-DEFUN ("<=", Fleq, Sleq, 2, 2, 0,
+DEFUE ("<=", Fleq, Sleq, 2, 2, 0,
        doc: /* Return t if first arg is less than or equal to second arg.
 Both must be numbers or markers.  */)
   (register Lisp_Object num1, Lisp_Object num2)
@@ -2292,7 +2294,7 @@ Both must be numbers or markers.  */)
   return arithcompare (num1, num2, less_or_equal);
 }
 
-DEFUN (">=", Fgeq, Sgeq, 2, 2, 0,
+DEFUE (">=", Fgeq, Sgeq, 2, 2, 0,
        doc: /* Return t if first arg is greater than or equal to second arg.
 Both must be numbers or markers.  */)
   (register Lisp_Object num1, Lisp_Object num2)
@@ -2307,7 +2309,7 @@ DEFUN ("/=", Fneq, Sneq, 2, 2, 0,
   return arithcompare (num1, num2, notequal);
 }
 
-DEFUN ("zerop", Fzerop, Szerop, 1, 1, 0,
+DEFUE ("zerop", Fzerop, Szerop, 1, 1, 0,
        doc: /* Return t if NUMBER is zero.  */)
   (register Lisp_Object number)
 {
@@ -2354,7 +2356,7 @@ cons_to_long (Lisp_Object c)
   return ((XINT (top) << 16) | XINT (bot));
 }
 
-DEFUN ("number-to-string", Fnumber_to_string, Snumber_to_string, 1, 1, 0,
+DEFUE ("number-to-string", Fnumber_to_string, Snumber_to_string, 1, 1, 0,
        doc: /* Return the decimal representation of NUMBER as a string.
 Uses a minus sign if negative.
 NUMBER may be an integer or a floating point number.  */)
@@ -2401,7 +2403,7 @@ digit_to_number (int character, int base)
     return digit;
 }
 
-DEFUN ("string-to-number", Fstring_to_number, Sstring_to_number, 1, 2, 0,
+DEFUE ("string-to-number", Fstring_to_number, Sstring_to_number, 1, 2, 0,
        doc: /* Parse STRING as a decimal number and return the number.
 This parses both integers and floating point numbers.
 It ignores leading spaces and tabs, and all trailing chars.
@@ -2624,7 +2626,7 @@ float_arith_driver (double accum, register size_t argnum, enum arithop code,
 }
 
 
-DEFUN ("+", Fplus, Splus, 0, MANY, 0,
+DEFUE ("+", Fplus, Splus, 0, MANY, 0,
        doc: /* Return sum of any number of arguments, which are numbers or markers.
 usage: (+ &rest NUMBERS-OR-MARKERS)  */)
   (size_t nargs, Lisp_Object *args)
@@ -2632,7 +2634,7 @@ usage: (+ &rest NUMBERS-OR-MARKERS)  */)
   return arith_driver (Aadd, nargs, args);
 }
 
-DEFUN ("-", Fminus, Sminus, 0, MANY, 0,
+DEFUE ("-", Fminus, Sminus, 0, MANY, 0,
        doc: /* Negate number or subtract numbers or markers and return the result.
 With one arg, negates it.  With more than one arg,
 subtracts all but the first from the first.
@@ -2642,7 +2644,7 @@ usage: (- &optional NUMBER-OR-MARKER &rest MORE-NUMBERS-OR-MARKERS)  */)
   return arith_driver (Asub, nargs, args);
 }
 
-DEFUN ("*", Ftimes, Stimes, 0, MANY, 0,
+DEFUE ("*", Ftimes, Stimes, 0, MANY, 0,
        doc: /* Return product of any number of arguments, which are numbers or markers.
 usage: (* &rest NUMBERS-OR-MARKERS)  */)
   (size_t nargs, Lisp_Object *args)
@@ -2650,7 +2652,7 @@ usage: (* &rest NUMBERS-OR-MARKERS)  */)
   return arith_driver (Amult, nargs, args);
 }
 
-DEFUN ("/", Fquo, Squo, 2, MANY, 0,
+DEFUE ("/", Fquo, Squo, 2, MANY, 0,
        doc: /* Return first argument divided by all the remaining arguments.
 The arguments must be numbers or markers.
 usage: (/ DIVIDEND DIVISOR &rest DIVISORS)  */)
@@ -2663,7 +2665,7 @@ usage: (/ DIVIDEND DIVISOR &rest DIVISORS)  */)
   return arith_driver (Adiv, nargs, args);
 }
 
-DEFUN ("%", Frem, Srem, 2, 2, 0,
+DEFUE ("%", Frem, Srem, 2, 2, 0,
        doc: /* Return remainder of X divided by Y.
 Both must be integers or markers.  */)
   (register Lisp_Object x, Lisp_Object y)
@@ -2734,7 +2736,7 @@ Both X and Y must be numbers or markers.  */)
   return val;
 }
 
-DEFUN ("max", Fmax, Smax, 1, MANY, 0,
+DEFUE ("max", Fmax, Smax, 1, MANY, 0,
        doc: /* Return largest of all the arguments (which must be numbers or markers).
 The value is always a number; markers are converted to numbers.
 usage: (max NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS)  */)
@@ -2743,7 +2745,7 @@ usage: (max NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS)  */)
   return arith_driver (Amax, nargs, args);
 }
 
-DEFUN ("min", Fmin, Smin, 1, MANY, 0,
+DEFUE ("min", Fmin, Smin, 1, MANY, 0,
        doc: /* Return smallest of all the arguments (which must be numbers or markers).
 The value is always a number; markers are converted to numbers.
 usage: (min NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS)  */)
@@ -2823,7 +2825,7 @@ In this case, zeros are shifted in on the left.  */)
   return val;
 }
 
-DEFUN ("1+", Fadd1, Sadd1, 1, 1, 0,
+DEFUE ("1+", Fadd1, Sadd1, 1, 1, 0,
        doc: /* Return NUMBER plus one.  NUMBER may be a number or a marker.
 Markers are converted to integers.  */)
   (register Lisp_Object number)
@@ -2837,7 +2839,7 @@ Markers are converted to integers.  */)
   return number;
 }
 
-DEFUN ("1-", Fsub1, Ssub1, 1, 1, 0,
+DEFUE ("1-", Fsub1, Ssub1, 1, 1, 0,
        doc: /* Return NUMBER minus one.  NUMBER may be a number or a marker.
 Markers are converted to integers.  */)
   (register Lisp_Object number)
@@ -2860,7 +2862,7 @@ DEFUN ("lognot", Flognot, Slognot, 1, 1, 0,
   return number;
 }
 
-DEFUN ("byteorder", Fbyteorder, Sbyteorder, 0, 0, 0,
+DEFUE ("byteorder", Fbyteorder, Sbyteorder, 0, 0, 0,
        doc: /* Return the byteorder for the machine.
 Returns 66 (ASCII uppercase B) for big endian machines or 108 (ASCII
 lowercase l) for small endian machines.  */)
diff --git a/src/dired.c b/src/dired.c
index 186cfd1420b..f5fc1e3a62d 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -87,6 +87,7 @@ Lisp_Object Qfile_attributes;
 Lisp_Object Qfile_attributes_lessp;
 
 static int scmp (const char *, const char *, int);
+INFUN (Ffile_attributes, 2);
 
 #ifdef WINDOWSNT
 Lisp_Object
diff --git a/src/dispnew.c b/src/dispnew.c
index 3a78845fa56..6e4c93d1676 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -337,7 +337,7 @@ add_frame_display_history (struct frame *f, int paused_p)
 }
 
 
-DEFUN ("dump-redisplay-history", Fdump_redisplay_history,
+DEFUE ("dump-redisplay-history", Fdump_redisplay_history,
        Sdump_redisplay_history, 0, 0, "",
        doc: /* Dump redisplay history to stderr.  */)
   (void)
@@ -3139,7 +3139,7 @@ window_to_frame_hpos (struct window *w, int hpos)
                             Redrawing Frames
  **********************************************************************/
 
-DEFUN ("redraw-frame", Fredraw_frame, Sredraw_frame, 1, 1, 0,
+DEFUE ("redraw-frame", Fredraw_frame, Sredraw_frame, 1, 1, 0,
        doc: /* Clear frame FRAME and output again what is supposed to appear on it.  */)
   (Lisp_Object frame)
 {
@@ -5878,7 +5878,7 @@ when TERMINAL is nil.  */)
 }
 
 
-DEFUN ("ding", Fding, Sding, 0, 1, 0,
+DEFUE ("ding", Fding, Sding, 0, 1, 0,
        doc: /* Beep, or flash the screen.
 Also, unless an argument is given,
 terminate any keyboard macro currently executing.  */)
@@ -5914,7 +5914,7 @@ bitch_at_user (void)
                           Sleeping, Waiting
  ***********************************************************************/
 
-DEFUN ("sleep-for", Fsleep_for, Ssleep_for, 1, 2, 0,
+DEFUE ("sleep-for", Fsleep_for, Ssleep_for, 1, 2, 0,
        doc: /* Pause, without updating display, for SECONDS seconds.
 SECONDS may be a floating-point value, meaning that you can wait for a
 fraction of a second.  Optional second arg MILLISECONDS specifies an
@@ -6020,7 +6020,7 @@ sit_for (Lisp_Object timeout, int reading, int do_display)
 }
 
 
-DEFUN ("redisplay", Fredisplay, Sredisplay, 0, 1, 0,
+DEFUE ("redisplay", Fredisplay, Sredisplay, 0, 1, 0,
        doc: /* Perform redisplay if no input is available.
 If optional arg FORCE is non-nil or `redisplay-dont-pause' is non-nil,
 perform a full redisplay even if input is available.
diff --git a/src/doc.c b/src/doc.c
index ed0d2323ed5..b6939ad78f6 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -42,7 +42,8 @@ static char *get_doc_string_buffer;
 static int get_doc_string_buffer_size;
 
 static unsigned char *read_bytecode_pointer;
-Lisp_Object Fsnarf_documentation (Lisp_Object);
+INFUN (Fdocumentation_property, 3);
+INFUN (Fsnarf_documentation, 1);
 
 /* readchar in lread.c calls back here to fetch the next byte.
    If UNREADFLAG is 1, we unread a byte.  */
@@ -680,7 +681,7 @@ the same file name is found in the `doc-directory'.  */)
   return Qnil;
 }
 
-DEFUN ("substitute-command-keys", Fsubstitute_command_keys,
+DEFUE ("substitute-command-keys", Fsubstitute_command_keys,
        Ssubstitute_command_keys, 1, 1, 0,
        doc: /* Substitute key descriptions for command names in STRING.
 Substrings of the form \\=\\[COMMAND] replaced by either: a keystroke
diff --git a/src/editfns.c b/src/editfns.c
index 85b30de6975..0c34a95b949 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -108,7 +108,7 @@ static void transpose_markers (EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT,
                                EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT);
 
 Lisp_Object Qbuffer_access_fontify_functions;
-Lisp_Object Fuser_full_name (Lisp_Object);
+INFUN (Fuser_full_name, 1);
 
 /* Symbol for the text property used to mark fields.  */
 
@@ -185,7 +185,7 @@ init_editfns (void)
 #endif
 }
 
-DEFUN ("char-to-string", Fchar_to_string, Schar_to_string, 1, 1, 0,
+DEFUE ("char-to-string", Fchar_to_string, Schar_to_string, 1, 1, 0,
        doc: /* Convert arg CHAR to a string containing that character.
 usage: (char-to-string CHAR)  */)
   (Lisp_Object character)
@@ -239,7 +239,7 @@ buildmark (EMACS_INT charpos, EMACS_INT bytepos)
   return mark;
 }
 
-DEFUN ("point", Fpoint, Spoint, 0, 0, 0,
+DEFUE ("point", Fpoint, Spoint, 0, 0, 0,
        doc: /* Return value of point, as an integer.
 Beginning of buffer is position (point-min).  */)
   (void)
@@ -249,7 +249,7 @@ Beginning of buffer is position (point-min).  */)
   return temp;
 }
 
-DEFUN ("point-marker", Fpoint_marker, Spoint_marker, 0, 0, 0,
+DEFUE ("point-marker", Fpoint_marker, Spoint_marker, 0, 0, 0,
        doc: /* Return value of point, as a marker object.  */)
   (void)
 {
@@ -267,7 +267,7 @@ clip_to_bounds (EMACS_INT lower, EMACS_INT num, EMACS_INT upper)
     return num;
 }
 
-DEFUN ("goto-char", Fgoto_char, Sgoto_char, 1, 1, "NGoto char: ",
+DEFUE ("goto-char", Fgoto_char, Sgoto_char, 1, 1, "NGoto char: ",
        doc: /* Set point to POSITION, a number or marker.
 Beginning of buffer is position (point-min), end is (point-max).
 
@@ -663,7 +663,7 @@ is before LIMIT, then LIMIT will be returned instead.  */)
   return make_number (beg);
 }
 
-DEFUN ("field-end", Ffield_end, Sfield_end, 0, 3, 0,
+DEFUE ("field-end", Ffield_end, Sfield_end, 0, 3, 0,
        doc: /* Return the end of the field surrounding POS.
 A field is a region of text with the same `field' property.
 If POS is nil, the value of point is used for POS.
@@ -678,7 +678,7 @@ is after LIMIT, then LIMIT will be returned instead.  */)
   return make_number (end);
 }
 
-DEFUN ("constrain-to-field", Fconstrain_to_field, Sconstrain_to_field, 2, 5, 0,
+DEFUE ("constrain-to-field", Fconstrain_to_field, Sconstrain_to_field, 2, 5, 0,
        doc: /* Return the position closest to NEW-POS that is in the same field as OLD-POS.
 
 A field is a region of text with the same `field' property.
@@ -787,7 +787,7 @@ Field boundaries are not noticed if `inhibit-field-text-motion' is non-nil.  */)
 }
 
 
-DEFUN ("line-beginning-position",
+DEFUE ("line-beginning-position",
        Fline_beginning_position, Sline_beginning_position, 0, 1, 0,
        doc: /* Return the character position of the first character on the current line.
 With argument N not nil or 1, move forward N - 1 lines first.
@@ -829,7 +829,7 @@ This function does not move point.  */)
                               Qt, Qnil);
 }
 
-DEFUN ("line-end-position", Fline_end_position, Sline_end_position, 0, 1, 0,
+DEFUE ("line-end-position", Fline_end_position, Sline_end_position, 0, 1, 0,
        doc: /* Return the character position of the last character on the current line.
 With argument N not nil or 1, move forward N - 1 lines first.
 If scan reaches end of buffer, return that position.
@@ -1048,7 +1048,7 @@ is in effect, in which case it is less.  */)
   return temp;
 }
 
-DEFUN ("point-max-marker", Fpoint_max_marker, Spoint_max_marker, 0, 0, 0,
+DEFUE ("point-max-marker", Fpoint_max_marker, Spoint_max_marker, 0, 0, 0,
        doc: /* Return a marker to the maximum permissible value of point in this buffer.
 This is (1+ (buffer-size)), unless narrowing (a buffer restriction)
 is in effect, in which case it is less.  */)
@@ -1099,7 +1099,7 @@ If BYTEPOS is out of range, the value is nil.  */)
   return make_number (BYTE_TO_CHAR (XINT (bytepos)));
 }
 
-DEFUN ("following-char", Ffollowing_char, Sfollowing_char, 0, 0, 0,
+DEFUE ("following-char", Ffollowing_char, Sfollowing_char, 0, 0, 0,
        doc: /* Return the character following point, as a number.
 At the end of the buffer or accessible region, return 0.  */)
   (void)
@@ -1112,7 +1112,7 @@ At the end of the buffer or accessible region, return 0.  */)
   return temp;
 }
 
-DEFUN ("preceding-char", Fprevious_char, Sprevious_char, 0, 0, 0,
+DEFUE ("preceding-char", Fprevious_char, Sprevious_char, 0, 0, 0,
        doc: /* Return the character preceding point, as a number.
 At the beginning of the buffer or accessible region, return 0.  */)
   (void)
@@ -1131,7 +1131,7 @@ At the beginning of the buffer or accessible region, return 0.  */)
   return temp;
 }
 
-DEFUN ("bobp", Fbobp, Sbobp, 0, 0, 0,
+DEFUE ("bobp", Fbobp, Sbobp, 0, 0, 0,
        doc: /* Return t if point is at the beginning of the buffer.
 If the buffer is narrowed, this means the beginning of the narrowed part.  */)
   (void)
@@ -1141,7 +1141,7 @@ If the buffer is narrowed, this means the beginning of the narrowed part.  */)
   return Qnil;
 }
 
-DEFUN ("eobp", Feobp, Seobp, 0, 0, 0,
+DEFUE ("eobp", Feobp, Seobp, 0, 0, 0,
        doc: /* Return t if point is at the end of the buffer.
 If the buffer is narrowed, this means the end of the narrowed part.  */)
   (void)
@@ -1151,7 +1151,7 @@ If the buffer is narrowed, this means the end of the narrowed part.  */)
   return Qnil;
 }
 
-DEFUN ("bolp", Fbolp, Sbolp, 0, 0, 0,
+DEFUE ("bolp", Fbolp, Sbolp, 0, 0, 0,
        doc: /* Return t if point is at the beginning of a line.  */)
   (void)
 {
@@ -1160,7 +1160,7 @@ DEFUN ("bolp", Fbolp, Sbolp, 0, 0, 0,
   return Qnil;
 }
 
-DEFUN ("eolp", Feolp, Seolp, 0, 0, 0,
+DEFUE ("eolp", Feolp, Seolp, 0, 0, 0,
        doc: /* Return t if point is at the end of a line.
 `End of a line' includes point being at the end of the buffer.  */)
   (void)
@@ -1170,7 +1170,7 @@ DEFUN ("eolp", Feolp, Seolp, 0, 0, 0,
   return Qnil;
 }
 
-DEFUN ("char-after", Fchar_after, Schar_after, 0, 1, 0,
+DEFUE ("char-after", Fchar_after, Schar_after, 0, 1, 0,
        doc: /* Return character in current buffer at position POS.
 POS is an integer or a marker and defaults to point.
 If POS is out of range, the value is nil.  */)
@@ -1247,7 +1247,7 @@ If POS is out of range, the value is nil.  */)
    return val;
 }
 
-DEFUN ("user-login-name", Fuser_login_name, Suser_login_name, 0, 1, 0,
+DEFUE ("user-login-name", Fuser_login_name, Suser_login_name, 0, 1, 0,
        doc: /* Return the name under which the user logged in, as a string.
 This is based on the effective uid, not the real uid.
 Also, if the environment variables LOGNAME or USER are set,
@@ -1387,7 +1387,7 @@ name, or nil if there is no such user.  */)
   return full;
 }
 
-DEFUN ("system-name", Fsystem_name, Ssystem_name, 0, 0, 0,
+DEFUE ("system-name", Fsystem_name, Ssystem_name, 0, 0, 0,
        doc: /* Return the host name of the machine you are running on, as a string.  */)
   (void)
 {
@@ -1462,7 +1462,7 @@ lo_time (time_t t)
   return t & ((1 << 16) - 1);
 }
 
-DEFUN ("current-time", Fcurrent_time, Scurrent_time, 0, 0, 0,
+DEFUE ("current-time", Fcurrent_time, Scurrent_time, 0, 0, 0,
        doc: /* Return the current time, as the number of seconds since 1970-01-01 00:00:00.
 The time is returned as a list of three integers.  The first has the
 most significant 16 bits of the seconds, while the second has the
@@ -1481,7 +1481,7 @@ resolution finer than a second.  */)
                 make_number (EMACS_USECS (t)));
 }
 
-DEFUN ("get-internal-run-time", Fget_internal_run_time, Sget_internal_run_time,
+DEFUE ("get-internal-run-time", Fget_internal_run_time, Sget_internal_run_time,
        0, 0, 0,
        doc: /* Return the current run time used by Emacs.
 The time is returned as a list of three integers.  The first has the
@@ -2255,7 +2255,7 @@ insert1 (Lisp_Object arg)
    not be used after calling insert or insert_from_string, so
    we don't care if it gets trashed.  */
 
-DEFUN ("insert", Finsert, Sinsert, 0, MANY, 0,
+DEFUE ("insert", Finsert, Sinsert, 0, MANY, 0,
        doc: /* Insert the arguments, either strings or characters, at point.
 Point and before-insertion markers move forward to end up
  after the inserted text.
@@ -2335,7 +2335,7 @@ usage: (insert-before-markers-and-inherit &rest ARGS)  */)
   return Qnil;
 }
 
-DEFUN ("insert-char", Finsert_char, Sinsert_char, 2, 3, 0,
+DEFUE ("insert-char", Finsert_char, Sinsert_char, 2, 3, 0,
        doc: /* Insert COUNT copies of CHARACTER.
 Point, and before-insertion markers, are relocated as in the function `insert'.
 The optional third arg INHERIT, if non-nil, says to inherit text properties
@@ -2509,7 +2509,7 @@ update_buffer_properties (EMACS_INT start, EMACS_INT end)
     }
 }
 
-DEFUN ("buffer-substring", Fbuffer_substring, Sbuffer_substring, 2, 2, 0,
+DEFUE ("buffer-substring", Fbuffer_substring, Sbuffer_substring, 2, 2, 0,
        doc: /* Return the contents of part of the current buffer as a string.
 The two arguments START and END are character positions;
 they can be in either order.
@@ -2545,7 +2545,7 @@ they can be in either order.  */)
   return make_buffer_string (b, e, 0);
 }
 
-DEFUN ("buffer-string", Fbuffer_string, Sbuffer_string, 0, 0, 0,
+DEFUE ("buffer-string", Fbuffer_string, Sbuffer_string, 0, 0, 0,
        doc: /* Return the contents of the current buffer as a string.
 If narrowing is in effect, this function returns only the visible part
 of the buffer.  */)
@@ -3183,7 +3183,7 @@ It returns the number of characters changed.  */)
   return make_number (cnt);
 }
 
-DEFUN ("delete-region", Fdelete_region, Sdelete_region, 2, 2, "r",
+DEFUE ("delete-region", Fdelete_region, Sdelete_region, 2, 2, "r",
        doc: /* Delete the text between point and mark.
 
 When called from a program, expects two arguments,
@@ -3206,7 +3206,7 @@ DEFUN ("delete-and-extract-region", Fdelete_and_extract_region,
   return del_range_1 (XINT (start), XINT (end), 1, 1);
 }
 
-DEFUN ("widen", Fwiden, Swiden, 0, 0, "",
+DEFUE ("widen", Fwiden, Swiden, 0, 0, "",
        doc: /* Remove restrictions (narrowing) from current buffer.
 This allows the buffer's full text to be seen and edited.  */)
   (void)
@@ -3221,7 +3221,7 @@ This allows the buffer's full text to be seen and edited.  */)
   return Qnil;
 }
 
-DEFUN ("narrow-to-region", Fnarrow_to_region, Snarrow_to_region, 2, 2, "r",
+DEFUE ("narrow-to-region", Fnarrow_to_region, Snarrow_to_region, 2, 2, "r",
        doc: /* Restrict editing in this buffer to the current region.
 The rest of the text becomes temporarily invisible and untouchable
 but is not deleted; if you save the buffer in a file, the invisible
@@ -3382,7 +3382,7 @@ static char *message_text;
 /* Allocated length of that buffer.  */
 static int message_length;
 
-DEFUN ("message", Fmessage, Smessage, 1, MANY, 0,
+DEFUE ("message", Fmessage, Smessage, 1, MANY, 0,
        doc: /* Display a message at the bottom of the screen.
 The message also goes into the `*Messages*' buffer.
 \(In keyboard macros, that's all it does.)
@@ -3494,7 +3494,7 @@ usage: (message-or-box FORMAT-STRING &rest ARGS)  */)
   return Fmessage (nargs, args);
 }
 
-DEFUN ("current-message", Fcurrent_message, Scurrent_message, 0, 0, 0,
+DEFUE ("current-message", Fcurrent_message, Scurrent_message, 0, 0, 0,
        doc: /* Return the string currently displayed in the echo area, or nil if none.  */)
   (void)
 {
@@ -3543,7 +3543,7 @@ usage: (propertize STRING &rest PROPERTIES)  */)
    ? count_size_as_multibyte (SDATA (STRING), SBYTES (STRING))          \
    : SBYTES (STRING))
 
-DEFUN ("format", Fformat, Sformat, 1, MANY, 0,
+DEFUE ("format", Fformat, Sformat, 1, MANY, 0,
        doc: /* Format a string out of a format-string and arguments.
 The first argument is a format control string.
 The other arguments are substituted into it to make the result, a string.
diff --git a/src/emacs.c b/src/emacs.c
index 6bdd2550ed1..74379f4c62e 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1958,7 +1958,7 @@ sort_args (int argc, char **argv)
   xfree (priority);
 }
 
-DEFUN ("kill-emacs", Fkill_emacs, Skill_emacs, 0, 1, "P",
+DEFUE ("kill-emacs", Fkill_emacs, Skill_emacs, 0, 1, "P",
        doc: /* Exit the Emacs job and kill it.
 If ARG is an integer, return ARG as the exit program code.
 If ARG is a string, stuff it as keyboard input.
diff --git a/src/eval.c b/src/eval.c
index 0f9e012b823..d6d62aa4afb 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -126,6 +126,7 @@ static Lisp_Object funcall_lambda (Lisp_Object, size_t, Lisp_Object *);
 static void unwind_to_catch (struct catchtag *, Lisp_Object) NO_RETURN;
 static int interactive_p (int);
 static Lisp_Object apply_lambda (Lisp_Object fun, Lisp_Object args);
+INFUN (Ffetch_bytecode, 1);
 
 void
 init_eval_once (void)
@@ -339,7 +340,7 @@ usage: (cond CLAUSES...)  */)
   return val;
 }
 
-DEFUN ("progn", Fprogn, Sprogn, 0, UNEVALLED, 0,
+DEFUE ("progn", Fprogn, Sprogn, 0, UNEVALLED, 0,
        doc: /* Eval BODY forms sequentially and return value of last one.
 usage: (progn BODY...)  */)
   (Lisp_Object args)
@@ -504,7 +505,7 @@ usage: (function ARG)  */)
 }
 
 
-DEFUN ("interactive-p", Finteractive_p, Sinteractive_p, 0, 0, 0,
+DEFUE ("interactive-p", Finteractive_p, Sinteractive_p, 0, 0, 0,
        doc: /* Return t if the containing function was run directly by user input.
 This means that the function was called with `call-interactively'
 \(which includes being called as the binding of a key)
@@ -1310,7 +1311,7 @@ unwind_to_catch (struct catchtag *catch, Lisp_Object value)
   _longjmp (catch->jmp, 1);
 }
 
-DEFUN ("throw", Fthrow, Sthrow, 2, 2, 0,
+DEFUE ("throw", Fthrow, Sthrow, 2, 2, 0,
        doc: /* Throw to the catch for TAG and return VALUE from it.
 Both TAG and VALUE are evalled.  */)
   (register Lisp_Object tag, Lisp_Object value)
@@ -1648,7 +1649,7 @@ static Lisp_Object find_handler_clause (Lisp_Object, Lisp_Object,
 static int maybe_call_debugger (Lisp_Object conditions, Lisp_Object sig,
                                 Lisp_Object data);
 
-DEFUN ("signal", Fsignal, Ssignal, 2, 2, 0,
+DEFUE ("signal", Fsignal, Ssignal, 2, 2, 0,
        doc: /* Signal an error.  Args are ERROR-SYMBOL and associated DATA.
 This function does not return.
 
@@ -2032,7 +2033,7 @@ error (const char *m, ...)
   va_end (ap);
 }
 
-DEFUN ("commandp", Fcommandp, Scommandp, 1, 2, 0,
+DEFUE ("commandp", Fcommandp, Scommandp, 1, 2, 0,
        doc: /* Non-nil if FUNCTION makes provisions for interactive calling.
 This means it contains a description for how to read arguments to give it.
 The value is nil for an invalid function or a symbol with no function
@@ -2213,7 +2214,7 @@ do_autoload (Lisp_Object fundef, Lisp_Object funname)
 }
 
 
-DEFUN ("eval", Feval, Seval, 1, 2, 0,
+DEFUE ("eval", Feval, Seval, 1, 2, 0,
        doc: /* Evaluate FORM and return its value.
 If LEXICAL is t, evaluate using lexical scoping.  */)
   (Lisp_Object form, Lisp_Object lexical)
@@ -2449,7 +2450,7 @@ eval_sub (Lisp_Object form)
   return val;
 }
 
-DEFUN ("apply", Fapply, Sapply, 2, MANY, 0,
+DEFUE ("apply", Fapply, Sapply, 2, MANY, 0,
        doc: /* Call FUNCTION with our remaining args, using our last arg as list of args.
 Then return the value FUNCTION returns.
 Thus, (apply '+ 1 2 '(3 4)) returns 10.
@@ -2544,7 +2545,7 @@ funcall_nil (size_t nargs, Lisp_Object *args)
   return Qnil;
 }
 
-DEFUN ("run-hooks", Frun_hooks, Srun_hooks, 0, MANY, 0,
+DEFUE ("run-hooks", Frun_hooks, Srun_hooks, 0, MANY, 0,
        doc: /* Run each hook in HOOKS.
 Each argument should be a symbol, a hook variable.
 These symbols are processed in the order specified.
@@ -2573,7 +2574,7 @@ usage: (run-hooks &rest HOOKS)  */)
   return Qnil;
 }
 
-DEFUN ("run-hook-with-args", Frun_hook_with_args,
+DEFUE ("run-hook-with-args", Frun_hook_with_args,
        Srun_hook_with_args, 1, MANY, 0,
        doc: /* Run HOOK with the specified arguments ARGS.
 HOOK should be a symbol, a hook variable.  If HOOK has a non-nil
@@ -2619,7 +2620,7 @@ funcall_not (size_t nargs, Lisp_Object *args)
   return NILP (Ffuncall (nargs, args)) ? Qt : Qnil;
 }
 
-DEFUN ("run-hook-with-args-until-failure", Frun_hook_with_args_until_failure,
+DEFUE ("run-hook-with-args-until-failure", Frun_hook_with_args_until_failure,
        Srun_hook_with_args_until_failure, 1, MANY, 0,
        doc: /* Run HOOK with the specified arguments ARGS.
 HOOK should be a symbol, a hook variable.  If HOOK has a non-nil
@@ -2906,7 +2907,7 @@ call7 (Lisp_Object fn, Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3,
 
 /* The caller should GCPRO all the elements of ARGS.  */
 
-DEFUN ("functionp", Ffunctionp, Sfunctionp, 1, 1, 0,
+DEFUE ("functionp", Ffunctionp, Sfunctionp, 1, 1, 0,
        doc: /* Non-nil if OBJECT is a function.  */)
      (Lisp_Object object)
 {
@@ -2939,7 +2940,7 @@ DEFUN ("functionp", Ffunctionp, Sfunctionp, 1, 1, 0,
     return Qnil;
 }
 
-DEFUN ("funcall", Ffuncall, Sfuncall, 1, MANY, 0,
+DEFUE ("funcall", Ffuncall, Sfuncall, 1, MANY, 0,
        doc: /* Call first argument as a function, passing remaining arguments to it.
 Return the value that function returns.
 Thus, (funcall 'cons 'x 'y) returns (x . y).
@@ -3647,8 +3648,6 @@ mark_backtrace (void)
     }
 }
 
-EXFUN (Funintern, 2);
-
 void
 syms_of_eval (void)
 {
diff --git a/src/fileio.c b/src/fileio.c
index f9923c420a3..5ad8b0a33a1 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -143,6 +143,7 @@ Lisp_Object Qfile_name_history;
 
 Lisp_Object Qcar_less_than_car;
 
+INFUN (Fmake_symbolic_link, 3);
 static int a_write (int, Lisp_Object, int, int,
                     Lisp_Object *, struct coding_system *);
 static int e_write (int, Lisp_Object, int, int, struct coding_system *);
@@ -239,7 +240,8 @@ Lisp_Object Qwrite_region;
 Lisp_Object Qverify_visited_file_modtime;
 Lisp_Object Qset_visited_file_modtime;
 
-DEFUN ("find-file-name-handler", Ffind_file_name_handler, Sfind_file_name_handler, 2, 2, 0,
+DEFUE ("find-file-name-handler", Ffind_file_name_handler,
+       Sfind_file_name_handler, 2, 2, 0,
        doc: /* Return FILENAME's handler function for OPERATION, if it has one.
 Otherwise, return nil.
 A file name is handled if one of the regular expressions in
@@ -299,7 +301,7 @@ use the standard functions without calling themselves recursively.  */)
   return result;
 }
 
-DEFUN ("file-name-directory", Ffile_name_directory, Sfile_name_directory,
+DEFUE ("file-name-directory", Ffile_name_directory, Sfile_name_directory,
        1, 1, 0,
        doc: /* Return the directory component in file name FILENAME.
 Return nil if FILENAME does not include a directory.
@@ -373,7 +375,7 @@ Given a Unix syntax file name, returns a string ending in slash.  */)
   return make_specified_string (beg, -1, p - beg, STRING_MULTIBYTE (filename));
 }
 
-DEFUN ("file-name-nondirectory", Ffile_name_nondirectory,
+DEFUE ("file-name-nondirectory", Ffile_name_nondirectory,
        Sfile_name_nondirectory, 1, 1, 0,
        doc: /* Return file name FILENAME sans its directory.
 For example, in a Unix-syntax file name,
@@ -408,7 +410,7 @@ or the entire name if it contains no slash.  */)
   return make_specified_string (p, -1, end - p, STRING_MULTIBYTE (filename));
 }
 
-DEFUN ("unhandled-file-name-directory", Funhandled_file_name_directory,
+DEFUE ("unhandled-file-name-directory", Funhandled_file_name_directory,
        Sunhandled_file_name_directory, 1, 1, 0,
        doc: /* Return a directly usable directory name somehow associated with FILENAME.
 A `directly usable' directory name is one that may be used without the
@@ -460,7 +462,7 @@ file_name_as_directory (char *out, const char *in)
   return out;
 }
 
-DEFUN ("file-name-as-directory", Ffile_name_as_directory,
+DEFUE ("file-name-as-directory", Ffile_name_as_directory,
        Sfile_name_as_directory, 1, 1, 0,
        doc: /* Return a string representing the file name FILE interpreted as a directory.
 This operation exists because a directory is also a file, but its name as
@@ -519,7 +521,7 @@ directory_file_name (char *src, char *dst)
   return 1;
 }
 
-DEFUN ("directory-file-name", Fdirectory_file_name, Sdirectory_file_name,
+DEFUE ("directory-file-name", Fdirectory_file_name, Sdirectory_file_name,
        1, 1, 0,
        doc: /* Returns the file name of the directory named DIRECTORY.
 This is the name of the file that holds the data for the directory DIRECTORY.
@@ -701,7 +703,7 @@ probably use `make-temp-file' instead, except in three circumstances:
 
 
 
-DEFUN ("expand-file-name", Fexpand_file_name, Sexpand_file_name, 1, 2, 0,
+DEFUE ("expand-file-name", Fexpand_file_name, Sexpand_file_name, 1, 2, 0,
        doc: /* Convert filename NAME to absolute, and canonicalize it.
 Second arg DEFAULT-DIRECTORY is directory to start with if NAME is relative
 \(does not start with slash or tilde); if DEFAULT-DIRECTORY is nil or missing,
@@ -1500,7 +1502,7 @@ search_embedded_absfilename (char *nm, char *endp)
   return NULL;
 }
 
-DEFUN ("substitute-in-file-name", Fsubstitute_in_file_name,
+DEFUE ("substitute-in-file-name", Fsubstitute_in_file_name,
        Ssubstitute_in_file_name, 1, 1, 0,
        doc: /* Substitute environment variables referred to in FILENAME.
 `$FOO' where FOO is an environment variable name means to substitute
@@ -2343,7 +2345,7 @@ This happens for interactive use with M-x.  */)
 }
 
 
-DEFUN ("file-name-absolute-p", Ffile_name_absolute_p, Sfile_name_absolute_p,
+DEFUE ("file-name-absolute-p", Ffile_name_absolute_p, Sfile_name_absolute_p,
        1, 1, 0,
        doc: /* Return t if file FILENAME specifies an absolute file name.
 On Unix, this is a name starting with a `/' or a `~'.  */)
@@ -2399,7 +2401,7 @@ check_writable (const char *filename)
 #endif /* not MSDOS */
 }
 
-DEFUN ("file-exists-p", Ffile_exists_p, Sfile_exists_p, 1, 1, 0,
+DEFUE ("file-exists-p", Ffile_exists_p, Sfile_exists_p, 1, 1, 0,
        doc: /* Return t if file FILENAME exists (whether or not you can read it.)
 See also `file-readable-p' and `file-attributes'.
 This returns nil for a symlink to a nonexistent file.
@@ -2446,7 +2448,7 @@ For a directory, this means you can access files in that directory.  */)
   return (check_executable (SSDATA (absname)) ? Qt : Qnil);
 }
 
-DEFUN ("file-readable-p", Ffile_readable_p, Sfile_readable_p, 1, 1, 0,
+DEFUE ("file-readable-p", Ffile_readable_p, Sfile_readable_p, 1, 1, 0,
        doc: /* Return t if file FILENAME exists and you can read it.
 See also `file-exists-p' and `file-attributes'.  */)
   (Lisp_Object filename)
@@ -2568,7 +2570,7 @@ If there is no error, returns nil.  */)
   return Qnil;
 }
 
-DEFUN ("file-symlink-p", Ffile_symlink_p, Sfile_symlink_p, 1, 1, 0,
+DEFUE ("file-symlink-p", Ffile_symlink_p, Sfile_symlink_p, 1, 1, 0,
        doc: /* Return non-nil if file FILENAME is the name of a symbolic link.
 The value is the link target, as a string.
 Otherwise it returns nil.
@@ -2606,7 +2608,7 @@ points to a nonexistent file.  */)
   return val;
 }
 
-DEFUN ("file-directory-p", Ffile_directory_p, Sfile_directory_p, 1, 1, 0,
+DEFUE ("file-directory-p", Ffile_directory_p, Sfile_directory_p, 1, 1, 0,
        doc: /* Return t if FILENAME names an existing directory.
 Symbolic links to directories count as directories.
 See `file-symlink-p' to distinguish symlinks.  */)
@@ -2631,7 +2633,8 @@ See `file-symlink-p' to distinguish symlinks.  */)
   return S_ISDIR (st.st_mode) ? Qt : Qnil;
 }
 
-DEFUN ("file-accessible-directory-p", Ffile_accessible_directory_p, Sfile_accessible_directory_p, 1, 1, 0,
+DEFUE ("file-accessible-directory-p", Ffile_accessible_directory_p,
+       Sfile_accessible_directory_p, 1, 1, 0,
        doc: /* Return t if file FILENAME names a directory you can open.
 For the value to be t, FILENAME must specify the name of a directory as a file,
 and the directory must allow you to open files in it.  In order to use a
@@ -4350,7 +4353,7 @@ choose_write_coding_system (Lisp_Object start, Lisp_Object end, Lisp_Object file
   return val;
 }
 
-DEFUN ("write-region", Fwrite_region, Swrite_region, 3, 7,
+DEFUE ("write-region", Fwrite_region, Swrite_region, 3, 7,
        "r\nFWrite region to file: \ni\ni\ni\np",
        doc: /* Write current region into specified file.
 When called from a program, requires three arguments:
@@ -4911,7 +4914,7 @@ e_write (int desc, Lisp_Object string, int start, int end, struct coding_system
   return 0;
 }
 
-DEFUN ("verify-visited-file-modtime", Fverify_visited_file_modtime,
+DEFUE ("verify-visited-file-modtime", Fverify_visited_file_modtime,
        Sverify_visited_file_modtime, 0, 1, 0,
        doc: /* Return t if last mod time of BUF's visited file matches what BUF records.
 This means that the file has not been changed since it was visited or saved.
@@ -5132,7 +5135,7 @@ do_auto_save_eh (Lisp_Object ignore)
   return Qnil;
 }
 
-DEFUN ("do-auto-save", Fdo_auto_save, Sdo_auto_save, 0, 2, "",
+DEFUE ("do-auto-save", Fdo_auto_save, Sdo_auto_save, 0, 2, "",
        doc: /* Auto-save all buffers that need it.
 This is all buffers that have auto-saving enabled
 and are changed since last auto-saved.
diff --git a/src/filelock.c b/src/filelock.c
index 13b27c72f19..c6b1617770c 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -639,7 +639,7 @@ or else nothing is done if current buffer isn't visiting a file.  */)
   return Qnil;
 }
 
-DEFUN ("unlock-buffer", Funlock_buffer, Sunlock_buffer,
+DEFUE ("unlock-buffer", Funlock_buffer, Sunlock_buffer,
        0, 0, 0,
        doc: /* Unlock the file visited in the current buffer.
 If the buffer is not modified, this does nothing because the file
diff --git a/src/floatfns.c b/src/floatfns.c
index 1232fc0afa1..345b3b94947 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -683,7 +683,7 @@ DEFUN ("abs", Fabs, Sabs, 1, 1, 0,
   return arg;
 }
 
-DEFUN ("float", Ffloat, Sfloat, 1, 1, 0,
+DEFUE ("float", Ffloat, Sfloat, 1, 1, 0,
        doc: /* Return the floating point number equal to ARG.  */)
   (register Lisp_Object arg)
 {
@@ -886,7 +886,7 @@ systems, but 2 on others.  */)
   return rounding_driver (arg, divisor, emacs_rint, round2, "round");
 }
 
-DEFUN ("truncate", Ftruncate, Struncate, 1, 2, 0,
+DEFUE ("truncate", Ftruncate, Struncate, 1, 2, 0,
        doc: /* Truncate a floating point number to an int.
 Rounds ARG toward zero.
 With optional DIVISOR, truncate ARG/DIVISOR.  */)
diff --git a/src/fns.c b/src/fns.c
index 09ce8c1b597..f4eaaccda33 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -61,7 +61,7 @@ static int internal_equal (Lisp_Object , Lisp_Object, int, int);
 extern long time ();
 #endif
 
-DEFUN ("identity", Fidentity, Sidentity, 1, 1, 0,
+DEFUE ("identity", Fidentity, Sidentity, 1, 1, 0,
        doc: /* Return the argument unchanged.  */)
   (Lisp_Object arg)
 {
@@ -105,7 +105,7 @@ Other values of LIMIT are ignored.  */)
 
 /* Random data-structure functions */
 
-DEFUN ("length", Flength, Slength, 1, 1, 0,
+DEFUE ("length", Flength, Slength, 1, 1, 0,
        doc: /* Return the length of vector, list or string SEQUENCE.
 A byte-code function object is also allowed.
 If the string contains multibyte characters, this is not necessarily
@@ -190,7 +190,7 @@ If STRING is multibyte, this may be greater than the length of STRING.  */)
   return make_number (SBYTES (string));
 }
 
-DEFUN ("string-equal", Fstring_equal, Sstring_equal, 2, 2, 0,
+DEFUE ("string-equal", Fstring_equal, Sstring_equal, 2, 2, 0,
        doc: /* Return t if two strings have identical contents.
 Case is significant, but text properties are ignored.
 Symbols are also allowed; their print names are used instead.  */)
@@ -210,7 +210,7 @@ Symbols are also allowed; their print names are used instead.  */)
   return Qt;
 }
 
-DEFUN ("compare-strings", Fcompare_strings, Scompare_strings, 6, 7, 0,
+DEFUE ("compare-strings", Fcompare_strings, Scompare_strings, 6, 7, 0,
        doc: /* Compare the contents of two strings, converting to multibyte if needed.
 In string STR1, skip the first START1 characters and stop at END1.
 In string STR2, skip the first START2 characters and stop at END2.
@@ -311,7 +311,7 @@ If string STR1 is greater, the value is a positive number N;
   return Qt;
 }
 
-DEFUN ("string-lessp", Fstring_lessp, Sstring_lessp, 2, 2, 0,
+DEFUE ("string-lessp", Fstring_lessp, Sstring_lessp, 2, 2, 0,
        doc: /* Return t if first arg string is less than second in lexicographic order.
 Case is significant.
 Symbols are also allowed; their print names are used instead.  */)
@@ -372,7 +372,7 @@ concat3 (Lisp_Object s1, Lisp_Object s2, Lisp_Object s3)
   return concat (3, args, Lisp_String, 0);
 }
 
-DEFUN ("append", Fappend, Sappend, 0, MANY, 0,
+DEFUE ("append", Fappend, Sappend, 0, MANY, 0,
        doc: /* Concatenate all the arguments and make the result a list.
 The result is a list whose elements are the elements of all the arguments.
 Each argument may be a list, vector or string.
@@ -383,7 +383,7 @@ usage: (append &rest SEQUENCES)  */)
   return concat (nargs, args, Lisp_Cons, 1);
 }
 
-DEFUN ("concat", Fconcat, Sconcat, 0, MANY, 0,
+DEFUE ("concat", Fconcat, Sconcat, 0, MANY, 0,
        doc: /* Concatenate all the arguments and make the result a string.
 The result is a string whose elements are the elements of all the arguments.
 Each argument may be a string or a list or vector of characters (integers).
@@ -393,7 +393,7 @@ usage: (concat &rest SEQUENCES)  */)
   return concat (nargs, args, Lisp_String, 0);
 }
 
-DEFUN ("vconcat", Fvconcat, Svconcat, 0, MANY, 0,
+DEFUE ("vconcat", Fvconcat, Svconcat, 0, MANY, 0,
        doc: /* Concatenate all the arguments and make the result a vector.
 The result is a vector whose elements are the elements of all the arguments.
 Each argument may be a list, vector or string.
@@ -404,7 +404,7 @@ usage: (vconcat &rest SEQUENCES)   */)
 }
 
 
-DEFUN ("copy-sequence", Fcopy_sequence, Scopy_sequence, 1, 1, 0,
+DEFUE ("copy-sequence", Fcopy_sequence, Scopy_sequence, 1, 1, 0,
        doc: /* Return a copy of a list, vector, string or char-table.
 The elements of a list or vector are not copied; they are shared
 with the original.  */)
@@ -944,7 +944,7 @@ string_make_unibyte (Lisp_Object string)
   return ret;
 }
 
-DEFUN ("string-make-multibyte", Fstring_make_multibyte, Sstring_make_multibyte,
+DEFUE ("string-make-multibyte", Fstring_make_multibyte, Sstring_make_multibyte,
        1, 1, 0,
        doc: /* Return the multibyte equivalent of STRING.
 If STRING is unibyte and contains non-ASCII characters, the function
@@ -962,7 +962,7 @@ string the same way whether it is unibyte or multibyte.)  */)
   return string_make_multibyte (string);
 }
 
-DEFUN ("string-make-unibyte", Fstring_make_unibyte, Sstring_make_unibyte,
+DEFUE ("string-make-unibyte", Fstring_make_unibyte, Sstring_make_unibyte,
        1, 1, 0,
        doc: /* Return the unibyte equivalent of STRING.
 Multibyte character codes are converted to unibyte according to
@@ -976,7 +976,7 @@ the low 8 bits of each character.  */)
   return string_make_unibyte (string);
 }
 
-DEFUN ("string-as-unibyte", Fstring_as_unibyte, Sstring_as_unibyte,
+DEFUE ("string-as-unibyte", Fstring_as_unibyte, Sstring_as_unibyte,
        1, 1, 0,
        doc: /* Return a unibyte string with the same individual bytes as STRING.
 If STRING is unibyte, the result is STRING itself.
@@ -1000,7 +1000,7 @@ If STRING is multibyte and contains a character of charset
   return string;
 }
 
-DEFUN ("string-as-multibyte", Fstring_as_multibyte, Sstring_as_multibyte,
+DEFUE ("string-as-multibyte", Fstring_as_multibyte, Sstring_as_multibyte,
        1, 1, 0,
        doc: /* Return a multibyte string with the same individual bytes as STRING.
 If STRING is multibyte, the result is STRING itself.
@@ -1038,7 +1038,7 @@ If you're not sure, whether to use `string-as-multibyte' or
   return string;
 }
 
-DEFUN ("string-to-multibyte", Fstring_to_multibyte, Sstring_to_multibyte,
+DEFUE ("string-to-multibyte", Fstring_to_multibyte, Sstring_to_multibyte,
        1, 1, 0,
        doc: /* Return a multibyte string with the same individual chars as STRING.
 If STRING is multibyte, the result is STRING itself.
@@ -1084,7 +1084,7 @@ an error is signaled.  */)
 }
 
 
-DEFUN ("copy-alist", Fcopy_alist, Scopy_alist, 1, 1, 0,
+DEFUE ("copy-alist", Fcopy_alist, Scopy_alist, 1, 1, 0,
        doc: /* Return a copy of ALIST.
 This is an alist which represents the same mapping from objects to objects,
 but does not share the alist structure with ALIST.
@@ -1110,7 +1110,7 @@ Elements of ALIST that are not conses are also shared.  */)
   return alist;
 }
 
-DEFUN ("substring", Fsubstring, Ssubstring, 2, 3, 0,
+DEFUE ("substring", Fsubstring, Ssubstring, 2, 3, 0,
        doc: /* Return a new string whose contents are a substring of STRING.
 The returned string consists of the characters between index FROM
 \(inclusive) and index TO (exclusive) of STRING.  FROM and TO are
@@ -1269,7 +1269,7 @@ substring_both (Lisp_Object string, EMACS_INT from, EMACS_INT from_byte,
   return res;
 }
 
-DEFUN ("nthcdr", Fnthcdr, Snthcdr, 2, 2, 0,
+DEFUE ("nthcdr", Fnthcdr, Snthcdr, 2, 2, 0,
        doc: /* Take cdr N times on LIST, return the result.  */)
   (Lisp_Object n, Lisp_Object list)
 {
@@ -1285,7 +1285,7 @@ DEFUN ("nthcdr", Fnthcdr, Snthcdr, 2, 2, 0,
   return list;
 }
 
-DEFUN ("nth", Fnth, Snth, 2, 2, 0,
+DEFUE ("nth", Fnth, Snth, 2, 2, 0,
        doc: /* Return the Nth element of LIST.
 N counts from zero.  If LIST is not that long, nil is returned.  */)
   (Lisp_Object n, Lisp_Object list)
@@ -1293,7 +1293,7 @@ N counts from zero.  If LIST is not that long, nil is returned.  */)
   return Fcar (Fnthcdr (n, list));
 }
 
-DEFUN ("elt", Felt, Selt, 2, 2, 0,
+DEFUE ("elt", Felt, Selt, 2, 2, 0,
        doc: /* Return element of SEQUENCE at index N.  */)
   (register Lisp_Object sequence, Lisp_Object n)
 {
@@ -1306,7 +1306,7 @@ DEFUN ("elt", Felt, Selt, 2, 2, 0,
   return Faref (sequence, n);
 }
 
-DEFUN ("member", Fmember, Smember, 2, 2, 0,
+DEFUE ("member", Fmember, Smember, 2, 2, 0,
        doc: /* Return non-nil if ELT is an element of LIST.  Comparison done with `equal'.
 The value is actually the tail of LIST whose car is ELT.  */)
   (register Lisp_Object elt, Lisp_Object list)
@@ -1324,7 +1324,7 @@ The value is actually the tail of LIST whose car is ELT.  */)
   return Qnil;
 }
 
-DEFUN ("memq", Fmemq, Smemq, 2, 2, 0,
+DEFUE ("memq", Fmemq, Smemq, 2, 2, 0,
        doc: /* Return non-nil if ELT is an element of LIST.  Comparison done with `eq'.
 The value is actually the tail of LIST whose car is ELT.  */)
   (register Lisp_Object elt, Lisp_Object list)
@@ -1372,7 +1372,7 @@ The value is actually the tail of LIST whose car is ELT.  */)
   return Qnil;
 }
 
-DEFUN ("assq", Fassq, Sassq, 2, 2, 0,
+DEFUE ("assq", Fassq, Sassq, 2, 2, 0,
        doc: /* Return non-nil if KEY is `eq' to the car of an element of LIST.
 The value is actually the first element of LIST whose car is KEY.
 Elements of LIST that are not conses are ignored.  */)
@@ -1418,7 +1418,7 @@ assq_no_quit (Lisp_Object key, Lisp_Object list)
   return CAR_SAFE (list);
 }
 
-DEFUN ("assoc", Fassoc, Sassoc, 2, 2, 0,
+DEFUE ("assoc", Fassoc, Sassoc, 2, 2, 0,
        doc: /* Return non-nil if KEY is `equal' to the car of an element of LIST.
 The value is actually the first element of LIST whose car equals KEY.  */)
   (Lisp_Object key, Lisp_Object list)
@@ -1469,7 +1469,7 @@ assoc_no_quit (Lisp_Object key, Lisp_Object list)
   return CONSP (list) ? XCAR (list) : Qnil;
 }
 
-DEFUN ("rassq", Frassq, Srassq, 2, 2, 0,
+DEFUE ("rassq", Frassq, Srassq, 2, 2, 0,
        doc: /* Return non-nil if KEY is `eq' to the cdr of an element of LIST.
 The value is actually the first element of LIST whose cdr is KEY.  */)
   (register Lisp_Object key, Lisp_Object list)
@@ -1500,7 +1500,7 @@ The value is actually the first element of LIST whose cdr is KEY.  */)
   return CAR (list);
 }
 
-DEFUN ("rassoc", Frassoc, Srassoc, 2, 2, 0,
+DEFUE ("rassoc", Frassoc, Srassoc, 2, 2, 0,
        doc: /* Return non-nil if KEY is `equal' to the cdr of an element of LIST.
 The value is actually the first element of LIST whose cdr equals KEY.  */)
   (Lisp_Object key, Lisp_Object list)
@@ -1536,7 +1536,7 @@ The value is actually the first element of LIST whose cdr equals KEY.  */)
   return CAR (list);
 }
 
-DEFUN ("delq", Fdelq, Sdelq, 2, 2, 0,
+DEFUE ("delq", Fdelq, Sdelq, 2, 2, 0,
        doc: /* Delete by side effect any occurrences of ELT as a member of LIST.
 The modified LIST is returned.  Comparison is done with `eq'.
 If the first member of LIST is ELT, there is no way to remove it by side effect;
@@ -1568,7 +1568,7 @@ to be sure of changing the value of `foo'.  */)
   return list;
 }
 
-DEFUN ("delete", Fdelete, Sdelete, 2, 2, 0,
+DEFUE ("delete", Fdelete, Sdelete, 2, 2, 0,
        doc: /* Delete by side effect any occurrences of ELT as a member of SEQ.
 SEQ must be a list, a vector, or a string.
 The modified SEQ is returned.  Comparison is done with `equal'.
@@ -1688,7 +1688,7 @@ to be sure of changing the value of `foo'.  */)
   return seq;
 }
 
-DEFUN ("nreverse", Fnreverse, Snreverse, 1, 1, 0,
+DEFUE ("nreverse", Fnreverse, Snreverse, 1, 1, 0,
        doc: /* Reverse LIST by modifying cdr pointers.
 Return the reversed list.  */)
   (Lisp_Object list)
@@ -1710,7 +1710,7 @@ Return the reversed list.  */)
   return prev;
 }
 
-DEFUN ("reverse", Freverse, Sreverse, 1, 1, 0,
+DEFUE ("reverse", Freverse, Sreverse, 1, 1, 0,
        doc: /* Reverse LIST, copying.  Return the reversed list.
 See also the function `nreverse', which is used more often.  */)
   (Lisp_Object list)
@@ -1728,7 +1728,7 @@ See also the function `nreverse', which is used more often.  */)
 
 Lisp_Object merge (Lisp_Object org_l1, Lisp_Object org_l2, Lisp_Object pred);
 
-DEFUN ("sort", Fsort, Ssort, 2, 2, 0,
+DEFUE ("sort", Fsort, Ssort, 2, 2, 0,
        doc: /* Sort LIST, stably, comparing elements using PREDICATE.
 Returns the sorted list.  LIST is modified by side effects.
 PREDICATE is called with two elements of LIST, and should return non-nil
@@ -1819,7 +1819,7 @@ merge (Lisp_Object org_l1, Lisp_Object org_l2, Lisp_Object pred)
 
 /* This does not check for quits.  That is safe since it must terminate.  */
 
-DEFUN ("plist-get", Fplist_get, Splist_get, 2, 2, 0,
+DEFUE ("plist-get", Fplist_get, Splist_get, 2, 2, 0,
        doc: /* Extract a value from a property list.
 PLIST is a property list, which is a list of the form
 \(PROP1 VALUE1 PROP2 VALUE2...).  This function returns the value
@@ -1852,7 +1852,7 @@ properties on the list.  This function never signals an error.  */)
   return Qnil;
 }
 
-DEFUN ("get", Fget, Sget, 2, 2, 0,
+DEFUE ("get", Fget, Sget, 2, 2, 0,
        doc: /* Return the value of SYMBOL's PROPNAME property.
 This is the last value stored with `(put SYMBOL PROPNAME VALUE)'.  */)
   (Lisp_Object symbol, Lisp_Object propname)
@@ -1861,7 +1861,7 @@ This is the last value stored with `(put SYMBOL PROPNAME VALUE)'.  */)
   return Fplist_get (XSYMBOL (symbol)->plist, propname);
 }
 
-DEFUN ("plist-put", Fplist_put, Splist_put, 3, 3, 0,
+DEFUE ("plist-put", Fplist_put, Splist_put, 3, 3, 0,
        doc: /* Change value in PLIST of PROP to VAL.
 PLIST is a property list, which is a list of the form
 \(PROP1 VALUE1 PROP2 VALUE2 ...).  PROP is a symbol and VAL is any object.
@@ -1894,7 +1894,7 @@ The PLIST is modified by side effects.  */)
   return plist;
 }
 
-DEFUN ("put", Fput, Sput, 3, 3, 0,
+DEFUE ("put", Fput, Sput, 3, 3, 0,
        doc: /* Store SYMBOL's PROPNAME property with value VALUE.
 It can be retrieved with `(get SYMBOL PROPNAME)'.  */)
   (Lisp_Object symbol, Lisp_Object propname, Lisp_Object value)
@@ -1974,7 +1974,7 @@ Floating-point numbers of equal value are `eql', but they may not be `eq'.  */)
     return EQ (obj1, obj2) ? Qt : Qnil;
 }
 
-DEFUN ("equal", Fequal, Sequal, 2, 2, 0,
+DEFUE ("equal", Fequal, Sequal, 2, 2, 0,
        doc: /* Return t if two Lisp objects have similar structure and contents.
 They must have the same data type.
 Conses are compared by comparing the cars and the cdrs.
@@ -2222,7 +2222,7 @@ nconc2 (Lisp_Object s1, Lisp_Object s2)
   return Fnconc (2, args);
 }
 
-DEFUN ("nconc", Fnconc, Snconc, 0, MANY, 0,
+DEFUE ("nconc", Fnconc, Snconc, 0, MANY, 0,
        doc: /* Concatenate any number of lists by altering them.
 Only the last argument is not altered, and need not be a list.
 usage: (nconc &rest LISTS)  */)
@@ -2342,7 +2342,7 @@ mapcar1 (EMACS_INT leni, Lisp_Object *vals, Lisp_Object fn, Lisp_Object seq)
   UNGCPRO;
 }
 
-DEFUN ("mapconcat", Fmapconcat, Smapconcat, 3, 3, 0,
+DEFUE ("mapconcat", Fmapconcat, Smapconcat, 3, 3, 0,
        doc: /* Apply FUNCTION to each element of SEQUENCE, and concat the results as strings.
 In between each pair of results, stick in SEPARATOR.  Thus, " " as
 SEPARATOR results in spaces between the values returned by FUNCTION.
@@ -2383,7 +2383,7 @@ SEQUENCE may be a list, a vector, a bool-vector, or a string.  */)
   return ret;
 }
 
-DEFUN ("mapcar", Fmapcar, Smapcar, 2, 2, 0,
+DEFUE ("mapcar", Fmapcar, Smapcar, 2, 2, 0,
        doc: /* Apply FUNCTION to each element of SEQUENCE, and make a list of the results.
 The result is a list just as long as SEQUENCE.
 SEQUENCE may be a list, a vector, a bool-vector, or a string.  */)
@@ -2561,7 +2561,7 @@ SUBFEATURE can be used to check a specific subfeature of FEATURE.  */)
   return (NILP (tem)) ? Qnil : Qt;
 }
 
-DEFUN ("provide", Fprovide, Sprovide, 1, 2, 0,
+DEFUE ("provide", Fprovide, Sprovide, 1, 2, 0,
        doc: /* Announce that FEATURE is a feature of the current Emacs.
 The optional argument SUBFEATURES should be a list of symbols listing
 particular subfeatures supported in this version of FEATURE.  */)
@@ -2699,7 +2699,7 @@ The normal messages at start and end of loading FILENAME are suppressed.  */)
    bottleneck of Widget operation.  Here is their translation to C,
    for the sole reason of efficiency.  */
 
-DEFUN ("plist-member", Fplist_member, Splist_member, 2, 2, 0,
+DEFUE ("plist-member", Fplist_member, Splist_member, 2, 2, 0,
        doc: /* Return non-nil if PLIST has the property PROP.
 PLIST is a property list, which is a list of the form
 \(PROP1 VALUE1 PROP2 VALUE2 ...\).  PROP is a symbol.
@@ -4248,7 +4248,7 @@ DEFUN ("sxhash", Fsxhash, Ssxhash, 1, 1, 0,
 }
 
 
-DEFUN ("make-hash-table", Fmake_hash_table, Smake_hash_table, 0, MANY, 0,
+DEFUE ("make-hash-table", Fmake_hash_table, Smake_hash_table, 0, MANY, 0,
        doc: /* Create and return a new hash table.
 
 Arguments are specified as keyword/argument pairs.  The following
@@ -4436,7 +4436,7 @@ DEFUN ("clrhash", Fclrhash, Sclrhash, 1, 1, 0,
 }
 
 
-DEFUN ("gethash", Fgethash, Sgethash, 2, 3, 0,
+DEFUE ("gethash", Fgethash, Sgethash, 2, 3, 0,
        doc: /* Look up KEY in TABLE and return its associated value.
 If KEY is not found, return DFLT which defaults to nil.  */)
   (Lisp_Object key, Lisp_Object table, Lisp_Object dflt)
@@ -4447,7 +4447,7 @@ If KEY is not found, return DFLT which defaults to nil.  */)
 }
 
 
-DEFUN ("puthash", Fputhash, Sputhash, 3, 3, 0,
+DEFUE ("puthash", Fputhash, Sputhash, 3, 3, 0,
        doc: /* Associate KEY with VALUE in hash table TABLE.
 If KEY is already present in table, replace its current value with
 VALUE.  */)
@@ -4467,7 +4467,7 @@ VALUE.  */)
 }
 
 
-DEFUN ("remhash", Fremhash, Sremhash, 2, 2, 0,
+DEFUE ("remhash", Fremhash, Sremhash, 2, 2, 0,
        doc: /* Remove KEY from TABLE.  */)
   (Lisp_Object key, Lisp_Object table)
 {
diff --git a/src/font.c b/src/font.c
index e01f67a95f6..a31a418e641 100644
--- a/src/font.c
+++ b/src/font.c
@@ -3762,7 +3762,7 @@ which kind of font it is.  It must be one of `font-spec', `font-entity',
   wrong_type_argument (intern ("font-extra-type"), extra_type);
 }
 
-DEFUN ("font-spec", Ffont_spec, Sfont_spec, 0, MANY, 0,
+DEFUE ("font-spec", Ffont_spec, Sfont_spec, 0, MANY, 0,
        doc: /* Return a newly created font-spec with arguments as properties.
 
 ARGS must come in pairs KEY VALUE of font properties.  KEY must be a
@@ -3866,7 +3866,7 @@ usage: (font-spec ARGS...)  */)
   return spec;
 }
 
-DEFUN ("copy-font-spec", Fcopy_font_spec, Scopy_font_spec, 1, 1, 0,
+DEFUE ("copy-font-spec", Fcopy_font_spec, Scopy_font_spec, 1, 1, 0,
        doc: /* Return a copy of FONT as a font-spec.  */)
   (Lisp_Object font)
 {
@@ -3892,7 +3892,7 @@ DEFUN ("copy-font-spec", Fcopy_font_spec, Scopy_font_spec, 1, 1, 0,
   return new_spec;
 }
 
-DEFUN ("merge-font-spec", Fmerge_font_spec, Smerge_font_spec, 2, 2, 0,
+DEFUE ("merge-font-spec", Fmerge_font_spec, Smerge_font_spec, 2, 2, 0,
        doc: /* Merge font-specs FROM and TO, and return a new font-spec.
 Every specified properties in FROM override the corresponding
 properties in TO.  */)
@@ -3921,7 +3921,7 @@ properties in TO.  */)
   return to;
 }
 
-DEFUN ("font-get", Ffont_get, Sfont_get, 2, 2, 0,
+DEFUE ("font-get", Ffont_get, Sfont_get, 2, 2, 0,
        doc: /* Return the value of FONT's property KEY.
 FONT is a font-spec, a font-entity, or a font-object.
 KEY is any symbol, but these are reserved for specific meanings:
@@ -4053,7 +4053,7 @@ are to be displayed on.  If omitted, the selected frame is used.  */)
 
 #endif
 
-DEFUN ("font-put", Ffont_put, Sfont_put, 3, 3, 0,
+DEFUE ("font-put", Ffont_put, Sfont_put, 3, 3, 0,
        doc: /* Set one property of FONT: give property KEY value VAL.
 FONT is a font-spec, a font-entity, or a font-object.
 
@@ -4087,7 +4087,7 @@ accepted by `font-spec'.  */)
   return val;
 }
 
-DEFUN ("list-fonts", Flist_fonts, Slist_fonts, 1, 4, 0,
+DEFUE ("list-fonts", Flist_fonts, Slist_fonts, 1, 4, 0,
        doc: /* List available fonts matching FONT-SPEC on the current frame.
 Optional 2nd argument FRAME specifies the target frame.
 Optional 3rd argument NUM, if non-nil, limits the number of returned fonts.
@@ -4181,7 +4181,7 @@ Optional 2nd argument FRAME, if non-nil, specifies the target frame.  */)
   return val;
 }
 
-DEFUN ("font-xlfd-name", Ffont_xlfd_name, Sfont_xlfd_name, 1, 2, 0,
+DEFUE ("font-xlfd-name", Ffont_xlfd_name, Sfont_xlfd_name, 1, 2, 0,
        doc: /*  Return XLFD name of FONT.
 FONT is a font-spec, font-entity, or font-object.
 If the name is too long for XLFD (maximum 255 chars), return nil.
@@ -4403,7 +4403,7 @@ where
 
 #if 0
 
-DEFUN ("font-drive-otf", Ffont_drive_otf, Sfont_drive_otf, 6, 6, 0,
+DEFUE ("font-drive-otf", Ffont_drive_otf, Sfont_drive_otf, 6, 6, 0,
        doc: /* Apply OpenType features on glyph-string GSTRING-IN.
 OTF-FEATURES specifies which features to apply in this format:
   (SCRIPT LANGSYS GSUB GPOS)
@@ -4473,7 +4473,7 @@ glyph-string.  */)
   return make_number (num);
 }
 
-DEFUN ("font-otf-alternates", Ffont_otf_alternates, Sfont_otf_alternates,
+DEFUE ("font-otf-alternates", Ffont_otf_alternates, Sfont_otf_alternates,
        3, 3, 0,
        doc: /* Return a list of alternate glyphs of CHARACTER in FONT-OBJECT.
 OTF-FEATURES specifies which features of the font FONT-OBJECT to apply
diff --git a/src/fontset.c b/src/fontset.c
index eea65535c78..4a9cc9393bf 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1172,7 +1172,7 @@ fs_query_fontset (Lisp_Object name, int name_pattern)
 }
 
 
-DEFUN ("query-fontset", Fquery_fontset, Squery_fontset, 1, 2, 0,
+DEFUE ("query-fontset", Fquery_fontset, Squery_fontset, 1, 2, 0,
        doc: /* Return the name of a fontset that matches PATTERN.
 The value is nil if there is no matching fontset.
 PATTERN can contain `*' or `?' as a wildcard
@@ -2138,7 +2138,7 @@ dump_fontset (Lisp_Object fontset)
   return vec;
 }
 
-DEFUN ("fontset-list-all", Ffontset_list_all, Sfontset_list_all, 0, 0, 0,
+DEFUE ("fontset-list-all", Ffontset_list_all, Sfontset_list_all, 0, 0, 0,
        doc: /* Return a brief summary of all fontsets for debug use.  */)
   (void)
 {
diff --git a/src/frame.c b/src/frame.c
index 1b6d36092ae..6e0e9c4ffc0 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -225,7 +225,7 @@ return values.  */)
           : Qnil);
 }
 
-DEFUN ("window-system", Fwindow_system, Swindow_system, 0, 1, 0,
+DEFUE ("window-system", Fwindow_system, Swindow_system, 0, 1, 0,
        doc: /* The name of the window system that FRAME is displaying through.
 The value is a symbol:
  nil for a termcap frame (a character-only terminal),
@@ -856,7 +856,7 @@ do_switch_frame (Lisp_Object frame, int track, int for_deletion, Lisp_Object nor
   return frame;
 }
 
-DEFUN ("select-frame", Fselect_frame, Sselect_frame, 1, 2, "e",
+DEFUE ("select-frame", Fselect_frame, Sselect_frame, 1, 2, "e",
        doc: /* Select FRAME.
 Subsequent editing commands apply to its selected window.
 Optional argument NORECORD means to neither change the order of
@@ -894,14 +894,14 @@ to that frame.  */)
   return do_switch_frame (event, 0, 0, Qnil);
 }
 
-DEFUN ("selected-frame", Fselected_frame, Sselected_frame, 0, 0, 0,
+DEFUE ("selected-frame", Fselected_frame, Sselected_frame, 0, 0, 0,
        doc: /* Return the frame that is now selected.  */)
   (void)
 {
   return selected_frame;
 }
 
-DEFUN ("window-frame", Fwindow_frame, Swindow_frame, 1, 1, 0,
+DEFUE ("window-frame", Fwindow_frame, Swindow_frame, 1, 1, 0,
        doc: /* Return the frame object that window WINDOW is on.  */)
   (Lisp_Object window)
 {
@@ -909,7 +909,7 @@ DEFUN ("window-frame", Fwindow_frame, Swindow_frame, 1, 1, 0,
   return XWINDOW (window)->frame;
 }
 
-DEFUN ("frame-first-window", Fframe_first_window, Sframe_first_window, 0, 1, 0,
+DEFUE ("frame-first-window", Fframe_first_window, Sframe_first_window, 0, 1, 0,
        doc: /* Returns the topmost, leftmost window of FRAME.
 If omitted, FRAME defaults to the currently selected frame.  */)
   (Lisp_Object frame)
@@ -943,7 +943,7 @@ DEFUN ("active-minibuffer-window", Factive_minibuffer_window,
   return minibuf_level ? minibuf_window : Qnil;
 }
 
-DEFUN ("frame-root-window", Fframe_root_window, Sframe_root_window, 0, 1, 0,
+DEFUE ("frame-root-window", Fframe_root_window, Sframe_root_window, 0, 1, 0,
        doc: /* Returns the root-window of FRAME.
 If omitted, FRAME defaults to the currently selected frame.  */)
   (Lisp_Object frame)
@@ -980,7 +980,7 @@ FRAME defaults to the currently selected frame.  */)
   return window;
 }
 
-DEFUN ("set-frame-selected-window", Fset_frame_selected_window,
+DEFUE ("set-frame-selected-window", Fset_frame_selected_window,
        Sset_frame_selected_window, 2, 3, 0,
        doc: /* Set selected window of FRAME to WINDOW.
 If FRAME is nil, use the selected frame.  If FRAME is the
@@ -1776,7 +1776,7 @@ before calling this function on it, like this.
 
 static void make_frame_visible_1 (Lisp_Object);
 
-DEFUN ("make-frame-visible", Fmake_frame_visible, Smake_frame_visible,
+DEFUE ("make-frame-visible", Fmake_frame_visible, Smake_frame_visible,
        0, 1, "",
        doc: /* Make the frame FRAME visible (assuming it is an X window).
 If omitted, FRAME defaults to the currently selected frame.  */)
@@ -1876,7 +1876,7 @@ displayed in the terminal.  */)
   return Qnil;
 }
 
-DEFUN ("iconify-frame", Ficonify_frame, Siconify_frame,
+DEFUE ("iconify-frame", Ficonify_frame, Siconify_frame,
        0, 1, "",
        doc: /* Make the frame FRAME into an icon.
 If omitted, FRAME defaults to the currently selected frame.  */)
@@ -1961,7 +1961,7 @@ DEFUN ("visible-frame-list", Fvisible_frame_list, Svisible_frame_list,
 }
 
 
-DEFUN ("raise-frame", Fraise_frame, Sraise_frame, 0, 1, "",
+DEFUE ("raise-frame", Fraise_frame, Sraise_frame, 0, 1, "",
        doc: /* Bring FRAME to the front, so it occludes any frames it overlaps.
 If FRAME is invisible or iconified, make it visible.
 If you don't specify a frame, the selected frame is used.
@@ -2014,7 +2014,7 @@ doesn't support multiple overlapping frames, this function does nothing.  */)
 }
 
 
-DEFUN ("redirect-frame-focus", Fredirect_frame_focus, Sredirect_frame_focus,
+DEFUE ("redirect-frame-focus", Fredirect_frame_focus, Sredirect_frame_focus,
        1, 2, 0,
        doc: /* Arrange for keystrokes typed at FRAME to be sent to FOCUS-FRAME.
 In other words, switch-frame events caused by events in FRAME will
@@ -2392,7 +2392,7 @@ If FRAME is omitted, return information on the currently selected frame.  */)
 }
 
 
-DEFUN ("frame-parameter", Fframe_parameter, Sframe_parameter, 2, 2, 0,
+DEFUE ("frame-parameter", Fframe_parameter, Sframe_parameter, 2, 2, 0,
        doc: /* Return FRAME's value for parameter PARAMETER.
 If FRAME is nil, describe the currently selected frame.  */)
   (Lisp_Object frame, Lisp_Object parameter)
@@ -2470,7 +2470,7 @@ If FRAME is nil, describe the currently selected frame.  */)
 }
 
 
-DEFUN ("modify-frame-parameters", Fmodify_frame_parameters,
+DEFUE ("modify-frame-parameters", Fmodify_frame_parameters,
        Smodify_frame_parameters, 2, 2, 0,
        doc: /* Modify the parameters of frame FRAME according to ALIST.
 If FRAME is nil, it defaults to the selected frame.
diff --git a/src/image.c b/src/image.c
index b3d2be88b96..20ca3cf1d6b 100644
--- a/src/image.c
+++ b/src/image.c
@@ -137,6 +137,7 @@ static void free_color_table (void);
 static unsigned long *colors_in_color_table (int *n);
 static unsigned long lookup_pixel_color (struct frame *f, unsigned long p);
 #endif
+INFUN (Finit_image_library, 2);
 
 /* Code to deal with bitmaps.  Bitmaps are referenced by their bitmap
    id, which is just an int that this section returns.  Bitmaps are
@@ -7869,7 +7870,7 @@ static struct image_type imagemagick_type =
   };
 
 
-DEFUN ("imagemagick-types", Fimagemagick_types, Simagemagick_types, 0, 0, 0,
+DEFUE ("imagemagick-types", Fimagemagick_types, Simagemagick_types, 0, 0, 0,
        doc: /* Return the image types supported by ImageMagick.
 Note that ImageMagick recognizes many file-types that Emacs does not recognize
 as images, such as .c.  */)
@@ -8580,7 +8581,7 @@ x_kill_gs_process (Pixmap pixmap, struct frame *f)
 
 #if GLYPH_DEBUG
 
-DEFUN ("imagep", Fimagep, Simagep, 1, 1, 0,
+DEFUE ("imagep", Fimagep, Simagep, 1, 1, 0,
        doc: /* Value is non-nil if SPEC is a valid image specification.  */)
   (Lisp_Object spec)
 {
@@ -8588,7 +8589,7 @@ DEFUN ("imagep", Fimagep, Simagep, 1, 1, 0,
 }
 
 
-DEFUN ("lookup-image", Flookup_image, Slookup_image, 1, 1, 0, "")
+DEFUE ("lookup-image", Flookup_image, Slookup_image, 1, 1, 0, "")
   (Lisp_Object spec)
 {
   int id = -1;
diff --git a/src/indent.c b/src/indent.c
index 8732b2ca5cc..84476e7bbdb 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -796,7 +796,7 @@ string_display_width (string, beg, end)
 #endif /* 0 */
 
 
-DEFUN ("indent-to", Findent_to, Sindent_to, 1, 2, "NIndent to column: ",
+DEFUE ("indent-to", Findent_to, Sindent_to, 1, 2, "NIndent to column: ",
        doc: /* Indent from point with tabs and spaces until COLUMN is reached.
 Optional second argument MINIMUM says always do at least MINIMUM spaces
 even if that goes past COLUMN; by default, MINIMUM is zero.
@@ -967,7 +967,7 @@ indented_beyond_p (EMACS_INT pos, EMACS_INT pos_byte, EMACS_INT column)
   return val >= column;
 }
 
-DEFUN ("move-to-column", Fmove_to_column, Smove_to_column, 1, 2, "p",
+DEFUE ("move-to-column", Fmove_to_column, Smove_to_column, 1, 2, "p",
        doc: /* Move point to column COLUMN in the current line.
 Interactively, COLUMN is the value of prefix numeric argument.
 The column of a character is calculated by adding together the widths
@@ -1959,7 +1959,7 @@ vmotion (register EMACS_INT from, register EMACS_INT vtarget, struct window *w)
                          w);
 }
 
-DEFUN ("vertical-motion", Fvertical_motion, Svertical_motion, 1, 2, 0,
+DEFUE ("vertical-motion", Fvertical_motion, Svertical_motion, 1, 2, 0,
        doc: /* Move point to start of the screen line LINES lines down.
 If LINES is negative, this means moving up.
 
diff --git a/src/insdel.c b/src/insdel.c
index 4bdcb4bc0b7..dd7e3c14335 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -48,7 +48,7 @@ static void adjust_markers_for_replace (EMACS_INT, EMACS_INT, EMACS_INT,
                                         EMACS_INT, EMACS_INT, EMACS_INT);
 static void adjust_point (EMACS_INT nchars, EMACS_INT nbytes);
 
-Lisp_Object Fcombine_after_change_execute (void);
+INFUN (Fcombine_after_change_execute, 0);
 
 /* List of elements of the form (BEG-UNCHANGED END-UNCHANGED CHANGE-AMOUNT)
    describing changes which happened while combine_after_change_calls
diff --git a/src/intervals.h b/src/intervals.h
index d7c34012e1f..b2d755036ba 100644
--- a/src/intervals.h
+++ b/src/intervals.h
@@ -315,10 +315,10 @@ EXFUN (Fget_char_property, 3);
 EXFUN (Fget_text_property, 3);
 EXFUN (Ftext_properties_at, 2);
 EXFUN (Fnext_property_change, 3);
-EXFUN (Fprevious_property_change, 3);
 EXFUN (Fadd_text_properties, 4);
 EXFUN (Fset_text_properties, 4);
 EXFUN (Fremove_text_properties, 4);
+EXFUN (Fremove_list_of_text_properties, 4);
 EXFUN (Ftext_property_any, 5);
 EXFUN (Fprevious_single_char_property_change, 4);
 extern Lisp_Object copy_text_properties (Lisp_Object, Lisp_Object,
diff --git a/src/keyboard.c b/src/keyboard.c
index 5df4f1b1ff4..97989fc1c15 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -350,7 +350,6 @@ Lisp_Object Qvertical_scroll_bar;
 Lisp_Object Qmenu_bar;
 
 Lisp_Object recursive_edit_unwind (Lisp_Object buffer), command_loop (void);
-Lisp_Object Fthis_command_keys (void);
 Lisp_Object Qextended_command_history;
 EMACS_TIME timer_check (void);
 
@@ -439,6 +438,7 @@ static void interrupt_signal (int signalnum);
 #ifdef SIGIO
 static void input_available_signal (int signo);
 #endif
+INFUN (Fcommand_execute, 4);
 static void handle_interrupt (void);
 static void timer_start_idle (void);
 static void timer_stop_idle (void);
@@ -758,7 +758,7 @@ force_auto_save_soon (void)
   record_asynch_buffer_change ();
 }
 
-DEFUN ("recursive-edit", Frecursive_edit, Srecursive_edit, 0, 0, "",
+DEFUE ("recursive-edit", Frecursive_edit, Srecursive_edit, 0, 0, "",
        doc: /* Invoke the editor command loop recursively.
 To get out of the recursive edit, a command can do `(throw 'exit nil)';
 that tells this function to return.
@@ -1152,7 +1152,7 @@ top_level_1 (Lisp_Object ignore)
   return Qnil;
 }
 
-DEFUN ("top-level", Ftop_level, Stop_level, 0, 0, "",
+DEFUE ("top-level", Ftop_level, Stop_level, 0, 0, "",
        doc: /* Exit all recursive editing levels.
 This also exits all active minibuffers.  */)
   (void)
@@ -1170,7 +1170,7 @@ This also exits all active minibuffers.  */)
   Fthrow (Qtop_level, Qnil);
 }
 
-Lisp_Object Fexit_recursive_edit (void) NO_RETURN;
+INFUN (Fexit_recursive_edit, 0) NO_RETURN;
 DEFUN ("exit-recursive-edit", Fexit_recursive_edit, Sexit_recursive_edit, 0, 0, "",
        doc: /* Exit from the innermost recursive edit or minibuffer.  */)
   (void)
@@ -1181,7 +1181,7 @@ DEFUN ("exit-recursive-edit", Fexit_recursive_edit, Sexit_recursive_edit, 0, 0,
   error ("No recursive edit is in progress");
 }
 
-Lisp_Object Fabort_recursive_edit (void) NO_RETURN;
+INFUN (Fabort_recursive_edit, 0) NO_RETURN;
 DEFUN ("abort-recursive-edit", Fabort_recursive_edit, Sabort_recursive_edit, 0, 0, "",
        doc: /* Abort the command that requested this recursive edit or minibuffer input.  */)
   (void)
@@ -6470,7 +6470,7 @@ modify_event_symbol (EMACS_INT symbol_num, unsigned int modifiers, Lisp_Object s
    such as (ctrl meta backspace), into the usual representation of that
    event type as a number or a symbol.  */
 
-DEFUN ("event-convert-list", Fevent_convert_list, Sevent_convert_list, 1, 1, 0,
+DEFUE ("event-convert-list", Fevent_convert_list, Sevent_convert_list, 1, 1, 0,
        doc: /* Convert the event description list EVENT-DESC to an event type.
 EVENT-DESC should contain one base event type (a character or symbol)
 and zero or more modifier names (control, meta, hyper, super, shift, alt,
@@ -9981,7 +9981,7 @@ read_key_sequence (Lisp_Object *keybuf, size_t bufsize, Lisp_Object prompt,
   return t;
 }
 
-DEFUN ("read-key-sequence", Fread_key_sequence, Sread_key_sequence, 1, 5, 0,
+DEFUE ("read-key-sequence", Fread_key_sequence, Sread_key_sequence, 1, 5, 0,
        doc: /* Read a sequence of keystrokes and return as a string or vector.
 The sequence is sufficient to specify a non-prefix command in the
 current local and global maps.
@@ -10609,7 +10609,7 @@ If FILE is nil, close any open dribble file.  */)
   return Qnil;
 }
 
-DEFUN ("discard-input", Fdiscard_input, Sdiscard_input, 0, 0, 0,
+DEFUE ("discard-input", Fdiscard_input, Sdiscard_input, 0, 0, 0,
        doc: /* Discard the contents of the terminal input buffer.
 Also end any kbd macro being defined.  */)
   (void)
@@ -10962,7 +10962,8 @@ quit_throw_to_read_char (void)
   _longjmp (getcjmp, 1);
 }
 
-DEFUN ("set-input-interrupt-mode", Fset_input_interrupt_mode, Sset_input_interrupt_mode, 1, 1, 0,
+DEFUE ("set-input-interrupt-mode", Fset_input_interrupt_mode,
+       Sset_input_interrupt_mode, 1, 1, 0,
        doc: /* Set interrupt mode of reading keyboard input.
 If INTERRUPT is non-nil, Emacs will use input interrupts;
 otherwise Emacs uses CBREAK mode.
@@ -11127,7 +11128,7 @@ See also `current-input-mode'.  */)
   return Qnil;
 }
 
-DEFUN ("set-input-mode", Fset_input_mode, Sset_input_mode, 3, 4, 0,
+DEFUE ("set-input-mode", Fset_input_mode, Sset_input_mode, 3, 4, 0,
        doc: /* Set mode of reading keyboard input.
 First arg INTERRUPT non-nil means use input interrupts;
  nil means use CBREAK mode.
diff --git a/src/keymap.c b/src/keymap.c
index 10000b935aa..9adf2898736 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -70,6 +70,7 @@ static Lisp_Object where_is_cache;
 /* Which keymaps are reverse-stored in the cache.  */
 static Lisp_Object where_is_cache_keymaps;
 
+INFUN (Flookup_key, 3);
 static Lisp_Object store_in_keymap (Lisp_Object, Lisp_Object, Lisp_Object);
 static void fix_submap_inheritance (Lisp_Object, Lisp_Object, Lisp_Object);
 
@@ -108,7 +109,7 @@ in case you use it as a menu with `x-popup-menu'.  */)
                 Fcons (Fmake_char_table (Qkeymap, Qnil), tail));
 }
 
-DEFUN ("make-sparse-keymap", Fmake_sparse_keymap, Smake_sparse_keymap, 0, 1, 0,
+DEFUE ("make-sparse-keymap", Fmake_sparse_keymap, Smake_sparse_keymap, 0, 1, 0,
        doc: /* Construct and return a new sparse keymap.
 Its car is `keymap' and its cdr is an alist of (CHAR . DEFINITION),
 which binds the character CHAR to DEFINITION, or (SYMBOL . DEFINITION),
@@ -160,7 +161,7 @@ is also allowed as an element.  */)
   return (KEYMAPP (object) ? Qt : Qnil);
 }
 
-DEFUN ("keymap-prompt", Fkeymap_prompt, Skeymap_prompt, 1, 1, 0,
+DEFUE ("keymap-prompt", Fkeymap_prompt, Skeymap_prompt, 1, 1, 0,
        doc: /* Return the prompt-string of a keymap MAP.
 If non-nil, the prompt is shown in the echo-area
 when reading a key-sequence to be looked-up in this keymap.  */)
@@ -291,7 +292,7 @@ keymap_memberp (Lisp_Object map, Lisp_Object maps)
 
 /* Set the parent keymap of MAP to PARENT.  */
 
-DEFUN ("set-keymap-parent", Fset_keymap_parent, Sset_keymap_parent, 2, 2, 0,
+DEFUE ("set-keymap-parent", Fset_keymap_parent, Sset_keymap_parent, 2, 2, 0,
        doc: /* Modify KEYMAP to set its parent map to PARENT.
 Return PARENT.  PARENT should be nil or another keymap.  */)
   (Lisp_Object keymap, Lisp_Object parent)
@@ -955,7 +956,7 @@ store_in_keymap (Lisp_Object keymap, register Lisp_Object idx, Lisp_Object def)
   return def;
 }
 
-EXFUN (Fcopy_keymap, 1);
+INFUN (Fcopy_keymap, 1);
 
 static Lisp_Object
 copy_keymap_item (Lisp_Object elt)
@@ -1079,7 +1080,7 @@ is not copied.  */)
 
 /* GC is possible in this function if it autoloads a keymap.  */
 
-DEFUN ("define-key", Fdefine_key, Sdefine_key, 3, 3, 0,
+DEFUE ("define-key", Fdefine_key, Sdefine_key, 3, 3, 0,
        doc: /* In KEYMAP, define key sequence KEY as DEF.
 KEYMAP is a keymap.
 
@@ -1210,7 +1211,7 @@ binding KEY to DEF is added at the front of KEYMAP.  */)
 
 /* This function may GC (it calls Fkey_binding).  */
 
-DEFUN ("command-remapping", Fcommand_remapping, Scommand_remapping, 1, 3, 0,
+DEFUE ("command-remapping", Fcommand_remapping, Scommand_remapping, 1, 3, 0,
        doc: /* Return the remapping for command COMMAND.
 Returns nil if COMMAND is not remapped (or not a symbol).
 
@@ -1518,7 +1519,7 @@ current_minor_maps (Lisp_Object **modeptr, Lisp_Object **mapptr)
   return i;
 }
 
-DEFUN ("current-active-maps", Fcurrent_active_maps, Scurrent_active_maps,
+DEFUE ("current-active-maps", Fcurrent_active_maps, Scurrent_active_maps,
        0, 2, 0,
        doc: /* Return a list of the currently active keymaps.
 OLP if non-nil indicates that we should obey `overriding-local-map' and
@@ -1661,7 +1662,7 @@ like in the respective argument of `key-binding'. */)
 
 /* GC is possible in this function if it autoloads a keymap.  */
 
-DEFUN ("key-binding", Fkey_binding, Skey_binding, 1, 4, 0,
+DEFUE ("key-binding", Fkey_binding, Skey_binding, 1, 4, 0,
        doc: /* Return the binding for command KEY in current keymaps.
 KEY is a string or vector, a sequence of keystrokes.
 The binding is probably a symbol with a function definition.
@@ -2178,7 +2179,7 @@ Lisp_Object Qsingle_key_description, Qkey_description;
 
 /* This function cannot GC.  */
 
-DEFUN ("key-description", Fkey_description, Skey_description, 1, 2, 0,
+DEFUE ("key-description", Fkey_description, Skey_description, 1, 2, 0,
        doc: /* Return a pretty description of key-sequence KEYS.
 Optional arg PREFIX is the sequence of keys leading up to KEYS.
 Control characters turn into "C-foo" sequences, meta into "M-foo",
@@ -2397,7 +2398,7 @@ push_key_description (register unsigned int c, register char *p, int force_multi
 
 /* This function cannot GC.  */
 
-DEFUN ("single-key-description", Fsingle_key_description,
+DEFUE ("single-key-description", Fsingle_key_description,
        Ssingle_key_description, 1, 2, 0,
        doc: /* Return a pretty description of command character KEY.
 Control characters turn into C-whatever, etc.
@@ -2675,7 +2676,7 @@ where_is_internal (Lisp_Object definition, Lisp_Object keymaps,
 
 /* This function can GC if Flookup_key autoloads any keymaps.  */
 
-DEFUN ("where-is-internal", Fwhere_is_internal, Swhere_is_internal, 1, 5, 0,
+DEFUE ("where-is-internal", Fwhere_is_internal, Swhere_is_internal, 1, 5, 0,
        doc: /* Return list of keys that invoke DEFINITION.
 If KEYMAP is a keymap, search only KEYMAP and the global keymap.
 If KEYMAP is nil, search all the currently active keymaps.
diff --git a/src/keymap.h b/src/keymap.h
index 38c6e986784..2b9d58b39dc 100644
--- a/src/keymap.h
+++ b/src/keymap.h
@@ -27,7 +27,6 @@ extern Lisp_Object current_global_map;
 EXFUN (Fmake_sparse_keymap, 1);
 EXFUN (Fkeymap_prompt, 1);
 EXFUN (Fdefine_key, 3);
-EXFUN (Flookup_key, 3);
 EXFUN (Fcommand_remapping, 3);
 EXFUN (Fkey_binding, 4);
 EXFUN (Fkey_description, 2);
@@ -53,4 +52,3 @@ extern void map_keymap_canonical (Lisp_Object map,
                                   Lisp_Object args, void *data);
 
 #endif
-
diff --git a/src/lisp.h b/src/lisp.h
index 4859862c88f..6a28a0f81b3 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1804,8 +1804,12 @@ typedef struct {
  `doc' is documentation for the user.  */
 
 /* This version of DEFUN declares a function prototype with the right
-   arguments, so we can catch errors with maxargs at compile-time.  */
-#define DEFUN(lname, fnname, sname, minargs, maxargs, intspec, doc)     \
+   arguments, so we can catch errors with maxargs at compile-time.
+   DEFUN defines an internal function, and DEFUE is similar but defines a
+   external function, which can be used in other C-language modules.  */
+#define DEFUN static DEFINE_FUNC
+#define DEFUE extern DEFINE_FUNC
+#define DEFINE_FUNC(lname, fnname, sname, minargs, maxargs, intspec, doc) \
   Lisp_Object fnname DEFUN_ARGS_ ## maxargs ;                           \
   DECL_ALIGN (struct Lisp_Subr, sname) =                                \
     { PVEC_SUBR | (sizeof (struct Lisp_Subr) / sizeof (EMACS_INT)),     \
@@ -2279,6 +2283,8 @@ void staticpro (Lisp_Object *);
    appropriate prototype.  */
 #define EXFUN(fnname, maxargs) \
   extern Lisp_Object fnname DEFUN_ARGS_ ## maxargs
+#define INFUN(fnname, maxargs) \
+  static Lisp_Object fnname DEFUN_ARGS_ ## maxargs
 
 /* Forward declarations for prototypes.  */
 struct window;
@@ -2404,7 +2410,6 @@ extern void init_coding_once (void);
 extern void syms_of_coding (void);
 
 /* Defined in character.c */
-EXFUN (Funibyte_char_to_multibyte, 1);
 EXFUN (Fchar_width, 1);
 EXFUN (Fstring, MANY);
 extern EMACS_INT chars_in_text (const unsigned char *, EMACS_INT);
@@ -2428,7 +2433,6 @@ extern void syms_of_composite (void);
 EXFUN (Fforward_word, 1);
 EXFUN (Fskip_chars_forward, 2);
 EXFUN (Fskip_chars_backward, 2);
-EXFUN (Fsyntax_table_p, 1);
 extern void init_syntax_once (void);
 extern void syms_of_syntax (void);
 
@@ -2529,7 +2533,6 @@ extern void init_fringe_once (void);
 extern Lisp_Object QCascent, QCmargin, QCrelief, Qcount, Qextension_data;
 extern Lisp_Object QCconversion, QCcolor_symbols, QCheuristic_mask;
 extern Lisp_Object QCindex, QCmatrix, QCcolor_adjustment, QCmask;
-EXFUN (Finit_image_library, 2);
 extern int x_bitmap_mask (struct frame *, int);
 extern void syms_of_image (void);
 extern void init_image (void);
@@ -2790,11 +2793,11 @@ EXFUN (Fread, 1);
 EXFUN (Fread_from_string, 3);
 EXFUN (Fintern, 2);
 EXFUN (Fintern_soft, 2);
+EXFUN (Funintern, 2);
 EXFUN (Fload, 5);
 EXFUN (Fget_load_suffixes, 0);
 EXFUN (Fread_char, 3);
 EXFUN (Fread_event, 3);
-EXFUN (Feval_region, 4);
 extern Lisp_Object check_obarray (Lisp_Object);
 extern Lisp_Object intern (const char *);
 extern Lisp_Object intern_c_string (const char *);
@@ -2852,7 +2855,6 @@ EXFUN (Feval, 2);
 extern Lisp_Object eval_sub (Lisp_Object form);
 EXFUN (Fapply, MANY);
 EXFUN (Ffuncall, MANY);
-EXFUN (Fbacktrace, 0);
 extern Lisp_Object apply1 (Lisp_Object, Lisp_Object);
 extern Lisp_Object call0 (Lisp_Object);
 extern Lisp_Object call1 (Lisp_Object, Lisp_Object);
@@ -2877,7 +2879,6 @@ extern void verror (const char *, va_list)
   NO_RETURN ATTRIBUTE_FORMAT_PRINTF (1, 0);
 extern void do_autoload (Lisp_Object, Lisp_Object);
 extern Lisp_Object un_autoload (Lisp_Object);
-EXFUN (Ffetch_bytecode, 1);
 extern void init_eval_once (void);
 extern Lisp_Object safe_call (size_t, Lisp_Object *);
 extern Lisp_Object safe_call1 (Lisp_Object, Lisp_Object);
@@ -2921,6 +2922,7 @@ EXFUN (Fwiden, 0);
 EXFUN (Fuser_login_name, 1);
 EXFUN (Fsystem_name, 0);
 EXFUN (Fcurrent_time, 0);
+EXFUN (Fget_internal_run_time, 0);
 extern EMACS_INT clip_to_bounds (EMACS_INT, EMACS_INT, EMACS_INT);
 extern Lisp_Object make_buffer_string (EMACS_INT, EMACS_INT, int);
 extern Lisp_Object make_buffer_string_both (EMACS_INT, EMACS_INT, EMACS_INT,
@@ -2953,7 +2955,6 @@ EXFUN (Fset_buffer, 1);
 extern Lisp_Object set_buffer_if_live (Lisp_Object);
 EXFUN (Fbarf_if_buffer_read_only, 0);
 EXFUN (Fcurrent_buffer, 0);
-EXFUN (Fswitch_to_buffer, 2);
 EXFUN (Fother_buffer, 3);
 EXFUN (Foverlay_get, 2);
 EXFUN (Fbuffer_modified_p, 1);
@@ -3018,7 +3019,6 @@ EXFUN (Funhandled_file_name_directory, 1);
 EXFUN (Ffile_directory_p, 1);
 EXFUN (Fwrite_region, 7);
 EXFUN (Ffile_readable_p, 1);
-EXFUN (Ffile_executable_p, 1);
 EXFUN (Fread_file_name, 6);
 extern Lisp_Object close_file_unwind (Lisp_Object);
 extern Lisp_Object restore_point_unwind (Lisp_Object);
@@ -3026,7 +3026,6 @@ extern void report_file_error (const char *, Lisp_Object) NO_RETURN;
 extern int internal_delete_file (Lisp_Object);
 extern void syms_of_fileio (void);
 extern Lisp_Object make_temp_name (Lisp_Object, int);
-EXFUN (Fmake_symbolic_link, 3);
 extern Lisp_Object Qdelete_file;
 
 /* Defined in abbrev.c */
@@ -3119,7 +3118,6 @@ extern int input_pending;
 EXFUN (Fdiscard_input, 0);
 EXFUN (Frecursive_edit, 0);
 EXFUN (Ftop_level, 0) NO_RETURN;
-EXFUN (Fcommand_execute, 4);
 extern Lisp_Object menu_bar_items (Lisp_Object);
 extern Lisp_Object tool_bar_items (Lisp_Object, int *);
 extern Lisp_Object Qvertical_scroll_bar;
@@ -3221,7 +3219,6 @@ extern int running_asynch_code;
 
 /* Defined in process.c */
 extern Lisp_Object QCtype, Qlocal;
-EXFUN (Fget_process, 1);
 EXFUN (Fget_buffer_process, 1);
 EXFUN (Fprocess_status, 1);
 EXFUN (Fkill_process, 2);
@@ -3255,7 +3252,6 @@ extern void syms_of_callproc (void);
 /* Defined in doc.c */
 extern Lisp_Object Qfunction_documentation;
 EXFUN (Fsubstitute_command_keys, 1);
-EXFUN (Fdocumentation_property, 3);
 extern Lisp_Object read_doc_string (Lisp_Object);
 extern Lisp_Object get_doc_string (Lisp_Object, int, int);
 extern void syms_of_doc (void);
@@ -3263,7 +3259,6 @@ extern int read_bytecode_char (int);
 
 /* Defined in bytecode.c */
 extern Lisp_Object Qbytecode;
-EXFUN (Fbyte_code, 3);
 extern void syms_of_bytecode (void);
 extern struct byte_stack *byte_stack_list;
 #ifdef BYTE_MARK_STACK
@@ -3384,7 +3379,6 @@ extern void syms_of_category (void);
 extern void syms_of_ccl (void);
 
 /* Defined in dired.c */
-EXFUN (Ffile_attributes, 2);
 extern void syms_of_dired (void);
 extern Lisp_Object directory_files_internal (Lisp_Object, Lisp_Object,
                                              Lisp_Object, Lisp_Object,
diff --git a/src/lread.c b/src/lread.c
index 8777bc34545..7d12f5a85d3 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -681,7 +681,7 @@ read_filtered_event (int no_switch_frame, int ascii_required,
   return val;
 }
 
-DEFUN ("read-char", Fread_char, Sread_char, 0, 3, 0,
+DEFUE ("read-char", Fread_char, Sread_char, 0, 3, 0,
        doc: /* Read a character from the command input (keyboard or macro).
 It is returned as a number.
 If the character has modifiers, they are resolved and reflected to the
@@ -714,7 +714,7 @@ floating-point value.  */)
           : make_number (char_resolve_modifier_mask (XINT (val))));
 }
 
-DEFUN ("read-event", Fread_event, Sread_event, 0, 3, 0,
+DEFUE ("read-event", Fread_event, Sread_event, 0, 3, 0,
        doc: /* Read an event object from the input stream.
 If the optional argument PROMPT is non-nil, display that as a prompt.
 If the optional argument INHERIT-INPUT-METHOD is non-nil and some
@@ -950,7 +950,7 @@ load_warn_old_style_backquotes (Lisp_Object file)
   return Qnil;
 }
 
-DEFUN ("get-load-suffixes", Fget_load_suffixes, Sget_load_suffixes, 0, 0, 0,
+DEFUE ("get-load-suffixes", Fget_load_suffixes, Sget_load_suffixes, 0, 0, 0,
        doc: /* Return the suffixes that `load' should try if a suffix is \
 required.
 This uses the variables `load-suffixes' and `load-file-rep-suffixes'.  */)
@@ -972,7 +972,7 @@ This uses the variables `load-suffixes' and `load-file-rep-suffixes'.  */)
   return Fnreverse (lst);
 }
 
-DEFUN ("load", Fload, Sload, 1, 5, 0,
+DEFUE ("load", Fload, Sload, 1, 5, 0,
        doc: /* Execute a file of Lisp code named FILE.
 First try FILE with `.elc' appended, then try with `.el',
 then try FILE unmodified (the exact suffixes in the exact order are
@@ -1906,7 +1906,7 @@ This function does not move point.  */)
 }
 
 
-DEFUN ("read", Fread, Sread, 0, 1, 0,
+DEFUE ("read", Fread, Sread, 0, 1, 0,
        doc: /* Read one Lisp expression as text from STREAM, return as Lisp object.
 If STREAM is nil, use the value of `standard-input' (which see).
 STREAM or the value of `standard-input' may be:
@@ -1929,7 +1929,7 @@ STREAM or the value of `standard-input' may be:
   return read_internal_start (stream, Qnil, Qnil);
 }
 
-DEFUN ("read-from-string", Fread_from_string, Sread_from_string, 1, 3, 0,
+DEFUE ("read-from-string", Fread_from_string, Sread_from_string, 1, 3, 0,
        doc: /* Read one Lisp expression which is represented as text by STRING.
 Returns a cons: (OBJECT-READ . FINAL-STRING-INDEX).
 START and END optionally delimit a substring of STRING from which to read;
@@ -3654,7 +3654,7 @@ make_symbol (const char *str)
                        : make_string (str, len));
 }
 
-DEFUN ("intern", Fintern, Sintern, 1, 2, 0,
+DEFUE ("intern", Fintern, Sintern, 1, 2, 0,
        doc: /* Return the canonical symbol whose name is STRING.
 If there is none, one is created by this function and returned.
 A second optional argument specifies the obarray to use;
@@ -3700,7 +3700,7 @@ it defaults to the value of `obarray'.  */)
   return sym;
 }
 
-DEFUN ("intern-soft", Fintern_soft, Sintern_soft, 1, 2, 0,
+DEFUE ("intern-soft", Fintern_soft, Sintern_soft, 1, 2, 0,
        doc: /* Return the canonical symbol named NAME, or nil if none exists.
 NAME may be a string or a symbol.  If it is a symbol, that exact
 symbol is searched for.
@@ -3728,7 +3728,7 @@ it defaults to the value of `obarray'.  */)
     return tem;
 }
 
-DEFUN ("unintern", Funintern, Sunintern, 1, 2, 0,
+DEFUE ("unintern", Funintern, Sunintern, 1, 2, 0,
        doc: /* Delete the symbol named NAME, if any, from OBARRAY.
 The value is t if a symbol was found and deleted, nil otherwise.
 NAME may be a string or a symbol.  If it is a symbol, that symbol
diff --git a/src/macros.c b/src/macros.c
index d90b31b503f..fd771b52dee 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -215,7 +215,7 @@ finalize_kbd_macro_chars (void)
   current_kboard->kbd_macro_end = current_kboard->kbd_macro_ptr;
 }
 
-DEFUN ("cancel-kbd-macro-events", Fcancel_kbd_macro_events,
+DEFUE ("cancel-kbd-macro-events", Fcancel_kbd_macro_events,
        Scancel_kbd_macro_events, 0, 0, 0,
        doc: /* Cancel the events added to a keyboard macro for this command.  */)
   (void)
@@ -282,7 +282,7 @@ pop_kbd_macro (Lisp_Object info)
   return Qnil;
 }
 
-DEFUN ("execute-kbd-macro", Fexecute_kbd_macro, Sexecute_kbd_macro, 1, 3, 0,
+DEFUE ("execute-kbd-macro", Fexecute_kbd_macro, Sexecute_kbd_macro, 1, 3, 0,
        doc: /* Execute MACRO as string of editor command characters.
 If MACRO is a symbol, its function definition is used.
 COUNT is a repeat count, or nil for once, or 0 for infinite loop.
@@ -391,4 +391,3 @@ This is nil when not executing a keyboard macro.  */);
   DEFVAR_KBOARD ("last-kbd-macro", Vlast_kbd_macro,
                  doc: /* Last kbd macro defined, as a string or vector; nil if none defined.  */);
 }
-
diff --git a/src/marker.c b/src/marker.c
index 7d461099140..b8567c2810f 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -420,7 +420,7 @@ buf_bytepos_to_charpos (struct buffer *b, EMACS_INT bytepos)
 
 /* Operations on markers. */
 
-DEFUN ("marker-buffer", Fmarker_buffer, Smarker_buffer, 1, 1, 0,
+DEFUE ("marker-buffer", Fmarker_buffer, Smarker_buffer, 1, 1, 0,
        doc: /* Return the buffer that MARKER points into, or nil if none.
 Returns nil if MARKER points into a dead buffer.  */)
   (register Lisp_Object marker)
@@ -440,7 +440,7 @@ Returns nil if MARKER points into a dead buffer.  */)
   return Qnil;
 }
 
-DEFUN ("marker-position", Fmarker_position, Smarker_position, 1, 1, 0,
+DEFUE ("marker-position", Fmarker_position, Smarker_position, 1, 1, 0,
        doc: /* Return the position MARKER points at, as a character number.
 Returns nil if MARKER points nowhere.  */)
   (Lisp_Object marker)
@@ -452,7 +452,7 @@ Returns nil if MARKER points nowhere.  */)
   return Qnil;
 }
 
-DEFUN ("set-marker", Fset_marker, Sset_marker, 2, 3, 0,
+DEFUE ("set-marker", Fset_marker, Sset_marker, 2, 3, 0,
        doc: /* Position MARKER before character number POSITION in BUFFER.
 BUFFER defaults to the current buffer.
 If POSITION is nil, makes marker point nowhere.
@@ -796,7 +796,7 @@ marker_byte_position (Lisp_Object marker)
   return i;
 }
 
-DEFUN ("copy-marker", Fcopy_marker, Scopy_marker, 0, 2, 0,
+DEFUE ("copy-marker", Fcopy_marker, Scopy_marker, 0, 2, 0,
        doc: /* Return a new marker pointing at the same place as MARKER.
 If argument is a number, makes a new marker pointing
 at that position in the current buffer.
diff --git a/src/menu.c b/src/menu.c
index 3bfb74863ae..bf6bb6486bd 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1017,7 +1017,7 @@ find_and_return_menu_selection (FRAME_PTR f, int keymaps, void *client_data)
 }
 #endif  /* HAVE_NS */
 
-DEFUN ("x-popup-menu", Fx_popup_menu, Sx_popup_menu, 2, 2, 0,
+DEFUE ("x-popup-menu", Fx_popup_menu, Sx_popup_menu, 2, 2, 0,
        doc: /* Pop up a deck-of-cards menu and return user's selection.
 POSITION is a position specification.  This is either a mouse button event
 or a list ((XOFFSET YOFFSET) WINDOW)
diff --git a/src/minibuf.c b/src/minibuf.c
index 54cb9c1acd7..3e8fc0c2424 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -872,7 +872,8 @@ read_minibuf_unwind (Lisp_Object data)
 }
 
 
-DEFUN ("read-from-minibuffer", Fread_from_minibuffer, Sread_from_minibuffer, 1, 7, 0,
+DEFUE ("read-from-minibuffer", Fread_from_minibuffer,
+       Sread_from_minibuffer, 1, 7, 0,
        doc: /* Read a string from the minibuffer, prompting with string PROMPT.
 The optional second arg INITIAL-CONTENTS is an obsolete alternative to
   DEFAULT-VALUE.  It normally should be nil in new code, except when
@@ -949,7 +950,7 @@ and some related functions, which use zero-indexing for POSITION.  */)
   return val;
 }
 
-DEFUN ("read-minibuffer", Fread_minibuffer, Sread_minibuffer, 1, 2, 0,
+DEFUE ("read-minibuffer", Fread_minibuffer, Sread_minibuffer, 1, 2, 0,
        doc: /* Return a Lisp object read using the minibuffer, unevaluated.
 Prompt with PROMPT.  If non-nil, optional second arg INITIAL-CONTENTS
 is a string to insert in the minibuffer before reading.
@@ -963,7 +964,7 @@ Such arguments are used as in `read-from-minibuffer'.)  */)
                        make_number (0), Qnil, 0, 0);
 }
 
-DEFUN ("eval-minibuffer", Feval_minibuffer, Seval_minibuffer, 1, 2, 0,
+DEFUE ("eval-minibuffer", Feval_minibuffer, Seval_minibuffer, 1, 2, 0,
        doc: /* Return value of Lisp expression read using the minibuffer.
 Prompt with PROMPT.  If non-nil, optional second arg INITIAL-CONTENTS
 is a string to insert in the minibuffer before reading.
@@ -979,7 +980,7 @@ Such arguments are used as in `read-from-minibuffer'.)  */)
 
 /* Functions that use the minibuffer to read various things. */
 
-DEFUN ("read-string", Fread_string, Sread_string, 1, 5, 0,
+DEFUE ("read-string", Fread_string, Sread_string, 1, 5, 0,
        doc: /* Read a string from the minibuffer, prompting with string PROMPT.
 If non-nil, second arg INITIAL-INPUT is a string to insert before reading.
   This argument has been superseded by DEFAULT-VALUE and should normally
@@ -1056,7 +1057,7 @@ Prompt with PROMPT.  */)
 }
 #endif /* NOTDEF */
 
-DEFUN ("read-variable", Fread_variable, Sread_variable, 1, 2, 0,
+DEFUE ("read-variable", Fread_variable, Sread_variable, 1, 2, 0,
        doc: /* Read the name of a user variable and return it as a symbol.
 Prompt with PROMPT.  By default, return DEFAULT-VALUE or its first element
 if it is a list.
@@ -1080,7 +1081,7 @@ A user variable is one for which `user-variable-p' returns non-nil.  */)
   return Fintern (name, Qnil);
 }
 
-DEFUN ("read-buffer", Fread_buffer, Sread_buffer, 1, 3, 0,
+DEFUE ("read-buffer", Fread_buffer, Sread_buffer, 1, 3, 0,
        doc: /* Read the name of a buffer and return as a string.
 Prompt with PROMPT.
 Optional second arg DEF is value to return if user enters an empty line.
@@ -1616,7 +1617,7 @@ with a space are ignored unless STRING itself starts with a space.  */)
   return Fnreverse (allmatches);
 }
 
-DEFUN ("completing-read", Fcompleting_read, Scompleting_read, 2, 8, 0,
+DEFUE ("completing-read", Fcompleting_read, Scompleting_read, 2, 8, 0,
        doc: /* Read a string in the minibuffer, with completion.
 PROMPT is a string to prompt with; normally it ends in a colon and a space.
 COLLECTION can be a list of strings, an alist, an obarray or a hash table.
@@ -1917,7 +1918,7 @@ The arguments STRING and PREDICATE are as in `try-completion',
 
 /* Like assoc but assumes KEY is a string, and ignores case if appropriate.  */
 
-DEFUN ("assoc-string", Fassoc_string, Sassoc_string, 2, 3, 0,
+DEFUE ("assoc-string", Fassoc_string, Sassoc_string, 2, 3, 0,
        doc: /* Like `assoc' but specifically for strings (and symbols).
 
 This returns the first element of LIST whose car matches the string or
diff --git a/src/print.c b/src/print.c
index f68f04ac5fa..f039b40aa60 100644
--- a/src/print.c
+++ b/src/print.c
@@ -526,7 +526,7 @@ static void print_preprocess (Lisp_Object obj);
 static void print_preprocess_string (INTERVAL interval, Lisp_Object arg);
 static void print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag);
 
-DEFUN ("terpri", Fterpri, Sterpri, 0, 1, 0,
+DEFUE ("terpri", Fterpri, Sterpri, 0, 1, 0,
        doc: /* Output a newline to stream PRINTCHARFUN.
 If PRINTCHARFUN is omitted or nil, the value of `standard-output' is used.  */)
   (Lisp_Object printcharfun)
@@ -541,7 +541,7 @@ If PRINTCHARFUN is omitted or nil, the value of `standard-output' is used.  */)
   return Qt;
 }
 
-DEFUN ("prin1", Fprin1, Sprin1, 1, 2, 0,
+DEFUE ("prin1", Fprin1, Sprin1, 1, 2, 0,
        doc: /* Output the printed representation of OBJECT, any Lisp object.
 Quoting characters are printed when needed to make output that `read'
 can handle, whenever this is possible.  For complex objects, the behavior
@@ -579,7 +579,7 @@ is used instead.  */)
 /* a buffer which is used to hold output being built by prin1-to-string */
 Lisp_Object Vprin1_to_string_buffer;
 
-DEFUN ("prin1-to-string", Fprin1_to_string, Sprin1_to_string, 1, 2, 0,
+DEFUE ("prin1-to-string", Fprin1_to_string, Sprin1_to_string, 1, 2, 0,
        doc: /* Return a string containing the printed representation of OBJECT.
 OBJECT can be any Lisp object.  This function outputs quoting characters
 when necessary to make output that `read' can handle, whenever possible,
@@ -636,7 +636,7 @@ A printed representation of an object is text which describes that object.  */)
   return unbind_to (count, object);
 }
 
-DEFUN ("princ", Fprinc, Sprinc, 1, 2, 0,
+DEFUE ("princ", Fprinc, Sprinc, 1, 2, 0,
        doc: /* Output the printed representation of OBJECT, any Lisp object.
 No quoting characters are used; no delimiters are printed around
 the contents of strings.
@@ -670,7 +670,7 @@ is used instead.  */)
   return object;
 }
 
-DEFUN ("print", Fprint, Sprint, 1, 2, 0,
+DEFUE ("print", Fprint, Sprint, 1, 2, 0,
        doc: /* Output the printed representation of OBJECT, with newlines around it.
 Quoting characters are printed when needed to make output that `read'
 can handle, whenever this is possible.  For complex objects, the behavior
@@ -813,7 +813,7 @@ safe_debug_print (Lisp_Object arg)
 }
 
 
-DEFUN ("error-message-string", Ferror_message_string, Serror_message_string,
+DEFUE ("error-message-string", Ferror_message_string, Serror_message_string,
        1, 1, 0,
        doc: /* Convert an error value (ERROR-SYMBOL . DATA) to an error message.
 See Info anchor `(elisp)Definition of signal' for some details on how this
diff --git a/src/process.c b/src/process.c
index 624610069d8..ec96c1aa67e 100644
--- a/src/process.c
+++ b/src/process.c
@@ -235,6 +235,7 @@ static int process_output_skip;
 #define process_output_delay_count 0
 #endif
 
+INFUN (Fget_process, 1);
 static int keyboard_bit_set (SELECT_TYPE *);
 static void deactivate_process (Lisp_Object);
 static void status_notify (struct Lisp_Process *);
@@ -782,7 +783,7 @@ nil, indicating the current buffer's process.  */)
   return Qnil;
 }
 
-DEFUN ("process-status", Fprocess_status, Sprocess_status, 1, 1, 0,
+DEFUE ("process-status", Fprocess_status, Sprocess_status, 1, 1, 0,
        doc: /* Return the status of PROCESS.
 The returned value is one of the following symbols:
 run  -- for a process that is running.
@@ -1083,7 +1084,7 @@ DEFUN ("process-query-on-exit-flag",
 }
 
 #ifdef DATAGRAM_SOCKETS
-Lisp_Object Fprocess_datagram_address (Lisp_Object process);
+INFUN (Fprocess_datagram_address, 1);
 #endif
 
 DEFUN ("process-contact", Fprocess_contact, Sprocess_contact,
@@ -5775,7 +5776,7 @@ don't send the signal.  */)
   return process;
 }
 
-DEFUN ("kill-process", Fkill_process, Skill_process, 0, 2, 0,
+DEFUE ("kill-process", Fkill_process, Skill_process, 0, 2, 0,
        doc: /* Kill process PROCESS.  May be process or name of one.
 See function `interrupt-process' for more details on usage.  */)
   (Lisp_Object process, Lisp_Object current_group)
@@ -6915,7 +6916,7 @@ close_process_descs (void)
 #endif
 }
 
-DEFUN ("get-buffer-process", Fget_buffer_process, Sget_buffer_process, 1, 1, 0,
+DEFUE ("get-buffer-process", Fget_buffer_process, Sget_buffer_process, 1, 1, 0,
        doc: /* Return the (or a) process associated with BUFFER.
 BUFFER may be a buffer or the name of one.  */)
   (register Lisp_Object buffer)
@@ -6982,8 +6983,8 @@ kill_buffer_processes (Lisp_Object buffer)
 #endif /* subprocesses */
 }
 
-DEFUN ("waiting-for-user-input-p", Fwaiting_for_user_input_p, Swaiting_for_user_input_p,
-       0, 0, 0,
+DEFUE ("waiting-for-user-input-p", Fwaiting_for_user_input_p,
+       Swaiting_for_user_input_p, 0, 0, 0,
        doc: /* Returns non-nil if Emacs is waiting for input from the user.
 This is intended for use by asynchronous process output filters and sentinels.  */)
   (void)
diff --git a/src/search.c b/src/search.c
index d9be8ca0105..34f02e6cd65 100644
--- a/src/search.c
+++ b/src/search.c
@@ -436,7 +436,7 @@ string_match_1 (Lisp_Object regexp, Lisp_Object string, Lisp_Object start, int p
   return make_number (string_byte_to_char (string, val));
 }
 
-DEFUN ("string-match", Fstring_match, Sstring_match, 2, 3, 0,
+DEFUE ("string-match", Fstring_match, Sstring_match, 2, 3, 0,
        doc: /* Return index of start of first match for REGEXP in STRING, or nil.
 Matching ignores case if `case-fold-search' is non-nil.
 If third arg START is non-nil, start search at that index in STRING.
@@ -2811,7 +2811,7 @@ match_limit (Lisp_Object num, int beginningp)
                                     : search_regs.end[n]));
 }
 
-DEFUN ("match-beginning", Fmatch_beginning, Smatch_beginning, 1, 1, 0,
+DEFUE ("match-beginning", Fmatch_beginning, Smatch_beginning, 1, 1, 0,
        doc: /* Return position of start of text matched by last search.
 SUBEXP, a number, specifies which parenthesized expression in the last
   regexp.
@@ -2823,7 +2823,7 @@ Zero means the entire text matched by the whole regexp or whole string.  */)
   return match_limit (subexp, 1);
 }
 
-DEFUN ("match-end", Fmatch_end, Smatch_end, 1, 1, 0,
+DEFUE ("match-end", Fmatch_end, Smatch_end, 1, 1, 0,
        doc: /* Return position of end of text matched by last search.
 SUBEXP, a number, specifies which parenthesized expression in the last
   regexp.
@@ -2835,7 +2835,7 @@ Zero means the entire text matched by the whole regexp or whole string.  */)
   return match_limit (subexp, 0);
 }
 
-DEFUN ("match-data", Fmatch_data, Smatch_data, 0, 3, 0,
+DEFUE ("match-data", Fmatch_data, Smatch_data, 0, 3, 0,
        doc: /* Return a list containing all info on what the last search matched.
 Element 2N is `(match-beginning N)'; element 2N + 1 is `(match-end N)'.
 All the elements are markers or nil (nil if the Nth pair didn't match)
@@ -2950,7 +2950,7 @@ Return value is undefined if the last search failed.  */)
    But it was ill-conceived: those supposedly-internal markers get exposed via
    the undo-list, so freeing them here is unsafe.  */
 
-DEFUN ("set-match-data", Fset_match_data, Sset_match_data, 1, 2, 0,
+DEFUE ("set-match-data", Fset_match_data, Sset_match_data, 1, 2, 0,
        doc: /* Set internal data on last search match from elements of LIST.
 LIST should have been created by calling `match-data' previously.
 
diff --git a/src/syntax.c b/src/syntax.c
index 1301c0689ad..819a7542a7b 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -138,6 +138,7 @@ static EMACS_INT find_start_begv;
 static int find_start_modiff;
 
 
+INFUN (Fsyntax_table_p, 1);
 static Lisp_Object skip_chars (int, Lisp_Object, Lisp_Object, int);
 static Lisp_Object skip_syntaxes (int, Lisp_Object, Lisp_Object);
 static Lisp_Object scan_lists (EMACS_INT, EMACS_INT, EMACS_INT, int);
@@ -1337,7 +1338,7 @@ scan_words (register EMACS_INT from, register EMACS_INT count)
   return from;
 }
 
-DEFUN ("forward-word", Fforward_word, Sforward_word, 0, 1, "^p",
+DEFUE ("forward-word", Fforward_word, Sforward_word, 0, 1, "^p",
        doc: /* Move point forward ARG words (backward if ARG is negative).
 Normally returns t.
 If an edge of the buffer or a field boundary is reached, point is left there
@@ -1366,9 +1367,7 @@ and the function returns nil.  Field boundaries are not noticed if
   return val == orig_val ? Qt : Qnil;
 }
 
-Lisp_Object skip_chars (int, Lisp_Object, Lisp_Object, int);
-
-DEFUN ("skip-chars-forward", Fskip_chars_forward, Sskip_chars_forward, 1, 2, 0,
+DEFUE ("skip-chars-forward", Fskip_chars_forward, Sskip_chars_forward, 1, 2, 0,
        doc: /* Move point forward, stopping before a char not in STRING, or at pos LIM.
 STRING is like the inside of a `[...]' in a regular expression
 except that `]' is never special and `\\' quotes `^', `-' or `\\'
@@ -1383,7 +1382,7 @@ Returns the distance traveled, either zero or positive.  */)
   return skip_chars (1, string, lim, 1);
 }
 
-DEFUN ("skip-chars-backward", Fskip_chars_backward, Sskip_chars_backward, 1, 2, 0,
+DEFUE ("skip-chars-backward", Fskip_chars_backward, Sskip_chars_backward, 1, 2, 0,
        doc: /* Move point backward, stopping after a char not in STRING, or at pos LIM.
 See `skip-chars-forward' for details.
 Returns the distance traveled, either zero or negative.  */)
diff --git a/src/term.c b/src/term.c
index ea856543a7d..3547b9a2ddd 100644
--- a/src/term.c
+++ b/src/term.c
@@ -2411,7 +2411,7 @@ get_named_tty (const char *name)
 }
 
 
-DEFUN ("tty-type", Ftty_type, Stty_type, 0, 1, 0,
+DEFUE ("tty-type", Ftty_type, Stty_type, 0, 1, 0,
        doc: /* Return the type of the tty device that TERMINAL uses.
 Returns nil if TERMINAL is not on a tty device.
 
diff --git a/src/terminal.c b/src/terminal.c
index c5185601fb6..7382622182f 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -305,7 +305,7 @@ delete_terminal (struct terminal *terminal)
 
 Lisp_Object Qrun_hook_with_args;
 static Lisp_Object Qdelete_terminal_functions;
-DEFUN ("delete-terminal", Fdelete_terminal, Sdelete_terminal, 0, 2, 0,
+DEFUE ("delete-terminal", Fdelete_terminal, Sdelete_terminal, 0, 2, 0,
        doc: /* Delete TERMINAL by deleting all frames on it and closing the terminal.
 TERMINAL may be a terminal object, a frame, or nil (meaning the
 selected frame's terminal).
@@ -348,7 +348,7 @@ but if the second argument FORCE is non-nil, you may do so. */)
 }
 
 
-DEFUN ("frame-terminal", Fframe_terminal, Sframe_terminal, 0, 1, 0,
+DEFUE ("frame-terminal", Fframe_terminal, Sframe_terminal, 0, 1, 0,
        doc: /* Return the terminal that FRAME is displayed on.
 If FRAME is nil, the selected frame is used.
 
diff --git a/src/textprop.c b/src/textprop.c
index 53f92ec936b..8cd9d580c4c 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -73,6 +73,7 @@ Lisp_Object interval_insert_behind_hooks;
 Lisp_Object interval_insert_in_front_hooks;
 
 static void text_read_only (Lisp_Object) NO_RETURN;
+INFUN (Fprevious_property_change, 3);
 
 
 /* Signal a `text-read-only' error.  This function makes it easier
@@ -544,7 +545,7 @@ interval_of (int position, Lisp_Object object)
   return find_interval (i, position);
 }
 
-DEFUN ("text-properties-at", Ftext_properties_at,
+DEFUE ("text-properties-at", Ftext_properties_at,
        Stext_properties_at, 1, 2, 0,
        doc: /* Return the list of properties of the character at POSITION in OBJECT.
 If the optional second argument OBJECT is a buffer (or nil, which means
@@ -571,7 +572,7 @@ If POSITION is at the end of OBJECT, the value is nil.  */)
   return i->plist;
 }
 
-DEFUN ("get-text-property", Fget_text_property, Sget_text_property, 2, 3, 0,
+DEFUE ("get-text-property", Fget_text_property, Sget_text_property, 2, 3, 0,
        doc: /* Return the value of POSITION's property PROP, in OBJECT.
 OBJECT is optional and defaults to the current buffer.
 If POSITION is at the end of OBJECT, the value is nil.  */)
@@ -646,7 +647,7 @@ get_char_property_and_overlay (Lisp_Object position, register Lisp_Object prop,
   return Fget_text_property (position, prop, object);
 }
 
-DEFUN ("get-char-property", Fget_char_property, Sget_char_property, 2, 3, 0,
+DEFUE ("get-char-property", Fget_char_property, Sget_char_property, 2, 3, 0,
        doc: /* Return the value of POSITION's property PROP, in OBJECT.
 Both overlay properties and text properties are checked.
 OBJECT is optional and defaults to the current buffer.
@@ -683,7 +684,7 @@ POSITION is at the end of OBJECT, both car and cdr are nil.  */)
 }
 
 
-DEFUN ("next-char-property-change", Fnext_char_property_change,
+DEFUE ("next-char-property-change", Fnext_char_property_change,
        Snext_char_property_change, 1, 2, 0,
        doc: /* Return the position of next text property or overlay change.
 This scans characters forward in the current buffer from POSITION till
@@ -708,7 +709,7 @@ LIMIT is a no-op if it is greater than (point-max).  */)
   return Fnext_property_change (position, Qnil, temp);
 }
 
-DEFUN ("previous-char-property-change", Fprevious_char_property_change,
+DEFUE ("previous-char-property-change", Fprevious_char_property_change,
        Sprevious_char_property_change, 1, 2, 0,
        doc: /* Return the position of previous text property or overlay change.
 Scans characters backward in the current buffer from POSITION till it
@@ -734,7 +735,7 @@ LIMIT is a no-op if it is less than (point-min).  */)
 }
 
 
-DEFUN ("next-single-char-property-change", Fnext_single_char_property_change,
+DEFUE ("next-single-char-property-change", Fnext_single_char_property_change,
        Snext_single_char_property_change, 2, 4, 0,
        doc: /* Return the position of next text property or overlay change for a specific property.
 Scans characters forward from POSITION till it finds
@@ -817,7 +818,7 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT.  */)
   return position;
 }
 
-DEFUN ("previous-single-char-property-change",
+DEFUE ("previous-single-char-property-change",
        Fprevious_single_char_property_change,
        Sprevious_single_char_property_change, 2, 4, 0,
        doc: /* Return the position of previous text property or overlay change for a specific property.
@@ -910,7 +911,7 @@ back past position LIMIT; return LIMIT if nothing is found before LIMIT.  */)
   return position;
 }
 
-DEFUN ("next-property-change", Fnext_property_change,
+DEFUE ("next-property-change", Fnext_property_change,
        Snext_property_change, 1, 3, 0,
        doc: /* Return the position of next property change.
 Scans characters forward from POSITION in OBJECT till it finds
@@ -974,7 +975,7 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT.  */)
     return make_number (next->position);
 }
 
-DEFUN ("next-single-property-change", Fnext_single_property_change,
+DEFUE ("next-single-property-change", Fnext_single_property_change,
        Snext_single_property_change, 2, 4, 0,
        doc: /* Return the position of next property change for a specific property.
 Scans characters forward from POSITION till it finds
@@ -1022,7 +1023,7 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT.  */)
     return make_number (next->position);
 }
 
-DEFUN ("previous-property-change", Fprevious_property_change,
+DEFUE ("previous-property-change", Fprevious_property_change,
        Sprevious_property_change, 1, 3, 0,
        doc: /* Return the position of previous property change.
 Scans characters backwards from POSITION in OBJECT till it finds
@@ -1069,7 +1070,7 @@ back past position LIMIT; return LIMIT if nothing is found until LIMIT.  */)
     return make_number (previous->position + LENGTH (previous));
 }
 
-DEFUN ("previous-single-property-change", Fprevious_single_property_change,
+DEFUE ("previous-single-property-change", Fprevious_single_property_change,
        Sprevious_single_property_change, 2, 4, 0,
        doc: /* Return the position of previous property change for a specific property.
 Scans characters backward from POSITION till it finds
@@ -1123,7 +1124,7 @@ back past position LIMIT; return LIMIT if nothing is found until LIMIT.  */)
 
 /* Callers note, this can GC when OBJECT is a buffer (or nil).  */
 
-DEFUN ("add-text-properties", Fadd_text_properties,
+DEFUE ("add-text-properties", Fadd_text_properties,
        Sadd_text_properties, 3, 4, 0,
        doc: /* Add properties to the text from START to END.
 The third argument PROPERTIES is a property list
@@ -1232,7 +1233,7 @@ Return t if any property value actually changed, nil otherwise.  */)
 
 /* Callers note, this can GC when OBJECT is a buffer (or nil).  */
 
-DEFUN ("put-text-property", Fput_text_property,
+DEFUE ("put-text-property", Fput_text_property,
        Sput_text_property, 4, 5, 0,
        doc: /* Set one property of the text from START to END.
 The third and fourth arguments PROPERTY and VALUE
@@ -1248,7 +1249,7 @@ markers).  If OBJECT is a string, START and END are 0-based indices into it.  */
   return Qnil;
 }
 
-DEFUN ("set-text-properties", Fset_text_properties,
+DEFUE ("set-text-properties", Fset_text_properties,
        Sset_text_properties, 3, 4, 0,
        doc: /* Completely replace properties of text from START to END.
 The third argument PROPERTIES is the new property list.
@@ -1415,7 +1416,7 @@ set_text_properties_1 (Lisp_Object start, Lisp_Object end, Lisp_Object propertie
   while (len > 0);
 }
 
-DEFUN ("remove-text-properties", Fremove_text_properties,
+DEFUE ("remove-text-properties", Fremove_text_properties,
        Sremove_text_properties, 3, 4, 0,
        doc: /* Remove some properties from text from START to END.
 The third argument PROPERTIES is a property list
@@ -1505,7 +1506,7 @@ Use `set-text-properties' if you want to remove all text properties.  */)
     }
 }
 
-DEFUN ("remove-list-of-text-properties", Fremove_list_of_text_properties,
+DEFUE ("remove-list-of-text-properties", Fremove_list_of_text_properties,
        Sremove_list_of_text_properties, 3, 4, 0,
        doc: /* Remove some properties from text from START to END.
 The third argument LIST-OF-PROPERTIES is a list of property names to remove.
@@ -1615,7 +1616,7 @@ Return t if any property was actually removed, nil otherwise.  */)
     }
 }
 
-DEFUN ("text-property-any", Ftext_property_any,
+DEFUE ("text-property-any", Ftext_property_any,
        Stext_property_any, 4, 5, 0,
        doc: /* Check text from START to END for property PROPERTY equalling VALUE.
 If so, return the position of the first character whose property PROPERTY
diff --git a/src/undo.c b/src/undo.c
index d11cd6f5570..b310133900c 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -270,7 +270,7 @@ record_property_change (EMACS_INT beg, EMACS_INT length,
   current_buffer = obuf;
 }
 
-DEFUN ("undo-boundary", Fundo_boundary, Sundo_boundary, 0, 0, 0,
+DEFUE ("undo-boundary", Fundo_boundary, Sundo_boundary, 0, 0, 0,
        doc: /* Mark a boundary between units of undo.
 An undo command will stop at this point,
 but another undo command will undo to the previous boundary.  */)
@@ -711,4 +711,3 @@ so it must make sure not to do a lot of consing.  */);
                doc: /* Non-nil means do not record `point' in `buffer-undo-list'.  */);
   undo_inhibit_record_point = 0;
 }
-
diff --git a/src/window.c b/src/window.c
index a8a6fceaaee..72ab2a3ea10 100644
--- a/src/window.c
+++ b/src/window.c
@@ -216,7 +216,7 @@ make_window (void)
   return val;
 }
 
-DEFUN ("selected-window", Fselected_window, Sselected_window, 0, 0, 0,
+DEFUE ("selected-window", Fselected_window, Sselected_window, 0, 0, 0,
        doc: /* Return the window that the cursor now appears in and commands apply to.  */)
   (void)
 {
@@ -235,7 +235,8 @@ used by that frame.  */)
   return FRAME_MINIBUF_WINDOW (XFRAME (frame));
 }
 
-DEFUN ("window-minibuffer-p", Fwindow_minibuffer_p, Swindow_minibuffer_p, 0, 1, 0,
+DEFUE ("window-minibuffer-p", Fwindow_minibuffer_p,
+       Swindow_minibuffer_p, 0, 1, 0,
        doc: /* Return non-nil if WINDOW is a minibuffer window.
 WINDOW defaults to the selected window.  */)
   (Lisp_Object window)
@@ -245,7 +246,7 @@ WINDOW defaults to the selected window.  */)
 }
 
 
-DEFUN ("pos-visible-in-window-p", Fpos_visible_in_window_p,
+DEFUE ("pos-visible-in-window-p", Fpos_visible_in_window_p,
        Spos_visible_in_window_p, 0, 3, 0,
        doc: /* Return non-nil if position POS is currently on the frame in WINDOW.
 Return nil if that position is scrolled vertically out of view.
@@ -442,7 +443,7 @@ decode_any_window (register Lisp_Object window)
   return XWINDOW (window);
 }
 
-DEFUN ("window-buffer", Fwindow_buffer, Swindow_buffer, 0, 1, 0,
+DEFUE ("window-buffer", Fwindow_buffer, Swindow_buffer, 0, 1, 0,
        doc: /* Return the buffer that WINDOW is displaying.
 WINDOW defaults to the selected window.  */)
   (Lisp_Object window)
@@ -1196,7 +1197,7 @@ if it isn't already recorded.  */)
   return value;
 }
 
-DEFUN ("set-window-point", Fset_window_point, Sset_window_point, 2, 2, 0,
+DEFUE ("set-window-point", Fset_window_point, Sset_window_point, 2, 2, 0,
        doc: /* Make point value in WINDOW be at position POS in WINDOW's buffer.
 Return POS.  */)
   (Lisp_Object window, Lisp_Object pos)
@@ -1243,7 +1244,7 @@ overriding motion of point in order to display at this exact start.  */)
 }
 
 
-DEFUN ("window-dedicated-p", Fwindow_dedicated_p, Swindow_dedicated_p,
+DEFUE ("window-dedicated-p", Fwindow_dedicated_p, Swindow_dedicated_p,
        0, 1, 0,
        doc: /* Return non-nil when WINDOW is dedicated to its buffer.
 More precisely, return the value assigned by the last call of
@@ -1484,7 +1485,7 @@ and so is its new parent, we should make replacement's
 children be children of that parent instead.  ***/
 }
 
-DEFUN ("delete-window", Fdelete_window, Sdelete_window, 0, 1, "",
+DEFUE ("delete-window", Fdelete_window, Sdelete_window, 0, 1, "",
        doc: /* Remove WINDOW from its frame.
 WINDOW defaults to the selected window.  Return nil.
 Signal an error when WINDOW is the only window on its frame.  */)
@@ -1945,7 +1946,7 @@ next_window (Lisp_Object window, Lisp_Object minibuf, Lisp_Object all_frames, in
 }
 
 
-DEFUN ("next-window", Fnext_window, Snext_window, 0, 3, 0,
+DEFUE ("next-window", Fnext_window, Snext_window, 0, 3, 0,
        doc: /* Return window following WINDOW in cyclic ordering of windows.
 WINDOW defaults to the selected window. The optional arguments
 MINIBUF and ALL-FRAMES specify the set of windows to consider.
@@ -2396,7 +2397,7 @@ If FRAME is a frame, search only that frame.  */)
                       frame);
 }
 
-DEFUN ("get-buffer-window", Fget_buffer_window, Sget_buffer_window, 0, 2, 0,
+DEFUE ("get-buffer-window", Fget_buffer_window, Sget_buffer_window, 0, 2, 0,
        doc: /* Return a window currently displaying BUFFER-OR-NAME, or nil if none.
 BUFFER-OR-NAME may be a buffer or a buffer name and defaults to the
 current buffer.
@@ -3275,8 +3276,10 @@ change_window_heights (Lisp_Object window, int n)
 
 int window_select_count;
 
-EXFUN (Fset_window_fringes, 4);
-EXFUN (Fset_window_scroll_bars, 4);
+INFUN (Fset_window_margins, 3);
+INFUN (Fset_window_fringes, 4);
+INFUN (Fset_window_scroll_bars, 4);
+INFUN (Fset_window_vscroll, 3);
 
 static void
 run_funs (Lisp_Object funs)
@@ -3441,7 +3444,7 @@ set_window_buffer (Lisp_Object window, Lisp_Object buffer, int run_hooks_p, int
 }
 
 
-DEFUN ("set-window-buffer", Fset_window_buffer, Sset_window_buffer, 2, 3, 0,
+DEFUE ("set-window-buffer", Fset_window_buffer, Sset_window_buffer, 2, 3, 0,
        doc: /* Make WINDOW display BUFFER-OR-NAME as its contents.
 WINDOW defaults to the selected window.  BUFFER-OR-NAME must be a buffer
 or the name of an existing buffer.  Optional third argument KEEP-MARGINS
@@ -3571,7 +3574,7 @@ select_window (Lisp_Object window, Lisp_Object norecord, int inhibit_point_swap)
 /* Note that selected_window can be nil when this is called from
    Fset_window_configuration.  */
 
-DEFUN ("select-window", Fselect_window, Sselect_window, 1, 2, 0,
+DEFUE ("select-window", Fselect_window, Sselect_window, 1, 2, 0,
        doc: /* Select WINDOW.  Most editing will apply to WINDOW's buffer.
 If WINDOW is not already selected, make WINDOW's buffer current
 and make WINDOW the frame's selected window.  Return WINDOW.
@@ -5499,7 +5502,7 @@ displayed_window_lines (struct window *w)
 }
 
 
-DEFUN ("recenter", Frecenter, Srecenter, 0, 1, "P",
+DEFUE ("recenter", Frecenter, Srecenter, 0, 1, "P",
        doc: /* Center point in selected window and maybe redisplay frame.
 With prefix argument ARG, recenter putting point on screen line ARG
 relative to the selected window.  If ARG is negative, it counts up from the
@@ -5852,7 +5855,7 @@ DEFUN ("window-configuration-frame", Fwindow_configuration_frame, Swindow_config
   return XWINDOW (SAVED_WINDOW_N (saved_windows, 0)->window)->frame;
 }
 
-DEFUN ("set-window-configuration", Fset_window_configuration,
+DEFUE ("set-window-configuration", Fset_window_configuration,
        Sset_window_configuration, 1, 1, 0,
        doc: /* Set the configuration of windows and buffers as specified by CONFIGURATION.
 CONFIGURATION must be a value previously returned
@@ -6349,7 +6352,7 @@ save_window_save (Lisp_Object window, struct Lisp_Vector *vector, int i)
   return i;
 }
 
-DEFUN ("current-window-configuration", Fcurrent_window_configuration,
+DEFUE ("current-window-configuration", Fcurrent_window_configuration,
        Scurrent_window_configuration, 0, 1, 0,
        doc: /* Return an object representing the current window configuration of FRAME.
 If FRAME is nil or omitted, use the selected frame.
@@ -6541,7 +6544,7 @@ as nil.  */)
                             Fringes
  ***********************************************************************/
 
-DEFUN ("set-window-fringes", Fset_window_fringes, Sset_window_fringes,
+DEFUE ("set-window-fringes", Fset_window_fringes, Sset_window_fringes,
        2, 4, 0,
        doc: /* Set the fringe widths of window WINDOW.
 If WINDOW is nil, set the fringe widths of the currently selected
@@ -6607,8 +6610,8 @@ Value is a list of the form (LEFT-WIDTH RIGHT-WIDTH OUTSIDE-MARGINS).  */)
                             Scroll bars
  ***********************************************************************/
 
-DEFUN ("set-window-scroll-bars", Fset_window_scroll_bars, Sset_window_scroll_bars,
-       2, 4, 0,
+DEFUE ("set-window-scroll-bars", Fset_window_scroll_bars,
+       Sset_window_scroll_bars, 2, 4, 0,
        doc: /* Set width and type of scroll bars of window WINDOW.
 If window is nil, set scroll bars of the currently selected window.
 Second parameter WIDTH specifies the pixel width for the scroll bar;
diff --git a/src/window.h b/src/window.h
index ad627aca340..e2e7a7f691f 100644
--- a/src/window.h
+++ b/src/window.h
@@ -763,8 +763,6 @@ extern Lisp_Object Vmouse_event;
 EXFUN (Fnext_window, 3);
 EXFUN (Fselect_window, 2);
 EXFUN (Fset_window_buffer, 3);
-EXFUN (Fset_window_vscroll, 3);
-EXFUN (Fset_window_margins, 3);
 EXFUN (Fset_window_point, 2);
 extern Lisp_Object make_window (void);
 extern Lisp_Object window_from_coordinates (struct frame *, int, int,
diff --git a/src/xdisp.c b/src/xdisp.c
index 6fd3945511b..7553841f51b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -16377,7 +16377,7 @@ dump_glyph_row (row, vpos, glyphs)
 }
 
 
-DEFUN ("dump-glyph-matrix", Fdump_glyph_matrix,
+DEFUE ("dump-glyph-matrix", Fdump_glyph_matrix,
        Sdump_glyph_matrix, 0, 1, "p",
        doc: /* Dump the current matrix of the selected window to stderr.
 Shows contents of glyph row structures.  With non-nil
@@ -16399,7 +16399,7 @@ glyphs in short form, otherwise show glyphs in long form.  */)
 }
 
 
-DEFUN ("dump-frame-glyph-matrix", Fdump_frame_glyph_matrix,
+DEFUE ("dump-frame-glyph-matrix", Fdump_frame_glyph_matrix,
        Sdump_frame_glyph_matrix, 0, 0, "", doc: /* */)
   (void)
 {
@@ -16409,7 +16409,7 @@ DEFUN ("dump-frame-glyph-matrix", Fdump_frame_glyph_matrix,
 }
 
 
-DEFUN ("dump-glyph-row", Fdump_glyph_row, Sdump_glyph_row, 1, 2, "",
+DEFUE ("dump-glyph-row", Fdump_glyph_row, Sdump_glyph_row, 1, 2, "",
        doc: /* Dump glyph row ROW to stderr.
 GLYPH 0 means don't dump glyphs.
 GLYPH 1 means dump glyphs in short form.
@@ -16430,7 +16430,7 @@ GLYPH > 1 or omitted means dump glyphs in long form.  */)
 }
 
 
-DEFUN ("dump-tool-bar-row", Fdump_tool_bar_row, Sdump_tool_bar_row, 1, 2, "",
+DEFUE ("dump-tool-bar-row", Fdump_tool_bar_row, Sdump_tool_bar_row, 1, 2, "",
        doc: /* Dump glyph row ROW of the tool-bar of the current frame to stderr.
 GLYPH 0 means don't dump glyphs.
 GLYPH 1 means dump glyphs in short form.
@@ -16450,7 +16450,7 @@ GLYPH > 1 or omitted means dump glyphs in long form.  */)
 }
 
 
-DEFUN ("trace-redisplay", Ftrace_redisplay, Strace_redisplay, 0, 1, "P",
+DEFUE ("trace-redisplay", Ftrace_redisplay, Strace_redisplay, 0, 1, "P",
        doc: /* Toggle tracing of redisplay.
 With ARG, turn tracing on if and only if ARG is positive.  */)
   (Lisp_Object arg)
@@ -16467,7 +16467,7 @@ With ARG, turn tracing on if and only if ARG is positive.  */)
 }
 
 
-DEFUN ("trace-to-stderr", Ftrace_to_stderr, Strace_to_stderr, 1, MANY, "",
+DEFUE ("trace-to-stderr", Ftrace_to_stderr, Strace_to_stderr, 1, MANY, "",
        doc: /* Like `format', but print result to stderr.
 usage: (trace-to-stderr STRING &rest OBJECTS)  */)
   (size_t nargs, Lisp_Object *args)
diff --git a/src/xfaces.c b/src/xfaces.c
index 8a64855bd8f..eb2065d4637 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -557,7 +557,7 @@ unregister_colors (pixels, n)
 }
 
 
-DEFUN ("dump-colors", Fdump_colors, Sdump_colors, 0, 0, 0,
+DEFUE ("dump-colors", Fdump_colors, Sdump_colors, 0, 0, 0,
        doc: /* Dump currently allocated colors to stderr.  */)
   (void)
 {
@@ -874,7 +874,7 @@ clear_face_cache (int clear_fonts_p)
 }
 
 
-DEFUN ("clear-face-cache", Fclear_face_cache, Sclear_face_cache, 0, 1, 0,
+DEFUE ("clear-face-cache", Fclear_face_cache, Sclear_face_cache, 0, 1, 0,
        doc: /* Clear face caches on all frames.
 Optional THOROUGHLY non-nil means try to free unused fonts, too.  */)
   (Lisp_Object thoroughly)
@@ -6363,7 +6363,7 @@ dump_realized_face (face)
 }
 
 
-DEFUN ("dump-face", Fdump_face, Sdump_face, 0, 1, 0, doc: /* */)
+DEFUE ("dump-face", Fdump_face, Sdump_face, 0, 1, 0, doc: /* */)
   (Lisp_Object n)
 {
   if (NILP (n))
@@ -6396,7 +6396,7 @@ DEFUN ("dump-face", Fdump_face, Sdump_face, 0, 1, 0, doc: /* */)
 }
 
 
-DEFUN ("show-face-resources", Fshow_face_resources, Sshow_face_resources,
+DEFUE ("show-face-resources", Fshow_face_resources, Sshow_face_resources,
        0, 0, 0, doc: /* */)
   (void)
 {
diff --git a/src/xfns.c b/src/xfns.c
index 04b8e44b561..8d8a908222f 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3520,7 +3520,7 @@ x_get_focus_frame (struct frame *frame)
    policy.  But I think it's okay to use when it's clearly done
    following a user-command.  */
 
-DEFUN ("x-focus-frame", Fx_focus_frame, Sx_focus_frame, 1, 1, 0,
+DEFUE ("x-focus-frame", Fx_focus_frame, Sx_focus_frame, 1, 1, 0,
        doc: /* Set the input focus to FRAME.
 FRAME nil means use the selected frame.  */)
   (Lisp_Object frame)
@@ -3573,7 +3573,7 @@ DEFUN ("xw-color-values", Fxw_color_values, Sxw_color_values, 1, 2, 0,
     return Qnil;
 }
 
-DEFUN ("xw-display-color-p", Fxw_display_color_p, Sxw_display_color_p, 0, 1, 0,
+DEFUE ("xw-display-color-p", Fxw_display_color_p, Sxw_display_color_p, 0, 1, 0,
        doc: /* Internal function called by `display-color-p', which see.  */)
   (Lisp_Object terminal)
 {
@@ -3595,7 +3595,7 @@ DEFUN ("xw-display-color-p", Fxw_display_color_p, Sxw_display_color_p, 0, 1, 0,
     }
 }
 
-DEFUN ("x-display-grayscale-p", Fx_display_grayscale_p, Sx_display_grayscale_p,
+DEFUE ("x-display-grayscale-p", Fx_display_grayscale_p, Sx_display_grayscale_p,
        0, 1, 0,
        doc: /* Return t if the X display supports shades of gray.
 Note that color displays do support shades of gray.
@@ -5229,7 +5229,7 @@ Text larger than the specified size is clipped.  */)
 }
 
 
-DEFUN ("x-hide-tip", Fx_hide_tip, Sx_hide_tip, 0, 0, 0,
+DEFUE ("x-hide-tip", Fx_hide_tip, Sx_hide_tip, 0, 0, 0,
        doc: /* Hide the current tooltip window, if there is any.
 Value is t if tooltip was open, nil otherwise.  */)
   (void)
diff --git a/src/xmenu.c b/src/xmenu.c
index b1f7dfb26bc..595ae795282 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -203,7 +203,7 @@ mouse_position_for_popup (FRAME_PTR f, int *x, int *y)
 
 #ifdef HAVE_MENUS
 
-DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 3, 0,
+DEFUE ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 3, 0,
        doc: /* Pop up a dialog box and return user's selection.
 POSITION specifies which frame to use.
 This is normally a mouse button event or a window or frame.
diff --git a/src/xsettings.c b/src/xsettings.c
index 097b2477e03..da6d088db15 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -718,8 +718,8 @@ DEFUN ("font-get-system-font", Ffont_get_system_font, Sfont_get_system_font,
     : Qnil;
 }
 
-DEFUN ("tool-bar-get-system-style", Ftool_bar_get_system_style, Stool_bar_get_system_style,
-       0, 0, 0,
+DEFUE ("tool-bar-get-system-style", Ftool_bar_get_system_style,
+       Stool_bar_get_system_style, 0, 0, 0,
        doc: /* Get the system tool bar style.
 If no system tool bar style is known, return `tool-bar-style' if set to a
 known style.  Otherwise return image.  */)