diff --git a/contrib/win32/openssh/config.h.vs b/contrib/win32/openssh/config.h.vs
index b0d71e3a3..98496e560 100644
--- a/contrib/win32/openssh/config.h.vs
+++ b/contrib/win32/openssh/config.h.vs
@@ -135,7 +135,7 @@
 #define DISABLE_WTMPX 1
 
 /* Enable for PKCS#11 support */
-/* #undef ENABLE_PKCS11 */
+#define ENABLE_PKCS11 1
 
 /* File names may not contain backslash characters */
 /* #undef FILESYSTEM_NO_BACKSLASH */
diff --git a/contrib/win32/win32compat/inc/dlfcn.h b/contrib/win32/win32compat/inc/dlfcn.h
index 5f1b9aee2..02be32978 100644
--- a/contrib/win32/win32compat/inc/dlfcn.h
+++ b/contrib/win32/win32compat/inc/dlfcn.h
@@ -5,7 +5,5 @@
 HMODULE dlopen(const char *filename, int flags);
 
 int dlclose(HMODULE handle);
-
-FARPROC dlsym(HMODULE handle, const char *symbol);
-
+void * dlsym(HMODULE handle, const char *symbol);
 char * dlerror();
diff --git a/contrib/win32/win32compat/misc.c b/contrib/win32/win32compat/misc.c
index 64e819e8e..62c510431 100644
--- a/contrib/win32/win32compat/misc.c
+++ b/contrib/win32/win32compat/misc.c
@@ -247,7 +247,7 @@ dlclose(HMODULE handle)
 	return 0;
 }
 
-FARPROC 
+void *
 dlsym(HMODULE handle, const char *symbol)
 {
 	void *ptr = GetProcAddress(handle, symbol);
@@ -1949,4 +1949,4 @@ cleanup:
 		free(command_w);
 
 	return ret;
-}
\ No newline at end of file
+}