diff --git a/common/utils/T/tracer/defs.h b/common/utils/T/tracer/defs.h
index 498f9e5b790847fdaa0d7b897da77d5234eab8f2..443fabdde8423ed744d1739f54acc82cef1c5c50 100644
--- a/common/utils/T/tracer/defs.h
+++ b/common/utils/T/tracer/defs.h
@@ -16,10 +16,6 @@ void iq_plot_set_sized(void *_plot, short *data, int len, int pp);
 void iq_plot_add_iq_point_loop(void *_plot, short i, short q, int pp);
 void iq_plot_add_energy_point_loop(void *_plot, int e, int pp);
 
-void *forwarder(int port);
-void forward(void *forwarder, char *buf, int size);
-void forward_start_client(void *forwarder, int socket);
-
 /* T gui functions */
 void t_gui_start(void);
 void t_gui_set_input_signal(int eNB, int frame, int subframe, int antenna,
diff --git a/common/utils/T/tracer/forward.c b/common/utils/T/tracer/forward.c
index e9eb93e1bb1490ba06a2b026ff23ba26c17d0131..2bddb80330c5891d7c402d0484e7080061f89b4e 100644
--- a/common/utils/T/tracer/forward.c
+++ b/common/utils/T/tracer/forward.c
@@ -1,4 +1,4 @@
-#include "defs.h"
+#include "forward.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <netinet/ip.h>
@@ -9,6 +9,10 @@
 #include <stdint.h>
 #include <inttypes.h>
 
+/* from local.c */
+int get_connection(char *addr, int port);
+void new_thread(void *(*f)(void *), void *data);
+
 typedef struct databuf {
   char *d;
   int l;
@@ -102,8 +106,6 @@ void forward_start_client(void *_f, int s)
   new_thread(forward_s_to_sc, f);
 }
 
-int get_connection(char *addr, int port);
-
 void *forwarder(int port)
 {
   forward_data *f;
diff --git a/common/utils/T/tracer/forward.h b/common/utils/T/tracer/forward.h
new file mode 100644
index 0000000000000000000000000000000000000000..80607d74fcbd4747e6c1a52dd541b8191aa2df27
--- /dev/null
+++ b/common/utils/T/tracer/forward.h
@@ -0,0 +1,8 @@
+#ifndef _FORWARD_H_
+#define _FORWARD_H_
+
+void *forwarder(int port);
+void forward(void *forwarder, char *buf, int size);
+void forward_start_client(void *forwarder, int socket);
+
+#endif /* _FORWARD_H_ */
diff --git a/common/utils/T/tracer/local.c b/common/utils/T/tracer/local.c
index 1648ae7d6036b1441b4c91bb9655bf90f05d7496..fbe4d6d4201453ea7de7695b9f132f985acfbbc8 100644
--- a/common/utils/T/tracer/local.c
+++ b/common/utils/T/tracer/local.c
@@ -11,7 +11,7 @@
 
 #define DEFAULT_PORT 2021
 
-#include "defs.h"
+#include "forward.h"
 
 #include "../T_defs.h"