diff --git a/contrib/win32/openssh/config.h.vs b/contrib/win32/openssh/config.h.vs
index aa90d9b..e10b769 100644
--- a/contrib/win32/openssh/config.h.vs
+++ b/contrib/win32/openssh/config.h.vs
@@ -166,7 +166,7 @@
 
 /* Define this if you want GSSAPI
  support in the version 2 protocol */
-#define GSSAPI 1
+/* #undef GSSAPI */
 
 /* Define if you want to use shadow password expire field */
 /* #undef HAS_SHADOW_EXPIRE */
@@ -1254,7 +1254,7 @@
 #define IP_TOS_IS_BROKEN 1
 
 /* Define if you want Kerberos 5 support */
-#define KRB5 1
+/* #undef KRB5 */
 
 /* Define if pututxline updates lastlog too */
 /* #undef LASTLOG_WRITE_PUTUTXLINE */
diff --git a/contrib/win32/openssh/libssh.vcxproj b/contrib/win32/openssh/libssh.vcxproj
index b2bad6f..6413b8d 100644
--- a/contrib/win32/openssh/libssh.vcxproj
+++ b/contrib/win32/openssh/libssh.vcxproj
@@ -204,7 +204,6 @@
     <ClCompile Include="$(OpenSSH-Src-Path)hmac.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)hostfile.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)jpake.c" />
-    <ClCompile Include="$(OpenSSH-Src-Path)kerberos-sspi.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)kex.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)kexc25519.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)kexc25519c.c" />
diff --git a/contrib/win32/openssh/libssh.vcxproj.filters b/contrib/win32/openssh/libssh.vcxproj.filters
index b07b7ef..fa793bc 100644
--- a/contrib/win32/openssh/libssh.vcxproj.filters
+++ b/contrib/win32/openssh/libssh.vcxproj.filters
@@ -129,9 +129,6 @@
     <ClCompile Include="$(OpenSSH-Src-Path)jpake.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(OpenSSH-Src-Path)kerberos-sspi.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(OpenSSH-Src-Path)kex.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/kexdhs.c b/kexdhs.c
index 06ef313..cf402c9 100644
--- a/kexdhs.c
+++ b/kexdhs.c
@@ -29,11 +29,6 @@
  * We support only client side kerberos on Windows.
  */
 
-#ifdef WIN32_FIXME
-  #undef GSSAPI
-  #undef KRB5
-#endif
-
 
 #include <sys/types.h>
 
diff --git a/kexgex.c b/kexgex.c
index f16a439..f036231 100644
--- a/kexgex.c
+++ b/kexgex.c
@@ -30,11 +30,6 @@
  * We support only client side kerberos on Windows.
  */
 
-#ifdef WIN32_FIXME
-  #undef GSSAPI
-  #undef KRB5
-#endif
-
 #include <sys/types.h>
 
 #include <openssl/evp.h>
diff --git a/key.c b/key.c
index a66feb3..0ba98b6 100644
--- a/key.c
+++ b/key.c
@@ -5,10 +5,6 @@
 
 #include "includes.h"
 
-#ifdef WIN32_FIXME
-#include "openbsd-compat/openssl-compat.h"
-#endif
-
 #include <sys/types.h>
 #include <errno.h>
 #include <stdarg.h>
diff --git a/sshconnect2.c b/sshconnect2.c
index 22f3ab5..5b595f5 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -332,21 +332,12 @@ static Authmethod *authmethod_get(char *authlist);
 static Authmethod *authmethod_lookup(const char *name);
 static char *authmethods_get(void);
 
-#ifdef WIN32_FIXME
-int userauth_sspi_kerberos(Authctxt *authctxt);
-
-void userauth_sspi_kerberos_cleanup(Authctxt *authctxt);
-#endif
-
 Authmethod authmethods[] = {
 #ifdef GSSAPI
 	{"gssapi-with-mic",
 		userauth_gssapi,
-#ifdef WIN32_FIXME
 		userauth_sspi_kerberos_cleanup,
-#else
 		NULL,
-#endif
 		&options.gss_authentication,
 		NULL},
 #endif