diff --git a/common/resolver.h b/common/resolver.h
index 084cf08..966ddc8 100644
--- a/common/resolver.h
+++ b/common/resolver.h
@@ -27,7 +27,7 @@
 extern "C" {
 #endif
 
-int kdb_hosts_loaded;
+extern int kdb_hosts_loaded;
 int kdb_load_hosts (void);
 
 struct hostent *kdb_gethostbyname (const char *name);
diff --git a/mtproto/mtproto-proxy.c b/mtproto/mtproto-proxy.c
index 4d749e1..528ac34 100644
--- a/mtproto/mtproto-proxy.c
+++ b/mtproto/mtproto-proxy.c
@@ -409,7 +409,7 @@ int worker_id, workers, slave_mode, parent_pid;
 int pids[MAX_WORKERS];
 
 long long get_queries;
-long long http_queries;
+extern long long http_queries;
 int pending_http_queries;
 
 long long active_rpcs, active_rpcs_created;
diff --git a/net/net-stats.c b/net/net-stats.c
index 0453d9b..579647c 100644
--- a/net/net-stats.c
+++ b/net/net-stats.c
@@ -52,7 +52,7 @@
 
 #include "engine/engine.h"
 
-struct process_id PID;
+struct process_id PIDstruct;
 
 extern int zheap_debug;
 long long queries_allocated;
@@ -60,8 +60,6 @@ long long max_queries_allocated;
 long long max_queries_allocated_sec;
 long long max_queries_allocated_prev_sec;
 
-long long total_vv_tree_nodes;
-
 int tl_rpc_op_stat __attribute__ ((weak));
 int op_stat_write (stats_buffer_t *sb) __attribute__ ((weak));
 int op_stat_write (stats_buffer_t *sb) { return 0; }
@@ -136,7 +134,7 @@ int prepare_stats (char *buff, int buff_size) {
       get_utime (CLOCK_MONOTONIC) - last_epoll_wait_at,
       epoll_calls,
       epoll_intr,
-      PID_TO_PRINT (&PID)
+      PID_TO_PRINT (&PIDstruct)
       );
 
 
diff --git a/vv/vv-tree.c b/vv/vv-tree.c
index d7c4987..2da17dd 100644
--- a/vv/vv-tree.c
+++ b/vv/vv-tree.c
@@ -21,7 +21,7 @@
 
 #include <assert.h>
       
-long long total_vv_tree_nodes;
+static long long total_vv_tree_nodes;
 
 #define SUFFIX2(a,b) a ## b
 #define SUFFIX(a,b) SUFFIX2(a,b)