Add -Wmissing-variable-declarations, with attendant fixes

This is a big-ish patch, but it's very straightforward.  Under this
clang warning, we're not actually allowed to have a global variable
without a previous extern declaration for it.  The cases where we
violated this rule fall into three roughly equal groups:
  * Stuff that should have been static.
  * Stuff that was global but where the extern was local to some
    other C file.
  * Stuff that was only global when built for the unit tests, that
    needed a conditional extern in the headers.

The first two were IMO genuine problems; the last is a wart of how
we build tests.

25 files changed, 126 insertions, 149 deletions

diff --git a/src/test/bench.c b/src/test/bench.c
index 5aefda5ff2..5595988f31 100644
--- a/src/test/bench.c
+++ b/src/test/bench.c
@@ -3,6 +3,7 @@
  * Copyright (c) 2007-2016, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
+extern const char tor_git_revision[];
 /* Ordinarily defined in tor_main.c; this bit is just here to provide one
  * since we're not linking to tor_main.c */
 const char tor_git_revision[] = "";
diff --git a/src/test/example_extrainfo.inc b/src/test/example_extrainfo.inc
index e096afd6c4..0bf2341ef5 100644
--- a/src/test/example_extrainfo.inc
+++ b/src/test/example_extrainfo.inc
@@ -133,7 +133,7 @@ static const char EX_EI_BAD_NICKNAME_KEY[] =
   "/UBWNSyXCFDMqnddb/LZ8+VgttmxfYkpeRzSSmDijN3RbOvYJhhBAgMBAAE=\n"
   "-----END RSA PUBLIC KEY-----\n";
 
-const char EX_EI_BAD_TOKENS[] =
+static const char EX_EI_BAD_TOKENS[] =
   "extra-info bob 6F314FB01A31162BD5E473D4977AC570DC5B86BB\n"
   "published 2014-10-05 20:07:00\n"
   "published 2014-10-05 20:07:00\n"
@@ -145,8 +145,9 @@ const char EX_EI_BAD_TOKENS[] =
   "-----END SIGNATURE-----\n"
   ;
 
-const char EX_EI_BAD_TOKENS_FP[] = "6F314FB01A31162BD5E473D4977AC570DC5B86BB";
-const char EX_EI_BAD_TOKENS_KEY[] =
+static const char EX_EI_BAD_TOKENS_FP[] =
+  "6F314FB01A31162BD5E473D4977AC570DC5B86BB";
+static const char EX_EI_BAD_TOKENS_KEY[] =
   "-----BEGIN RSA PUBLIC KEY-----\n"
   "MIGJAoGBAL7Z8tz45Tb4tnEFS2sAyjubBV/giSfZdmXRkDV8Jo4xqWqhWFJn7+zN\n"
   "AXBWBThGeVH2WXrpz5seNJXgZJPxMTMsrnSCGcRXZw0Npti2MkLuQ6+prZa+OPwE\n"
@@ -210,7 +211,8 @@ static const char EX_EI_GOOD_ED_EI[] =
   "\n"
   "\n"
   ;
-const char EX_EI_GOOD_ED_EI_FP[] = "A692FE045C32B5E3A54B52882EF678A9DAC46A73";
+static const char EX_EI_GOOD_ED_EI_FP[] =
+  "A692FE045C32B5E3A54B52882EF678A9DAC46A73";
 static const char EX_EI_GOOD_ED_EI_KEY[] =
   "-----BEGIN RSA PUBLIC KEY-----\n"
   "MIGJAoGBAM3jdYwjwGxDWYj/vyFkQT7RgeCNIn89Ei6D2+L/fdtFnqrMXOreFFHL\n"
@@ -237,7 +239,8 @@ static const char EX_EI_ED_MISSING_SIG[] =
   "\n"
   "\n"
   ;
-const char EX_EI_ED_MISSING_SIG_FP[] = "2A7521497B91A8437021515308A47491164EDBA1";
+static const char EX_EI_ED_MISSING_SIG_FP[] =
+  "2A7521497B91A8437021515308A47491164EDBA1";
 static const char EX_EI_ED_MISSING_SIG_KEY[] =
   "-----BEGIN RSA PUBLIC KEY-----\n"
   "MIGJAoGBAOOB8ccxbtk2dB5FuKFhGndDcO6STNjB6KiG0b9X2QwKrOZMfmXSigto\n"
