--- a/src/symsinit.h	Mon Aug 13 11:12:06 2007 +0200
+++ b/src/symsinit.h	Mon Aug 13 11:13:30 2007 +0200
@@ -20,8 +20,8 @@
 
 /* Synched up with: Not in FSF. */
 
-#ifndef _XEMACS_SYMSINIT_H_
-#define _XEMACS_SYMSINIT_H_
+#ifndef INCLUDED_symsinit_h_
+#define INCLUDED_symsinit_h_
 
 /* Earliest environment initializations (dump-time and run-time). */
 
@@ -33,11 +33,14 @@
 void init_ralloc (void);
 void init_signals_very_early (void);
 
-/* Early Lisp-engine initialization (dump-time only). */
+/* Early Lisp-engine initialization (dump-time for init, run-time for reinit). */
 
 void init_alloc_once_early (void);
+void reinit_alloc_once_early (void);
 void init_symbols_once_early (void);
+void reinit_symbols_once_early (void);
 void init_errors_once_early (void);
+void reinit_opaque_once_early (void);
 void init_opaque_once_early (void);
 
 /* Declare the built-in symbols and primitives (dump-time only). */
@@ -95,9 +98,12 @@
 void syms_of_glyphs_widget (void);
 void syms_of_glyphs_mswindows (void);
 void syms_of_glyphs (void);
+void syms_of_gui_mswindows (void);
 void syms_of_gui_x (void);
 void syms_of_gui (void);
+void syms_of_gutter (void);
 void syms_of_indent (void);
+void syms_of_input_method_xlib (void);
 void syms_of_intl (void);
 void syms_of_keymap (void);
 void syms_of_lread (void);
@@ -113,8 +119,9 @@
 void syms_of_mule_canna (void);
 void syms_of_mule_ccl (void);
 void syms_of_mule_charset (void);
-void syms_of_mule_coding (void);
+void syms_of_file_coding (void);
 void syms_of_mule_wnn (void);
+void syms_of_ntproc (void);
 void syms_of_objects_tty (void);
 void syms_of_objects_x (void);
 void syms_of_objects_mswindows (void);
@@ -129,6 +136,7 @@
 void syms_of_scrollbar (void);
 void syms_of_scrollbar_mswindows(void);
 void syms_of_search (void);
+void syms_of_select (void);
 void syms_of_select_mswindows (void);
 void syms_of_signal (void);
 void syms_of_sound (void);
@@ -136,34 +144,42 @@
 void syms_of_sunpro (void);
 void syms_of_symbols (void);
 void syms_of_syntax (void);
+void syms_of_tests (void);
 void syms_of_toolbar (void);
 void syms_of_tooltalk (void);
 void syms_of_undo (void);
 void syms_of_widget (void);
 void syms_of_window (void);
-void syms_of_xselect (void);
+void syms_of_select_x (void);
 void syms_of_eldap (void);
+void syms_of_gpmevent (void);
 
-/* Initialize the console types (dump-time only). */
+/* Initialize the console types (dump-time but for reinit_). */
 
 void console_type_create (void);
 void console_type_create_stream (void);
+void reinit_console_type_create_stream (void);
 void console_type_create_tty (void);
+void reinit_console_type_create_tty (void);
 void console_type_create_device_tty (void);
 void console_type_create_frame_tty (void);
 void console_type_create_objects_tty (void);
 void console_type_create_redisplay_tty (void);
 void console_type_create_x (void);
+void reinit_console_type_create_x (void);
 void console_type_create_device_x (void);
+void reinit_console_type_create_device_x (void);
 void console_type_create_frame_x (void);
 void console_type_create_glyphs_x (void);
 void console_type_create_menubar_x (void);
 void console_type_create_objects_x (void);
 void console_type_create_redisplay_x (void);
 void console_type_create_scrollbar_x (void);
+void console_type_create_select_x (void);
 void console_type_create_toolbar_x (void);
 void console_type_create_dialog_x (void);
 void console_type_create_mswindows (void);
+void reinit_console_type_create_mswindows (void);
 void console_type_create_device_mswindows (void);
 void console_type_create_frame_mswindows (void);
 void console_type_create_menubar_mswindows (void);
@@ -173,13 +189,20 @@
 void console_type_create_toolbar_mswindows (void);
 void console_type_create_glyphs_mswindows (void);
 void console_type_create_dialog_mswindows (void);
