--- a/src/defun-int.h	Wed Feb 20 01:09:19 2008 -0500
+++ b/src/defun-int.h	Wed Feb 20 04:22:50 2008 -0500
@@ -28,7 +28,6 @@
 
 #include "ov-builtin.h"
 #include "ov-dld-fcn.h"
-#include "ov-mapper.h"
 #include "symtab.h"
 #include "version.h"
 
@@ -40,9 +39,6 @@
 extern OCTINTERP_API void check_version (const std::string& version, const std::string& fcn);
 
 extern OCTINTERP_API void
-install_builtin_mapper (octave_mapper *mf, const std::string& name);
-
-extern OCTINTERP_API void
 install_builtin_function (octave_builtin::fcn f, const std::string& name,
 			  const std::string& doc, bool is_text_fcn = false,
 			  bool can_hide_function = true);
@@ -179,15 +175,6 @@
     XDEFALIAS_INTERNAL(alias, name) \
   END_INSTALL_BUILTIN
 
-#define DEFUN_MAPPER_INTERNAL(name, ch_map, d_b_map, c_b_map, d_d_map, \
-			      d_c_map, c_c_map, lo, hi, \
-			      ch_map_flag, can_ret_cmplx_for_real, doc) \
-  BEGIN_INSTALL_BUILTIN \
-    XDEFUN_MAPPER_INTERNAL(name, ch_map, d_b_map, c_b_map, d_d_map, \
-		           d_c_map, c_c_map, lo, hi, \
-			   ch_map_flag, can_ret_cmplx_for_real, doc) \
-  END_INSTALL_BUILTIN
-
 #else /* ! MAKE_BUILTINS */
 
 // Generate the first line of the function definition.  This ensures
@@ -207,20 +194,6 @@
 
 #define DEFALIAS_INTERNAL(alias, name)
 
-// How mapper functions are actually installed.
-
-// FIXME -- Really want to avoid the following casts, since
-// (as always with casts) it may mask some real errors...
-
-#define DEFUN_MAPPER_INTERNAL(name, ch_map, d_b_map, c_b_map, d_d_map, \
-			      d_c_map, c_c_map, lo, hi, \
-			      ch_map_flag, can_ret_cmplx_for_real, doc) \
-  install_builtin_mapper \
-    (new octave_mapper \
-       (ch_map, d_b_map, c_b_map, d_d_map, d_c_map, c_c_map, \
-        lo, hi, ch_map_flag, can_ret_cmplx_for_real, #name, doc), \
-     #name)
-
 #endif /* ! MAKE_BUILTINS */
 
 #endif