diff --git a/dlls/wow64win/syscall.c b/dlls/wow64win/syscall.c
index 20ea054ff7c..5d08e1fd905 100644
--- a/dlls/wow64win/syscall.c
+++ b/dlls/wow64win/syscall.c
@@ -30,15 +30,15 @@
 
 static void * const win32_syscalls[] =
 {
-#define SYSCALL_ENTRY(func) wow64_ ## func,
-    ALL_WIN32_SYSCALLS
+#define SYSCALL_ENTRY(id,name,args) wow64_ ## name,
+    ALL_SYSCALLS32
 #undef SYSCALL_ENTRY
 };
 
 static const char * const win32_syscall_names[] =
 {
-#define SYSCALL_ENTRY(func) #func,
-    ALL_WIN32_SYSCALLS
+#define SYSCALL_ENTRY(id,name,args) #name,
+    ALL_SYSCALLS32
 #undef SYSCALL_ENTRY
 };
 
diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h
deleted file mode 100644
index 3d441668f6a..00000000000
--- a/dlls/wow64win/syscall.h
+++ /dev/null
@@ -1,427 +0,0 @@
-/*
- * WoW64 USER32 syscall definitions
- *
- * Copyright 2021 Alexandre Julliard
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef __WOW64WIN_SYSCALL_H
-#define __WOW64WIN_SYSCALL_H
-
-#define ALL_WIN32_SYSCALLS \
-    SYSCALL_ENTRY( NtGdiAbortDoc ) \
-    SYSCALL_ENTRY( NtGdiAbortPath ) \
-    SYSCALL_ENTRY( NtGdiAddFontMemResourceEx ) \
-    SYSCALL_ENTRY( NtGdiAddFontResourceW ) \
-    SYSCALL_ENTRY( NtGdiAlphaBlend ) \
-    SYSCALL_ENTRY( NtGdiAngleArc ) \
-    SYSCALL_ENTRY( NtGdiArcInternal ) \
-    SYSCALL_ENTRY( NtGdiBeginPath ) \
-    SYSCALL_ENTRY( NtGdiBitBlt ) \
-    SYSCALL_ENTRY( NtGdiCloseFigure ) \
-    SYSCALL_ENTRY( NtGdiCombineRgn ) \
-    SYSCALL_ENTRY( NtGdiComputeXformCoefficients ) \
-    SYSCALL_ENTRY( NtGdiCreateBitmap ) \
-    SYSCALL_ENTRY( NtGdiCreateClientObj ) \
-    SYSCALL_ENTRY( NtGdiCreateCompatibleBitmap ) \
-    SYSCALL_ENTRY( NtGdiCreateCompatibleDC ) \
-    SYSCALL_ENTRY( NtGdiCreateDIBBrush ) \
-    SYSCALL_ENTRY( NtGdiCreateDIBSection ) \
-    SYSCALL_ENTRY( NtGdiCreateDIBitmapInternal ) \
-    SYSCALL_ENTRY( NtGdiCreateEllipticRgn ) \
-    SYSCALL_ENTRY( NtGdiCreateHalftonePalette ) \
-    SYSCALL_ENTRY( NtGdiCreateHatchBrushInternal ) \
-    SYSCALL_ENTRY( NtGdiCreateMetafileDC ) \
-    SYSCALL_ENTRY( NtGdiCreatePaletteInternal ) \
-    SYSCALL_ENTRY( NtGdiCreatePatternBrushInternal ) \
-    SYSCALL_ENTRY( NtGdiCreatePen ) \
-    SYSCALL_ENTRY( NtGdiCreateRectRgn ) \
-    SYSCALL_ENTRY( NtGdiCreateRoundRectRgn ) \
-    SYSCALL_ENTRY( NtGdiCreateSolidBrush ) \
-    SYSCALL_ENTRY( NtGdiDdDDICheckVidPnExclusiveOwnership ) \
-    SYSCALL_ENTRY( NtGdiDdDDICloseAdapter ) \
-    SYSCALL_ENTRY( NtGdiDdDDICreateDCFromMemory ) \
-    SYSCALL_ENTRY( NtGdiDdDDICreateDevice ) \
-    SYSCALL_ENTRY( NtGdiDdDDIDestroyDCFromMemory ) \
-    SYSCALL_ENTRY( NtGdiDdDDIDestroyDevice ) \
-    SYSCALL_ENTRY( NtGdiDdDDIEscape ) \
-    SYSCALL_ENTRY( NtGdiDdDDIOpenAdapterFromDeviceName ) \
-    SYSCALL_ENTRY( NtGdiDdDDIOpenAdapterFromHdc ) \
-    SYSCALL_ENTRY( NtGdiDdDDIOpenAdapterFromLuid ) \
-    SYSCALL_ENTRY( NtGdiDdDDIQueryAdapterInfo ) \
-    SYSCALL_ENTRY( NtGdiDdDDIQueryStatistics ) \
-    SYSCALL_ENTRY( NtGdiDdDDIQueryVideoMemoryInfo ) \
-    SYSCALL_ENTRY( NtGdiDdDDISetQueuedLimit ) \
-    SYSCALL_ENTRY( NtGdiDdDDISetVidPnSourceOwner ) \
-    SYSCALL_ENTRY( NtGdiDeleteClientObj ) \
-    SYSCALL_ENTRY( NtGdiDeleteObjectApp ) \
-    SYSCALL_ENTRY( NtGdiDescribePixelFormat ) \
-    SYSCALL_ENTRY( NtGdiDoPalette ) \
-    SYSCALL_ENTRY( NtGdiDrawStream ) \
-    SYSCALL_ENTRY( NtGdiEllipse ) \
-    SYSCALL_ENTRY( NtGdiEndDoc ) \
-    SYSCALL_ENTRY( NtGdiEndPage ) \
-    SYSCALL_ENTRY( NtGdiEndPath ) \
-    SYSCALL_ENTRY( NtGdiEnumFonts ) \
-    SYSCALL_ENTRY( NtGdiEqualRgn ) \
-    SYSCALL_ENTRY( NtGdiExcludeClipRect ) \
-    SYSCALL_ENTRY( NtGdiExtCreatePen ) \
-    SYSCALL_ENTRY( NtGdiExtCreateRegion ) \
-    SYSCALL_ENTRY( NtGdiExtEscape ) \
-    SYSCALL_ENTRY( NtGdiExtFloodFill ) \
-    SYSCALL_ENTRY( NtGdiExtGetObjectW ) \
-    SYSCALL_ENTRY( NtGdiExtSelectClipRgn ) \
-    SYSCALL_ENTRY( NtGdiExtTextOutW ) \
-    SYSCALL_ENTRY( NtGdiFillPath ) \
-    SYSCALL_ENTRY( NtGdiFillRgn ) \
-    SYSCALL_ENTRY( NtGdiFlattenPath ) \
-    SYSCALL_ENTRY( NtGdiFlush ) \
-    SYSCALL_ENTRY( NtGdiFontIsLinked ) \
-    SYSCALL_ENTRY( NtGdiFrameRgn ) \
-    SYSCALL_ENTRY( NtGdiGetAndSetDCDword ) \
-    SYSCALL_ENTRY( NtGdiGetAppClipBox ) \
-    SYSCALL_ENTRY( NtGdiGetBitmapBits ) \
-    SYSCALL_ENTRY( NtGdiGetBitmapDimension ) \
-    SYSCALL_ENTRY( NtGdiGetBoundsRect ) \
-    SYSCALL_ENTRY( NtGdiGetCharABCWidthsW ) \
-    SYSCALL_ENTRY( NtGdiGetCharWidthInfo ) \
-    SYSCALL_ENTRY( NtGdiGetCharWidthW ) \
-    SYSCALL_ENTRY( NtGdiGetColorAdjustment ) \
-    SYSCALL_ENTRY( NtGdiGetDCDword ) \
-    SYSCALL_ENTRY( NtGdiGetDCObject ) \
-    SYSCALL_ENTRY( NtGdiGetDCPoint ) \
-    SYSCALL_ENTRY( NtGdiGetDIBitsInternal ) \
-    SYSCALL_ENTRY( NtGdiGetDeviceCaps ) \
-    SYSCALL_ENTRY( NtGdiGetDeviceGammaRamp ) \
-    SYSCALL_ENTRY( NtGdiGetFontData ) \
-    SYSCALL_ENTRY( NtGdiGetFontFileData ) \
-    SYSCALL_ENTRY( NtGdiGetFontFileInfo ) \
-    SYSCALL_ENTRY( NtGdiGetFontUnicodeRanges ) \
-    SYSCALL_ENTRY( NtGdiGetGlyphIndicesW ) \
-    SYSCALL_ENTRY( NtGdiGetGlyphOutline ) \
-    SYSCALL_ENTRY( NtGdiGetKerningPairs ) \
-    SYSCALL_ENTRY( NtGdiGetNearestColor ) \
-    SYSCALL_ENTRY( NtGdiGetNearestPaletteIndex ) \
-    SYSCALL_ENTRY( NtGdiGetOutlineTextMetricsInternalW ) \
-    SYSCALL_ENTRY( NtGdiGetPath ) \
-    SYSCALL_ENTRY( NtGdiGetPixel ) \
-    SYSCALL_ENTRY( NtGdiGetRandomRgn ) \
-    SYSCALL_ENTRY( NtGdiGetRasterizerCaps ) \
-    SYSCALL_ENTRY( NtGdiGetRealizationInfo ) \
-    SYSCALL_ENTRY( NtGdiGetRegionData ) \
-    SYSCALL_ENTRY( NtGdiGetRgnBox ) \
-    SYSCALL_ENTRY( NtGdiGetSpoolMessage ) \
-    SYSCALL_ENTRY( NtGdiGetSystemPaletteUse ) \
-    SYSCALL_ENTRY( NtGdiGetTextCharsetInfo ) \
-    SYSCALL_ENTRY( NtGdiGetTextExtentExW ) \
-    SYSCALL_ENTRY( NtGdiGetTextFaceW ) \
-    SYSCALL_ENTRY( NtGdiGetTextMetricsW ) \
-    SYSCALL_ENTRY( NtGdiGetTransform ) \
-    SYSCALL_ENTRY( NtGdiGradientFill ) \
-    SYSCALL_ENTRY( NtGdiHfontCreate ) \
-    SYSCALL_ENTRY( NtGdiIcmBrushInfo ) \
-    SYSCALL_ENTRY( NtGdiInitSpool ) \
-    SYSCALL_ENTRY( NtGdiIntersectClipRect ) \
-    SYSCALL_ENTRY( NtGdiInvertRgn ) \
-    SYSCALL_ENTRY( NtGdiLineTo ) \
-    SYSCALL_ENTRY( NtGdiMaskBlt ) \
-    SYSCALL_ENTRY( NtGdiModifyWorldTransform ) \
-    SYSCALL_ENTRY( NtGdiMoveTo ) \
-    SYSCALL_ENTRY( NtGdiOffsetClipRgn ) \
-    SYSCALL_ENTRY( NtGdiOffsetRgn ) \
-    SYSCALL_ENTRY( NtGdiOpenDCW ) \
-    SYSCALL_ENTRY( NtGdiPatBlt ) \
-    SYSCALL_ENTRY( NtGdiPathToRegion ) \
-    SYSCALL_ENTRY( NtGdiPlgBlt ) \
-    SYSCALL_ENTRY( NtGdiPolyDraw ) \
-    SYSCALL_ENTRY( NtGdiPolyPolyDraw ) \
-    SYSCALL_ENTRY( NtGdiPtInRegion ) \
-    SYSCALL_ENTRY( NtGdiPtVisible ) \
-    SYSCALL_ENTRY( NtGdiRectInRegion ) \
-    SYSCALL_ENTRY( NtGdiRectVisible ) \
-    SYSCALL_ENTRY( NtGdiRectangle ) \
-    SYSCALL_ENTRY( NtGdiRemoveFontMemResourceEx ) \
-    SYSCALL_ENTRY( NtGdiRemoveFontResourceW ) \
-    SYSCALL_ENTRY( NtGdiResetDC ) \
-    SYSCALL_ENTRY( NtGdiResizePalette ) \
-    SYSCALL_ENTRY( NtGdiRestoreDC ) \
-    SYSCALL_ENTRY( NtGdiRoundRect ) \
-    SYSCALL_ENTRY( NtGdiSaveDC ) \
-    SYSCALL_ENTRY( NtGdiScaleViewportExtEx ) \
-    SYSCALL_ENTRY( NtGdiScaleWindowExtEx ) \
-    SYSCALL_ENTRY( NtGdiSelectBitmap ) \
-    SYSCALL_ENTRY( NtGdiSelectBrush ) \
-    SYSCALL_ENTRY( NtGdiSelectClipPath ) \
-    SYSCALL_ENTRY( NtGdiSelectFont ) \
-    SYSCALL_ENTRY( NtGdiSelectPen ) \
-    SYSCALL_ENTRY( NtGdiSetBitmapBits ) \
-    SYSCALL_ENTRY( NtGdiSetBitmapDimension ) \
-    SYSCALL_ENTRY( NtGdiSetBoundsRect ) \
-    SYSCALL_ENTRY( NtGdiSetBrushOrg ) \
-    SYSCALL_ENTRY( NtGdiSetColorAdjustment ) \
-    SYSCALL_ENTRY( NtGdiSetDIBitsToDeviceInternal ) \
-    SYSCALL_ENTRY( NtGdiSetDeviceGammaRamp ) \
-    SYSCALL_ENTRY( NtGdiSetLayout ) \
-    SYSCALL_ENTRY( NtGdiSetMagicColors ) \
-    SYSCALL_ENTRY( NtGdiSetMetaRgn ) \
-    SYSCALL_ENTRY( NtGdiSetPixel ) \
-    SYSCALL_ENTRY( NtGdiSetPixelFormat ) \
-    SYSCALL_ENTRY( NtGdiSetRectRgn ) \
-    SYSCALL_ENTRY( NtGdiSetSystemPaletteUse ) \
-    SYSCALL_ENTRY( NtGdiSetTextJustification ) \
-    SYSCALL_ENTRY( NtGdiSetVirtualResolution ) \
-    SYSCALL_ENTRY( NtGdiStartDoc ) \
-    SYSCALL_ENTRY( NtGdiStartPage ) \
-    SYSCALL_ENTRY( NtGdiStretchBlt ) \
-    SYSCALL_ENTRY( NtGdiStretchDIBitsInternal ) \
-    SYSCALL_ENTRY( NtGdiStrokeAndFillPath ) \
-    SYSCALL_ENTRY( NtGdiStrokePath ) \
-    SYSCALL_ENTRY( NtGdiSwapBuffers ) \
-    SYSCALL_ENTRY( NtGdiTransformPoints ) \
-    SYSCALL_ENTRY( NtGdiTransparentBlt ) \
-    SYSCALL_ENTRY( NtGdiUnrealizeObject ) \
-    SYSCALL_ENTRY( NtGdiUpdateColors ) \
-    SYSCALL_ENTRY( NtGdiWidenPath ) \
-    SYSCALL_ENTRY( NtUserActivateKeyboardLayout ) \
-    SYSCALL_ENTRY( NtUserAddClipboardFormatListener ) \
-    SYSCALL_ENTRY( NtUserAssociateInputContext ) \
-    SYSCALL_ENTRY( NtUserAttachThreadInput ) \
-    SYSCALL_ENTRY( NtUserBeginPaint ) \
-    SYSCALL_ENTRY( NtUserBuildHimcList ) \
-    SYSCALL_ENTRY( NtUserBuildHwndList ) \
-    SYSCALL_ENTRY( NtUserCallHwnd ) \
-    SYSCALL_ENTRY( NtUserCallHwndParam ) \
-    SYSCALL_ENTRY( NtUserCallMsgFilter ) \
-    SYSCALL_ENTRY( NtUserCallNextHookEx ) \
-    SYSCALL_ENTRY( NtUserCallNoParam ) \
-    SYSCALL_ENTRY( NtUserCallOneParam ) \
-    SYSCALL_ENTRY( NtUserCallTwoParam ) \
-    SYSCALL_ENTRY( NtUserChangeClipboardChain ) \
-    SYSCALL_ENTRY( NtUserChangeDisplaySettings ) \
-    SYSCALL_ENTRY( NtUserCheckMenuItem ) \
-    SYSCALL_ENTRY( NtUserChildWindowFromPointEx ) \
-    SYSCALL_ENTRY( NtUserClipCursor ) \
-    SYSCALL_ENTRY( NtUserCloseClipboard ) \
-    SYSCALL_ENTRY( NtUserCloseDesktop ) \
-    SYSCALL_ENTRY( NtUserCloseWindowStation ) \
-    SYSCALL_ENTRY( NtUserCopyAcceleratorTable ) \
-    SYSCALL_ENTRY( NtUserCountClipboardFormats ) \
-    SYSCALL_ENTRY( NtUserCreateAcceleratorTable ) \
-    SYSCALL_ENTRY( NtUserCreateCaret ) \
-    SYSCALL_ENTRY( NtUserCreateDesktopEx ) \
-    SYSCALL_ENTRY( NtUserCreateInputContext ) \
-    SYSCALL_ENTRY( NtUserCreateWindowEx ) \
-    SYSCALL_ENTRY( NtUserCreateWindowStation ) \
-    SYSCALL_ENTRY( NtUserDeferWindowPosAndBand ) \
-    SYSCALL_ENTRY( NtUserDeleteMenu ) \
-    SYSCALL_ENTRY( NtUserDestroyAcceleratorTable ) \
-    SYSCALL_ENTRY( NtUserDestroyCursor ) \
-    SYSCALL_ENTRY( NtUserDestroyInputContext ) \
-    SYSCALL_ENTRY( NtUserDestroyMenu ) \
-    SYSCALL_ENTRY( NtUserDestroyWindow ) \
-    SYSCALL_ENTRY( NtUserDisableThreadIme ) \
-    SYSCALL_ENTRY( NtUserDispatchMessage ) \
-    SYSCALL_ENTRY( NtUserDisplayConfigGetDeviceInfo ) \
-    SYSCALL_ENTRY( NtUserDragDetect ) \
-    SYSCALL_ENTRY( NtUserDragObject ) \
-    SYSCALL_ENTRY( NtUserDrawCaptionTemp ) \
-    SYSCALL_ENTRY( NtUserDrawIconEx ) \
-    SYSCALL_ENTRY( NtUserDrawMenuBarTemp ) \
-    SYSCALL_ENTRY( NtUserEmptyClipboard ) \
-    SYSCALL_ENTRY( NtUserEnableMenuItem ) \
-    SYSCALL_ENTRY( NtUserEnableMouseInPointer ) \
-    SYSCALL_ENTRY( NtUserEnableScrollBar ) \
-    SYSCALL_ENTRY( NtUserEndDeferWindowPosEx ) \
-    SYSCALL_ENTRY( NtUserEndMenu ) \
-    SYSCALL_ENTRY( NtUserEndPaint ) \
-    SYSCALL_ENTRY( NtUserEnumDisplayDevices ) \
-    SYSCALL_ENTRY( NtUserEnumDisplayMonitors ) \
-    SYSCALL_ENTRY( NtUserEnumDisplaySettings ) \
-    SYSCALL_ENTRY( NtUserExcludeUpdateRgn ) \
-    SYSCALL_ENTRY( NtUserFindExistingCursorIcon ) \
-    SYSCALL_ENTRY( NtUserFindWindowEx ) \
-    SYSCALL_ENTRY( NtUserFlashWindowEx ) \
-    SYSCALL_ENTRY( NtUserGetAncestor ) \
-    SYSCALL_ENTRY( NtUserGetAsyncKeyState ) \
-    SYSCALL_ENTRY( NtUserGetAtomName ) \
-    SYSCALL_ENTRY( NtUserGetCaretBlinkTime ) \
-    SYSCALL_ENTRY( NtUserGetCaretPos ) \
-    SYSCALL_ENTRY( NtUserGetClassInfoEx ) \
-    SYSCALL_ENTRY( NtUserGetClassName ) \
-    SYSCALL_ENTRY( NtUserGetClipboardData ) \
-    SYSCALL_ENTRY( NtUserGetClipboardFormatName ) \
-    SYSCALL_ENTRY( NtUserGetClipboardOwner ) \
-    SYSCALL_ENTRY( NtUserGetClipboardSequenceNumber ) \
-    SYSCALL_ENTRY( NtUserGetClipboardViewer ) \
-    SYSCALL_ENTRY( NtUserGetCursor ) \
-    SYSCALL_ENTRY( NtUserGetCursorFrameInfo ) \
-    SYSCALL_ENTRY( NtUserGetCursorInfo ) \
-    SYSCALL_ENTRY( NtUserGetDC ) \
-    SYSCALL_ENTRY( NtUserGetDCEx ) \
-    SYSCALL_ENTRY( NtUserGetDisplayConfigBufferSizes ) \
-    SYSCALL_ENTRY( NtUserGetDoubleClickTime ) \
-    SYSCALL_ENTRY( NtUserGetDpiForMonitor ) \
-    SYSCALL_ENTRY( NtUserGetForegroundWindow ) \
-    SYSCALL_ENTRY( NtUserGetGUIThreadInfo ) \
-    SYSCALL_ENTRY( NtUserGetIconInfo ) \
-    SYSCALL_ENTRY( NtUserGetIconSize ) \
-    SYSCALL_ENTRY( NtUserGetInternalWindowPos ) \
-    SYSCALL_ENTRY( NtUserGetKeyNameText ) \
-    SYSCALL_ENTRY( NtUserGetKeyState ) \
-    SYSCALL_ENTRY( NtUserGetKeyboardLayout ) \
-    SYSCALL_ENTRY( NtUserGetKeyboardLayoutList ) \
-    SYSCALL_ENTRY( NtUserGetKeyboardLayoutName ) \
-    SYSCALL_ENTRY( NtUserGetKeyboardState ) \
-    SYSCALL_ENTRY( NtUserGetLayeredWindowAttributes ) \
-    SYSCALL_ENTRY( NtUserGetMenuBarInfo ) \
-    SYSCALL_ENTRY( NtUserGetMenuItemRect ) \
-    SYSCALL_ENTRY( NtUserGetMessage ) \
-    SYSCALL_ENTRY( NtUserGetMouseMovePointsEx ) \
-    SYSCALL_ENTRY( NtUserGetObjectInformation ) \
-    SYSCALL_ENTRY( NtUserGetOpenClipboardWindow ) \
-    SYSCALL_ENTRY( NtUserGetPointerInfoList ) \
-    SYSCALL_ENTRY( NtUserGetPriorityClipboardFormat ) \
-    SYSCALL_ENTRY( NtUserGetProcessDpiAwarenessContext ) \
-    SYSCALL_ENTRY( NtUserGetProcessWindowStation ) \
-    SYSCALL_ENTRY( NtUserGetProp ) \
-    SYSCALL_ENTRY( NtUserGetQueueStatus ) \
-    SYSCALL_ENTRY( NtUserGetRawInputBuffer ) \
-    SYSCALL_ENTRY( NtUserGetRawInputData ) \
-    SYSCALL_ENTRY( NtUserGetRawInputDeviceInfo ) \
-    SYSCALL_ENTRY( NtUserGetRawInputDeviceList ) \
-    SYSCALL_ENTRY( NtUserGetRegisteredRawInputDevices ) \
-    SYSCALL_ENTRY( NtUserGetScrollBarInfo ) \
-    SYSCALL_ENTRY( NtUserGetSystemDpiForProcess ) \
-    SYSCALL_ENTRY( NtUserGetSystemMenu ) \
-    SYSCALL_ENTRY( NtUserGetThreadDesktop ) \
-    SYSCALL_ENTRY( NtUserGetTitleBarInfo ) \
-    SYSCALL_ENTRY( NtUserGetUpdateRect ) \
-    SYSCALL_ENTRY( NtUserGetUpdateRgn ) \
-    SYSCALL_ENTRY( NtUserGetUpdatedClipboardFormats ) \
-    SYSCALL_ENTRY( NtUserGetWindowDC ) \
-    SYSCALL_ENTRY( NtUserGetWindowPlacement ) \
-    SYSCALL_ENTRY( NtUserGetWindowRgnEx ) \
-    SYSCALL_ENTRY( NtUserHideCaret ) \
-    SYSCALL_ENTRY( NtUserHiliteMenuItem ) \
-    SYSCALL_ENTRY( NtUserInitializeClientPfnArrays ) \
-    SYSCALL_ENTRY( NtUserInternalGetWindowIcon ) \
-    SYSCALL_ENTRY( NtUserInternalGetWindowText ) \
-    SYSCALL_ENTRY( NtUserInvalidateRect ) \
-    SYSCALL_ENTRY( NtUserInvalidateRgn ) \
-    SYSCALL_ENTRY( NtUserIsClipboardFormatAvailable ) \
-    SYSCALL_ENTRY( NtUserIsMouseInPointerEnabled ) \
-    SYSCALL_ENTRY( NtUserKillTimer ) \
-    SYSCALL_ENTRY( NtUserLockWindowUpdate ) \
-    SYSCALL_ENTRY( NtUserLogicalToPerMonitorDPIPhysicalPoint ) \
-    SYSCALL_ENTRY( NtUserMapVirtualKeyEx ) \
-    SYSCALL_ENTRY( NtUserMenuItemFromPoint ) \
-    SYSCALL_ENTRY( NtUserMessageCall ) \
-    SYSCALL_ENTRY( NtUserMoveWindow ) \
-    SYSCALL_ENTRY( NtUserMsgWaitForMultipleObjectsEx ) \
-    SYSCALL_ENTRY( NtUserNotifyIMEStatus ) \
-    SYSCALL_ENTRY( NtUserNotifyWinEvent ) \
-    SYSCALL_ENTRY( NtUserOpenClipboard ) \
-    SYSCALL_ENTRY( NtUserOpenDesktop ) \
-    SYSCALL_ENTRY( NtUserOpenInputDesktop ) \
-    SYSCALL_ENTRY( NtUserOpenWindowStation ) \
-    SYSCALL_ENTRY( NtUserPeekMessage ) \
-    SYSCALL_ENTRY( NtUserPerMonitorDPIPhysicalToLogicalPoint ) \
-    SYSCALL_ENTRY( NtUserPostMessage ) \
-    SYSCALL_ENTRY( NtUserPostThreadMessage ) \
-    SYSCALL_ENTRY( NtUserPrintWindow ) \
-    SYSCALL_ENTRY( NtUserQueryDisplayConfig ) \
-    SYSCALL_ENTRY( NtUserQueryInputContext ) \
-    SYSCALL_ENTRY( NtUserRealChildWindowFromPoint ) \
-    SYSCALL_ENTRY( NtUserRedrawWindow ) \
-    SYSCALL_ENTRY( NtUserRegisterClassExWOW ) \
-    SYSCALL_ENTRY( NtUserRegisterHotKey ) \
-    SYSCALL_ENTRY( NtUserRegisterRawInputDevices ) \
-    SYSCALL_ENTRY( NtUserReleaseDC ) \
-    SYSCALL_ENTRY( NtUserRemoveClipboardFormatListener ) \
-    SYSCALL_ENTRY( NtUserRemoveMenu ) \
-    SYSCALL_ENTRY( NtUserRemoveProp ) \
-    SYSCALL_ENTRY( NtUserScrollDC ) \
-    SYSCALL_ENTRY( NtUserScrollWindowEx ) \
-    SYSCALL_ENTRY( NtUserSelectPalette ) \
-    SYSCALL_ENTRY( NtUserSendInput ) \
-    SYSCALL_ENTRY( NtUserSetActiveWindow ) \
-    SYSCALL_ENTRY( NtUserSetCapture ) \
-    SYSCALL_ENTRY( NtUserSetClassLong ) \
-    SYSCALL_ENTRY( NtUserSetClassLongPtr ) \
-    SYSCALL_ENTRY( NtUserSetClassWord ) \
-    SYSCALL_ENTRY( NtUserSetClipboardData ) \
-    SYSCALL_ENTRY( NtUserSetClipboardViewer ) \
-    SYSCALL_ENTRY( NtUserSetCursor ) \
-    SYSCALL_ENTRY( NtUserSetCursorIconData ) \
-    SYSCALL_ENTRY( NtUserSetCursorPos ) \
-    SYSCALL_ENTRY( NtUserSetFocus ) \
-    SYSCALL_ENTRY( NtUserSetInternalWindowPos ) \
-    SYSCALL_ENTRY( NtUserSetKeyboardState ) \
-    SYSCALL_ENTRY( NtUserSetLayeredWindowAttributes ) \
-    SYSCALL_ENTRY( NtUserSetMenu ) \
-    SYSCALL_ENTRY( NtUserSetMenuContextHelpId ) \
-    SYSCALL_ENTRY( NtUserSetMenuDefaultItem ) \
-    SYSCALL_ENTRY( NtUserSetObjectInformation ) \
-    SYSCALL_ENTRY( NtUserSetParent ) \
-    SYSCALL_ENTRY( NtUserSetProcessDpiAwarenessContext ) \
-    SYSCALL_ENTRY( NtUserSetProcessWindowStation ) \
-    SYSCALL_ENTRY( NtUserSetProp ) \
-    SYSCALL_ENTRY( NtUserSetScrollInfo ) \
-    SYSCALL_ENTRY( NtUserSetShellWindowEx ) \
-    SYSCALL_ENTRY( NtUserSetSysColors ) \
-    SYSCALL_ENTRY( NtUserSetSystemMenu ) \
-    SYSCALL_ENTRY( NtUserSetSystemTimer ) \
-    SYSCALL_ENTRY( NtUserSetThreadDesktop ) \
-    SYSCALL_ENTRY( NtUserSetTimer ) \
-    SYSCALL_ENTRY( NtUserSetWinEventHook ) \
-    SYSCALL_ENTRY( NtUserSetWindowLong ) \
-    SYSCALL_ENTRY( NtUserSetWindowLongPtr ) \
-    SYSCALL_ENTRY( NtUserSetWindowPlacement ) \
-    SYSCALL_ENTRY( NtUserSetWindowPos ) \
-    SYSCALL_ENTRY( NtUserSetWindowRgn ) \
-    SYSCALL_ENTRY( NtUserSetWindowWord ) \
-    SYSCALL_ENTRY( NtUserSetWindowsHookEx ) \
-    SYSCALL_ENTRY( NtUserShowCaret ) \
-    SYSCALL_ENTRY( NtUserShowCursor ) \
-    SYSCALL_ENTRY( NtUserShowScrollBar ) \
-    SYSCALL_ENTRY( NtUserShowWindow ) \
-    SYSCALL_ENTRY( NtUserShowWindowAsync ) \
-    SYSCALL_ENTRY( NtUserSystemParametersInfo ) \
-    SYSCALL_ENTRY( NtUserSystemParametersInfoForDpi ) \
-    SYSCALL_ENTRY( NtUserThunkedMenuInfo ) \
-    SYSCALL_ENTRY( NtUserThunkedMenuItemInfo ) \
-    SYSCALL_ENTRY( NtUserToUnicodeEx ) \
-    SYSCALL_ENTRY( NtUserTrackMouseEvent ) \
-    SYSCALL_ENTRY( NtUserTrackPopupMenuEx ) \
-    SYSCALL_ENTRY( NtUserTranslateAccelerator )  \
-    SYSCALL_ENTRY( NtUserTranslateMessage ) \
-    SYSCALL_ENTRY( NtUserUnhookWinEvent ) \
-    SYSCALL_ENTRY( NtUserUnhookWindowsHookEx ) \
-    SYSCALL_ENTRY( NtUserUnregisterClass ) \
-    SYSCALL_ENTRY( NtUserUnregisterHotKey ) \
-    SYSCALL_ENTRY( NtUserUpdateInputContext ) \
-    SYSCALL_ENTRY( NtUserUpdateLayeredWindow ) \
-    SYSCALL_ENTRY( NtUserValidateRect ) \
-    SYSCALL_ENTRY( NtUserVkKeyScanEx ) \
-    SYSCALL_ENTRY( NtUserWaitForInputIdle ) \
-    SYSCALL_ENTRY( NtUserWaitMessage ) \
-    SYSCALL_ENTRY( NtUserWindowFromDC ) \
-    SYSCALL_ENTRY( NtUserWindowFromPoint ) \
-    SYSCALL_ENTRY( __wine_get_file_outline_text_metric ) \
-    SYSCALL_ENTRY( __wine_get_icm_profile ) \
-    SYSCALL_ENTRY( __wine_send_input )
-
-#endif /* __WOW64WIN_SYSCALL_H */
diff --git a/dlls/wow64win/wow64win_private.h b/dlls/wow64win/wow64win_private.h
index 76e0c98f0f0..a4fa1ad2a06 100644
--- a/dlls/wow64win/wow64win_private.h
+++ b/dlls/wow64win/wow64win_private.h
@@ -21,14 +21,14 @@
 #ifndef __WOW64WIN_PRIVATE_H
 #define __WOW64WIN_PRIVATE_H
 
-#include "syscall.h"
+#include "../win32u/win32syscalls.h"
 
-#define SYSCALL_ENTRY(func) extern NTSTATUS WINAPI wow64_ ## func( UINT *args ) DECLSPEC_HIDDEN;
-ALL_WIN32_SYSCALLS
+#define SYSCALL_ENTRY(id,name,_args) extern NTSTATUS WINAPI wow64_ ## name( UINT *args );
+ALL_SYSCALLS32
 #undef SYSCALL_ENTRY
 
 typedef NTSTATUS (WINAPI *user_callback)( void *params, ULONG size );
-extern user_callback user_callbacks[] DECLSPEC_HIDDEN;
+extern user_callback user_callbacks[];
 
 struct object_attr64
 {