diff --git a/dll/win32/user32/CMakeLists.txt b/dll/win32/user32/CMakeLists.txt
index 6039968838c..1b015fd2ba2 100644
--- a/dll/win32/user32/CMakeLists.txt
+++ b/dll/win32/user32/CMakeLists.txt
@@ -64,7 +64,6 @@ list(APPEND SOURCE
     windows/text.c
     windows/window.c
     windows/winpos.c
-    stubs.c
     user32.rc
     ${CMAKE_CURRENT_BINARY_DIR}/user32.def)
     
diff --git a/dll/win32/user32/stubs.c b/dll/win32/user32/stubs.c
deleted file mode 100644
index 812ac668f76..00000000000
--- a/dll/win32/user32/stubs.c
+++ /dev/null
@@ -1,201 +0,0 @@
-#include <stdarg.h>
-#include "windef.h"
-#include "winbase.h"
-#include "wine/config.h"
-#include "wine/exception.h"
-
-#include <stubs.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(user32);
-
-int __stdcall BuildReasonArray()
-{
-	FIXME("WARNING: calling stub BuildReasonArray()\n");
-	__wine_spec_unimplemented_stub("user32.dll", __FUNCTION__);
-	return 0;
-}
-
-int __stdcall CalcMenuBar()
-{
-	FIXME("WARNING: calling stub CalcMenuBar()\n");
-	__wine_spec_unimplemented_stub("user32.dll", __FUNCTION__);
-	return 0;
-}
-
-int __stdcall CreateSystemThreads()
-{
-	FIXME("WARNING: calling stub CreateSystemThreads()\n");
-	__wine_spec_unimplemented_stub("user32.dll", __FUNCTION__);
-	return 0;
-}
-
-int __stdcall DestroyReasons()
-{
-	FIXME("WARNING: calling stub DestroyReasons()\n");
-	__wine_spec_unimplemented_stub("user32.dll", __FUNCTION__);
-	return 0;
-}
-
-int __stdcall DeviceEventWorker()
-{
-	FIXME("WARNING: calling stub DeviceEventWorker()\n");
-	__wine_spec_unimplemented_stub("user32.dll", __FUNCTION__);
-	return 0;
-}
-
-int __stdcall EnterReaderModeHelper()
-{
-	FIXME("WARNING: calling stub EnterReaderModeHelper()\n");
-	__wine_spec_unimplemented_stub("user32.dll", __FUNCTION__);
-	return 0;
-}
-
-int __stdcall GetCursorFrameInfo()
-{
-	FIXME("WARNING: calling stub GetCursorFrameInfo()\n");
-	__wine_spec_unimplemented_stub("user32.dll", __FUNCTION__);
-	return 0;
-}
-
-int __stdcall GetReasonTitleFromReasonCode()
-{
-	FIXME("WARNING: calling stub GetReasonTitleFromReasonCode()\n");
-	__wine_spec_unimplemented_stub("user32.dll", __FUNCTION__);
-	return 0;
-}
-
-int __stdcall InitializeWin32EntryTable()
-{
-	FIXME("WARNING: calling stub InitializeWin32EntryTable()\n");
-	__wine_spec_unimplemented_stub("user32.dll", __FUNCTION__);
-	return 0;
-}
-
-int __stdcall IsProcess16Bit()
-{
-	FIXME("WARNING: calling stub IsProcess16Bit()\n");
-	__wine_spec_unimplemented_stub("user32.dll", __FUNCTION__);
-	return 0;
-}
-
-int __stdcall IsSETEnabled()
-{
-	FIXME("WARNING: calling stub IsSETEnabled()\n");
-	__wine_spec_unimplemented_stub("user32.dll", __FUNCTION__);
-	return 0;
-}
-
-int __stdcall IsWow64Message()
-{
-	FIXME("WARNING: calling stub IsWow64Message()\n");
-	__wine_spec_unimplemented_stub("user32.dll", __FUNCTION__);
-	return 0;
-}
-
-int __stdcall LoadKeyboardLayoutEx()
-{
-	FIXME("WARNING: calling stub LoadKeyboardLayoutEx()\n");
-	__wine_spec_unimplemented_stub("user32.dll", __FUNCTION__);
-	return 0;
-}
-
-int __stdcall MessageBoxTimeoutA()
-{
-	FIXME("WARNING: calling stub MessageBoxTimeoutA()\n");
-	__wine_spec_unimplemented_stub("user32.dll", __FUNCTION__);
-	return 0;
-}
-
-int __stdcall MessageBoxTimeoutW()
-{
-	FIXME("WARNING: calling stub MessageBoxTimeoutW()\n");
-	__wine_spec_unimplemented_stub("user32.dll", __FUNCTION__);
-	return 0;
-}
-
-int __stdcall PaintMenuBar()
-{
-	FIXME("WARNING: calling stub PaintMenuBar()\n");
-	__wine_spec_unimplemented_stub("user32.dll", __FUNCTION__);
-	return 0;
-}
-
-int __stdcall ReasonCodeNeedsBugID()
-{
-	FIXME("WARNING: calling stub ReasonCodeNeedsBugID()\n");
-	__wine_spec_unimplemented_stub("user32.dll", __FUNCTION__);
-	return 0;
-}
-
-int __stdcall ReasonCodeNeedsComment()
-{
-	FIXME("WARNING: calling stub ReasonCodeNeedsComment()\n");
-	__wine_spec_unimplemented_stub("user32.dll", __FUNCTION__);
-	return 0;
-}
-
-int __stdcall RecordShutdownReason()
-{
-	FIXME("WARNING: calling stub RecordShutdownReason()\n");
-	__wine_spec_unimplemented_stub("user32.dll", __FUNCTION__);
-	return 0;
-}
-
-int __stdcall RegisterMessagePumpHook()
-{
-	FIXME("WARNING: calling stub RegisterMessagePumpHook()\n");
-	__wine_spec_unimplemented_stub("user32.dll", __FUNCTION__);
-	return 0;
-}
-
-int __stdcall SetConsoleReserveKeys()
-{
-	FIXME("WARNING: calling stub SetConsoleReserveKeys()\n");
-	__wine_spec_unimplemented_stub("user32.dll", __FUNCTION__);
-	return 0;
-}
-
-int __stdcall SoftModalMessageBox()
-{
-	FIXME("WARNING: calling stub SoftModalMessageBox()\n");
-	__wine_spec_unimplemented_stub("user32.dll", __FUNCTION__);
-	return 0;
-}
-
-int __stdcall TranslateMessageEx()
-{
-	FIXME("WARNING: calling stub TranslateMessageEx()\n");
-	__wine_spec_unimplemented_stub("user32.dll", __FUNCTION__);
-	return 0;
-}
-
-#if 0
-int __stdcall UnregisterMessagePumpHook()
-{
-	FIXME("WARNING: calling stub UnregisterMessagePumpHook()\n");
-	__wine_spec_unimplemented_stub("user32.dll", __FUNCTION__);
-	return 0;
-}
-#endif
-
-int __stdcall UserLpkPSMTextOut()
-{
-	FIXME("WARNING: calling stub UserLpkPSMTextOut()\n");
-	__wine_spec_unimplemented_stub("user32.dll", __FUNCTION__);
-	return 0;
-}
-
-int __stdcall UserLpkTabbedTextOut()
-{
-	FIXME("WARNING: calling stub UserLpkTabbedTextOut()\n");
-	__wine_spec_unimplemented_stub("user32.dll", __FUNCTION__);
-	return 0;
-}
-
-int __stdcall Win32PoolAllocationStats()
-{
-	FIXME("WARNING: calling stub Win32PoolAllocationStats()\n");
-	__wine_spec_unimplemented_stub("user32.dll", __FUNCTION__);
-	return 0;
-}
-
diff --git a/dll/win32/user32/user32.spec b/dll/win32/user32/user32.spec
index 16d8b52fadf..fe5f299f748 100644
--- a/dll/win32/user32/user32.spec
+++ b/dll/win32/user32/user32.spec
@@ -20,8 +20,8 @@
 @ stdcall BroadcastSystemMessageExA(long ptr long long long ptr)
 @ stdcall BroadcastSystemMessageExW(long ptr long long long ptr)
 @ stdcall BroadcastSystemMessageW(long ptr long long long)
