diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
index 70db1eb8d..91e704281 100644
--- a/winsup/w32api/include/winuser.h
+++ b/winsup/w32api/include/winuser.h
@@ -3460,8 +3460,13 @@ WINUSERAPI BOOL WINAPI GetClassInfoW(HINSTANCE,LPCWSTR,LPWNDCLASSW);
 WINUSERAPI BOOL WINAPI GetClassInfoExW(HINSTANCE,LPCWSTR,LPWNDCLASSEXW);
 WINUSERAPI DWORD WINAPI GetClassLongA(HWND,int);
 WINUSERAPI DWORD WINAPI GetClassLongW(HWND,int);
+#ifdef _WIN64
 WINUSERAPI ULONG_PTR WINAPI GetClassLongPtrA(HWND,int);
 WINUSERAPI ULONG_PTR WINAPI GetClassLongPtrW(HWND,int);
+#else
+#define GetClassLongPtrA GetClassLongA
+#define GetClassLongPtrW GetClassLongW
+#endif
 WINUSERAPI int WINAPI GetClassNameA(HWND,LPSTR,int);
 WINUSERAPI int WINAPI GetClassNameW(HWND,LPWSTR,int);
 WINUSERAPI WORD WINAPI GetClassWord(HWND,int);
@@ -3785,8 +3790,13 @@ WINUSERAPI BOOL WINAPI SetCaretBlinkTime(UINT);
 WINUSERAPI BOOL WINAPI SetCaretPos(int,int);
 WINUSERAPI DWORD WINAPI SetClassLongA(HWND,int,LONG);
 WINUSERAPI DWORD WINAPI SetClassLongW(HWND,int,LONG);
+#ifdef _WIN64
 WINUSERAPI ULONG_PTR WINAPI SetClassLongPtrA(HWND,int,LONG_PTR);
 WINUSERAPI ULONG_PTR WINAPI SetClassLongPtrW(HWND,int,LONG_PTR);
+#else
+#define SetClassLongPtrA SetClassLongA
+#define SetClassLongPtrW SetClassLongW
+#endif
 WINUSERAPI WORD WINAPI SetClassWord(HWND,int,WORD);
 WINUSERAPI HANDLE WINAPI SetClipboardData(UINT,HANDLE);
 WINUSERAPI HWND WINAPI SetClipboardViewer(HWND);
diff --git a/winsup/w32api/lib/user32.def b/winsup/w32api/lib/user32.def
index ff7c99d8d..120b2a377 100644
--- a/winsup/w32api/lib/user32.def
+++ b/winsup/w32api/lib/user32.def
@@ -232,8 +232,6 @@ GetClassInfoExW@12
 GetClassInfoW@12
 GetClassLongA@8
 GetClassLongW@8
-GetClassLongPtrA@8
-GetClassLongPtrW@8
 GetClassNameA@12
 GetClassNameW@12
 GetClassWord@8
@@ -517,8 +515,6 @@ SetCaretBlinkTime@4
 SetCaretPos@8
 SetClassLongA@12
 SetClassLongW@12
-SetClassLongPtrA@12
-SetClassLongPtrW@12
 SetClassWord@12
 SetClipboardData@8
 SetClipboardViewer@4