diff --git a/iocallback.c b/iocallback.c
index 0ce6a6d..eb67e67 100644
--- a/iocallback.c
+++ b/iocallback.c
@@ -43,14 +43,11 @@
 #include <glib.h>
 #include "../globals.h"
 
-// static int 				  static_CallAndWait(int(*callback)(H3270 *session, void *), H3270 *session, void *parm);
-static void				  static_RemoveSource(void *id);
-
 static void				* static_AddSource(H3270 *session, int fd, LIB3270_IO_FLAG flag, void(*proc)(H3270 *, int, LIB3270_IO_FLAG, void *), void *userdata);
-static void	  			  static_RemoveSource(void *id);
+static void	  			  static_RemoveSource(H3270 *session, void *id);
 
-static void 			* static_AddTimeOut(unsigned long interval_ms, H3270 *session, void (*proc)(H3270 *session));
-static void 			  static_RemoveTimeOut(void * timer);
+static void 			* static_AddTimeOut(H3270 *session, unsigned long interval_ms, void (*proc)(H3270 *session));
+static void 			  static_RemoveTimeOut(H3270 *session, void * timer);
 static int				  static_Sleep(H3270 *hSession, int seconds);
 static int 				  static_RunPendingEvents(H3270 *hSession, int wait);
 
@@ -116,32 +113,12 @@ static void	* static_AddSource(H3270 *session, int fd, LIB3270_IO_FLAG flag, voi
 	return src;
 }
 
-/*
-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);
-}
-
-
-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(void *id)
+static void static_RemoveSource(H3270 *session, void *id)
 {
 	if(id)
 		g_source_destroy((GSource *) id);
 }
 
-/*
-static void * static_AddExcept(int source, H3270 *session, void (*fn)(H3270 *session))
-{
-	return AddSource(source,session,G_IO_HUP|G_IO_ERR,fn);
-}
-*/
-
 static gboolean do_timer(TIMER *t)
 {
 	if(!t->remove)
@@ -149,7 +126,7 @@ static gboolean do_timer(TIMER *t)
 	return FALSE;
 }
 
-static void * static_AddTimeOut(unsigned long interval, H3270 *session, void (*call)(H3270 *session))
+static void * static_AddTimeOut(H3270 *session, unsigned long interval, void (*call)(H3270 *session))
 {
 	TIMER *t = g_malloc0(sizeof(TIMER));
 
@@ -162,7 +139,7 @@ static void * static_AddTimeOut(unsigned long interval, H3270 *session, void (*c
 	return t;
 }
 
-static void static_RemoveTimeOut(void * timer)
+static void static_RemoveTimeOut(H3270 *session, void * timer)
 {
 	((TIMER *) timer)->remove++;
 }
--
libgit2 0.21.2