-@ stdcall BuildReasonArray()
-@ stdcall CalcMenuBar()
+@ stub BuildReasonArray
+@ stub CalcMenuBar
 @ stdcall CallMsgFilter(ptr long) CallMsgFilterA
 @ stdcall CallMsgFilterA(ptr long)
 @ stdcall CallMsgFilterW(ptr long)
@@ -94,7 +94,7 @@
 @ stdcall CreateMDIWindowW(ptr ptr long long long long long long long long)
 @ stdcall CreateMenu()
 @ stdcall CreatePopupMenu()
-@ stdcall CreateSystemThreads()
+@ stub CreateSystemThreads
 @ stdcall CreateWindowExA(long str str long long long long long long long long ptr)
 @ stdcall CreateWindowExW(long wstr wstr long long long long long long long long ptr)
 @ stdcall CreateWindowStationA(str long long ptr)
@@ -151,9 +151,9 @@
 @ stdcall DestroyCursor(long)
 @ stdcall DestroyIcon(long)
 @ stdcall DestroyMenu(long) NtUserDestroyMenu
-@ stdcall DestroyReasons()
+@ stub DestroyReasons
 @ stdcall DestroyWindow(long) NtUserDestroyWindow
-@ stdcall DeviceEventWorker()
+@ stub DeviceEventWorker
 @ stdcall DialogBoxIndirectParamA(long ptr long ptr long)
 @ stdcall DialogBoxIndirectParamAorW(long ptr long ptr long long)
 @ stdcall DialogBoxIndirectParamW(long ptr long ptr long)
