diff --git a/ChangeLog b/ChangeLog
index a1981d2..1d40f10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-22  Jean-Paul Calderone  <exarkun@twistedmatrix.com>
+
+	* src/ssl/connection.c src/ssl/context.c src/ssl/ssl.c: Fix
+	  compilation on Windows.  (patch from Michael Schneider)
+
 2008-02-21  Jean-Paul Calderone  <exarkun@twistedmatrix.com>
 
 	* src/ssl/connection.c: Expose SSL_get_shutdown and
diff --git a/src/ssl/connection.c b/src/ssl/connection.c
index 885f66d..6bf7f65 100755
--- a/src/ssl/connection.c
+++ b/src/ssl/connection.c
@@ -9,9 +9,7 @@
  * Reviewed 2001-07-23
  */
 #include <Python.h>
-#define SSL_MODULE
-#include <openssl/err.h>
-#include "ssl.h"
+
 
 #ifndef MS_WINDOWS
 #  include <sys/socket.h>
@@ -21,8 +19,15 @@
 #  endif
 #else
 #  include <winsock.h>
+#  include <wincrypt.h>
 #endif
 
+#define SSL_MODULE
+#include <openssl/err.h>
+
+
+#include "ssl.h"
+
 static char *CVSid = "@(#) $Id: connection.c,v 1.28 2004/08/06 10:21:56 martin Exp $";
 
 
diff --git a/src/ssl/context.c b/src/ssl/context.c
index e88b004..4c3f277 100644
--- a/src/ssl/context.c
+++ b/src/ssl/context.c
@@ -9,6 +9,20 @@
  * Reviewed 2001-07-23
  */
 #include <Python.h>
+
+
+
+#ifndef MS_WINDOWS
+#  include <sys/socket.h>
+#  include <netinet/in.h>
+#  if !(defined(__BEOS__) || defined(__CYGWIN__))
+#    include <netinet/tcp.h>
+#  endif
+#else
+#  include <winsock.h>
+#  include <wincrypt.h>
+#endif
+
 #define SSL_MODULE
 #include "ssl.h"
 
diff --git a/src/ssl/ssl.c b/src/ssl/ssl.c
index 1bd2d9e..93d597b 100644
--- a/src/ssl/ssl.c
+++ b/src/ssl/ssl.c
@@ -9,6 +9,20 @@
  * Reviewed 2001-07-23
  */
 #include <Python.h>
+
+
+
+#ifndef MS_WINDOWS
+#  include <sys/socket.h>
+#  include <netinet/in.h>
+#  if !(defined(__BEOS__) || defined(__CYGWIN__))
+#    include <netinet/tcp.h>
+#  endif
+#else
+#  include <winsock.h>
+#  include <wincrypt.h>
+#endif
+
 #define SSL_MODULE
 #include "ssl.h"