--- a/src/variables.h
+++ b/src/variables.h
@@ -26,8 +26,6 @@
 
 class octave_function;
 class octave_user_function;
-class symbol_record;
-class symbol_table;
 
 class tree_identifier;
 class octave_value;
@@ -45,11 +43,9 @@
 #include "ov-builtin.h"
 #include "symtab.h"
 
-extern OCTINTERP_API bool at_top_level (void);
-
-extern OCTINTERP_API void initialize_symbol_tables (void);
 extern OCTINTERP_API void clear_mex_functions (void);
 
+extern OCTINTERP_API void mark_as_command (const std::string&);
 extern OCTINTERP_API bool is_command_name (const std::string&);
 
 // The next three are here temporarily...
@@ -58,9 +54,6 @@
 extern OCTINTERP_API void unmark_rawcommand (const std::string& s);
 
 extern OCTINTERP_API bool is_rawcommand_name (const std::string&);
-extern OCTINTERP_API bool is_mapper_function_name (const std::string&);
-extern OCTINTERP_API bool is_builtin_function_name (const std::string&);
-extern OCTINTERP_API bool is_globally_visible (const std::string&);
 
 extern OCTINTERP_API octave_function *
 is_valid_function (const octave_value&, const std::string& = std::string (),
@@ -91,20 +84,6 @@
 extern OCTINTERP_API std::string
 unique_symbol_name (const std::string& basename);
 
-extern OCTINTERP_API bool
-fcn_out_of_date (octave_function *fcn, const std::string& ff, time_t tp);
-
-extern OCTINTERP_API bool lookup (symbol_record *s, bool exec_script = true);
-
-extern OCTINTERP_API symbol_record *
-lookup_by_name (const std::string& nm, bool exec_script = true);
-
-extern OCTINTERP_API octave_value
-lookup_function (const std::string& nm,
-		 const std::string& parent = std::string ());
-
-extern OCTINTERP_API octave_value lookup_user_function (const std::string& nm);
-
 extern OCTINTERP_API octave_value lookup_function_handle (const std::string& nm);
 
 extern OCTINTERP_API octave_value
@@ -147,38 +126,18 @@
 extern OCTINTERP_API int builtin_real_scalar_variable (const std::string&, double&);
 extern OCTINTERP_API octave_value builtin_any_variable (const std::string&);
 
-extern OCTINTERP_API void link_to_global_variable (symbol_record *sr);
-extern OCTINTERP_API void link_to_builtin_or_function (symbol_record *sr);
-
-extern OCTINTERP_API void force_link_to_function (const std::string&);
-
 extern OCTINTERP_API void bind_ans (const octave_value& val, bool print);
 
 extern OCTINTERP_API void
 bind_internal_variable (const std::string& fname, const octave_value& val);
 
-extern OCTINTERP_API void mlock (const std::string&);
+extern OCTINTERP_API void mlock (void);
 extern OCTINTERP_API void munlock (const std::string&);
 extern OCTINTERP_API bool mislocked (const std::string&);
 
-extern OCTINTERP_API bool clear_function (const std::string& nm);
-extern OCTINTERP_API bool clear_variable (const std::string& nm);
-extern OCTINTERP_API bool clear_symbol (const std::string& nm);
-
-// Symbol table for symbols at the top level.
-extern OCTINTERP_API symbol_table *top_level_sym_tab;
-
-// Symbol table for the current scope.
-extern OCTINTERP_API symbol_table *curr_sym_tab;
-
-// Symbol table for the current caller scope.
-extern OCTINTERP_API symbol_table *curr_caller_sym_tab;
-
-// Symbol table for global symbols.
-extern OCTINTERP_API symbol_table *global_sym_tab;
-
-// Symbol table for functions and built-in symbols.
-extern OCTINTERP_API symbol_table *fbi_sym_tab;
+extern OCTINTERP_API void clear_function (const std::string& nm);
+extern OCTINTERP_API void clear_variable (const std::string& nm);
+extern OCTINTERP_API void clear_symbol (const std::string& nm);
 
 #endif