diff --git a/src/include/lib3270.h b/src/include/lib3270.h
index ab4834f..dff87ec 100644
--- a/src/include/lib3270.h
+++ b/src/include/lib3270.h
@@ -554,16 +554,16 @@
 	{
 		unsigned short sz;
 
-		unsigned long	(*AddTimeOut)(unsigned long interval_ms, H3270 *session, void (*proc)(H3270 *session));
-		void			(*RemoveTimeOut)(unsigned long timer);
+		void	* (*AddTimeOut)(unsigned long interval_ms, H3270 *session, void (*proc)(H3270 *session));
+		void	  (*RemoveTimeOut)(void *timer);
 
-		unsigned long	(*AddInput)(int source, H3270 *session, void (*fn)(H3270 *session));
-		void			(*RemoveInput)(unsigned long id);
+		void	* (*AddInput)(int source, H3270 *session, void (*fn)(H3270 *session));
+		void	  (*RemoveInput)(void *id);
 
-		unsigned long	(*AddExcept)(int source, H3270 *session, void (*fn)(H3270 *session));
+		void 	* (*AddExcept)(int source, H3270 *session, void (*fn)(H3270 *session));
 
 		#if !defined(_WIN32) /*[*/
-			unsigned long (*AddOutput)(int source, H3270 *session, void (*fn)(H3270 *session));
+			void * (*AddOutput)(int source, H3270 *session, void (*fn)(H3270 *session));
 		#endif /*]*/
 
 		int 			(*callthread)(int(*callback)(H3270 *, void *), H3270 *session, void *parm);
diff --git a/src/include/lib3270/session.h b/src/include/lib3270/session.h
index a7b3770..2cb3b39 100644
--- a/src/include/lib3270/session.h
+++ b/src/include/lib3270/session.h
@@ -172,8 +172,8 @@
 		} select;
 
 		// xio
-		unsigned long			  ns_read_id;
-		unsigned long			  ns_exception_id;
+		void 					* ns_read_id;
+		void 					* ns_exception_id;
 		char					  reading;
 		char					  excepting;
 
diff --git a/src/lib3270/XtGlue.c b/src/lib3270/XtGlue.c
index 3c43508..e3f3ad0 100644
--- a/src/lib3270/XtGlue.c
+++ b/src/lib3270/XtGlue.c
@@ -91,17 +91,17 @@
 
 /*---[ Callbacks ]------------------------------------------------------------------------------------------*/
 
-static void DefaultRemoveTimeOut(unsigned long timer);
-static unsigned long DefaultAddTimeOut(unsigned long interval_ms, H3270 *session, void (*proc)(H3270 *session));
+static void   DefaultRemoveTimeOut(void *timer);
+static void * DefaultAddTimeOut(unsigned long interval_ms, H3270 *session, void (*proc)(H3270 *session));
 
-static unsigned long DefaultAddInput(int source, H3270 *session, void (*fn)(H3270 *session));
-static unsigned long DefaultAddExcept(int source, H3270 *session, void (*fn)(H3270 *session));
+static void * DefaultAddInput(int source, H3270 *session, void (*fn)(H3270 *session));
+static void * DefaultAddExcept(int source, H3270 *session, void (*fn)(H3270 *session));
 
 #if !defined(_WIN32) /*[*/
-static unsigned long DefaultAddOutput(int source, H3270 *session, void (*fn)(H3270 *session));
+static void * DefaultAddOutput(int source, H3270 *session, void (*fn)(H3270 *session));
 #endif
 
-static void DefaultRemoveInput(unsigned long id);
+static void DefaultRemoveInput(void *id);
 
 static int DefaultProcessEvents(int block);
 
@@ -171,7 +171,7 @@ typedef struct timeout
 #define TN	(timeout_t *)NULL
 static timeout_t *timeouts = TN;
 