@@ -260,7 +263,8 @@ static const char EX_EI_ED_MISSING_CERT[] =
   "\n"
   "\n"
   ;
-const char EX_EI_ED_MISSING_CERT_FP[] = "E88E43E86015345A323D93D825C33E4AD1028F65";
+static const char EX_EI_ED_MISSING_CERT_FP[] =
+  "E88E43E86015345A323D93D825C33E4AD1028F65";
 static const char EX_EI_ED_MISSING_CERT_KEY[] =
   "-----BEGIN RSA PUBLIC KEY-----\n"
   "MIGJAoGBALjA/geb0TR9rp/UPvLhABQpB0XUDYuZAnLkrv+i7AAV7FemTDveEGnc\n"
@@ -284,7 +288,8 @@ static const char EX_EI_ED_BAD_CERT1[] =
   "-----END SIGNATURE-----\n"
   "\n"
   ;
-const char EX_EI_ED_BAD_CERT1_FP[] = "F78D8A655607D32281D02144817A4F1D26AE520F";
+static const char EX_EI_ED_BAD_CERT1_FP[] =
+  "F78D8A655607D32281D02144817A4F1D26AE520F";
 static const char EX_EI_ED_BAD_CERT1_KEY[] =
   "-----BEGIN RSA PUBLIC KEY-----\n"
   "MIGJAoGBAMlR46JhxsCmWYtmIB/JjTV2TUYIhJLmHy+X7FfkK3ZVQvvl9/3GSXFL\n"
@@ -309,7 +314,8 @@ static const char EX_EI_ED_BAD_CERT2[] =
   "cVrtU6RVmzldSbyir8V/Z4S/Cm67gYAgjM5gfoFUqDs=\n"
   "-----END SIGNATURE-----\n"
   ;
-const char EX_EI_ED_BAD_CERT2_FP[] = "7C2B42E783C4E0EB0CC3BDB37385D16737BACFBD";
+static const char EX_EI_ED_BAD_CERT2_FP[] =
+  "7C2B42E783C4E0EB0CC3BDB37385D16737BACFBD";
 static const char EX_EI_ED_BAD_CERT2_KEY[] =
   "-----BEGIN RSA PUBLIC KEY-----\n"
   "MIGJAoGBALAM1F/0XJEsbxIQqb3+ObX/yGVnq9of8Q9sLsmxffD6hwVpCqnV3lTg\n"
@@ -335,7 +341,8 @@ static const char EX_EI_ED_BAD_SIG1[] =
   "-----END SIGNATURE-----\n"
   "\n"
   ;
-const char EX_EI_ED_BAD_SIG1_FP[] = "5AC3A538FEEFC6F9FCC5FA0CE64704396C30D62A";
+static const char EX_EI_ED_BAD_SIG1_FP[] =
+  "5AC3A538FEEFC6F9FCC5FA0CE64704396C30D62A";
 static const char EX_EI_ED_BAD_SIG1_KEY[] =
   "-----BEGIN RSA PUBLIC KEY-----\n"
   "MIGJAoGBAMvb6SuoIkPfBkJgQuo5aQDepAs1kEETZ9VXotMlhB0JJikrqBrAAz+7\n"
@@ -361,7 +368,8 @@ static const char EX_EI_ED_BAD_SIG2[] =
   "-----END SIGNATURE-----\n"
   "\n"
   ;
-const char EX_EI_ED_BAD_SIG2_FP[] = "7F1D4DD477E340C6D6B389FAC26EDC746113082F";
+static const char EX_EI_ED_BAD_SIG2_FP[] =
+  "7F1D4DD477E340C6D6B389FAC26EDC746113082F";
 static const char EX_EI_ED_BAD_SIG2_KEY[] =
   "-----BEGIN RSA PUBLIC KEY-----\n"
   "MIGJAoGBALzOyfCEUZnvCyhlyMctPkdXg/XRE3Cr6QgyzdKf5kQbUiu2n0FgSHOX\n"
@@ -388,7 +396,8 @@ static const char EX_EI_ED_MISPLACED_CERT[] =
   "-----END SIGNATURE-----\n"
   "\n"
   ;
