diff --git a/src/core/connect.c b/src/core/connect.c
index 699d05e..c875b49 100644
--- a/src/core/connect.c
+++ b/src/core/connect.c
@@ -166,11 +166,14 @@
 
 	non_blocking(hSession,False);
 
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Wcast-function-type"
 	int rc = lib3270_run_task(
 			hSession,
 			(int(*)(H3270 *h, void *)) hSession->network.module->start_tls,
 			NULL
 		);
+	#pragma GCC diagnostic pop
 
 	if(rc == ENOTSUP) {
 
diff --git a/src/include/internals.h b/src/include/internals.h
index 7d284ec..3983343 100644
--- a/src/include/internals.h
+++ b/src/include/internals.h
@@ -42,12 +42,16 @@
 #include <networking.h>
 #include <lib3270/os.h>
 
+#if defined(HAVE_LDAP) && defined (HAVE_LIBSSL)
+	#include <openssl/x509.h>
+#endif // !HAVE_LDAP && HAVE_LIBSSL
+
 #if defined(X3270_TN3270E) && !defined(X3270_ANSI) /*[*/
-		#define X3270_ANSI	1	/* RFC2355 requires NVT mode */
+		#define X3270_ANSI	1	// RFC2355 requires NVT mode
 #endif /*]*/
 
 #if defined(HAVE_VASPRINTF) && !defined(_GNU_SOURCE) /*[*/
-	#define _GNU_SOURCE		/* vasprintf isn't POSIX */
+	#define _GNU_SOURCE		// vasprintf isn't POSIX
 #endif /*]*/
 
 // gettext stuff
--
libgit2 0.21.2