@@ -201,7 +201,7 @@
 @ stdcall EndMenu()
 @ stdcall EndPaint(long ptr) NtUserEndPaint
 @ stdcall EndTask(ptr long long)
-@ stdcall EnterReaderModeHelper()
+@ stub EnterReaderModeHelper
 @ stdcall EnumChildWindows(long ptr long)
 @ stdcall EnumClipboardFormats(long)
 @ stdcall EnumDesktopWindows(long ptr ptr)
@@ -266,7 +266,7 @@
 @ stdcall GetClipboardViewer() NtUserGetClipboardViewer
 @ stdcall GetComboBoxInfo(long ptr) ; Direct call NtUserGetComboBoxInfo
 @ stdcall GetCursor()
-@ stdcall GetCursorFrameInfo()
+@ stub GetCursorFrameInfo
 @ stdcall GetCursorInfo(ptr) NtUserGetCursorInfo
 @ stdcall GetCursorPos(ptr)
 @ stdcall GetDC(long) NtUserGetDC
@@ -339,7 +339,7 @@
 @ stdcall GetRawInputDeviceInfoA(ptr long ptr ptr)
 @ stdcall GetRawInputDeviceInfoW(ptr long ptr ptr)
 @ stdcall GetRawInputDeviceList(ptr ptr long)
-@ stdcall GetReasonTitleFromReasonCode()
+@ stub GetReasonTitleFromReasonCode
 @ stdcall GetRegisteredRawInputDevices(ptr ptr long)
 @ stdcall GetScrollBarInfo(long long ptr) NtUserGetScrollBarInfo
 @ stdcall GetScrollInfo(long long ptr)
@@ -399,7 +399,7 @@
 @ stdcall InSendMessageEx(ptr)
 @ stdcall InflateRect(ptr long long)
 @ stdcall InitializeLpkHooks(ptr)
-@ stdcall InitializeWin32EntryTable()
+@ stub InitializeWin32EntryTable
 @ stdcall InsertMenuA(long long long long ptr)
 @ stdcall InsertMenuItemA(long long long ptr)
 @ stdcall InsertMenuItemW(long long long ptr)
@@ -427,9 +427,9 @@
 @ stdcall IsHungAppWindow(long)
 @ stdcall IsIconic(long)
 @ stdcall IsMenu(long)
-@ stdcall IsProcess16Bit()
+@ stub IsProcess16Bit
 @ stdcall IsRectEmpty(ptr)
-@ stdcall IsSETEnabled()
+@ stub IsSETEnabled
 @ stdcall IsServerSideWindow(long)
 @ stdcall IsWinEventHookInstalled(long)
 @ stdcall IsWindow(long)
@@ -437,7 +437,7 @@
 @ stdcall IsWindowInDestroy(long)
 @ stdcall IsWindowUnicode(long)
 @ stdcall IsWindowVisible(long)
-@ stdcall IsWow64Message()
+@ stub IsWow64Message
 @ stdcall IsZoomed(long)
 @ stdcall KillSystemTimer(long long)
 @ stdcall KillTimer(long long) NtUserKillTimer
@@ -454,7 +454,7 @@
 @ stdcall LoadImageA(long str long long long long)
 @ stdcall LoadImageW(long wstr long long long long)
 @ stdcall LoadKeyboardLayoutA(str long)
-@ stdcall LoadKeyboardLayoutEx()
+@ stub LoadKeyboardLayoutEx
 @ stdcall LoadKeyboardLayoutW(wstr long)
 @ stdcall LoadLocalFonts()
 @ stdcall LoadMenuA(long str)
@@ -487,8 +487,8 @@
 @ stdcall MessageBoxExW(long wstr wstr long long)
 @ stdcall MessageBoxIndirectA(ptr)
 @ stdcall MessageBoxIndirectW(ptr)
-@ stdcall MessageBoxTimeoutA()
-@ stdcall MessageBoxTimeoutW()
+@ stub MessageBoxTimeoutA
+@ stub MessageBoxTimeoutW
 @ stdcall MessageBoxW(long wstr wstr long)
 @ stdcall ModifyMenuA(long long long long ptr)
 @ stdcall ModifyMenuW(long long long long ptr)
@@ -514,7 +514,7 @@
 @ stdcall OpenWindowStationW(wstr long long)
 @ stdcall PackDDElParam(long long long)
 @ stdcall PaintDesktop(long) NtUserPaintDesktop