-const char EX_EI_ED_MISPLACED_CERT_FP[] = "3B788BD0CE348BC5CED48313307C78175EB6D0F3";
+static const char EX_EI_ED_MISPLACED_CERT_FP[] =
+  "3B788BD0CE348BC5CED48313307C78175EB6D0F3";
 static const char EX_EI_ED_MISPLACED_CERT_KEY[] =
   "-----BEGIN RSA PUBLIC KEY-----\n"
   "MIGJAoGBALTwNqhTprg1oC6bEbDqwIYBoER6prqUXQFbwbFDn+ekXhZj8vltgGwp\n"
@@ -414,7 +423,8 @@ static const char EX_EI_ED_MISPLACED_SIG[] =
   "-----END SIGNATURE-----\n"
   "\n"
   ;
-const char EX_EI_ED_MISPLACED_SIG_FP[] = "384E40A5DEED4AB1D8A74F1FCBDB18B7C24A8284";
+static const char EX_EI_ED_MISPLACED_SIG_FP[] =
+  "384E40A5DEED4AB1D8A74F1FCBDB18B7C24A8284";
 static const char EX_EI_ED_MISPLACED_SIG_KEY[] =
   "-----BEGIN RSA PUBLIC KEY-----\n"
   "MIGJAoGBAK0HgOCG/6433VCrwz/vhk3cKmyOfenCp0GZ4DIUwPWt4DeyP4nTbN6T\n"
diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c
index 5e89534db6..c28d5054a2 100644
--- a/src/test/test-memwipe.c
+++ b/src/test/test-memwipe.c
@@ -14,6 +14,7 @@ static unsigned fill_heap_buffer_memwipe(void) __attribute__((noinline));
 static unsigned fill_heap_buffer_nothing(void) __attribute__((noinline));
 static unsigned check_a_buffer(void) __attribute__((noinline));
 
+extern const char *s; /* Make the linkage global */
 const char *s = NULL;
 
 #define BUF_LEN 2048
diff --git a/src/test/test.c b/src/test/test.c
index 1595c8ee4f..c0faec3027 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -1124,62 +1124,6 @@ static struct testcase_t test_array[] = {
   END_OF_TESTCASES
 };
 
