3 files changed, 6 insertions, 9 deletions

diff --git a/cryptography/hazmat/backends/openssl/ssl.py b/cryptography/hazmat/backends/openssl/ssl.py
index e4192349..32ea2190 100644
--- a/cryptography/hazmat/backends/openssl/ssl.py
+++ b/cryptography/hazmat/backends/openssl/ssl.py
@@ -13,12 +13,6 @@
 
 INCLUDES = """
 #include <openssl/ssl.h>
-
-/*
- * Get some simpler definitions for some types used by later prototypes.
- */
-typedef STACK_OF(X509) Cryptography_STACK_OF_X509;
-typedef STACK_OF(X509_NAME) Cryptography_STACK_OF_X509_NAME;
 """
 
 TYPES = """
@@ -116,9 +110,6 @@ static const int X509_V_OK;
 typedef ... SSL_METHOD;
 typedef ... SSL_CTX;
 
-typedef ... Cryptography_STACK_OF_X509;
-typedef ... Cryptography_STACK_OF_X509_NAME;
-
 typedef struct {
     int master_key_length;
     unsigned char master_key[...];
diff --git a/cryptography/hazmat/backends/openssl/x509.py b/cryptography/hazmat/backends/openssl/x509.py
index 632efb31..8f4f3a0b 100644
--- a/cryptography/hazmat/backends/openssl/x509.py
+++ b/cryptography/hazmat/backends/openssl/x509.py
@@ -13,6 +13,8 @@
 
 INCLUDES = """
 #include <openssl/ssl.h>
+
+typedef STACK_OF(X509) Cryptography_STACK_OF_X509;
 """
 
 TYPES = """
@@ -63,6 +65,7 @@ typedef struct {
 
 typedef ... X509_STORE;
 typedef ... NETSCAPE_SPKI;
+typedef ... Cryptography_STACK_OF_X509;
 """
 
 FUNCTIONS = """
diff --git a/cryptography/hazmat/backends/openssl/x509name.py b/cryptography/hazmat/backends/openssl/x509name.py
index 0543e387..25638ab0 100644
--- a/cryptography/hazmat/backends/openssl/x509name.py
+++ b/cryptography/hazmat/backends/openssl/x509name.py
@@ -13,11 +13,14 @@
 
 INCLUDES = """
 #include <openssl/x509.h>
+
+typedef STACK_OF(X509_NAME) Cryptography_STACK_OF_X509_NAME;
 """
 
 TYPES = """
 typedef ... X509_NAME;
 typedef ... X509_NAME_ENTRY;
+typedef ... Cryptography_STACK_OF_X509_NAME;
 """
 
 FUNCTIONS = """