diff --git a/pw3270.cbp b/pw3270.cbp
index 4ef26e6..946d8b4 100644
--- a/pw3270.cbp
+++ b/pw3270.cbp
@@ -220,6 +220,7 @@
 		</Unit>
 		<Unit filename="src/lib3270/xioc.h" />
 		<Unit filename="src/lib3270/xl.h" />
+		<Unit filename="src/pw3270/Makefile.in" />
 		<Unit filename="src/pw3270/actions.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -320,6 +321,7 @@
 		<Unit filename="src/pw3270/window.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="src/tools/Makefile.in" />
 		<Unit filename="ui/00default.xml" />
 		<Unit filename="ui/99debug.xml" />
 		<Extensions>
diff --git a/src/include/lib3270/session.h b/src/include/lib3270/session.h
index 707c30e..88fc1d5 100644
--- a/src/include/lib3270/session.h
+++ b/src/include/lib3270/session.h
@@ -36,11 +36,6 @@
 	#define LIB3270_LUNAME_LENGTH			16
 	#define LIB3270_FULL_MODEL_NAME_LENGTH	13
 
-	#if defined(HAVE_LIBSSL)
-		#include <openssl/ssl.h>
-		#include <openssl/err.h>
-	#endif
-
 	/**  extended attributes */
 	struct ea
 	{
@@ -66,6 +61,10 @@
 		void (*upcall)(H3270 *, struct lib3270_toggle *, LIB3270_TOGGLE_TYPE); /**< change value */
 	};
 
+#ifndef HEADER_SSL_H
+	#define SSL void
+#endif // !HEADER_SSL_H
+
 	struct _h3270
 	{
 		unsigned short 		  	  sz;					/**< Struct size */
@@ -157,10 +156,9 @@
 		char					  reading;
 		char					  excepting;
 
-#if defined(HAVE_LIBSSL) /*[*/
+		// SSL Data (Always defined to mantain the same structure size
 		unsigned long 			  last_ssl_error;
 		SSL 					* ssl_con;
-#endif
 
 		// State change callbacks.
 		struct lib3270_state_callback *st_callbacks[LIB3270_STATE_USER];
diff --git a/src/lib3270/telnet.c b/src/lib3270/telnet.c
index 6d114ec..a9e5416 100644
--- a/src/lib3270/telnet.c
+++ b/src/lib3270/telnet.c
@@ -37,29 +37,40 @@
  *		the given IBM host.
  */
 
+#include <lib3270/config.h>
+#if defined(HAVE_LIBSSL)
+	#include <openssl/ssl.h>
+	#include <openssl/err.h>
+#endif
+
 #include "globals.h"
 #include <errno.h>
 
-#if defined(_WIN32) /*[*/
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#else /*][*/
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <netinet/in.h>
-#endif /*]*/
+#if defined(_WIN32)
+	#include <winsock2.h>
+	#include <ws2tcpip.h>
+#else
+	#include <sys/socket.h>
+	#include <sys/ioctl.h>
+	#include <netinet/in.h>
+#endif
+
 #define TELCMDS 1
 #define TELOPTS 1
 #include "arpa_telnet.h"
-#if !defined(_WIN32) /*[*/
-#include <arpa/inet.h>
-#endif /*]*/
+
+#if !defined(_WIN32)
+	#include <arpa/inet.h>
+#endif
+
 #include <errno.h>
 #include <fcntl.h>
-#if !defined(_WIN32) /*[*/
-#include <netdb.h>
-#endif /*]*/
-#include <stdarg.h>
+
+#if !defined(_WIN32)
+	#include <netdb.h>
+#endif
+
+// #include <stdarg.h>
 
 #include "tn3270e.h"
 #include "3270ds.h"
@@ -2593,11 +2604,12 @@ check_linemode(Boolean init)
 	 */
 	linemode = !hisopts[TELOPT_ECHO] /* && !hisopts[TELOPT_SGA] */;
 
-	if (init || linemode != wasline) {
+	if (init || linemode != wasline)
+	{
 		st_changed(ST_LINE_MODE, linemode);
-		if (!init) {
-			trace_dsn("Operating in %s mode.\n",
-			    linemode ? "line" : "character-at-a-time");
+		if (!init)
+		{
+			trace_dsn("Operating in %s mode.\n",linemode ? "line" : "character-at-a-time");
 		}
 #if defined(X3270_ANSI) /*[*/
 		if (IN_ANSI && linemode)
@@ -3375,7 +3387,7 @@ static void ssl_info_callback(INFO_CONST SSL *s, int where, int ret)
 		lib3270_write_log(NULL,"SSL","Current state is \"%s\"",SSL_state_string_long(s));
 	}
 
-	trace("%s: where=%04x ret=%d",__FUNCTION__,where,ret);
+	trace("%s: state=%04x where=%04x ret=%d",__FUNCTION__,SSL_state(s),where,ret);
 
 #ifdef DEBUG
 	if(where & SSL_CB_EXIT)
--
libgit2 0.21.2