diff --git a/dlls/user32/button.c b/dlls/user32/button.c
index 25a94a326cc..84b54ab48c1 100644
--- a/dlls/user32/button.c
+++ b/dlls/user32/button.c
@@ -229,8 +229,8 @@ static void setup_clipping( HWND hwnd, HDC hdc )
 /***********************************************************************
  *           ButtonWndProc_common
  */
-static LRESULT WINAPI ButtonWndProc_common(HWND hWnd, UINT uMsg,
-                                           WPARAM wParam, LPARAM lParam, BOOL unicode )
+static LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg,
+                                    WPARAM wParam, LPARAM lParam, BOOL unicode )
 {
     RECT rect;
     POINT pt;
diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c
index 97ee3a8b183..6914906e0bf 100644
--- a/dlls/user32/edit.c
+++ b/dlls/user32/edit.c
@@ -223,7 +223,7 @@ static void	EDIT_AdjustFormatRect(EDITSTATE *es);
 static void	EDIT_SetRectNP(EDITSTATE *es, const RECT *lprc);
 static void	EDIT_UnlockBuffer(EDITSTATE *es, BOOL force);
 static void	EDIT_UpdateScrollInfo(EDITSTATE *es);
-static INT CALLBACK EDIT_WordBreakProc(LPWSTR s, INT index, INT count, INT action);
+static INT      EDIT_WordBreakProc(LPWSTR s, INT index, INT count, INT action);
 /*
  *	EM_XXX message handlers
  */
@@ -449,8 +449,8 @@ static inline INT get_vertical_line_count(EDITSTATE *es)
  *	names).
  *
  */
-static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg,
-                                          WPARAM wParam, LPARAM lParam, BOOL unicode )
+static LRESULT EditWndProc_common( HWND hwnd, UINT msg,
+                                   WPARAM wParam, LPARAM lParam, BOOL unicode )
 {
 	EDITSTATE *es = (EDITSTATE *)GetWindowLongPtrW( hwnd, 0 );
 	LRESULT result = 0;
@@ -2602,7 +2602,7 @@ static void EDIT_UpdateScrollInfo(EDITSTATE *es)
  *		internally, so we can decide this for ourselves.
  *
  */
-static INT CALLBACK EDIT_WordBreakProc(LPWSTR s, INT index, INT count, INT action)
+static INT EDIT_WordBreakProc(LPWSTR s, INT index, INT count, INT action)
 {
 	INT ret = 0;
 
diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c
index 0c24e717f98..9b2378d10d2 100644
--- a/dlls/user32/listbox.c
+++ b/dlls/user32/listbox.c
@@ -2606,8 +2606,8 @@ static BOOL LISTBOX_Destroy( LB_DESCR *descr )
 /***********************************************************************
  *           ListBoxWndProc_common
  */
-static LRESULT WINAPI ListBoxWndProc_common( HWND hwnd, UINT msg,
-                                             WPARAM wParam, LPARAM lParam, BOOL unicode )
+static LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg,
+                                      WPARAM wParam, LPARAM lParam, BOOL unicode )
 {
     LB_DESCR *descr = (LB_DESCR *)GetWindowLongPtrW( hwnd, 0 );
     LPHEADCOMBO lphc = 0;
diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c
index 20035cb95da..ce6d020533a 100644
--- a/dlls/user32/tests/class.c
+++ b/dlls/user32/tests/class.c
@@ -814,7 +814,7 @@ static 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. */
-static void WINAPI CreateDialogParamTest(HINSTANCE hInstance)
+static void CreateDialogParamTest(HINSTANCE hInstance)
 {
     HWND hWndMain;