diff --git a/common/utils/itti/intertask_interface.h b/common/utils/itti/intertask_interface.h
index 84edb96495..a92a69547b 100644
--- a/common/utils/itti/intertask_interface.h
+++ b/common/utils/itti/intertask_interface.h
@@ -41,9 +41,7 @@
 #include <stdlib.h>
 #include <stdint.h>
 
-#include "mme_config.h"
-#include "common_types.h"
-
+#include "intertask_interface_conf.h"
 #include "intertask_interface_types.h"
 
 /* Make the message number platform specific */
diff --git a/common/utils/itti/intertask_interface_dump.c b/common/utils/itti/intertask_interface_dump.c
index 3f30c0365a..77a86c0567 100644
--- a/common/utils/itti/intertask_interface_dump.c
+++ b/common/utils/itti/intertask_interface_dump.c
@@ -52,8 +52,6 @@
 #include "assertions.h"
 #include "queue.h"
 
-#include "mme_default_values.h"
-
 #include "intertask_interface.h"
 #include "intertask_interface_dump.h"
 
@@ -420,7 +418,7 @@ static void *itti_dump_socket(void *arg_p)
                             /* No more new connection max_sd = itti_listen_socket */
                             max_sd = itti_listen_socket;
                         } else {
-                            while (FD_ISSET(max_sd, &master_set) == FALSE) {
+                            while (FD_ISSET(max_sd, &master_set) == 0) {
                                 max_sd -= 1;
                             }
                         }
diff --git a/common/utils/itti/intertask_interface_init.h b/common/utils/itti/intertask_interface_init.h
index 9d8d51fab6..f3e6f971b0 100644
--- a/common/utils/itti/intertask_interface_init.h
+++ b/common/utils/itti/intertask_interface_init.h
@@ -51,7 +51,7 @@
 #ifndef CHECK_PROTOTYPE_ONLY
 
 const char * const messages_definition_xml = {
-#include "../messages_xml.h"
+#include "messages_xml.h"
 };
 
 /* Map thread id to printable name. */
diff --git a/common/utils/itti/intertask_interface_types.h b/common/utils/itti/intertask_interface_types.h
index 2f914daa97..c7495d44da 100644
--- a/common/utils/itti/intertask_interface_types.h
+++ b/common/utils/itti/intertask_interface_types.h
@@ -37,6 +37,8 @@
 #ifndef INTERTASK_INTERFACE_TYPES_H_
 #define INTERTASK_INTERFACE_TYPES_H_
 
+#include <stdint.h>
+
 /* Defines to handle bit fields on unsigned long values */
 #define UL_BIT_MASK(lENGTH)             ((1UL << (lENGTH)) - 1UL)
 #define UL_BIT_SHIFT(vALUE, oFFSET)     ((vALUE) << (oFFSET))