-extern struct testcase_t accounting_tests[];
-extern struct testcase_t addr_tests[];
-extern struct testcase_t address_tests[];
-extern struct testcase_t buffer_tests[];
-extern struct testcase_t cell_format_tests[];
-extern struct testcase_t cell_queue_tests[];
-extern struct testcase_t channel_tests[];
-extern struct testcase_t channeltls_tests[];
-extern struct testcase_t checkdir_tests[];
-extern struct testcase_t circuitlist_tests[];
-extern struct testcase_t circuitmux_tests[];
-extern struct testcase_t compat_libevent_tests[];
-extern struct testcase_t config_tests[];
-extern struct testcase_t connection_tests[];
-extern struct testcase_t container_tests[];
-extern struct testcase_t controller_tests[];
-extern struct testcase_t controller_event_tests[];
-extern struct testcase_t crypto_tests[];
-extern struct testcase_t dir_tests[];
-extern struct testcase_t dir_handle_get_tests[];
-extern struct testcase_t entryconn_tests[];
-extern struct testcase_t entrynodes_tests[];
-extern struct testcase_t guardfraction_tests[];
-extern struct testcase_t extorport_tests[];
-extern struct testcase_t hs_tests[];
-extern struct testcase_t introduce_tests[];
-extern struct testcase_t keypin_tests[];
-extern struct testcase_t link_handshake_tests[];
-extern struct testcase_t logging_tests[];
-extern struct testcase_t microdesc_tests[];
-extern struct testcase_t nodelist_tests[];
-extern struct testcase_t oom_tests[];
-extern struct testcase_t options_tests[];
-extern struct testcase_t policy_tests[];
-extern struct testcase_t procmon_tests[];
-extern struct testcase_t pubsub_tests[];
-extern struct testcase_t pt_tests[];
-extern struct testcase_t relay_tests[];
-extern struct testcase_t relaycell_tests[];
-extern struct testcase_t rend_cache_tests[];
-extern struct testcase_t replaycache_tests[];
-extern struct testcase_t router_tests[];
-extern struct testcase_t routerkeys_tests[];
-extern struct testcase_t routerlist_tests[];
-extern struct testcase_t routerset_tests[];
-extern struct testcase_t scheduler_tests[];
-extern struct testcase_t socks_tests[];
-extern struct testcase_t status_tests[];
-extern struct testcase_t thread_tests[];
-extern struct testcase_t tortls_tests[];
-extern struct testcase_t util_tests[];
-extern struct testcase_t util_format_tests[];
-extern struct testcase_t util_process_tests[];
-extern struct testcase_t dns_tests[];
-extern struct testcase_t handle_tests[];
-
 struct testgroup_t testgroups[] = {
   { "", test_array },
   { "accounting/", accounting_tests },
diff --git a/src/test/test.h b/src/test/test.h
index 153b7cae00..747b61d669 100644
--- a/src/test/test.h
+++ b/src/test/test.h
@@ -163,11 +163,86 @@ struct crypto_pk_t *pk_generate(int idx);
 
 #define CALLED(mock_name) US_CONCAT_2_(NS(mock_name), called)
 #define NS_DECL(retval, mock_fn, args) \
+    extern int CALLED(mock_fn);        \
     static retval NS(mock_fn) args; int CALLED(mock_fn) = 0
 #define NS_MOCK(name) MOCK(name, NS(name))
 #define NS_UNMOCK(name) UNMOCK(name)
 
 extern const struct testcase_setup_t passthrough_setup;
 
+extern struct testcase_t accounting_tests[];
+extern struct testcase_t addr_tests[];
+extern struct testcase_t address_tests[];
+extern struct testcase_t buffer_tests[];
+extern struct testcase_t cell_format_tests[];
+extern struct testcase_t cell_queue_tests[];
+extern struct testcase_t channel_tests[];
+extern struct testcase_t channeltls_tests[];
+extern struct testcase_t checkdir_tests[];
+extern struct testcase_t circuitlist_tests[];
+extern struct testcase_t circuitmux_tests[];
+extern struct testcase_t compat_libevent_tests[];
+extern struct testcase_t config_tests[];
+extern struct testcase_t connection_tests[];
+extern struct testcase_t container_tests[];
+extern struct testcase_t controller_tests[];
+extern struct testcase_t controller_event_tests[];
+extern struct testcase_t crypto_tests[];
+extern struct testcase_t dir_tests[];
+extern struct testcase_t dir_handle_get_tests[];
+extern struct testcase_t entryconn_tests[];
+extern struct testcase_t entrynodes_tests[];
+extern struct testcase_t guardfraction_tests[];
+extern struct testcase_t extorport_tests[];
+extern struct testcase_t hs_tests[];
+extern struct testcase_t introduce_tests[];
+extern struct testcase_t keypin_tests[];
+extern struct testcase_t link_handshake_tests[];
+extern struct testcase_t logging_tests[];
+extern struct testcase_t microdesc_tests[];
+extern struct testcase_t nodelist_tests[];
+extern struct testcase_t oom_tests[];
+extern struct testcase_t options_tests[];
+extern struct testcase_t policy_tests[];
+extern struct testcase_t procmon_tests[];
+extern struct testcase_t pubsub_tests[];
+extern struct testcase_t pt_tests[];
+extern struct testcase_t relay_tests[];
+extern struct testcase_t relaycell_tests[];
+extern struct testcase_t rend_cache_tests[];
+extern struct testcase_t replaycache_tests[];
+extern struct testcase_t router_tests[];
+extern struct testcase_t routerkeys_tests[];
+extern struct testcase_t routerlist_tests[];
+extern struct testcase_t routerset_tests[];
+extern struct testcase_t scheduler_tests[];
+extern struct testcase_t socks_tests[];
+extern struct testcase_t status_tests[];
+extern struct testcase_t thread_tests[];
+extern struct testcase_t tortls_tests[];
+extern struct testcase_t util_tests[];
+extern struct testcase_t util_format_tests[];
+extern struct testcase_t util_process_tests[];
+extern struct testcase_t dns_tests[];
+extern struct testcase_t handle_tests[];
+
+extern struct testcase_t slow_crypto_tests[];
+extern struct testcase_t slow_util_tests[];
+
+extern struct testgroup_t testgroups[];
+
+extern const char AUTHORITY_CERT_1[];
+extern const char AUTHORITY_SIGNKEY_1[];
+extern const char AUTHORITY_SIGNKEY_A_DIGEST[];
+extern const char AUTHORITY_SIGNKEY_A_DIGEST256[];
+extern const char AUTHORITY_CERT_2[];
+extern const char AUTHORITY_SIGNKEY_2[];
+extern const char AUTHORITY_SIGNKEY_B_DIGEST[];
+extern const char AUTHORITY_SIGNKEY_B_DIGEST256[];
+extern const char AUTHORITY_CERT_3[];
+extern const char AUTHORITY_SIGNKEY_3[];
+extern const char AUTHORITY_SIGNKEY_C_DIGEST[];
+extern const char AUTHORITY_SIGNKEY_C_DIGEST256[];
+
 #endif
 
diff --git a/src/test/test_buffers.c b/src/test/test_buffers.c
index e5e56edf75..95584d54a8 100644
--- a/src/test/test_buffers.c
+++ b/src/test/test_buffers.c
@@ -695,9 +695,9 @@ test_buffers_zlib_fin_at_chunk_end(void *arg)
   tor_free(msg);
 }
 
