diff --git a/ft.c b/ft.c
index e53e0d7..8b2270c 100644
--- a/ft.c
+++ b/ft.c
@@ -33,6 +33,7 @@
 #include <lib3270.h>
 #include <lib3270/filetransfer.h>
 #include "globals.h"
+#include <lib3270/trace.h>
 
 #include <errno.h>
 
diff --git a/kybd.c b/kybd.c
index 9552549..ac00510 100644
--- a/kybd.c
+++ b/kybd.c
@@ -39,6 +39,7 @@ struct ta;
 #define LIB3270_TA struct ta
 
 #include "globals.h"
+#include <lib3270/trace.h>
 
 #ifndef ANDROID
 	#include <stdlib.h>
diff --git a/trace_ds.c b/trace_ds.c
index 86a2dc9..271294c 100644
--- a/trace_ds.c
+++ b/trace_ds.c
@@ -38,6 +38,7 @@
  */
 
 #include "globals.h"
+#include <lib3270/trace.h>
 
 #if defined(X3270_TRACE) /*[*/
 
@@ -74,9 +75,11 @@ static void	wtrace(H3270 *session, const char *fmt, ...);
 static void (*vwtrace)(H3270 *session, const char *fmt, va_list args) = __vwtrace;
 
 
-LIB3270_EXPORT void lib3270_set_trace_handler( void (*handler)(H3270 *session, const char *fmt, va_list args) )
+LIB3270_EXPORT LIB3270_TRACE_HANDLER lib3270_set_trace_handler( LIB3270_TRACE_HANDLER handler )
 {
+	void (*ret)(H3270 *session, const char *fmt, va_list args) = vwtrace;
 	vwtrace = handler ? handler : __vwtrace;
+	return ret;
 }
 
 /* display a (row,col) */
@@ -88,10 +91,6 @@ const char * rcba(H3270 *hSession, int baddr)
 }
 
 /* Data Stream trace print, handles line wraps */
-
-// static char *tdsbuf = CN;
-// #define TDS_LEN	75
-
 static void trace_ds_s(H3270 *hSession, char *s, Boolean can_break)
 {
 	static int      dscnt = 0;
--
libgit2 0.21.2