diff --git a/src/include/lib3270.h b/src/include/lib3270.h
index 366da42..898069d 100644
--- a/src/include/lib3270.h
+++ b/src/include/lib3270.h
@@ -170,27 +170,27 @@
 
 
 	/**
-	 * 3270 program messages.
+	 * @brief 3270 program messages.
 	 *
 	 */
 	typedef enum _LIB3270_MESSAGE
 	{
-		LIB3270_MESSAGE_NONE,				/**<  0 - No message */
-		LIB3270_MESSAGE_SYSWAIT,			/**<  1 - */
-		LIB3270_MESSAGE_TWAIT,				/**<  2 - */
-		LIB3270_MESSAGE_CONNECTED,			/**<  3 - Connected */
-		LIB3270_MESSAGE_DISCONNECTED,		/**<  4 - Disconnected from host */
-		LIB3270_MESSAGE_AWAITING_FIRST,		/**<  5 - */
-		LIB3270_MESSAGE_MINUS,				/**<  6 - */
-		LIB3270_MESSAGE_PROTECTED,			/**<  7 - */
-		LIB3270_MESSAGE_NUMERIC,			/**<  8 - */
-		LIB3270_MESSAGE_OVERFLOW,			/**<  9 - */
-		LIB3270_MESSAGE_INHIBIT,			/**< 10 - */
-		LIB3270_MESSAGE_KYBDLOCK,			/**< 11 - Keyboard is locked */
-
-		LIB3270_MESSAGE_X,					/**< 12 - */
-		LIB3270_MESSAGE_RESOLVING,			/**< 13 - Resolving hostname (running DNS query) */
-		LIB3270_MESSAGE_CONNECTING,			/**< 14 - Connecting to host */
+		LIB3270_MESSAGE_NONE,				///< @brief No message
+		LIB3270_MESSAGE_SYSWAIT,			///< @brief --
+		LIB3270_MESSAGE_TWAIT,				///< @brief --
+		LIB3270_MESSAGE_CONNECTED,			///< @brief Connected
+		LIB3270_MESSAGE_DISCONNECTED,		///< @brief Disconnected from host
+		LIB3270_MESSAGE_AWAITING_FIRST,		///< @brief --
+		LIB3270_MESSAGE_MINUS,				///< @brief --
+		LIB3270_MESSAGE_PROTECTED,			///< @brief --
+		LIB3270_MESSAGE_NUMERIC,			///< @brief --
+		LIB3270_MESSAGE_OVERFLOW,			///< @brief --
+		LIB3270_MESSAGE_INHIBIT,			///< @brief --
+		LIB3270_MESSAGE_KYBDLOCK,			///< @brief Keyboard is locked
+
+		LIB3270_MESSAGE_X,					///< @brief --
+		LIB3270_MESSAGE_RESOLVING,			///< @brief Resolving hostname (running DNS query)
+		LIB3270_MESSAGE_CONNECTING,			///< @brief Connecting to host
 
 		LIB3270_MESSAGE_USER
 
diff --git a/src/lib3270/api.h b/src/lib3270/api.h
index 0f9d5a0..201c91c 100644
--- a/src/lib3270/api.h
+++ b/src/lib3270/api.h
@@ -114,46 +114,43 @@
 //		#define ST_PRINTER				LIB3270_STATE_PRINTER
 //		#define ST_EXITING				LIB3270_STATE_EXITING
 //		#define ST_CHARSET				LIB3270_STATE_CHARSET
-		#define N_ST					LIB3270_STATE_USER
-		#define LIB3270_STATE_CHANGE	LIB3270_STATE
+//		#define N_ST					LIB3270_STATE_USER
+//		#define LIB3270_STATE_CHANGE	LIB3270_STATE
 
 		/** connection state */
-		#define cstate LIB3270_CSTATE
+//		#define cstate LIB3270_CSTATE
 //		#define NOT_CONNECTED	LIB3270_NOT_CONNECTED
-		#define RESOLVING	LIB3270_RESOLVING
-		#define PENDING	LIB3270_PENDING
-		#define CONNECTED_INITIAL	LIB3270_CONNECTED_INITIAL
-		#define CONNECTED_ANSI	LIB3270_CONNECTED_ANSI
-		#define CONNECTED_3270	LIB3270_CONNECTED_3270
-		#define CONNECTED_INITIAL_E	LIB3270_CONNECTED_INITIAL_E
-		#define CONNECTED_NVT	LIB3270_CONNECTED_NVT
-		#define CONNECTED_SSCP	LIB3270_CONNECTED_SSCP
-		#define CONNECTED_TN3270E	LIB3270_CONNECTED_TN3270E
-
-		#define LIB3270_STATUS					LIB3270_MESSAGE
-		#define LIB3270_STATUS_BLANK			LIB3270_MESSAGE_NONE
-		#define LIB3270_STATUS_SYSWAIT			LIB3270_MESSAGE_SYSWAIT
-		#define LIB3270_STATUS_TWAIT			LIB3270_MESSAGE_TWAIT
-		#define LIB3270_STATUS_CONNECTED		LIB3270_MESSAGE_CONNECTED
-		#define LIB3270_STATUS_DISCONNECTED		LIB3270_MESSAGE_DISCONNECTED
-		#define LIB3270_STATUS_AWAITING_FIRST	LIB3270_MESSAGE_AWAITING_FIRST
-		#define LIB3270_STATUS_MINUS			LIB3270_MESSAGE_MINUS
-		#define LIB3270_STATUS_PROTECTED		LIB3270_MESSAGE_PROTECTED
-		#define LIB3270_STATUS_NUMERIC			LIB3270_MESSAGE_NUMERIC
-		#define LIB3270_STATUS_OVERFLOW			LIB3270_MESSAGE_OVERFLOW
-		#define LIB3270_STATUS_INHIBIT			LIB3270_MESSAGE_INHIBIT
-		#define LIB3270_STATUS_KYBDLOCK			LIB3270_MESSAGE_KYBDLOCK
-		#define LIB3270_STATUS_X				LIB3270_MESSAGE_X
-		#define LIB3270_STATUS_RESOLVING		LIB3270_MESSAGE_RESOLVING
-		#define LIB3270_STATUS_CONNECTING		LIB3270_MESSAGE_CONNECTING
-		#define LIB3270_STATUS_USER				LIB3270_MESSAGE_USER
+//		#define RESOLVING	LIB3270_RESOLVING
+//		#define PENDING	LIB3270_PENDING
+//		#define CONNECTED_INITIAL	LIB3270_CONNECTED_INITIAL
+//		#define CONNECTED_ANSI	LIB3270_CONNECTED_ANSI
+//		#define CONNECTED_3270	LIB3270_CONNECTED_3270
+//		#define CONNECTED_INITIAL_E	LIB3270_CONNECTED_INITIAL_E
+//		#define CONNECTED_NVT	LIB3270_CONNECTED_NVT
+//		#define CONNECTED_SSCP	LIB3270_CONNECTED_SSCP
+//		#define CONNECTED_TN3270E	LIB3270_CONNECTED_TN3270E
+
+//		#define LIB3270_STATUS					LIB3270_MESSAGE
+//		#define LIB3270_STATUS_BLANK			LIB3270_MESSAGE_NONE
+//		#define LIB3270_STATUS_SYSWAIT			LIB3270_MESSAGE_SYSWAIT
+//		#define LIB3270_STATUS_TWAIT			LIB3270_MESSAGE_TWAIT
+//		#define LIB3270_STATUS_CONNECTED		LIB3270_MESSAGE_CONNECTED
+//		#define LIB3270_STATUS_DISCONNECTED		LIB3270_MESSAGE_DISCONNECTED
+//		#define LIB3270_STATUS_AWAITING_FIRST	LIB3270_MESSAGE_AWAITING_FIRST
+//		#define LIB3270_MESSAGE_MINUS			LIB3270_MESSAGE_MINUS
+//		#define LIB3270_STATUS_PROTECTED		LIB3270_MESSAGE_PROTECTED
+//		#define LIB3270_STATUS_NUMERIC			LIB3270_MESSAGE_NUMERIC
+//		#define LIB3270_STATUS_OVERFLOW			LIB3270_MESSAGE_OVERFLOW
+//		#define LIB3270_STATUS_INHIBIT			LIB3270_MESSAGE_INHIBIT
+//		#define LIB3270_STATUS_KYBDLOCK			LIB3270_MESSAGE_KYBDLOCK
+//		#define LIB3270_STATUS_X				LIB3270_MESSAGE_X
+//		#define LIB3270_MESSAGE_RESOLVING		LIB3270_MESSAGE_RESOLVING
+//		#define LIB3270_STATUS_CONNECTING		LIB3270_MESSAGE_CONNECTING
+//		#define LIB3270_STATUS_USER				LIB3270_MESSAGE_USER
 
 		#define OIA_FLAG_BOXSOLID	LIB3270_FLAG_BOXSOLID
 		#define OIA_FLAG_UNDERA		LIB3270_FLAG_UNDERA
-//		#define OIA_FLAG_SECURE		LIB3270_FLAG_SECURE
 		#define OIA_FLAG_TYPEAHEAD	LIB3270_FLAG_TYPEAHEAD
-//		#define OIA_FLAG_PRINTER	LIB3270_FLAG_PRINTER
-//		#define OIA_FLAG_REVERSE	LIB3270_FLAG_REVERSE
 		#define OIA_FLAG_USER		LIB3270_FLAG_COUNT
 		#define OIA_FLAG			LIB3270_FLAG
 
diff --git a/src/lib3270/ctlr.c b/src/lib3270/ctlr.c
index 73801db..baec023 100644
--- a/src/lib3270/ctlr.c
+++ b/src/lib3270/ctlr.c
@@ -1980,7 +1980,7 @@ enum pds ctlr_write(H3270 *hSession, unsigned char buf[], int buflen, Boolean er
 		do_reset(hSession,False);
 	} else if (hSession->kybdlock & KL_OIA_TWAIT) {
 		lib3270_kybdlock_clear(hSession,KL_OIA_TWAIT);
-		status_changed(hSession,LIB3270_STATUS_SYSWAIT);
+		status_changed(hSession,LIB3270_MESSAGE_SYSWAIT);
 	}
 	if (wcc_sound_alarm)
 		lib3270_ring_bell(hSession);
diff --git a/src/lib3270/host.c b/src/lib3270/host.c
index 992fe19..f296d64 100644
--- a/src/lib3270/host.c
+++ b/src/lib3270/host.c
@@ -110,9 +110,9 @@ void host_disconnect(H3270 *hSession, int failed)
 /* The host has entered 3270 or ANSI mode, or switched between them. */
 void host_in3270(H3270 *hSession, LIB3270_CSTATE new_cstate)
 {
-	Boolean now3270 = (new_cstate == CONNECTED_3270 ||
-			   new_cstate == CONNECTED_SSCP ||
-			   new_cstate == CONNECTED_TN3270E);
+	Boolean now3270 = (new_cstate == LIB3270_CONNECTED_3270 ||
+			   new_cstate == LIB3270_CONNECTED_SSCP ||
+			   new_cstate == LIB3270_CONNECTED_TN3270E);
 
 	hSession->cstate = new_cstate;
 	hSession->ever_3270 = now3270;
@@ -121,7 +121,7 @@ void host_in3270(H3270 *hSession, LIB3270_CSTATE new_cstate)
 
 void lib3270_set_connected(H3270 *hSession)
 {
-	hSession->cstate	= CONNECTED_INITIAL;
+	hSession->cstate	= LIB3270_CONNECTED_INITIAL;
 	hSession->starting	= 1;	// Enable autostart
 
 	lib3270_st_changed(hSession, LIB3270_STATE_CONNECT, True);
@@ -151,7 +151,7 @@ void lib3270_set_disconnected(H3270 *hSession)
 }
 
 /* Register a function interested in a state change. */
-LIB3270_EXPORT void lib3270_register_schange(H3270 *h, LIB3270_STATE_CHANGE tx, void (*func)(H3270 *, int, void *),void *data)
+LIB3270_EXPORT void lib3270_register_schange(H3270 *h, LIB3270_STATE tx, void (*func)(H3270 *, int, void *),void *data)
 {
 	struct lib3270_state_callback *st;
 
diff --git a/src/lib3270/kybd.c b/src/lib3270/kybd.c
index 2ffb146..9697349 100644
--- a/src/lib3270/kybd.c
+++ b/src/lib3270/kybd.c
@@ -502,7 +502,7 @@ static void key_AID(H3270 *hSession, unsigned char aid_code)
 			return;
 		if (aid_code != AID_ENTER && aid_code != AID_CLEAR)
 		{
-			status_changed(hSession,LIB3270_STATUS_MINUS);
+			status_changed(hSession,LIB3270_MESSAGE_MINUS);
 			kybdlock_set(hSession,KL_OIA_MINUS);
 			return;
 		}
@@ -752,11 +752,13 @@ static Boolean key_Character(H3270 *hSession, int code, Boolean with_ge, Boolean
 	baddr = hSession->cursor_addr;
 	faddr = find_field_attribute(hSession,baddr);
 	fa = get_field_attribute(hSession,baddr);
+
 	if (hSession->ea_buf[baddr].fa || FA_IS_PROTECTED(fa))
 	{
 		operator_error(hSession,KL_OERR_PROTECTED);
 		return False;
 	}
+
 	if (hSession->numeric_lock && FA_IS_NUMERIC(fa) &&
 	    !((code >= EBC_0 && code <= EBC_9) ||
 	      code == EBC_minus || code == EBC_period)) {
diff --git a/src/lib3270/private.h b/src/lib3270/private.h
index cb2edf7..a058c06 100644
--- a/src/lib3270/private.h
+++ b/src/lib3270/private.h
@@ -249,7 +249,9 @@ struct lib3270_text
 /** @brief lib3270 session data */
 struct _h3270
 {
-	unsigned short 		  	  sz;								/**< Struct size */
+	struct lib3270_session_callbacks	  cbk;		// Callback table - Always the first one.
+
+//	unsigned short 		  	  sz;								/**< Struct size */
 
 	// Connection info
 	int						  sock;								/**< Network socket */
@@ -556,7 +558,6 @@ struct _h3270
 	// Callbacks.
 	struct lib3270_state_callback		* st_callbacks[LIB3270_STATE_USER];
 	struct lib3270_state_callback		* st_last[LIB3270_STATE_USER];
-	struct lib3270_session_callbacks	  cbk;
 
 };
 
diff --git a/src/lib3270/resolver.c b/src/lib3270/resolver.c
index 8a4e2df..cf79aee 100644
--- a/src/lib3270/resolver.c
+++ b/src/lib3270/resolver.c
@@ -189,7 +189,7 @@ int resolve_host_and_port(H3270 *hSession, const char *host, char *portname, uns
 
 	trace("Calling resolver for %s status=%d", p.host, (int) saved_status);
 
-	status_changed(hSession,LIB3270_STATUS_RESOLVING);
+	status_changed(hSession,LIB3270_MESSAGE_RESOLVING);
 	hSession->cursor(hSession,CURSOR_MODE_LOCKED);
 
 	rc = lib3270_call_thread((int (*)(H3270 *, void *)) cresolve_host_and_port,hSession,&p);
diff --git a/src/lib3270/screen.c b/src/lib3270/screen.c
index 6f04f7e..b359dba 100644
--- a/src/lib3270/screen.c
+++ b/src/lib3270/screen.c
@@ -460,7 +460,7 @@ void status_ctlr_done(H3270 *session)
 
 void status_oerr(H3270 *session, int error_type)
 {
-	LIB3270_STATUS sts = LIB3270_MESSAGE_USER;
+	LIB3270_MESSAGE sts = LIB3270_MESSAGE_USER;
 
 	CHECK_SESSION_HANDLE(session);
 
@@ -520,9 +520,9 @@ void status_reset(H3270 *session)
  *
  * @return status-code.
  *
- * @see LIB3270_STATUS
+ * @see LIB3270_MESSAGE
  */
-LIB3270_EXPORT LIB3270_STATUS lib3270_get_program_message(H3270 *session)
+LIB3270_EXPORT LIB3270_MESSAGE lib3270_get_program_message(H3270 *session)
 {
 	CHECK_SESSION_HANDLE(session);
 	return session->oia_status;
@@ -564,7 +564,7 @@ LIB3270_EXPORT int lib3270_is_ready(H3270 *hSession)
 }
 
 
-void status_changed(H3270 *session, LIB3270_STATUS id)
+void status_changed(H3270 *session, LIB3270_MESSAGE id)
 {
 	CHECK_SESSION_HANDLE(session);
 
@@ -580,7 +580,7 @@ void status_twait(H3270 *session)
 {
 	CHECK_SESSION_HANDLE(session);
 	set_status(session,OIA_FLAG_UNDERA,False);
-	status_changed(session,LIB3270_STATUS_TWAIT);
+	status_changed(session,LIB3270_MESSAGE_TWAIT);
 }
 
 void set_viewsize(H3270 *session, int rows, int cols)
@@ -609,7 +609,7 @@ void status_lu(H3270 *session, const char *lu)
 
 static void status_connect(H3270 *hSession, int connected, void *dunno)
 {
-	LIB3270_STATUS id = LIB3270_STATUS_USER;
+	LIB3270_MESSAGE id = LIB3270_MESSAGE_USER;
 
 	ctlr_erase(hSession,1);
 
@@ -618,15 +618,15 @@ static void status_connect(H3270 *hSession, int connected, void *dunno)
 		set_status(hSession,OIA_FLAG_BOXSOLID,IN_3270 && !IN_SSCP);
 
 		if (hSession->kybdlock & KL_AWAITING_FIRST)
-			id = LIB3270_STATUS_AWAITING_FIRST;
+			id = LIB3270_MESSAGE_AWAITING_FIRST;
 		else
-			id = LIB3270_STATUS_CONNECTED;
+			id = LIB3270_MESSAGE_CONNECTED;
 
 	}
 	else
 	{
 		set_status(hSession,OIA_FLAG_BOXSOLID,False);
-		id = LIB3270_STATUS_DISCONNECTED;
+		id = LIB3270_MESSAGE_DISCONNECTED;
 	}
 
 	status_changed(hSession,id);
diff --git a/src/lib3270/session.c b/src/lib3270/session.c
index 5334aa7..b646e67 100644
--- a/src/lib3270/session.c
+++ b/src/lib3270/session.c
@@ -70,7 +70,7 @@ void lib3270_session_free(H3270 *h)
 	shutdown_toggles(h);
 
 	// Release state change callbacks
-	for(f=0;f<N_ST;f++)
+	for(f=0;f<LIB3270_STATE_USER;f++)
 	{
 		while(h->st_callbacks[f])
 		{
@@ -187,7 +187,7 @@ static void lib3270_session_init(H3270 *hSession, const char *model, const char 
 	int		f;
 
 	memset(hSession,0,sizeof(H3270));
-	hSession->sz = sizeof(H3270);
+//	hSession->sz = sizeof(H3270);
 
 	lib3270_set_host_charset(hSession,charset);
 
@@ -210,7 +210,7 @@ static void lib3270_session_init(H3270 *hSession, const char *model, const char 
 	hSession->cbk.update_ssl		= update_ssl;
 	hSession->cbk.display			= screen_disp;
 	hSession->cbk.set_width			= nop_int;
-	hSession->cbk.update_status		= (void (*)(H3270 *, LIB3270_STATUS)) nop_int;
+	hSession->cbk.update_status		= (void (*)(H3270 *, LIB3270_MESSAGE)) nop_int;
 	hSession->cbk.autostart			= nop;
 	hSession->cbk.set_timer			= set_timer;
 	hSession->cbk.print				= print;
@@ -222,7 +222,6 @@ static void lib3270_session_init(H3270 *hSession, const char *model, const char 
 	hSession->unlock_delay			=  1;
 	hSession->icrnl 				=  1;
 	hSession->onlcr					=  1;
-//	hSession->charset.host			= "bracket";
 	hSession->sock					= -1;
 	hSession->model_num				= -1;
 	hSession->cstate				= LIB3270_NOT_CONNECTED;
@@ -241,9 +240,7 @@ static void lib3270_session_init(H3270 *hSession, const char *model, const char 
 	hSession->options				= LIB3270_OPTION_DEFAULTS;
 	hSession->colors				= 16;
 	hSession->m3279					= 1;
-
-	// Keyboard unlock
-	hSession->unlock_delay_ms		= 350; /* 0.35s after last unlock */
+	hSession->unlock_delay_ms		= 350; // 0.35s after last unlock
 
 	// CSD
 	for(f=0;f<4;f++)
diff --git a/src/lib3270/state.c b/src/lib3270/state.c
index aadae0b..4ce089c 100644
--- a/src/lib3270/state.c
+++ b/src/lib3270/state.c
@@ -40,19 +40,19 @@ LIB3270_EXPORT LIB3270_CSTATE lib3270_get_connection_state(H3270 *h)
 LIB3270_EXPORT int lib3270_pconnected(H3270 *h)
 {
 	CHECK_SESSION_HANDLE(h);
-	return (((int) h->cstate) >= (int)RESOLVING);
+	return (((int) h->cstate) >= (int)LIB3270_RESOLVING);
 }
 
 LIB3270_EXPORT int lib3270_half_connected(H3270 *h)
 {
 	CHECK_SESSION_HANDLE(h);
-	return (h->cstate == RESOLVING || h->cstate == PENDING);
+	return (h->cstate == LIB3270_RESOLVING || h->cstate == LIB3270_PENDING);
 }
 
 LIB3270_EXPORT int lib3270_connected(H3270 *h)
 {
 	CHECK_SESSION_HANDLE(h);
-	return ((int) h->cstate >= (int)CONNECTED_INITIAL);
+	return ((int) h->cstate >= (int)LIB3270_CONNECTED_INITIAL);
 }
 
 LIB3270_EXPORT int lib3270_disconnected(H3270 *h)
@@ -65,43 +65,43 @@ LIB3270_EXPORT int lib3270_disconnected(H3270 *h)
 LIB3270_EXPORT int lib3270_in_neither(H3270 *h)
 {
 	CHECK_SESSION_HANDLE(h);
-	return (h->cstate == CONNECTED_INITIAL);
+	return (h->cstate == LIB3270_CONNECTED_INITIAL);
 }
 
 LIB3270_EXPORT int lib3270_in_ansi(H3270 *h)
 {
 	CHECK_SESSION_HANDLE(h);
-	return (h->cstate == CONNECTED_ANSI || h->cstate == CONNECTED_NVT);
+	return (h->cstate == LIB3270_CONNECTED_ANSI || h->cstate == LIB3270_CONNECTED_NVT);
 }
 
 LIB3270_EXPORT int lib3270_in_3270(H3270 *h)
 {
 	CHECK_SESSION_HANDLE(h);
-	return (h->cstate == CONNECTED_3270 || h->cstate == CONNECTED_TN3270E || h->cstate == CONNECTED_SSCP);
+	return (h->cstate == LIB3270_CONNECTED_3270 || h->cstate == LIB3270_CONNECTED_TN3270E || h->cstate == LIB3270_CONNECTED_SSCP);
 }
 
 LIB3270_EXPORT int lib3270_in_sscp(H3270 *h)
 {
 	CHECK_SESSION_HANDLE(h);
-	return (h->cstate == CONNECTED_SSCP);
+	return (h->cstate == LIB3270_CONNECTED_SSCP);
 }
 
 LIB3270_EXPORT int lib3270_in_tn3270e(H3270 *h)
 {
 	CHECK_SESSION_HANDLE(h);
-	return (h->cstate == CONNECTED_TN3270E);
+	return (h->cstate == LIB3270_CONNECTED_TN3270E);
 }
 
 LIB3270_EXPORT int lib3270_is_connected(H3270 *h)
 {
 	CHECK_SESSION_HANDLE(h);
-	return (h->cstate == CONNECTED_TN3270E);
+	return (h->cstate == LIB3270_CONNECTED_TN3270E);
 }
 
 LIB3270_EXPORT int lib3270_in_e(H3270 *h)
 {
 	CHECK_SESSION_HANDLE(h);
-	return (h->cstate >= CONNECTED_INITIAL_E);
+	return (h->cstate >= LIB3270_CONNECTED_INITIAL_E);
 }
 
 
diff --git a/src/lib3270/statusc.h b/src/lib3270/statusc.h
index 381bf6d..227ac1a 100644
--- a/src/lib3270/statusc.h
+++ b/src/lib3270/statusc.h
@@ -29,7 +29,7 @@ LIB3270_INTERNAL void 		status_twait(H3270 *session);
 
 
 
-LIB3270_INTERNAL void 		status_changed(H3270 *session, LIB3270_STATUS id);
+LIB3270_INTERNAL void 		status_changed(H3270 *session, LIB3270_MESSAGE id);
 
 LIB3270_INTERNAL void 		set_status(H3270 *session, OIA_FLAG id, Boolean on);
 
diff --git a/src/lib3270/telnet.c b/src/lib3270/telnet.c
index e30edea..b9b7dd0 100644
--- a/src/lib3270/telnet.c
+++ b/src/lib3270/telnet.c
@@ -1171,7 +1171,7 @@ static int telnet_fsm(H3270 *hSession, unsigned char c)
 			if (hSession->linemode)
 				cooked_init(hSession);
 #endif /*]*/
-			host_in3270(hSession,CONNECTED_ANSI);
+			host_in3270(hSession,LIB3270_CONNECTED_ANSI);
 			lib3270_kybdlock_clear(hSession,KL_AWAITING_FIRST);
 			status_reset(hSession);
 			ps_process(hSession);
@@ -2406,19 +2406,19 @@ static void check_in3270(H3270 *hSession)
 #if defined(X3270_TN3270E) /*[*/
 	if (hSession->myopts[TELOPT_TN3270E]) {
 		if (!hSession->tn3270e_negotiated)
-			new_cstate = CONNECTED_INITIAL_E;
+			new_cstate = LIB3270_CONNECTED_INITIAL_E;
 		else switch (hSession->tn3270e_submode) {
 		case E_NONE:
-			new_cstate = CONNECTED_INITIAL_E;
+			new_cstate = LIB3270_CONNECTED_INITIAL_E;
 			break;
 		case E_NVT:
-			new_cstate = CONNECTED_NVT;
+			new_cstate = LIB3270_CONNECTED_NVT;
 			break;
 		case E_3270:
-			new_cstate = CONNECTED_TN3270E;
+			new_cstate = LIB3270_CONNECTED_TN3270E;
 			break;
 		case E_SSCP:
-			new_cstate = CONNECTED_SSCP;
+			new_cstate = LIB3270_CONNECTED_SSCP;
 			break;
 		}
 	} else
@@ -2428,12 +2428,12 @@ static void check_in3270(H3270 *hSession)
 	           hSession->myopts[TELOPT_TTYPE] &&
 	           hSession->hisopts[TELOPT_BINARY] &&
 	           hSession->hisopts[TELOPT_EOR]) {
-		new_cstate = CONNECTED_3270;
-	} else if (hSession->cstate == CONNECTED_INITIAL) {
+		new_cstate = LIB3270_CONNECTED_3270;
+	} else if (hSession->cstate == LIB3270_CONNECTED_INITIAL) {
 		/* Nothing has happened, yet. */
 		return;
 	} else {
-		new_cstate = CONNECTED_ANSI;
+		new_cstate = LIB3270_CONNECTED_ANSI;
 	}
 
 	if (new_cstate != hSession->cstate) {
@@ -2454,7 +2454,7 @@ static void check_in3270(H3270 *hSession)
 #endif /*]*/
 
 		/* Allocate the initial 3270 input buffer. */
-		if(new_cstate >= CONNECTED_INITIAL && !(hSession->ibuf_size && hSession->ibuf))
+		if(new_cstate >= LIB3270_CONNECTED_INITIAL && !(hSession->ibuf_size && hSession->ibuf))
 		{
 			hSession->ibuf 		= (unsigned char *) lib3270_malloc(BUFSIZ);
 			hSession->ibuf_size	= BUFSIZ;
@@ -2463,8 +2463,8 @@ static void check_in3270(H3270 *hSession)
 
 #if defined(X3270_ANSI) /*[*/
 		/* Reinitialize line mode. */
-		if ((new_cstate == CONNECTED_ANSI && hSession->linemode) ||
-		    new_cstate == CONNECTED_NVT)
+		if ((new_cstate == LIB3270_CONNECTED_ANSI && hSession->linemode) ||
+		    new_cstate == LIB3270_CONNECTED_NVT)
 			cooked_init(hSession);
 #endif /*]*/
 
--
libgit2 0.21.2