diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c
index ae88cce2238..0d5e715937a 100644
--- a/dlls/ddraw/tests/ddrawmodes.c
+++ b/dlls/ddraw/tests/ddrawmodes.c
@@ -100,7 +100,7 @@ HRESULT WINAPI enummodescallback(LPDDSURFACEDESC lpddsd, LPVOID lpContext)
     return DDENUMRET_OK;
 }
 
-void enumdisplaymodes(void)
+static void enumdisplaymodes(void)
 {
     DDSURFACEDESC ddsd;
     HRESULT rc;
diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c
index 3d2db05c72a..7a39435ef46 100644
--- a/dlls/iphlpapi/tests/iphlpapi.c
+++ b/dlls/iphlpapi/tests/iphlpapi.c
@@ -277,7 +277,7 @@ static void testGetIpForwardTable(void)
   }
 }
 
-void testGetIpNetTable(void)
+static void testGetIpNetTable(void)
 {
   if (gGetIpNetTable) {
     DWORD apiReturn;
@@ -307,7 +307,7 @@ void testGetIpNetTable(void)
   }
 }
 
-void testGetIcmpStatistics(void)
+static void testGetIcmpStatistics(void)
 {
   if (gGetIcmpStatistics) {
     DWORD apiReturn;
@@ -325,7 +325,7 @@ void testGetIcmpStatistics(void)
   }
 }
 
-void testGetIpStatistics(void)
+static void testGetIpStatistics(void)
 {
   if (gGetIpStatistics) {
     DWORD apiReturn;
@@ -343,7 +343,7 @@ void testGetIpStatistics(void)
   }
 }
 
-void testGetTcpStatistics(void)
+static void testGetTcpStatistics(void)
 {
   if (gGetTcpStatistics) {
     DWORD apiReturn;
@@ -361,7 +361,7 @@ void testGetTcpStatistics(void)
   }
 }
 
-void testGetUdpStatistics(void)
+static void testGetUdpStatistics(void)
 {
   if (gGetUdpStatistics) {
     DWORD apiReturn;
@@ -379,7 +379,7 @@ void testGetUdpStatistics(void)
   }
 }
 
-void testGetTcpTable(void)
+static void testGetTcpTable(void)
 {
   if (gGetTcpTable) {
     DWORD apiReturn;
@@ -407,7 +407,7 @@ void testGetTcpTable(void)
   }
 }
 
-void testGetUdpTable(void)
+static void testGetUdpTable(void)
 {
   if (gGetUdpTable) {
     DWORD apiReturn;
diff --git a/dlls/kernel/tests/pipe.c b/dlls/kernel/tests/pipe.c
index a6821748d9e..86e6365b1c7 100644
--- a/dlls/kernel/tests/pipe.c
+++ b/dlls/kernel/tests/pipe.c
@@ -297,7 +297,7 @@ static void test_CreateNamedPipe(int pipemode)
     trace("test_CreateNamedPipe returning\n");
 }
 
-void test_CreateNamedPipe_instances_must_match(void)
+static void test_CreateNamedPipe_instances_must_match(void)
 {
     HANDLE hnp, hnp2;
 
diff --git a/dlls/msvcrt/tests/headers.c b/dlls/msvcrt/tests/headers.c
index 1d142626f41..8ba8d8085af 100644
--- a/dlls/msvcrt/tests/headers.c
+++ b/dlls/msvcrt/tests/headers.c
@@ -73,7 +73,7 @@
 #define CHECK_DEF(n,d1,d2) ok(d1 == d2, "Defines (MSVCRT_)%s are different: '%d' vs. '%d'\n", n, d1, d2)
 
 /************* Checking types ***************/
-void test_types(void)
+static void test_types(void)
 {
     CHECK_TYPE(wchar_t);
     CHECK_TYPE(wint_t);
@@ -97,7 +97,7 @@ void test_types(void)
 }
 
 /************* Checking structs ***************/
-void test_structs(void)
+static void test_structs(void)
 {
     CHECK_STRUCT(tm);
     CHECK_FIELD(tm, tm_sec);
diff --git a/dlls/msvcrtd/tests/debug.c b/dlls/msvcrtd/tests/debug.c
index d20d435719f..81a533a1276 100644
--- a/dlls/msvcrtd/tests/debug.c
+++ b/dlls/msvcrtd/tests/debug.c
@@ -34,7 +34,7 @@ static void * (*pMSVCRTD_operator_new_dbg)(unsigned long, int, const char *, int
 #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hModule,y)
 #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y)
 
-int init_functions(void)
+static int init_functions(void)
 {
   HMODULE hModule = LoadLibraryA("msvcrtd.dll");
   ok(hModule != NULL, "LoadLibraryA failed\n");
@@ -51,7 +51,7 @@ int init_functions(void)
 
 /**********************************************************************/
 
-void test_new(void)
+static void test_new(void)
 {
   void *mem;
 
diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c
index 34de09df368..be20e224bab 100644
--- a/dlls/netapi32/tests/access.c
+++ b/dlls/netapi32/tests/access.c
@@ -64,7 +64,7 @@ static int init_access_tests(void)
     return 1;
 }
 
-void run_usergetinfo_tests(void)
+static void run_usergetinfo_tests(void)
 {
     NET_API_STATUS rc;
     PUSER_INFO_0 ui0 = NULL;
@@ -123,7 +123,7 @@ void run_usergetinfo_tests(void)
 }
 
 /* checks Level 1 of NetQueryDisplayInformation */
-void run_querydisplayinformation1_tests(void)
+static void run_querydisplayinformation1_tests(void)
 {
     PNET_DISPLAY_USER Buffer, rec;
     DWORD Result, EntryCount;
diff --git a/dlls/netapi32/tests/apibuf.c b/dlls/netapi32/tests/apibuf.c
index d4adbbb0339..43a63d028d1 100644
--- a/dlls/netapi32/tests/apibuf.c
+++ b/dlls/netapi32/tests/apibuf.c
@@ -35,7 +35,7 @@ static NET_API_STATUS (WINAPI *pNetApiBufferReallocate)(LPVOID,DWORD,LPVOID*)=NU
 static NET_API_STATUS (WINAPI *pNetApiBufferSize)(LPVOID,LPDWORD)=NULL;
 
 
-void run_apibuf_tests(void)
+static void run_apibuf_tests(void)
 {
     VOID *p;
     DWORD dwSize;
diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c
index efc186cd1c1..d74c4bc17c3 100644
--- a/dlls/rpcrt4/tests/rpc.c
+++ b/dlls/rpcrt4/tests/rpc.c
@@ -58,7 +58,7 @@ static BOOL Uuid_Comparison_Grid[11][11] = {
   { TRUE,  FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE  }
 };
 
-void UuidConversionAndComparison(void) {
+static void UuidConversionAndComparison(void) {
     CHAR strx[100], x;
     LPSTR str = strx;
     WCHAR wstrx[100], wx;
@@ -123,7 +123,7 @@ void UuidConversionAndComparison(void) {
     }
 }
 
-void TestDceErrorInqText (void)
+static void TestDceErrorInqText (void)
 {
     char bufferInvalid [1024];
     char buffer [1024]; /* The required size is not documented but would