diff --git a/monitor.c b/monitor.c
index f88fbb123..55974c50e 100644
--- a/monitor.c
+++ b/monitor.c
@@ -83,6 +83,7 @@
 #include "canohost.h"
 #include "log.h"
 #include "misc.h"
+#include "msg.h"
 #include "servconf.h"
 #include "monitor.h"
 #ifdef GSSAPI
diff --git a/ssh-pkcs11-client.c b/ssh-pkcs11-client.c
index 45cda44b5..fb7ab3923 100644
--- a/ssh-pkcs11-client.c
+++ b/ssh-pkcs11-client.c
@@ -509,10 +509,12 @@ pkcs11_start_helper(void)
 #endif
 	/* success */
 	debug3_f("started pid=%ld", (long)pid);
+#ifdef WINDOWS
 out:
 	if (client_token)
 		CloseHandle(client_token);
 	return r;
+#endif
 }
 
 int