--- a/src/defun-dld.h
+++ b/src/defun-dld.h
@@ -33,27 +33,18 @@
 // time.
 //
 // If Octave is not configured for dynamic linking of builtin
-// functions, this is exactly like DEFUN.
+// functions, this is similar to DEFUN, except that it will generate
+// an extra static struct and an extra externally visible function.
+//
+// The first DECLARE_FUN is for the struct, the second is for the
+// definition of the function.
 
-#if defined (OCTAVE_LITE) && defined (WITH_DYNAMIC_LINKING)
-#if ! defined (MAKE_BUILTINS)
-#define DEFUN_DLD_BUILTIN(name, args_name, nargout_name, doc) \
-  DEFUN_DLD (name, args_name, nargout_name, doc)
-#endif
-#else
-#define DEFUN_DLD_BUILTIN(name, args_name, nargout_name, doc) \
+#if defined (MAKE_BUILTINS)
+#if ! (defined (OCTAVE_LITE) && defined (WITH_DYNAMIC_LINKING))
+#define DEFUN_DLD(name, args_name, nargout_name, doc) \
   DEFUN_INTERNAL (name, args_name, nargout_name, 0, doc)
 #endif
-
-// Define a function that may be loaded dynamically at run time.
-//
-// If Octave is not configured for dynamic linking of builtin
-// functions, this won't do anything useful.
-//
-// The forward declaration is for the struct, the second is for the
-// definition of the function.
-
-#if ! defined (MAKE_BUILTINS)
+#else
 #define DEFUN_DLD(name, args_name, nargout_name, doc) \
   DECLARE_FUN (name, args_name, nargout_name); \
   DEFINE_FUN_STRUCT (name, 0, doc); \