diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index 6ce41677afcd137fd5f48e6d2452f078ca9b04fb..07ce051576d5eaec80699635ee8dced2e435a103 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -34,7 +34,7 @@
 //#define DEBUG_MMAP
 
 #if defined(CONFIG_USE_NPTL)
-pthread_mutex_t mmap_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t mmap_mutex = PTHREAD_MUTEX_INITIALIZER;
 static int __thread mmap_lock_count;
 
 void mmap_lock(void)
diff --git a/slirp/slirp.c b/slirp/slirp.c
index 691420e801a128da0c6cd5ec4e998deaec363d05..d4a9bacf17c9b49f0cdc2341eb8e85d0cc43b1c5 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -104,7 +104,7 @@ static void winsock_cleanup(void)
 
 #else
 
-struct stat dns_addr_stat;
+static struct stat dns_addr_stat;
 
 int get_dns_addr(struct in_addr *pdns_addr)
 {
diff --git a/target-i386/ops_sse.h b/target-i386/ops_sse.h
index 47a01d40f911c3a0bc5d72489a229fd1343a40f2..709732a4a795a0452fc4b2caa7b3811e8d5a1f5f 100644
--- a/target-i386/ops_sse.h
+++ b/target-i386/ops_sse.h
@@ -895,7 +895,7 @@ SSE_HELPER_CMP(cmpnlt, FPU_CMPNLT)
 SSE_HELPER_CMP(cmpnle, FPU_CMPNLE)
 SSE_HELPER_CMP(cmpord, FPU_CMPORD)
 
-const int comis_eflags[4] = {CC_C, CC_Z, 0, CC_Z | CC_P | CC_C};
+static const int comis_eflags[4] = {CC_C, CC_Z, 0, CC_Z | CC_P | CC_C};
 
 void helper_ucomiss(Reg *d, Reg *s)
 {