diff --git a/openair1/PHY/LTE_TRANSPORT/if4_tools.c b/openair1/PHY/LTE_TRANSPORT/if4_tools.c
index 587d139422ec1d5b5430cb6e8a7e8739d7f0f6d0..a0e4d2e3f71ecc71ecf3f5281cc43aa44a4db1e1 100644
--- a/openair1/PHY/LTE_TRANSPORT/if4_tools.c
+++ b/openair1/PHY/LTE_TRANSPORT/if4_tools.c
@@ -39,7 +39,6 @@
 */
 
 #include "PHY/defs.h"
-#include "PHY/LTE_TRANSPORT/if4_tools.h"
 #include "PHY/TOOLS/alaw_lut.h"
 
 #include "targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h"
diff --git a/openair1/PHY/LTE_TRANSPORT/if5_mobipass_tools.c b/openair1/PHY/LTE_TRANSPORT/if5_mobipass_tools.c
index d38dfb76a527c5356258849b1436dec5d16adf4a..ab60c2fb0f6dad94e61964178eb404a774949776 100644
--- a/openair1/PHY/LTE_TRANSPORT/if5_mobipass_tools.c
+++ b/openair1/PHY/LTE_TRANSPORT/if5_mobipass_tools.c
@@ -39,7 +39,6 @@
 */
 
 #include "PHY/defs.h"
-#include "PHY/LTE_TRANSPORT/if5_mobipass_tools.h"
 
 #include "targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h"
 
diff --git a/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c b/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
index bf5554fd26445351fab91762ec07b7963d98c9e5..699d15350bb03cff1eda8c51711ef7f28f693e7d 100644
--- a/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
+++ b/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
@@ -51,9 +51,6 @@
 
 #include "common_lib.h"
 #include "ethernet_lib.h"
-#include "if_defs.h"
-#include "openair1/PHY/LTE_TRANSPORT/if4_tools.h"
-#include "openair1/PHY/LTE_TRANSPORT/if5_mobipass_tools.h"
 
 #define DEBUG 0
 
diff --git a/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c b/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
index 55b5e0853522a5447313edc6585002483008defb..a9706c73bdd16dad3cce786ead09bca8700b65f2 100644
--- a/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
+++ b/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
@@ -52,7 +52,6 @@
 
 #include "common_lib.h"
 #include "ethernet_lib.h"
-#include "if_defs.h"
 
 #define DEBUG 0
 struct sockaddr_in dest_addr[MAX_INST];
diff --git a/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c b/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
index 0ec8971ba88b9461ddb400bcbce704fd532bc0ec..f29375dac3198fd1219dcd763832812eb65ee99a 100644
--- a/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
+++ b/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
@@ -51,7 +51,6 @@
 
 #include "common_lib.h"
 #include "ethernet_lib.h"
-#include "if_defs.h"
 
 int num_devices_eth = 0;
 struct sockaddr_in dest_addr[MAX_INST];
diff --git a/targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h b/targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h
index e17890836bbe5dd210e9a905b3bf504b0762f2fe..86f580d911de88b2541520e1daf717e415b1e2c7 100644
--- a/targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h
+++ b/targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h
@@ -41,6 +41,9 @@
 #include <netinet/ether.h>
 #include <stdint.h>
 
+#include "PHY/LTE_TRANSPORT/if4_tools.h"
+#include "PHY/LTE_TRANSPORT/if5_mobipass_tools.h"
+
 // ETH transport preference modes
 #define ETH_UDP_MODE        0
 #define ETH_RAW_MODE        1