+void console_type_create_select_mswindows (void);
 
 /* Initialize the specifier types (dump-time only). */
 
 void specifier_type_create (void);
+void reinit_specifier_type_create (void);
 void specifier_type_create_image (void);
+void reinit_specifier_type_create_image (void);
+void specifier_type_create_gutter (void);
+void reinit_specifier_type_create_gutter (void);
 void specifier_type_create_objects (void);
+void reinit_specifier_type_create_objects (void);
 void specifier_type_create_toolbar (void);
+void reinit_specifier_type_create_toolbar (void);
 
 /* Initialize the structure types (dump-time only). */
 
@@ -196,11 +219,12 @@
 void image_instantiator_format_create_glyphs_widget (void);
 void image_instantiator_format_create_glyphs_x (void);
 void image_instantiator_format_create_glyphs_mswindows (void);
+void image_instantiator_format_create_glyphs_tty (void);
 
 /* Initialize the lstream types (dump-time only). */
 
 void lstream_type_create (void);
-void lstream_type_create_mule_coding (void);
+void lstream_type_create_file_coding (void);
 void lstream_type_create_print (void);
 void lstream_type_create_mswindows_selectable (void);
 
@@ -213,27 +237,33 @@
 
 void init_provide_once (void);
 
-/* Initialize most variables (dump-time only). */
+/* Initialize most variables (dump-time for vars_, run-time for reinit_vars). */
 
 void vars_of_abbrev (void);
 void vars_of_alloc (void);
 void vars_of_balloon_x (void);
 void vars_of_buffer (void);
+void reinit_vars_of_buffer (void);
 void vars_of_bytecode (void);
 void vars_of_callint (void);
 void vars_of_callproc (void);
+void vars_of_chartab (void);
 void vars_of_cmdloop (void);
 void vars_of_cmds (void);
 void vars_of_console (void);
+void reinit_vars_of_console (void);
 void vars_of_console_stream (void);
 void vars_of_console_mswindows (void);
 void vars_of_console_tty (void);
 void vars_of_data (void);
 void vars_of_database (void);
 void vars_of_debug (void);
+void reinit_vars_of_debug (void);
 void vars_of_device (void);
+void reinit_vars_of_device (void);
 void vars_of_device_mswindows (void);
 void vars_of_device_x (void);
+void reinit_vars_of_device_x (void);
 void vars_of_dialog (void);
 void vars_of_dialog_x (void);
 void vars_of_dialog_mswindows (void);
@@ -245,79 +275,113 @@
 void vars_of_elhash (void);
 void vars_of_emacs (void);
 void vars_of_eval (void);
+void reinit_vars_of_eval (void);
 void vars_of_event_stream (void);
+void reinit_vars_of_event_stream (void);
 void vars_of_event_tty (void);
+void reinit_vars_of_event_tty (void);
 void vars_of_event_mswindows (void);
+void reinit_vars_of_event_mswindows (void);
 void vars_of_event_Xt (void);
+void reinit_vars_of_event_Xt (void);
 void vars_of_events (void);
+void reinit_vars_of_events (void);
 void vars_of_extents (void);
+void reinit_vars_of_extents (void);
 void vars_of_faces (void);
 void vars_of_fileio (void);
 void vars_of_filelock (void);
 void vars_of_floatfns (void);
 void vars_of_font_lock (void);
+void reinit_vars_of_font_lock (void);
 void vars_of_frame_tty (void);
 void vars_of_frame_mswindows (void);
+void reinit_vars_of_frame_mswindows (void);
 void vars_of_frame_x (void);
 void vars_of_frame (void);
 void vars_of_glyphs_x (void);
 void vars_of_glyphs_eimage (void);
 void vars_of_glyphs_widget (void);
+void reinit_vars_of_glyphs_widget (void);
 void vars_of_glyphs_mswindows (void);
 void vars_of_glyphs (void);
+void reinit_vars_of_glyphs (void);
 void vars_of_gui_x (void);
+void reinit_vars_of_gui_x (void);
 void vars_of_gui (void);
+void vars_of_gutter (void);
 void vars_of_input_method_motif (void);
 void vars_of_input_method_xlib (void);
 void vars_of_indent (void);
 void vars_of_insdel (void);
+void reinit_vars_of_insdel (void);
 void vars_of_intl (void);
 void vars_of_keymap (void);
 void vars_of_lread (void);
