diff --git a/src/remote/os/win32/ibconfig.cpp b/src/remote/os/win32/ibconfig.cpp
index a2dff7691b..28b827e5d1 100644
--- a/src/remote/os/win32/ibconfig.cpp
+++ b/src/remote/os/win32/ibconfig.cpp
@@ -569,7 +569,7 @@ BOOL ValidateUser(HWND hParentWnd)
 	else {
 		szSysDbaPasswd[0] = '\0';
 		return (DialogBox
-				((HINSTANCE) GetWindowLong(hParentWnd, GWLP_HINSTANCE),
+				((HINSTANCE) GetWindowLongPtr(hParentWnd, GWLP_HINSTANCE),
 				 MAKEINTRESOURCE(PASSWORD_DLG), hParentWnd,
 				 (DLGPROC) PasswordDlgProc) > 0);
 	}
diff --git a/src/remote/os/win32/window.h b/src/remote/os/win32/window.h
index 21c47435c9..6a25ed5f37 100644
--- a/src/remote/os/win32/window.h
+++ b/src/remote/os/win32/window.h
@@ -58,7 +58,16 @@ static const char* szWindowName = "Firebird Server"; // Used in iscguard.cpp
 #ifndef GWLP_HINSTANCE
 #define GWLP_HINSTANCE GWL_HINSTANCE
 #endif
+#ifndef GCLP_HICON
+#define GCLP_HICON GCL_HICON
+#endif
+#ifndef LONG_PTR
+#define LONG_PTR long
+#endif
+#define GetWindowLongPtr GetWindowLong
+#define SetWindowLongPtr SetWindowLong
+#define GetClassLongPtr GetClassLong
+#define SetClassLongPtr SetClassLong
 #endif
 
 #endif // OS_WIN32_WINDOW_H
-