-static unsigned long DefaultAddTimeOut(unsigned long interval_ms, H3270 *session, void (*proc)(H3270 *session))
+static void * DefaultAddTimeOut(unsigned long interval_ms, H3270 *session, void (*proc)(H3270 *session))
 {
 	timeout_t *t_new;
 	timeout_t *t;
@@ -225,10 +225,10 @@ static unsigned long DefaultAddTimeOut(unsigned long interval_ms, H3270 *session
 
 	trace("Timeout added: %p",t_new);
 
-	return (unsigned long) t_new;
+	return t_new;
 }
 
-static void DefaultRemoveTimeOut(unsigned long timer)
+static void DefaultRemoveTimeOut(void * timer)
 {
 	timeout_t *st = (timeout_t *)timer;
 	timeout_t *t;
@@ -262,7 +262,7 @@ typedef struct input {
 static input_t *inputs = (input_t *)NULL;
 static Boolean inputs_changed = False;
 
-static unsigned long DefaultAddInput(int source, H3270 *session, void (*fn)(H3270 *session))
+static void * DefaultAddInput(int source, H3270 *session, void (*fn)(H3270 *session))
 {
 	input_t *ip;
 
@@ -281,10 +281,10 @@ static unsigned long DefaultAddInput(int source, H3270 *session, void (*fn)(H327
 
 	Trace("%s: fd=%d callback=%p handle=%p",__FUNCTION__,source,fn,ip);
 
-	return (unsigned long) ip;
+	return ip;
 }
 
-static unsigned long DefaultAddExcept(int source, H3270 *session, void (*fn)(H3270 *session))
+static void * DefaultAddExcept(int source, H3270 *session, void (*fn)(H3270 *session))
 {
 #if defined(_WIN32) /*[*/
 	return 0;
@@ -306,12 +306,12 @@ static unsigned long DefaultAddExcept(int source, H3270 *session, void (*fn)(H32
 
 	Trace("%s: fd=%d callback=%p handle=%p",__FUNCTION__,source,fn,ip);
 
-	return (unsigned long)ip;
+	return ip;
 #endif /*]*/
 }
 
 #if !defined(_WIN32) /*[*/
-static unsigned long DefaultAddOutput(int source, H3270 *session, void (*fn)(H3270 *session))
+static void * DefaultAddOutput(int source, H3270 *session, void (*fn)(H3270 *session))
 {
 	input_t *ip;
 
@@ -330,11 +330,11 @@ static unsigned long DefaultAddOutput(int source, H3270 *session, void (*fn)(H32
 
 	Trace("%s: fd=%d callback=%p handle=%p",__FUNCTION__,source,fn,ip);
 
-	return (unsigned long)ip;
+	return ip;
 }
 #endif /*]*/
 
-static void DefaultRemoveInput(unsigned long id)
+static void DefaultRemoveInput(void *id)
 {
 	input_t *ip;
 	input_t *prev = (input_t *)NULL;
@@ -404,7 +404,7 @@ static int DefaultProcessEvents(int block)
 		if ((unsigned long)ip->condition & InputReadMask)
 		{
 #if defined(_WIN32)
-			ha[nha++] = (HANDLE)ip->source;
+			ha[nha++] = (HANDLE) ip->source;
 #else
 			FD_SET(ip->source, &rfds);
 #endif
@@ -801,7 +801,7 @@ const char * KeysymToString(KeySym k)
 
 /* Timeouts. */
 
-unsigned long AddTimeOut(unsigned long interval_ms, H3270 *session, void (*proc)(H3270 *session))
+void * AddTimeOut(unsigned long interval_ms, H3270 *session, void (*proc)(H3270 *session))
 {
 	CHECK_SESSION_HANDLE(session);
 	if(callbacks->AddTimeOut)
@@ -809,13 +809,13 @@ unsigned long AddTimeOut(unsigned long interval_ms, H3270 *session, void (*proc)
 	return 0;
 }
 
-void RemoveTimeOut(unsigned long timer)
+void RemoveTimeOut(void * timer)
 {
 	if(callbacks->RemoveTimeOut)
 		return callbacks->RemoveTimeOut(timer);
 }
 
-unsigned long AddInput(int source, H3270 *session, void (*fn)(H3270 *session))
+void * AddInput(int source, H3270 *session, void (*fn)(H3270 *session))
 {
 	CHECK_SESSION_HANDLE(session);
 
@@ -826,7 +826,7 @@ unsigned long AddInput(int source, H3270 *session, void (*fn)(H3270 *session))
 	return 0;
 }
 
-unsigned long AddExcept(int source, H3270 *session, void (*fn)(H3270 *session))
+void * AddExcept(int source, H3270 *session, void (*fn)(H3270 *session))
 {
 	CHECK_SESSION_HANDLE(session);
 	if(callbacks->AddExcept)
@@ -835,7 +835,7 @@ unsigned long AddExcept(int source, H3270 *session, void (*fn)(H3270 *session))
 }
 
 #if !defined(_WIN32) /*[*/
-unsigned long AddOutput(int source, H3270 *session, void (*fn)(H3270 *session))
+void * AddOutput(int source, H3270 *session, void (*fn)(H3270 *session))
 {
 	CHECK_SESSION_HANDLE(session);
 	if(callbacks->AddOutput)
@@ -844,7 +844,7 @@ unsigned long AddOutput(int source, H3270 *session, void (*fn)(H3270 *session))
 }
 #endif /*]*/
 
-void RemoveInput(unsigned long id)
+void RemoveInput(void * id)
 {
 	if(callbacks->RemoveInput)
 		callbacks->RemoveInput(id);
diff --git a/src/lib3270/ctlr.c b/src/lib3270/ctlr.c
index 085e24b..81c4bd7 100644
--- a/src/lib3270/ctlr.c
+++ b/src/lib3270/ctlr.c
@@ -2706,7 +2706,7 @@ ctlr_dbcs_state(int baddr)
 static struct timeval t_start;
 static Boolean ticking = False;
 static Boolean mticking = False;
-static unsigned long tick_id;
+static void * tick_id;
 static struct timeval t_want;
 
 /* Return the difference in milliseconds between two timevals. */
diff --git a/src/lib3270/kybd.c b/src/lib3270/kybd.c
index 6774ae2..d2e58ec 100644
--- a/src/lib3270/kybd.c
+++ b/src/lib3270/kybd.c
@@ -104,7 +104,7 @@ static unsigned char pa_xlate[] = {
 };
 #define PF_SZ	(sizeof(pf_xlate)/sizeof(pf_xlate[0]))
 #define PA_SZ	(sizeof(pa_xlate)/sizeof(pa_xlate[0]))
-static unsigned long unlock_id;
+static void * unlock_id;
 static time_t unlock_delay_time;
 #define UNLOCK_MS		350	/* 0.35s after last unlock */
 static Boolean key_Character(int code, Boolean with_ge, Boolean pasting,Boolean *skipped);
diff --git a/src/lib3270/utilc.h b/src/lib3270/utilc.h
index 8007a50..a527a52 100644
--- a/src/lib3270/utilc.h
+++ b/src/lib3270/utilc.h
@@ -38,12 +38,12 @@ LIB3270_INTERNAL void xs_warning(const char *fmt, ...) printflike(1, 2);
 LIB3270_INTERNAL char * xs_vsprintf(const char *fmt, va_list args);
 
 
-LIB3270_INTERNAL unsigned long AddInput(int, H3270 *session, void (*fn)(H3270 *session));
-LIB3270_INTERNAL unsigned long AddExcept(int, H3270 *session, void (*fn)(H3270 *session));
-LIB3270_INTERNAL unsigned long AddOutput(int, H3270 *session, void (*fn)(H3270 *session));
-LIB3270_INTERNAL void RemoveInput(unsigned long);
-LIB3270_INTERNAL unsigned long AddTimeOut(unsigned long msec, H3270 *session, void (*fn)(H3270 *session));
-LIB3270_INTERNAL void RemoveTimeOut(unsigned long cookie);
+LIB3270_INTERNAL void * AddInput(int, H3270 *session, void (*fn)(H3270 *session));
+LIB3270_INTERNAL void * AddExcept(int, H3270 *session, void (*fn)(H3270 *session));
+LIB3270_INTERNAL void * AddOutput(int, H3270 *session, void (*fn)(H3270 *session));
+LIB3270_INTERNAL void RemoveInput(void *);
+LIB3270_INTERNAL void * AddTimeOut(unsigned long msec, H3270 *session, void (*fn)(H3270 *session));
+LIB3270_INTERNAL void RemoveTimeOut(void *cookie);
 
 LIB3270_INTERNAL const char * KeysymToString(KeySym k);
 LIB3270_INTERNAL KeySym StringToKeysym(char *s);
diff --git a/src/pw3270/v3270/iocallback.c b/src/pw3270/v3270/iocallback.c
index d3f080f..ac1ffae 100644
--- a/src/pw3270/v3270/iocallback.c
+++ b/src/pw3270/v3270/iocallback.c
@@ -47,19 +47,19 @@
 	#include <malloc.h>
 #endif
 
-static int 				static_CallAndWait(int(*callback)(H3270 *session, void *), H3270 *session, void *parm);
-static unsigned long	static_AddInput(int source, H3270 *session, void (*fn)(H3270 *session));
-static void				static_RemoveSource(unsigned long id);
+static int 				  static_CallAndWait(int(*callback)(H3270 *session, void *), H3270 *session, void *parm);
+static void 			* static_AddInput(int source, H3270 *session, void (*fn)(H3270 *session));
+static void				  static_RemoveSource(void *id);
 
 #if !defined(_WIN32) /*[*/
-static unsigned long	static_AddOutput(int source, H3270 *session, void (*fn)(H3270 *session));
+static void 			* static_AddOutput(int source, H3270 *session, void (*fn)(H3270 *session));
 #endif
 
-static unsigned long	static_AddExcept(int source, H3270 *session, void (*fn)(H3270 *session));
-static unsigned long	static_AddTimeOut(unsigned long interval_ms, H3270 *session, void (*proc)(H3270 *session));
-static void 			static_RemoveTimeOut(unsigned long timer);
-static int				static_Sleep(int seconds);
-static int 				static_RunPendingEvents(int wait);
+static void 			* static_AddExcept(int source, H3270 *session, void (*fn)(H3270 *session));
+static void 			* static_AddTimeOut(unsigned long interval_ms, H3270 *session, void (*proc)(H3270 *session));
+static void 			  static_RemoveTimeOut(void * timer);
+static int				  static_Sleep(int seconds);
+static int 				  static_RunPendingEvents(int wait);
 
 static gboolean 		IO_prepare(GSource *source, gint *timeout);
 static gboolean 		IO_check(GSource *source);
@@ -97,7 +97,7 @@ static gboolean			IO_closure(gpointer data);
 
 /*---[ Implement ]-----------------------------------------------------------------------------------------*/
 
-static unsigned long AddSource(int source, H3270 *session, gushort events, void (*fn)(H3270 *session))
+static void * AddSource(int source, H3270 *session, gushort events, void (*fn)(H3270 *session))
 {
 	IO_Source *src = (IO_Source *) g_source_new(&IOSources,sizeof(IO_Source));
 
@@ -109,28 +109,28 @@ static unsigned long AddSource(int source, H3270 *session, gushort events, void 
 	g_source_attach((GSource *) src,NULL);
 	g_source_add_poll((GSource *) src,&src->poll);
 
-	return (unsigned long) src;
+	return src;
 }
 
-static unsigned long static_AddInput(int source, H3270 *session, void (*fn)(H3270 *session))
+static void * static_AddInput(int source, H3270 *session, void (*fn)(H3270 *session))
 {
 	return AddSource(source,session,G_IO_IN|G_IO_HUP|G_IO_ERR,fn);
 }
 
-static void static_RemoveSource(unsigned long id)
+static void static_RemoveSource(void *id)
 {
 	if(id)
 		g_source_destroy((GSource *) id);
 }
 
 #if !defined(_WIN32) /*[*/
-static unsigned long static_AddOutput(int source, H3270 *session, void (*fn)(H3270 *session))
+static void * static_AddOutput(int source, H3270 *session, void (*fn)(H3270 *session))
 {
 	return AddSource(source,session,G_IO_OUT|G_IO_HUP|G_IO_ERR,fn);
 }
 #endif /*]*/
 
-static unsigned long static_AddExcept(int source, H3270 *session, void (*fn)(H3270 *session))
+static void * static_AddExcept(int source, H3270 *session, void (*fn)(H3270 *session))
 {
 #if defined(_WIN32) /*[*/
 	return 0;
@@ -146,22 +146,20 @@ static gboolean do_timer(TIMER *t)
 	return FALSE;
 }
 
-static unsigned long static_AddTimeOut(unsigned long interval, H3270 *session, void (*proc)(H3270 *session))
+static void * static_AddTimeOut(unsigned long interval, H3270 *session, void (*proc)(H3270 *session))
 {
-	TIMER *t = g_malloc(sizeof(TIMER));
+	TIMER *t = g_malloc0(sizeof(TIMER));
 
-	t->remove	= 0;
 	t->fn		= proc;
 	t->session	= session;
 
 	g_timeout_add_full(G_PRIORITY_DEFAULT, (guint) interval, (GSourceFunc) do_timer, t, g_free);
 
-	return (unsigned long) t;
+	return t;
 }
 
-static void static_RemoveTimeOut(unsigned long timer)
+static void static_RemoveTimeOut(void * timer)
 {
-	// FIXME (perry#2#): It this really necessary? The timeout is removed as soon as it ticks.
 	((TIMER *) timer)->remove++;
 }
 
--
libgit2 0.21.2