diff --git a/collects/openssl/mzssl.rkt b/collects/openssl/mzssl.rkt
index 4ccb941705..f440b453aa 100644
--- a/collects/openssl/mzssl.rkt
+++ b/collects/openssl/mzssl.rkt
@@ -87,23 +87,17 @@
     #:default-make-fail make-not-available)
   (define-ffi-definer define-mzscheme libmz)
 
-  (define-syntax typedef
-    (syntax-rules ()
-      [(_ id t)
-       (define-fun-syntax id (syntax-id-rules () [_ t]))]))
-
-  (typedef _BIO_METHOD* _pointer)
-  (typedef _BIO* _pointer)
-  (typedef _SSL_METHOD* _pointer)
-  (typedef _SSL_CTX* _pointer)
-  (typedef _SSL* _pointer)
-  (typedef _X509_NAME* _pointer)
-  (typedef _X509_NAME_ENTRY* _pointer)
-  (typedef _X509* _pointer)
-  (typedef _ASN1_STRING* _pointer)
-  (typedef _STACK* _pointer)
-
-  (define-cstruct _GENERAL_NAME ([type _int] [d _pointer]))
+  (define-cpointer-type _BIO_METHOD*)
+  (define-cpointer-type _BIO*)
+  (define-cpointer-type _SSL_METHOD*)
+  (define-cpointer-type _SSL_CTX*)
+  (define-cpointer-type _SSL*)
+  (define-cpointer-type _X509_NAME*)
+  (define-cpointer-type _X509_NAME_ENTRY*)
+  (define-cpointer-type _X509*)
+  (define-cpointer-type _ASN1_STRING*)
+  (define-cpointer-type _STACK*)
+  (define-cstruct _GENERAL_NAME ([type _int] [d _ASN1_STRING*]))
 
   (define-ssl SSLv2_client_method (_fun -> _SSL_METHOD*))
   (define-ssl SSLv2_server_method (_fun -> _SSL_METHOD*))
@@ -137,7 +131,7 @@
   (define-ssl SSL_CTX_set_session_id_context (_fun _SSL_CTX* _bytes _int -> _int))
   (define-ssl SSL_CTX_use_RSAPrivateKey_file (_fun _SSL_CTX* _bytes _int -> _int))
   (define-ssl SSL_CTX_use_PrivateKey_file (_fun _SSL_CTX* _bytes _int -> _int))
-  (define-ssl SSL_load_client_CA_file (_fun _bytes -> _X509_NAME*))
+  (define-ssl SSL_load_client_CA_file (_fun _bytes -> _X509_NAME*/null))
   (define-ssl SSL_CTX_set_cipher_list (_fun _SSL_CTX* _string -> _int))
 
   (define-ssl SSL_new (_fun _SSL_CTX* -> _SSL*))
@@ -149,13 +143,13 @@
   (define-ssl SSL_write (_fun _SSL* _bytes _int -> _int))
   (define-ssl SSL_shutdown (_fun _SSL* -> _int))
   (define-ssl SSL_get_verify_result (_fun _SSL* -> _long))
-  (define-ssl SSL_get_peer_certificate (_fun _SSL* -> _X509*))
+  (define-ssl SSL_get_peer_certificate (_fun _SSL* -> _X509*/null))
   (define-ssl SSL_set_verify (_fun _SSL* _int _pointer -> _void))
   (define-ssl SSL_set_session_id_context (_fun _SSL* _bytes _int -> _int))
   (define-ssl SSL_renegotiate (_fun _SSL* -> _int))
   (define-ssl SSL_renegotiate_pending (_fun _SSL* -> _int))
   (define-ssl SSL_do_handshake (_fun _SSL* -> _int))
-  
+
   (define-crypto X509_get_subject_name (_fun _X509* -> _X509_NAME*))
   (define-crypto X509_get_issuer_name (_fun _X509* -> _X509_NAME*))
   (define-crypto X509_NAME_oneline (_fun _X509_NAME* _bytes _int -> _bytes))
@@ -172,9 +166,9 @@
   (define-crypto ASN1_STRING_length (_fun _ASN1_STRING* -> _int))
   (define-crypto ASN1_STRING_data (_fun _ASN1_STRING* -> _pointer))
   (define-crypto X509_NAME_get_index_by_NID (_fun _X509_NAME* _int _int -> _int))
-  (define-crypto X509_NAME_get_entry (_fun _X509_NAME* _int -> _X509_NAME_ENTRY*))
-  (define-crypto X509_NAME_ENTRY_get_data (_fun _X509_NAME_ENTRY* -> _pointer))
-  (define-crypto X509_get_ext_d2i (_fun _X509* _int _pointer _pointer -> _STACK*))
+  (define-crypto X509_NAME_get_entry (_fun _X509_NAME* _int -> _X509_NAME_ENTRY*/null))
+  (define-crypto X509_NAME_ENTRY_get_data (_fun _X509_NAME_ENTRY* -> _ASN1_STRING*))
+  (define-crypto X509_get_ext_d2i (_fun _X509* _int _pointer _pointer -> _STACK*/null))
   (define-crypto sk_num (_fun _STACK* -> _int))
   (define-crypto sk_GENERAL_NAME_value (_fun _STACK* _int -> _GENERAL_NAME-pointer)
     #:c-id sk_value)