-const uint8_t *tls_read_ptr;
-int n_remaining;
-int next_reply_val[16];
+static const uint8_t *tls_read_ptr;
+static int n_remaining;
+static int next_reply_val[16];
 
 static int
 mock_tls_read(tor_tls_t *tls, char *cp, size_t len)
diff --git a/src/test/test_channel.c b/src/test/test_channel.c
index f37e71816e..a9e0634d9e 100644
--- a/src/test/test_channel.c
+++ b/src/test/test_channel.c
@@ -20,9 +20,6 @@
 #include "test.h"
 #include "fakechans.h"
 
-/* This comes from channel.c */
-extern uint64_t estimated_total_queue_size;
-
 static int test_chan_accept_cells = 0;
 static int test_chan_fixed_cells_recved = 0;
 static cell_t * test_chan_last_seen_fixed_cell_ptr = NULL;
diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c
index e6b250a677..6362331942 100644
--- a/src/test/test_crypto.c
+++ b/src/test/test_crypto.c
@@ -18,10 +18,6 @@
 #include <openssl/evp.h>
 #include <openssl/rand.h>
 
-extern const char AUTHORITY_SIGNKEY_3[];
-extern const char AUTHORITY_SIGNKEY_A_DIGEST[];
-extern const char AUTHORITY_SIGNKEY_A_DIGEST256[];
-
 /** Run unit tests for Diffie-Hellman functionality. */
 static void
 test_crypto_dh(void *arg)
@@ -275,9 +271,6 @@ test_crypto_rng_range(void *arg)
   ;
 }
 
