diff --git a/common/utils/T/tracer/event.h b/common/utils/T/tracer/event.h
index e488c0c703..4e2e766f11 100644
--- a/common/utils/T/tracer/event.h
+++ b/common/utils/T/tracer/event.h
@@ -7,7 +7,6 @@
 
 #include "utils.h"
 #include "../T_defs.h"
-#include "common/platform_types.h"
 #ifdef T_SEND_TIME
 #include <time.h>
 #endif
diff --git a/common/utils/T/tracer/logger/textlog.c b/common/utils/T/tracer/logger/textlog.c
index 2009bc5a32..34422e5e29 100644
--- a/common/utils/T/tracer/logger/textlog.c
+++ b/common/utils/T/tracer/logger/textlog.c
@@ -7,7 +7,7 @@
 #include "handler.h"
 #include "database.h"
 #include "view/view.h"
-#include "utils.h"
+#include "../utils.h"
 #include "filter/filter.h"
 #include <stdlib.h>
 #include <string.h>
diff --git a/common/utils/T/tracer/macpdu2wireshark.c b/common/utils/T/tracer/macpdu2wireshark.c
index 9a931e2690..b2b5b23204 100644
--- a/common/utils/T/tracer/macpdu2wireshark.c
+++ b/common/utils/T/tracer/macpdu2wireshark.c
@@ -323,7 +323,7 @@ void dl(void *_d, event e)
   }
 
   trace_lte(e.sending_time, d, DIRECTION_DOWNLINK,
-            e.e[d->dl_rnti].i != 0xffff ? C_RNTI : SI_RNTI_T, e.e[d->dl_rnti].i,
+            e.e[d->dl_rnti].i != 0xffff ? C_RNTI : SI_RNTI, e.e[d->dl_rnti].i,
             e.e[d->dl_frame].i, e.e[d->dl_subframe].i,
             e.e[d->dl_data].b, e.e[d->dl_data].bsize,
             NO_PREAMBLE, NO_SR_RNTI);
diff --git a/common/utils/T/tracer/packet-mac-lte.h b/common/utils/T/tracer/packet-mac-lte.h
index 3df8d66314..715bbb68d9 100644
--- a/common/utils/T/tracer/packet-mac-lte.h
+++ b/common/utils/T/tracer/packet-mac-lte.h
@@ -27,12 +27,12 @@
 
 /* rntiType */
 #define NO_RNTI     0
-#define P_RNTI_T    1
+#define P_RNTI      1
 #define RA_RNTI     2
 #define C_RNTI      3
-#define SI_RNTI_T   4
+#define SI_RNTI     4
 #define SPS_RNTI    5
-#define M_RNTI_T    6
+#define M_RNTI      6
 #define SL_BCH_RNTI 7
 #define SL_RNTI     8
 #define SC_RNTI     9
diff --git a/common/utils/T/tracer/record.c b/common/utils/T/tracer/record.c
index c636ba3457..0e4611fab3 100644
--- a/common/utils/T/tracer/record.c
+++ b/common/utils/T/tracer/record.c
@@ -11,7 +11,6 @@
 #include "utils.h"
 #include "../T_defs.h"
 #include "configuration.h"
-#include "common/platform_types.h"
 
 void usage(void)
 {
diff --git a/common/utils/T/tracer/utils.h b/common/utils/T/tracer/utils.h
index 8a4915a19f..ebe595b2ec 100644
--- a/common/utils/T/tracer/utils.h
+++ b/common/utils/T/tracer/utils.h
@@ -5,6 +5,8 @@
 #ifndef _UTILS_H_
 #define _UTILS_H_
 
+#define UNUSED(x) (void)x
+
 void new_thread(void *(*f)(void *), void *data);
 void sleepms(int ms);
 void bps(char *out, float v, char *suffix);
diff --git a/common/utils/T/tracer/view/stdout.c b/common/utils/T/tracer/view/stdout.c
index 7f039cc3d7..f9b39b6e46 100644
--- a/common/utils/T/tracer/view/stdout.c
+++ b/common/utils/T/tracer/view/stdout.c
@@ -3,6 +3,7 @@
  */
 
 #include "view.h"
+#include "../utils.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <pthread.h>
diff --git a/common/utils/T/tracer/view/view.h b/common/utils/T/tracer/view/view.h
index 1b4596119b..a7c3eb3711 100644
--- a/common/utils/T/tracer/view/view.h
+++ b/common/utils/T/tracer/view/view.h
@@ -6,7 +6,6 @@
 #define _VIEW_H_
 
 #include "gui/gui.h"
-#include "common/platform_types.h"
 
 /* defines the public API of views */