--- a/src/defun-dld.h
+++ b/src/defun-dld.h
@@ -36,8 +36,32 @@
 // If Octave is not configured for dynamic linking of builtin
 // functions, this is exactly like DEFUN.
 
-#define DEFUN_DLD(name, fname, sname, nargin_max, nargout_max, doc) \
+#if defined (WITH_DLD) && defined (OCTAVE_LITE) && defined (MAKE_BUILTINS)
+#define DEFUN_DLD_BUILTIN(name, fname, sname, nargin_max, nargout_max, doc) \
+  BEGIN_INSTALL_BUILTIN \
+    DEFINE_FUN_STRUCT (name, 0, sname, nargin_max, nargout_max, 0, doc); \
+    install_builtin_function (&sname); \
+  END_INSTALL_BUILTIN
+#else
+#define DEFUN_DLD_BUILTIN(name, fname, sname, nargin_max, nargout_max, doc) \
   DEFUN_INTERNAL (name, fname, sname, nargin_max, nargout_max, 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)
+#define DEFUN_DLD(name, fname, sname, fsname, nargin_max, nargout_max, doc) \
+  DECLARE_FUN (fname);
+  DEFINE_FUN_STRUCT (name, fname, sname, nargin_max, nargout_max, 0, doc); \
+  DEFINE_FUN_STRUCT_FUN (sname, fsname) \
+  DECLARE_FUN (fname)
+#endif
 
 #endif