diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c
index ceaf5724bd6..e378598c100 100644
--- a/dlls/rsaenh/rsaenh.c
+++ b/dlls/rsaenh/rsaenh.c
@@ -974,7 +974,7 @@ static void destroy_key_container(OBJECTHDR *pObjectHdr)
  *  Success: Handle to the new key container.
  *  Failure: INVALID_HANDLE_VALUE
  */
-static HCRYPTPROV new_key_container(PCHAR pszContainerName, DWORD dwFlags, PVTableProvStruc pVTable)
+static HCRYPTPROV new_key_container(PCCH pszContainerName, DWORD dwFlags, PVTableProvStruc pVTable)
 {
     KEYCONTAINER *pKeyContainer;
     HCRYPTPROV hKeyContainer;
diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c
index 052289ce97b..87e90d74a65 100644
--- a/dlls/rsaenh/tests/rsaenh.c
+++ b/dlls/rsaenh/tests/rsaenh.c
@@ -1091,7 +1091,7 @@ static void test_verify_signature() {
     if (!result) return;
 }
 
-void test_rsa_encrypt()
+static void test_rsa_encrypt(void)
 {
     HCRYPTKEY hRSAKey;
     BYTE abData[2048] = "Wine rocks!";
@@ -1125,7 +1125,7 @@ void test_rsa_encrypt()
     CryptDestroyKey(hRSAKey);
 }
         
-void test_schannel_provider()
+static void test_schannel_provider(void)
 {
     HCRYPTPROV hProv;
     HCRYPTKEY hRSAKey, hMasterSecret, hServerWriteKey, hServerWriteMACKey;
@@ -1372,7 +1372,7 @@ void test_schannel_provider()
     CryptReleaseContext(hProv, 0);
 }
 
-void test_enum_container()
+static void test_enum_container(void)
 {
     BYTE abContainerName[256];
     DWORD dwBufferLen;
diff --git a/dlls/user/tests/class.c b/dlls/user/tests/class.c
index 497c732482d..250b6b6f407 100644
--- a/dlls/user/tests/class.c
+++ b/dlls/user/tests/class.c
@@ -547,12 +547,12 @@ static void test_instances(void)
     check_thread_instance( "EDIT", (HINSTANCE)0x12345678, (HINSTANCE)0x12345678, (HINSTANCE)0xdeadbeef );
 }
 
-LRESULT WINAPI TestDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+static LRESULT WINAPI TestDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     return DefWindowProc(hWnd, uMsg, wParam, lParam);
 }
 
-BOOL RegisterTestDialog(HINSTANCE hInstance)
+static BOOL RegisterTestDialog(HINSTANCE hInstance)
 {
     WNDCLASSEX wcx;
     ATOM atom = 0;
@@ -582,7 +582,7 @@ BOOL RegisterTestDialog(HINSTANCE hInstance)
 
 /* test registering a dialog box created by using the CLASS directive in a
    resource file, then test creating the dialog using CreateDialogParam. */
-void WINAPI CreateDialogParamTest(HINSTANCE hInstance)
+static void WINAPI CreateDialogParamTest(HINSTANCE hInstance)
 {
     HWND hWndMain;
 
diff --git a/dlls/user/tests/edit.c b/dlls/user/tests/edit.c
index a8b627d5e93..71b62164658 100644
--- a/dlls/user/tests/edit.c
+++ b/dlls/user/tests/edit.c
@@ -42,7 +42,7 @@ static char szEditTest2Name[] = "Edit Test 2 window class";
 static HINSTANCE hinst;
 static HWND hwndET2;
 
-HWND create_editcontrol (DWORD style, DWORD exstyle)
+static HWND create_editcontrol (DWORD style, DWORD exstyle)
 {
     HWND handle;
 
diff --git a/dlls/user/tests/listbox.c b/dlls/user/tests/listbox.c
index c647170b5f0..347da2022df 100644
--- a/dlls/user/tests/listbox.c
+++ b/dlls/user/tests/listbox.c
@@ -37,7 +37,7 @@ static const char *strings[4] = {
   "Fourth added which is very long because at some time we only had a 256 byte character buffer and that was overflowing in one of those applications that had a common dialog file open box and tried to add a 300 characters long custom filter string which of course the code did not like and crashed. Just make sure this string is longer than 256 characters."
 };
 
-HWND
+static HWND
 create_listbox (DWORD add_style)
 {
   HWND handle=CreateWindow ("LISTBOX", "TestList",
@@ -75,7 +75,7 @@ struct listbox_test {
   struct listbox_stat   sel,   sel_todo;
 };
 
-void
+static void
 listbox_query (HWND handle, struct listbox_stat *results)
 {
   results->selected = SendMessage (handle, LB_GETCURSEL, 0, 0);
@@ -84,7 +84,7 @@ listbox_query (HWND handle, struct listbox_stat *results)
   results->selcount = SendMessage (handle, LB_GETSELCOUNT, 0, 0);
 }
 
-void
+static void
 buttonpress (HWND handle, WORD x, WORD y)
 {
   LPARAM lp=x+(y<<16);
@@ -95,7 +95,7 @@ buttonpress (HWND handle, WORD x, WORD y)
   REDRAW;
 }
 
-void
+static void
 keypress (HWND handle, WPARAM keycode, BYTE scancode, BOOL extended)
 {
   LPARAM lp=1+(scancode<<16)+(extended?KEYEVENTF_EXTENDEDKEY:0);
@@ -121,7 +121,7 @@ keypress (HWND handle, WPARAM keycode, BYTE scancode, BOOL extended)
   listbox_todo_field_ok(t, s, caret, got); \
   listbox_todo_field_ok(t, s, selcount, got)
 
-void
+static void
 check (const struct listbox_test test)
 {
   struct listbox_stat answer;
@@ -172,7 +172,7 @@ check (const struct listbox_test test)
   DestroyWindow (hLB);
 }
 
-void check_item_height()
+static void check_item_height(void)
 {
     HWND hLB;
     HDC hdc;
diff --git a/dlls/user/tests/sysparams.c b/dlls/user/tests/sysparams.c
index fa7a1620d86..9d6411f8851 100644
--- a/dlls/user/tests/sysparams.c
+++ b/dlls/user/tests/sysparams.c
@@ -160,7 +160,7 @@ static void test_change_message( int action, int optional )
     change_last_param = 0;
 }
 
-static BOOL test_error_msg ( int rc, char *name )
+static BOOL test_error_msg ( int rc, const char *name )
 {
     DWORD last_error = GetLastError();
 
diff --git a/dlls/user/tests/win.c b/dlls/user/tests/win.c
index a3519be2292..43895da0c28 100644
--- a/dlls/user/tests/win.c
+++ b/dlls/user/tests/win.c
@@ -2627,7 +2627,7 @@ static void test_window_styles()
     check_window_style(0, WS_EX_APPWINDOW, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_APPWINDOW|WS_EX_WINDOWEDGE);
 }
 
-void test_scrollvalidate( HWND parent)
+static void test_scrollvalidate( HWND parent)
 {
     HDC hdc;
     HRGN hrgn=CreateRectRgn(0,0,0,0);
@@ -2758,7 +2758,7 @@ void test_scrollvalidate( HWND parent)
 
 /* couple of tests of return values of scrollbar functions
  * called on a scrollbarless window */ 
-void test_scroll()
+static void test_scroll(void)
 {
     BOOL ret;
     INT min, max;
@@ -2792,7 +2792,7 @@ void test_scroll()
     DestroyWindow( hwnd);
 }
 
-static void test_params()
+static void test_params(void)
 {
     INT rc;