-@ stdcall PaintMenuBar()
+@ stub PaintMenuBar
 @ stdcall PeekMessageA(ptr long long long long)
 @ stdcall PeekMessageW(ptr long long long long)
 @ stdcall PostMessageA(long long long long)
@@ -533,9 +533,9 @@
 @ stdcall RealGetWindowClass(long ptr long) RealGetWindowClassA
 @ stdcall RealGetWindowClassA(long ptr long)
 @ stdcall RealGetWindowClassW(long ptr long)
-@ stdcall ReasonCodeNeedsBugID()
-@ stdcall ReasonCodeNeedsComment()
-@ stdcall RecordShutdownReason()
+@ stub ReasonCodeNeedsBugID
+@ stub ReasonCodeNeedsComment
+@ stub RecordShutdownReason
 @ stdcall RedrawWindow(long ptr long long) NtUserRedrawWindow
 @ stdcall RegisterClassA(ptr)
 @ stdcall RegisterClassExA(ptr)
@@ -547,7 +547,7 @@
 @ stdcall RegisterDeviceNotificationW(long ptr long)
 @ stdcall RegisterHotKey(long long long long) NtUserRegisterHotKey
 @ stdcall RegisterLogonProcess(long long)
-@ stdcall RegisterMessagePumpHook()
+@ stub RegisterMessagePumpHook
 @ stdcall RegisterRawInputDevices(ptr long long)
 @ stdcall RegisterServicesProcess(long)
 @ stdcall RegisterShellHookWindow(long)
@@ -593,7 +593,7 @@
 @ stdcall SetClassWord(long long long) ; Direct call NtUserSetClassWord
 @ stdcall SetClipboardData(long long)
 @ stdcall SetClipboardViewer(long) NtUserSetClipboardViewer
-@ stdcall SetConsoleReserveKeys()
+@ stub SetConsoleReserveKeys
 @ stdcall SetCursor(long) NtUserSetCursor
 @ stdcall SetCursorContents(ptr ptr) NtUserSetCursorContents
 @ stdcall SetCursorPos(long long)
@@ -667,7 +667,7 @@
 @ stdcall ShowStartGlass(long)
 @ stdcall ShowWindow(long long) NtUserShowWindow
 @ stdcall ShowWindowAsync(long long) NtUserShowWindowAsync
-@ stdcall SoftModalMessageBox()
+@ stub SoftModalMessageBox
 @ stdcall SubtractRect(ptr ptr ptr)
 @ stdcall SwapMouseButton(long)
 @ stdcall SwitchDesktop(long) NtUserSwitchDesktop
@@ -690,7 +690,7 @@
 @ stdcall TranslateAcceleratorW(long long ptr)
 @ stdcall TranslateMDISysAccel(long ptr)
 @ stdcall TranslateMessage(ptr)
-@ stdcall TranslateMessageEx()
+@ stub TranslateMessageEx
 @ stdcall UnhookWinEvent(long) NtUserUnhookWinEvent
 @ stdcall UnhookWindowsHook(long ptr)
 @ stdcall UnhookWindowsHookEx(long) NtUserUnhookWindowsHookEx
@@ -702,7 +702,7 @@
 @ stdcall UnregisterClassW(wstr long)
 @ stdcall UnregisterDeviceNotification(long)
 @ stdcall UnregisterHotKey(long long) NtUserUnregisterHotKey
-@ stdcall UnregisterMessagePumpHook()
+@ stub UnregisterMessagePumpHook
 @ stdcall UnregisterUserApiHook() NtUserUnregisterUserApiHook
 @ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long)
 @ stdcall UpdateLayeredWindowIndirect(long ptr)
@@ -711,8 +711,8 @@
 @ stdcall User32InitializeImmEntryTable(ptr)
 @ stdcall UserClientDllInitialize(long long ptr) DllMain
 @ stdcall UserHandleGrantAccess(ptr ptr long) NtUserUserHandleGrantAccess
-@ stdcall UserLpkPSMTextOut()
-@ stdcall UserLpkTabbedTextOut()
+@ stub UserLpkPSMTextOut
+@ stub UserLpkTabbedTextOut
 @ stdcall UserRealizePalette(long)
 @ stdcall UserRegisterWowHandlers(ptr ptr)
 @ stdcall ValidateRect(long ptr) NtUserValidateRect
@@ -727,7 +727,7 @@
 @ stdcall WINNLSGetIMEHotkey(long)
 @ stdcall WaitForInputIdle(long long)
 @ stdcall WaitMessage() NtUserWaitMessage
-@ stdcall Win32PoolAllocationStats()
+@ stub Win32PoolAllocationStats
 @ stdcall WinHelpA(long str long long)
 @ stdcall WinHelpW(long wstr long long)
 @ stdcall WindowFromDC(long)