diff --git a/src/ChangeLog b/src/ChangeLog
index 06a15d30b..cdc4a6d23 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2002-08-18  Pavel Roskin  <proski@gnu.org>
 
+	* main.h [USE_INTERNAL_EDIT]: Don't include declarations from
+	edit.h.
+	* setup.c [USE_INTERNAL_EDIT]: Include edit.h.
+
 	* boxes.h: Remove user_format.
 	* boxes.c: Make more variables static, remove all extern
 	declarations.
diff --git a/src/main.h b/src/main.h
index 41b610907..50bcb4f5e 100644
--- a/src/main.h
+++ b/src/main.h
@@ -42,22 +42,6 @@ extern int use_internal_view;
 extern int use_internal_edit;
 extern char *view_one_file;
 extern char *edit_one_file;
-#ifdef USE_INTERNAL_EDIT
-extern int edit (const char *file, int line);
-extern int option_word_wrap_line_length;
-extern int edit_key_emulation;
-extern int option_tab_spacing;
-extern int option_fill_tabs_with_spaces;
-extern int option_return_does_auto_indent;
-extern int option_backspace_through_tabs;
-extern int option_fake_half_tabs;
-extern int option_save_mode;
-extern int option_backup_ext_int;
-extern int option_auto_para_formatting;
-extern int option_typewriter_wrap;
-extern int edit_confirm_save;
-extern int option_syntax_highlighting;
-#endif	/* ! USE_INTERNAL_EDIT */
 extern int fast_reload_w;
 extern int clear_before_exec;
 extern int mou_auto_repeat;
diff --git a/src/setup.c b/src/setup.c
index c65429b3a..530587371 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -50,6 +50,11 @@
 #   include "../vfs/ftpfs.h"
 #endif
 
+#ifdef USE_INTERNAL_EDIT
+#   include "../edit/edit.h"
+#endif
+
+
 /* "$Id$" */
 
 extern char *find_ignore_dirs;