diff --git a/mswin32/nmap.vcproj b/mswin32/nmap.vcproj
index f7a8e3f75..476fb7e40 100644
--- a/mswin32/nmap.vcproj
+++ b/mswin32/nmap.vcproj
@@ -294,6 +294,10 @@
 				RelativePath="..\nse_pcrelib.cc"
 				>
 			</File>
+			<File
+				RelativePath="..\nse_ssl_cert.cc"
+				>
+			</File>
 			<File
 				RelativePath="..\osscan.cc"
 				>
@@ -487,6 +491,10 @@
 				RelativePath="..\nse_pcrelib.h"
 				>
 			</File>
+			<File
+				RelativePath="..\nse_ssl_cert.h"
+				>
+			</File>
 			<File
 				RelativePath="..\osscan.h"
 				>
diff --git a/nse_nsock.h b/nse_nsock.h
index 71a3f3d38..e8936809c 100644
--- a/nse_nsock.h
+++ b/nse_nsock.h
@@ -1,10 +1,6 @@
 #ifndef NMAP_LUA_NSOCK_H
 #define NMAP_LUA_NSOCK_H
 
-#ifdef HAVE_CONFIG_H
-#include "nmap_config.h"
-#endif
-
 int luaopen_nsock(lua_State *);
 int l_nsock_new(lua_State *);
 int l_nsock_sleep(lua_State *L);
@@ -14,10 +10,5 @@ int l_dnet_get_interface_link(lua_State *);
 
 #define NSE_NSOCK_LOOP "NSOCK_LOOP"
 
-#if HAVE_OPENSSL
-#include <openssl/ssl.h>
-const SSL *nse_nsock_get_ssl(lua_State *L);
-#endif
-
 #endif
 
diff --git a/nse_ssl_cert.cc b/nse_ssl_cert.cc
index 8ee46a671..876000bf1 100644
--- a/nse_ssl_cert.cc
+++ b/nse_ssl_cert.cc
@@ -90,6 +90,7 @@
 /* $Id:$ */
 
 #include <assert.h>
+#include <ctype.h>
 #include <errno.h>
 #include <openssl/bio.h>
 #include <openssl/pem.h>
@@ -100,16 +101,18 @@ extern "C"
 {
 #include "lua.h"
 #include "lauxlib.h"
+void *safe_realloc(void *, size_t);
 }
 
 #include "nse_nsock.h"
-#include "nbase.h"
 
 struct cert_userdata {
   X509 *cert;
   int attributes_table;
 };
 
+const SSL *nse_nsock_get_ssl(lua_State *L);
+
 /* This is a reference to a table that will be used as the metatable for
    certificate attribute tables. It has an __index entry that points to the
    global table of certificate functions like digest. */