diff --git a/libguac/include/thread.h b/libguac/include/thread.h
index ae537b1f..33bd5d5d 100644
--- a/libguac/include/thread.h
+++ b/libguac/include/thread.h
@@ -53,7 +53,7 @@ typedef pthread_t guac_thread_t;
 
 #include <windows.h>
 #include <process.h>
-typedef uintptr_t guac_thread_t;
+typedef HANDLE guac_thread_t;
 
 #endif
 
diff --git a/libguac/src/thread.c b/libguac/src/thread.c
index d8a0db79..cacc7b08 100644
--- a/libguac/src/thread.c
+++ b/libguac/src/thread.c
@@ -48,7 +48,7 @@ int guac_thread_create(guac_thread_t* thread, void*(*function)(void*), void* dat
 #ifdef HAVE_LIBPTHREAD
     return pthread_create(thread, NULL, function, data);
 #elif defined(__MINGW32__)
-    *thread = _beginthreadex(NULL, 0,
+    *thread = (guac_thread_t) _beginthreadex(NULL, 0,
             (unsigned(__stdcall*)(void*)) function, data,
             0 /* Create running */, NULL);
     if (thread == 0)
@@ -61,7 +61,7 @@ void guac_thread_join(guac_thread_t thread) {
 #ifdef HAVE_LIBPTHREAD
     pthread_join(thread, NULL);
 #elif defined(__MINGW32__)
-    WaitForSingleObject(&thread, INFINITE);
+    WaitForSingleObject(thread, INFINITE);
 #endif
 }