--- a/src/defaults.h.in	Sat May 06 14:55:35 2006 +0000
+++ b/src/defaults.h.in	Mon May 08 20:23:07 2006 +0000
@@ -185,23 +185,17 @@
 extern std::string Vfcn_file_dir;
 extern std::string Voct_file_dir;
 
-// The path that will be searched for programs that we execute.
-// (--exec-path path)
-extern std::string Vexec_path;
-
 // And the cached directory path corresponding to Vload_path.
 extern dir_path Vload_path_dir_path;
 
 // Name of the editor to be invoked by the edit_history command.
-extern std::string Veditor;
-
-extern std::string Vimagepath;
+extern std::string VEDITOR;
 
 extern std::string Vlocal_site_defaults_file;
 extern std::string Vsite_defaults_file;
 
 // Name of the FFTW wisdom program.
-extern std::string Vfftw_wisdom_prog;
+extern std::string Vfftw_wisdom_program;
 
 extern void execute_default_pkg_add_files (void);