diff --git a/iocalls.c b/iocalls.c
index 18c590d..bb94677 100644
--- a/iocalls.c
+++ b/iocalls.c
@@ -533,12 +533,16 @@ static void internal_ring_bell(H3270 *session)
 
 void * AddTimeOut(unsigned long interval_ms, H3270 *session, void (*proc)(H3270 *session))
 {
+	void *timer;
 	CHECK_SESSION_HANDLE(session);
-	return add_timeout(interval_ms,session,proc);
+	timer = add_timeout(interval_ms,session,proc);
+	trace("Timeout %p created with %ld ms",timer,interval_ms);
+	return timer;
 }
 
 void RemoveTimeOut(void * timer)
 {
+	trace("Removing timeout %p",timer);
 	return remove_timeout(timer);
 }
 
diff --git a/sources.mak b/sources.mak
index d401163..0e4c83f 100644
--- a/sources.mak
+++ b/sources.mak
@@ -27,12 +27,12 @@
 # Terminal only sources
 TERMINAL_SOURCES =	bounds.c ctlr.c util.c toggles.c screen.c selection.c kybd.c telnet.c \
 					host.c sf.c ansi.c resolver.c tables.c utf8.c charset.c \
-					version.c session.c state.c html.c
+					version.c session.c state.c html.c trace_ds.c see.c
 
 # Network I/O Sources
 NETWORK_SOURCES = iocalls.c proxy.c
 
 # Full library sources
 SOURCES =			$(TERMINAL_SOURCES) $(NETWORK_SOURCES) ft.c ft_cut.c ft_dft.c glue.c resources.c \
-					rpq.c see.c trace_ds.c paste.c macros.c fallbacks.c log.c
+					rpq.c paste.c macros.c fallbacks.c log.c
 
--
libgit2 0.21.2