diff --git a/src/native/windows/Window.h b/src/native/windows/Window.h
index 5b08c0e8..400dec33 100644
--- a/src/native/windows/Window.h
+++ b/src/native/windows/Window.h
@@ -42,9 +42,15 @@
 	#define _LWJGL_WINDOW_H_INCLUDED_
 
 	#define WIN32_LEAN_AND_MEAN
-	#define _WIN32_WINDOWS 0x0410
-	#define WINVER 0x0410
-	#define _WIN32_WINNT 0x0400
+	#ifndef _WIN32_WINDOWS
+		#define _WIN32_WINDOWS 0x0410
+	#endif
+	#ifndef WINVER
+		#define WINVER 0x0410
+	#endif
+	#ifndef _WIN32_WINNT
+		#define _WIN32_WINNT 0x0400
+	#endif
 
 	#include <windows.h>
 	#include <jni.h>
diff --git a/src/native/windows/org_lwjgl_opengl_Display.c b/src/native/windows/org_lwjgl_opengl_Display.c
index 6f1d2382..a9fa7745 100644
--- a/src/native/windows/org_lwjgl_opengl_Display.c
+++ b/src/native/windows/org_lwjgl_opengl_Display.c
@@ -520,10 +520,10 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_WindowsDisplay_nSetNativeCursor
 	if (handle_buffer != NULL) {
 		cursor_handle = (HCURSOR *)(*env)->GetDirectBufferAddress(env, handle_buffer);
 		cursor = *cursor_handle;
-		SetClassLongPtr(hwnd, GCL_HCURSOR, (LONG_PTR)cursor);
+		SetClassLongPtr(hwnd, GCLP_HCURSOR, (LONG_PTR)cursor);
 		SetCursor(cursor);
 	} else {
-		SetClassLongPtr(hwnd, GCL_HCURSOR, (LONG_PTR)NULL);
+		SetClassLongPtr(hwnd, GCLP_HCURSOR, (LONG_PTR)NULL);
 		SetCursor(LoadCursor(NULL, IDC_ARROW));
 	}
 }