+void reinit_vars_of_lread (void);
 void vars_of_lstream (void);
+void reinit_vars_of_lstream (void);
 void vars_of_macros (void);
 void vars_of_md5 (void);
 void vars_of_menubar_x (void);
+void reinit_vars_of_menubar_x (void);
 void vars_of_menubar (void);
 void vars_of_menubar_mswindows (void);
 void vars_of_minibuf (void);
+void reinit_vars_of_minibuf (void);
 void vars_of_module (void);
+void reinit_vars_of_module (void);
 void vars_of_mule (void);
 void vars_of_mule_canna (void);
+void vars_of_mule_ccl(void);
 void vars_of_mule_charset (void);
-void vars_of_mule_coding (void);
+void vars_of_file_coding (void);
 void vars_of_mule_wnn (void);
+void vars_of_nt (void);
+void vars_of_ntproc (void);
 void vars_of_objects (void);
+void reinit_vars_of_objects (void);
 void vars_of_objects_tty (void);
 void vars_of_objects_mswindows (void);
 void vars_of_objects_x (void);
 void vars_of_print (void);
+void reinit_vars_of_print (void);
 void vars_of_process (void);
 void vars_of_process_nt (void);
 void vars_of_process_unix (void);
 void vars_of_profile (void);
 void vars_of_ralloc (void);
 void vars_of_redisplay (void);
+void reinit_vars_of_redisplay (void);
 void vars_of_scrollbar_x (void);
+void reinit_vars_of_scrollbar_x (void);
 void vars_of_scrollbar (void);
 void vars_of_scrollbar_mswindows (void);
 void vars_of_search (void);
+void reinit_vars_of_search (void);
+void vars_of_select (void);
 void vars_of_select_mswindows (void);
 void vars_of_sound (void);
 void vars_of_specifier (void);
 void vars_of_sunpro (void);
 void vars_of_symbols (void);
 void vars_of_syntax (void);
+void vars_of_tests (void);
 void vars_of_toolbar (void);
 void vars_of_tooltalk (void);
 void vars_of_undo (void);
+void reinit_vars_of_undo (void);
 void vars_of_window (void);
-void vars_of_xselect (void);
+void reinit_vars_of_window (void);
+void vars_of_select_x (void);
+void reinit_vars_of_select_x (void);
 void vars_of_eldap (void);
+void vars_of_gpmevent (void);
 
 /* Initialize specifier variables (dump-time only). */
 
 void specifier_vars_of_glyphs (void);
+void specifier_vars_of_gutter (void);
 void specifier_vars_of_menubar (void);
 void specifier_vars_of_redisplay (void);
 void specifier_vars_of_scrollbar (void);
@@ -325,7 +389,7 @@
 void specifier_vars_of_window (void);
 
 /* Initialize variables with complex dependencies
-   on other variables (dump-time only). */
+   on other variables (dump-time for complex_vars_, run-time for reinit_). */
 
 void complex_vars_of_regex (void);
 void complex_vars_of_search (void);
@@ -333,7 +397,7 @@
 void complex_vars_of_extents (void);
 void complex_vars_of_faces (void);
 void complex_vars_of_mule_charset (void);
-void complex_vars_of_mule_coding (void);
+void complex_vars_of_file_coding (void);
 void complex_vars_of_glyphs (void);
 void complex_vars_of_glyphs_x (void);
 void complex_vars_of_glyphs_mswindows (void);
@@ -345,11 +409,13 @@
 void complex_vars_of_syntax (void);
 void complex_vars_of_chartab (void);
 void complex_vars_of_buffer (void);
+void reinit_complex_vars_of_buffer (void);
 void complex_vars_of_console (void);
+void reinit_complex_vars_of_console (void);
 void complex_vars_of_emacs (void);
 void complex_vars_of_minibuf (void);
+void reinit_complex_vars_of_minibuf (void);
 void complex_vars_of_callproc (void);
-void complex_vars_of_filelock (void);
 void complex_vars_of_keymap (void);
 
 /* Reset the Lisp engine (run-time only). */
@@ -381,4 +447,4 @@
 void init_redisplay (void);
 void init_sunpro (void);
 
-#endif /* _XEMACS_SYMSINIT_H_ */
+#endif /* INCLUDED_symsinit_h_ */