-extern int break_strongest_rng_fallback;
-extern int break_strongest_rng_syscall;
-
 static void
 test_crypto_rng_strongest(void *arg)
 {
diff --git a/src/test/test_data.c b/src/test/test_data.c
index 32de54bc84..788489a097 100644
--- a/src/test/test_data.c
+++ b/src/test/test_data.c
@@ -3,6 +3,8 @@
  * Copyright (c) 2007-2016, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
+#include "test.h"
+
 /* Our unit test expect that the AUTHORITY_CERT_* public keys will sort
  * in this order. */
 #define AUTHORITY_CERT_A AUTHORITY_CERT_3
diff --git a/src/test/test_dir_common.c b/src/test/test_dir_common.c
index 0b446c2dfd..2448d307b2 100644
--- a/src/test/test_dir_common.c
+++ b/src/test/test_dir_common.c
@@ -21,13 +21,6 @@ networkstatus_t * dir_common_add_rs_and_parse(networkstatus_t *vote,
                             crypto_pk_t *sign_skey, int *n_vrs,
                             time_t now, int clear_rl);
 
-extern const char AUTHORITY_CERT_1[];
-extern const char AUTHORITY_SIGNKEY_1[];
-extern const char AUTHORITY_CERT_2[];
-extern const char AUTHORITY_SIGNKEY_2[];
-extern const char AUTHORITY_CERT_3[];
-extern const char AUTHORITY_SIGNKEY_3[];
-
 /** Initialize and set auth certs and keys
  * Returns 0 on success, -1 on failure. Clean up handled by caller.
  */
diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c
index 44edaf850b..9e47deb74f 100644
--- a/src/test/test_dir_handle_get.c
+++ b/src/test/test_dir_handle_get.c
@@ -1212,8 +1212,6 @@ test_dir_handle_get_server_keys_all_not_found(void* data)
 
 #define TEST_CERTIFICATE AUTHORITY_CERT_3
 #define TEST_SIGNING_KEY AUTHORITY_SIGNKEY_A_DIGEST
-extern const char AUTHORITY_CERT_3[];
-extern const char AUTHORITY_SIGNKEY_A_DIGEST[];
 
 static const char TEST_CERT_IDENT_KEY[] =
   "D867ACF56A9D229B35C25F0090BC9867E906BE69";
diff --git a/src/test/test_introduce.c b/src/test/test_introduce.c
index 9c7a86da66..810b03c93d 100644
--- a/src/test/test_introduce.c
+++ b/src/test/test_introduce.c
@@ -9,8 +9,6 @@
 #define RENDSERVICE_PRIVATE
 #include "rendservice.h"
 
-extern const char AUTHORITY_SIGNKEY_1[];
-
 static uint8_t v0_test_plaintext[] =
     /* 20 bytes of rendezvous point nickname */
   { 0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65,
diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c
index e8856c60de..4038783459 100644
--- a/src/test/test_link_handshake.c
+++ b/src/test/test_link_handshake.c
@@ -16,7 +16,7 @@
 
 #include "test.h"
 
-var_cell_t *mock_got_var_cell = NULL;
+static var_cell_t *mock_got_var_cell = NULL;
 
 static void
 mock_write_var_cell(const var_cell_t *vc, or_connection_t *conn)
diff --git a/src/test/test_options.c b/src/test/test_options.c
index 20e8dd563a..8d1d6f901e 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -12,7 +12,7 @@
 
 #define ROUTERSET_PRIVATE
 #include "routerset.h"
-
+#include "main.h"
 #include "log_test_helpers.h"
 
 #include "sandbox.h"
@@ -572,8 +572,6 @@ test_options_validate__contactinfo(void *ignored)
   tor_free(msg);
 }
 
-extern int quiet_level;
-
 static void
 test_options_validate__logs(void *ignored)
 {
diff --git a/src/test/test_policy.c b/src/test/test_policy.c
index a939ebf54f..913a2f303a 100644
--- a/src/test/test_policy.c
+++ b/src/test/test_policy.c
@@ -778,8 +778,8 @@ test_policies_reject_port_address(void *arg)
   UNMOCK(get_configured_ports);
 }
 
-smartlist_t *mock_ipv4_addrs = NULL;
-smartlist_t *mock_ipv6_addrs = NULL;
+static smartlist_t *mock_ipv4_addrs = NULL;
+static smartlist_t *mock_ipv6_addrs = NULL;
 
 /* mock get_interface_address6_list, returning a deep copy of the template
  * address list ipv4_interface_address_list or ipv6_interface_address_list */
diff --git a/src/test/test_rendcache.c b/src/test/test_rendcache.c
index d1b52649b2..eac41ecdda 100644
--- a/src/test/test_rendcache.c
+++ b/src/test/test_rendcache.c
@@ -20,11 +20,6 @@ static const int TIME_IN_THE_PAST = -(REND_CACHE_MAX_AGE + \
                                       REND_CACHE_MAX_SKEW + 10);
 static const int TIME_IN_THE_FUTURE = REND_CACHE_MAX_SKEW + 10;
 
-extern strmap_t *rend_cache;
-extern digestmap_t *rend_cache_v2_dir;
-extern strmap_t *rend_cache_failure;
-extern size_t rend_cache_total_allocation;
-
 static rend_data_t *
 mock_rend_data(const char *onion_address)
 {
diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c
index 2cffa6e801..34b70ac8a8 100644
--- a/src/test/test_routerlist.c
+++ b/src/test/test_routerlist.c
@@ -24,13 +24,6 @@
 #include "test.h"
 #include "test_dir_common.h"
 
-extern const char AUTHORITY_CERT_1[];
-extern const char AUTHORITY_SIGNKEY_1[];
-extern const char AUTHORITY_CERT_2[];
-extern const char AUTHORITY_SIGNKEY_2[];
-extern const char AUTHORITY_CERT_3[];
-extern const char AUTHORITY_SIGNKEY_3[];
-
 void construct_consensus(char **consensus_text_md);
 
 /* 4 digests + 3 sep + pre + post + NULL */
@@ -423,7 +416,7 @@ test_router_pick_directory_server_impl(void *arg)
   networkstatus_vote_free(con_md);
 }
 
-connection_t *mocked_connection = NULL;
+static connection_t *mocked_connection = NULL;
 
 /* Mock connection_get_by_type_addr_port_purpose by returning
  * mocked_connection. */
diff --git a/src/test/test_routerset.c b/src/test/test_routerset.c
index 74b39c0486..1b526d430b 100644
--- a/src/test/test_routerset.c
+++ b/src/test/test_routerset.c
@@ -432,7 +432,7 @@ NS(test_main)(void *arg)
 NS_DECL(addr_policy_t *, router_parse_addr_policy_item_from_string,
     (const char *s, int assume_action, int *malformed_list));
 
-addr_policy_t *NS(mock_addr_policy);
+static addr_policy_t *NS(mock_addr_policy);
 
 static void
 NS(test_main)(void *arg)
@@ -480,7 +480,7 @@ NS(router_parse_addr_policy_item_from_string)(const char *s,
 NS_DECL(addr_policy_t *, router_parse_addr_policy_item_from_string,
         (const char *s, int assume_action, int *bogus));
 
-addr_policy_t *NS(mock_addr_policy);
+static addr_policy_t *NS(mock_addr_policy);
 
 static void
 NS(test_main)(void *arg)
@@ -527,7 +527,7 @@ NS(router_parse_addr_policy_item_from_string)(const char *s, int assume_action,
 NS_DECL(addr_policy_t *, router_parse_addr_policy_item_from_string,
         (const char *s, int assume_action, int *bad));
 
-addr_policy_t *NS(mock_addr_policy);
+static addr_policy_t *NS(mock_addr_policy);
 
 static void
 NS(test_main)(void *arg)
@@ -1477,7 +1477,7 @@ NS(test_main)(void *arg)
  * routerset or routerinfo.
  */
 
-node_t NS(mock_node);
+static node_t NS(mock_node);
 
 static void
 NS(test_main)(void *arg)
@@ -1504,7 +1504,7 @@ NS(test_main)(void *arg)
  * routerset and no routerinfo.
  */
 
-node_t NS(mock_node);
+static node_t NS(mock_node);
 
 static void
 NS(test_main)(void *arg)
@@ -1603,7 +1603,7 @@ NS(test_main)(void *arg)
 
 NS_DECL(const node_t *, node_get_by_nickname,
     (const char *nickname, int warn_if_unused));
-const char *NS(mock_nickname);
+static const char *NS(mock_nickname);
 
 static void
 NS(test_main)(void *arg)
@@ -1652,8 +1652,8 @@ NS(node_get_by_nickname)(const char *nickname, int warn_if_unused)
 
 NS_DECL(const node_t *, node_get_by_nickname,
     (const char *nickname, int warn_if_unused));
-const char *NS(mock_nickname);
-node_t NS(mock_node);
+static const char *NS(mock_nickname);
+static node_t NS(mock_node);
 
 static void
 NS(test_main)(void *arg)
@@ -1702,8 +1702,8 @@ NS(node_get_by_nickname)(const char *nickname, int warn_if_unused)
 
 NS_DECL(const node_t *, node_get_by_nickname,
     (const char *nickname, int warn_if_unused));
-char *NS(mock_nickname);
-node_t NS(mock_node);
+static char *NS(mock_nickname);
+static node_t NS(mock_node);
 
 static void
 NS(test_main)(void *arg)
@@ -1754,7 +1754,7 @@ NS(node_get_by_nickname)(const char *nickname, int warn_if_unused)
 
 NS_DECL(smartlist_t *, nodelist_get_list, (void));
 
-smartlist_t *NS(mock_smartlist);
+static smartlist_t *NS(mock_smartlist);
 
 static void
 NS(test_main)(void *arg)
@@ -1800,8 +1800,8 @@ NS(nodelist_get_list)(void)
 
 NS_DECL(smartlist_t *, nodelist_get_list, (void));
 
-smartlist_t *NS(mock_smartlist);
-node_t NS(mock_node);
+static smartlist_t *NS(mock_smartlist);
+static node_t NS(mock_node);
 
 static void
 NS(test_main)(void *arg)
diff --git a/src/test/test_scheduler.c b/src/test/test_scheduler.c
index 6e9889b48b..15fbb2d186 100644
--- a/src/test/test_scheduler.c
+++ b/src/test/test_scheduler.c
@@ -24,12 +24,6 @@
 #include "test.h"
 #include "fakechans.h"
 
-/* Statics in scheduler.c exposed to the test suite */
-extern smartlist_t *channels_pending;
-extern struct event *run_sched_ev;
-extern uint64_t queue_heuristic;
-extern time_t queue_heuristic_timestamp;
-
 /* Event base for scheduelr tests */
 static struct event_base *mock_event_base = NULL;
 
diff --git a/src/test/test_slow.c b/src/test/test_slow.c
index c1d2e81914..7c9f0b1cc2 100644
--- a/src/test/test_slow.c
+++ b/src/test/test_slow.c
@@ -18,9 +18,6 @@
 #include "or.h"
 #include "test.h"
 
-extern struct testcase_t slow_crypto_tests[];
-extern struct testcase_t slow_util_tests[];
-
 struct testgroup_t testgroups[] = {
   { "slow/crypto/", slow_crypto_tests },
   { "slow/util/", slow_util_tests },
diff --git a/src/test/test_socks.c b/src/test/test_socks.c
index 6da09fd653..62ff12fe15 100644
--- a/src/test/test_socks.c
+++ b/src/test/test_socks.c
@@ -34,7 +34,7 @@ socks_test_cleanup(const struct testcase_t *testcase, void *ptr)
   return 1;
 }
 
-const struct testcase_setup_t socks_setup = {
+static const struct testcase_setup_t socks_setup = {
   socks_test_setup, socks_test_cleanup
 };
 
diff --git a/src/test/test_status.c b/src/test/test_status.c
index 84a0f6c024..b4438aabe9 100644
--- a/src/test/test_status.c
+++ b/src/test/test_status.c
@@ -310,8 +310,6 @@ NS_DECL(void, logv, (int severity, log_domain_mask_t domain,
 NS_DECL(int, server_mode, (const or_options_t *options));
 
 static routerinfo_t *mock_routerinfo;
-extern int onion_handshakes_requested[MAX_ONION_HANDSHAKE_TYPE+1];
-extern int onion_handshakes_assigned[MAX_ONION_HANDSHAKE_TYPE+1];
 
 static void
 NS(test_main)(void *arg)
diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c
index caaada8701..42b9ef7733 100644
--- a/src/test/test_tortls.c
+++ b/src/test/test_tortls.c
@@ -51,9 +51,6 @@
 #include "log_test_helpers.h"
 #define NS_MODULE tortls
 
-extern tor_tls_context_t *server_tls_context;
-extern tor_tls_context_t *client_tls_context;
-
 #if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) \
     && !defined(LIBRESSL_VERSION_NUMBER)
 #define OPENSSL_OPAQUE
@@ -278,8 +275,6 @@ test_tortls_get_state_description(void *ignored)
   tor_free(tls);
 }
 
-extern int tor_tls_object_ex_data_index;
-
 static void
 test_tortls_get_by_ssl(void *ignored)
 {
@@ -790,8 +785,6 @@ get_cipher_by_id(uint16_t id)
   return NULL;
 }
 
-extern uint16_t v2_cipher_list[];
-
 static void
 test_tortls_classify_client_ciphers(void *ignored)
 {
@@ -1184,9 +1177,6 @@ test_tortls_get_forced_write_size(void *ignored)
   tor_free(tls);
 }
 
-extern uint64_t total_bytes_written_over_tls;
-extern uint64_t total_bytes_written_by_tls;
-
 static void
 test_tortls_get_write_overhead_ratio(void *ignored)
 {
diff --git a/src/test/testing_common.c b/src/test/testing_common.c
index 39c3d02ab1..ea9366305c 100644
--- a/src/test/testing_common.c
+++ b/src/test/testing_common.c
@@ -3,6 +3,8 @@
  * Copyright (c) 2007-2016, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
+extern const char tor_git_revision[];
+
 /* Ordinarily defined in tor_main.c; this bit is just here to provide one
  * since we're not linking to tor_main.c */
 const char tor_git_revision[] = "";
@@ -215,8 +217,6 @@ const struct testcase_setup_t passthrough_setup = {
   passthrough_test_setup, passthrough_test_cleanup
 };
 
-extern struct testgroup_t testgroups[];
-
 /** Main entry point for unit test code: parse the command line, and run
  * some unit tests. */
 int
diff --git a/src/test/vote_descriptors.inc b/src/test/vote_descriptors.inc
index c5ce21f744..895dc6c65c 100644
--- a/src/test/vote_descriptors.inc
+++ b/src/test/vote_descriptors.inc
@@ -1,4 +1,4 @@
-const char* VOTE_BODY_V3 = 
+static const char* VOTE_BODY_V3 =
 "network-status-version 3\n"
 "vote-status vote\n"
 "consensus-methods 13 14 15 16 17 18 19 20 21\n"