diff --git a/src/config.c b/src/config.c
index 8ddfe26..a2c0dda 100644
--- a/src/config.c
+++ b/src/config.c
@@ -34,7 +34,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-store_conf_t *stores;
+static store_conf_t *stores;
 
 char *
 get_arg( conffile_t *cfile, int required, int *comment )
diff --git a/src/drv_imap.c b/src/drv_imap.c
index dc00a14..ee2d1a8 100644
--- a/src/drv_imap.c
+++ b/src/drv_imap.c
@@ -3184,7 +3184,7 @@ imap_get_fail_state( store_conf_t *gconf )
 
 /******************* imap_parse_store *******************/
 
-imap_server_conf_t *servers, **serverapp = &servers;
+static imap_server_conf_t *servers, **serverapp = &servers;
 
 static int
 imap_parse_store( conffile_t *cfg, store_conf_t **storep )
diff --git a/src/main.c b/src/main.c
index 2cb092c..c2420ef 100644
--- a/src/main.c
+++ b/src/main.c
@@ -49,8 +49,8 @@ const char *Home;	/* for config */
 
 int BufferLimit = 10 * 1024 * 1024;
 
-int chans_total, chans_done;
-int boxes_total, boxes_done;
+static int chans_total, chans_done;
+static int boxes_total, boxes_done;
 int new_total[2], new_done[2];
 int flags_total[2], flags_done[2];
 int trash_total[2], trash_done[2];
diff --git a/src/sync.c b/src/sync.c
index 786ca1e..cf788f0 100644
--- a/src/sync.c
+++ b/src/sync.c
@@ -65,7 +65,7 @@ debugn( const char *msg, ... )
 	va_end( va );
 }
 
-void
+static void
 Fclose( FILE *f, int safe )
 {
 	if ((safe && (fflush( f ) || (UseFSync && fdatasync( fileno( f ) )))) || fclose( f ) == EOF) {
@@ -74,7 +74,7 @@ Fclose( FILE *f, int safe )
 	}
 }
 
-void ATTR_PRINTFLIKE(2, 0)
+static void ATTR_PRINTFLIKE(2, 0)
 vFprintf( FILE *f, const char *msg, va_list va )
 {
 	int r;
@@ -86,7 +86,7 @@ vFprintf( FILE *f, const char *msg, va_list va )
 	}
 }
 
-void ATTR_PRINTFLIKE(2, 3)
+static void ATTR_PRINTFLIKE(2, 3)
 Fprintf( FILE *f, const char *msg, ... )
 {
 	va_list va;
@@ -217,7 +217,7 @@ static int check_cancel( sync_vars_t *svars );
 #define ST_SENDING_NEW     (1<<15)
 
 
-void ATTR_PRINTFLIKE(2, 3)
+static void ATTR_PRINTFLIKE(2, 3)
 jFprintf( sync_vars_t *svars, const char *msg, ... )
 {
 	va_list va;