--- libextra/openssl_compat.h.orig	2011-07-04 16:30:35.300970884 +0200
+++ libextra/openssl_compat.h	2011-07-04 16:36:25.495478807 +0200
@@ -26,6 +26,9 @@
 #ifndef GNUTLS_COMPAT8_H
 #define GNUTLS_COMPAT8_H
 
+#include <winsock2.h>
+#undef X509_NAME
+
 /* Extra definitions */
 #include <gnutls/openssl.h>
 
--- src/cli.c.orig	2011-07-04 17:24:20.082828141 +0200
+++ src/cli.c	2011-07-04 17:25:39.664938552 +0200
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <sys/types.h>
 #include <string.h>
 #include <sys/time.h>