diff --git a/src/ChangeLog b/src/ChangeLog
index c3ef1e1d1..06a15d30b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2002-08-18  Pavel Roskin  <proski@gnu.org>
 
+	* boxes.h: Remove user_format.
+	* boxes.c: Make more variables static, remove all extern
+	declarations.
+	* setup.c: Remove some extern declarations.
+
 	* mountlist.h: Move some internals ...
 	* mountlist.c: ... here.
 
diff --git a/src/boxes.c b/src/boxes.c
index 8273e4c7c..832b2db93 100644
--- a/src/boxes.c
+++ b/src/boxes.c
@@ -53,9 +53,10 @@
 #include "selcodepage.h"
 #endif
 
-#ifdef WITH_SMBFS
-#include "../vfs/vfs.h"		/* smb_authinfo */
-#endif /* WITH_SMBFS */
+#include "../vfs/vfs.h"		/* vfs_timeout */
+#ifdef USE_NETCODE
+#   include "../vfs/ftpfs.h"
+#endif
 
 static int DISPLAY_X = 45, DISPLAY_Y = 14;
 
@@ -65,7 +66,6 @@ static WInput *user;
 static WInput *status;
 static WCheck *check_status;
 static int current_mode;
-extern int ftpfs_always_use_proxy;
 
 static char **displays_status;
 static char* display_title = N_(" Listing mode ");
@@ -264,9 +264,9 @@ display_box (WPanel *panel, char **userp, char **minip, int *use_msformat, int n
     return result;
 }
 
-int SORT_X = 40, SORT_Y = 14;
+static int SORT_X = 40, SORT_Y = 14;
 
-char *sort_orders_names [SORT_TYPES];
+static char *sort_orders_names [SORT_TYPES];
 
 sortfn *
 sort_box (sortfn *sort_fn, int *reverse, int *case_sensitive)
@@ -460,7 +460,7 @@ confirm_box ()
 static int new_mode;
 static int new_meta;
 
-char *display_bits_str [] =
+static char *display_bits_str [] =
 { N_("Full 8 bits output"), N_("ISO 8859-1"), N_("7 bits") };
 
 static QuickWidget display_widgets [] = {
@@ -547,7 +547,7 @@ display_bits_box ()
 #else /* HAVE_CHARSET */
 
 
-Dlg_head *dbits_dlg;
+static Dlg_head *dbits_dlg;
 
 static void dbits_refresh()
 {
@@ -573,8 +573,8 @@ static int dbits_callback( Dlg_head * h, int Par, int Msg )
 
 static int new_display_codepage;
 
-WLabel *cplabel;
-WCheck *inpcheck;
+static WLabel *cplabel;
+static WCheck *inpcheck;
 
 static int sel_charset_button( int action, void *param )
 {
@@ -725,14 +725,6 @@ tree_box (char *current_dir)
 
 #define VFSX 56
 
-extern int vfs_timeout;
-extern int ftpfs_always_use_proxy;
-
-#if defined(USE_NETCODE)
-extern char *ftpfs_anonymous_passwd;
-extern char *ftpfs_proxy_host;
-#endif
-
 static char *ret_timeout;
 
 #if defined(USE_NETCODE)
diff --git a/src/boxes.h b/src/boxes.h
index 7369db1dd..4be2b5138 100644
--- a/src/boxes.h
+++ b/src/boxes.h
@@ -1,8 +1,6 @@
 #ifndef __BOXES_H
 #define __BOXES_H
 
-extern char *user_format [];
-
 int     display_box      (WPanel *p, char **user, char **mini,
 			  int *use_msformat, int num);
 sortfn *sort_box         (sortfn *sort_fn, int *reverse,
diff --git a/src/setup.c b/src/setup.c
index cc67dbfdf..c65429b3a 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -52,11 +52,6 @@
 
 /* "$Id$" */
 
-#ifdef USE_VFS
-extern int vfs_timeout;
-extern int tar_gzipped_memlimit;
-#endif
-
 extern char *find_ignore_dirs;
 
 extern int num_history_items_recorded;