diff --git a/lib/include/srslte/interfaces/enb_metrics_interface.h b/lib/include/srslte/interfaces/enb_metrics_interface.h
index 6c8b2e740..4e540ab78 100644
--- a/lib/include/srslte/interfaces/enb_metrics_interface.h
+++ b/lib/include/srslte/interfaces/enb_metrics_interface.h
@@ -29,13 +29,13 @@
 
 #include <stdint.h>
 
-#include "upper/common_enb.h"
-#include "upper/s1ap_metrics.h"
-#include "upper/rrc_metrics.h"
-#include "../../../../srsue/hdr/upper/gw_metrics.h"
+#include "srsenb/hdr/upper/common_enb.h"
+#include "srsenb/hdr/upper/s1ap_metrics.h"
+#include "srsenb/hdr/upper/rrc_metrics.h"
+#include "srsue/hdr/upper/gw_metrics.h"
 #include "srslte/upper/rlc_metrics.h"
-#include "mac/mac_metrics.h"
-#include "phy/phy_metrics.h"
+#include "srsenb/hdr/mac/mac_metrics.h"
+#include "srsenb/hdr/phy/phy_metrics.h"
 
 namespace srsenb {
   
diff --git a/srsenb/CMakeLists.txt b/srsenb/CMakeLists.txt
index c836f36d5..f36987915 100644
--- a/srsenb/CMakeLists.txt
+++ b/srsenb/CMakeLists.txt
@@ -35,7 +35,7 @@ endif()
 include_directories(
     ${Boost_INCLUDE_DIRS}
     ${SEC_INCLUDE_DIRS}
-    ${PROJECT_SOURCE_DIR}/srsenb/hdr
+    ${PROJECT_SOURCE_DIR}
 )
 
 link_directories(
diff --git a/srsenb/hdr/mac/mac.h b/srsenb/hdr/mac/mac.h
index af122e36b..5f541b443 100644
--- a/srsenb/hdr/mac/mac.h
+++ b/srsenb/hdr/mac/mac.h
@@ -36,10 +36,10 @@
 #include "srslte/common/threads.h"
 #include "srslte/common/tti_sync_cv.h"
 #include "srslte/common/mac_pcap.h"
-#include "mac/scheduler.h"
-#include "mac/scheduler_metric.h"
+#include "scheduler.h"
+#include "scheduler_metric.h"
 #include "srslte/interfaces/enb_metrics_interface.h"
-#include "mac/ue.h"
+#include "ue.h"
 
 namespace srsenb {
   
diff --git a/srsenb/hdr/mac/scheduler_metric.h b/srsenb/hdr/mac/scheduler_metric.h
index 385d5803d..11e77b455 100644
--- a/srsenb/hdr/mac/scheduler_metric.h
+++ b/srsenb/hdr/mac/scheduler_metric.h
@@ -27,7 +27,7 @@
 #ifndef SRSENB_SCHEDULER_METRIC_H
 #define SRSENB_SCHEDULER_METRIC_H
 
-#include "mac/scheduler.h"
+#include "scheduler.h"
 
 namespace srsenb {
   
diff --git a/srsenb/hdr/mac/ue.h b/srsenb/hdr/mac/ue.h
index 405acd120..e7fbd0c10 100644
--- a/srsenb/hdr/mac/ue.h
+++ b/srsenb/hdr/mac/ue.h
@@ -34,7 +34,7 @@
 #include "srslte/interfaces/enb_interfaces.h"
 #include "srslte/interfaces/sched_interface.h"
 #include <pthread.h>
-#include "mac/mac_metrics.h"
+#include "mac_metrics.h"
 
 namespace srsenb {
   
diff --git a/srsenb/hdr/phy/phch_worker.h b/srsenb/hdr/phy/phch_worker.h
index 35e0607ba..9821a2d1e 100644
--- a/srsenb/hdr/phy/phch_worker.h
+++ b/srsenb/hdr/phy/phch_worker.h
@@ -30,7 +30,7 @@
 #include <string.h>
 
 #include "srslte/srslte.h"
-#include "phy/phch_common.h"
+#include "phch_common.h"
 
 #define LOG_EXECTIME
 
diff --git a/srsenb/hdr/phy/phy.h b/srsenb/hdr/phy/phy.h
index 07c181741..74b28be11 100644
--- a/srsenb/hdr/phy/phy.h
+++ b/srsenb/hdr/phy/phy.h
@@ -29,9 +29,9 @@
 
 #include "srslte/common/log.h"
 #include "srslte/common/log_filter.h"
-#include "phy/txrx.h"
-#include "phy/phch_worker.h"
-#include "phy/phch_common.h"
+#include "txrx.h"
+#include "phch_worker.h"
+#include "phch_common.h"
 #include "srslte/radio/radio.h"
 #include "srslte/interfaces/enb_interfaces.h"
 #include "srslte/common/task_dispatcher.h"
diff --git a/srsenb/hdr/phy/txrx.h b/srsenb/hdr/phy/txrx.h
index 9ba048c83..69a119900 100644
--- a/srsenb/hdr/phy/txrx.h
+++ b/srsenb/hdr/phy/txrx.h
@@ -31,8 +31,8 @@
 #include "srslte/common/threads.h"
 #include "srslte/common/thread_pool.h"
 #include "srslte/radio/radio.h"
-#include "phy/phch_common.h"
-#include "phy/prach_worker.h"
+#include "phch_common.h"
+#include "prach_worker.h"
 
 namespace srsenb {
     
diff --git a/srsenb/hdr/upper/gtpu.h b/srsenb/hdr/upper/gtpu.h
index b3323ffe2..892068757 100644
--- a/srsenb/hdr/upper/gtpu.h
+++ b/srsenb/hdr/upper/gtpu.h
@@ -29,7 +29,7 @@
 
 #include "srslte/common/buffer_pool.h"
 #include "srslte/common/log.h"
-#include "upper/common_enb.h"
+#include "common_enb.h"
 #include "srslte/common/threads.h"
 #include "srslte/srslte.h"
 #include "srslte/interfaces/enb_interfaces.h"
diff --git a/srsenb/hdr/upper/rrc.h b/srsenb/hdr/upper/rrc.h
index 49da1c0d9..cadb4af43 100644
--- a/srsenb/hdr/upper/rrc.h
+++ b/srsenb/hdr/upper/rrc.h
@@ -36,7 +36,7 @@
 #include "srslte/common/timeout.h"
 #include "srslte/common/log.h"
 #include "srslte/interfaces/enb_interfaces.h"
-#include "upper/common_enb.h"
+#include "common_enb.h"
 #include "rrc_metrics.h"
 
 namespace srsenb {
diff --git a/srsenb/hdr/upper/rrc_metrics.h b/srsenb/hdr/upper/rrc_metrics.h
index aba942f3f..7c388da01 100644
--- a/srsenb/hdr/upper/rrc_metrics.h
+++ b/srsenb/hdr/upper/rrc_metrics.h
@@ -27,7 +27,7 @@
 #ifndef SRSENB_RRC_METRICS_H
 #define SRSENB_RRC_METRICS_H
 
-#include "upper/common_enb.h"
+#include "common_enb.h"
 
 namespace srsenb {
 
diff --git a/srsenb/hdr/upper/s1ap.h b/srsenb/hdr/upper/s1ap.h
index ad9137eec..35369790f 100644
--- a/srsenb/hdr/upper/s1ap.h
+++ b/srsenb/hdr/upper/s1ap.h
@@ -35,7 +35,7 @@
 #include "srslte/common/msg_queue.h"
 #include "srslte/common/threads.h"
 #include "srslte/interfaces/enb_interfaces.h"
-#include "upper/common_enb.h"
+#include "common_enb.h"
 
 #include "srslte/asn1/liblte_s1ap.h"
 #include "s1ap_metrics.h"
diff --git a/srsenb/src/enb.cc b/srsenb/src/enb.cc
index 2d3466522..85cda6185 100644
--- a/srsenb/src/enb.cc
+++ b/srsenb/src/enb.cc
@@ -25,8 +25,7 @@
  */
 
 #include <boost/algorithm/string.hpp>
-#include <enb.h>
-#include "enb.h"
+#include "srsenb/hdr/enb.h"
 
 namespace srsenb {
 
diff --git a/srsenb/src/enb_cfg_parser.cc b/srsenb/src/enb_cfg_parser.cc
index b63c46058..af2ade941 100644
--- a/srsenb/src/enb_cfg_parser.cc
+++ b/srsenb/src/enb_cfg_parser.cc
@@ -26,10 +26,10 @@
 
 #include "srslte/asn1/liblte_common.h"
 #include "srslte/asn1/liblte_rrc.h"
-#include "cfg_parser.h"
+#include "srsenb/hdr/cfg_parser.h"
 #include "srslte/srslte.h"
 
-#include "parser.h"
+#include "srsenb/hdr/parser.h"
 #include "enb_cfg_parser.h"
 
 namespace srsenb {
diff --git a/srsenb/src/enb_cfg_parser.h b/srsenb/src/enb_cfg_parser.h
index d68fb87d8..912c9bf19 100644
--- a/srsenb/src/enb_cfg_parser.h
+++ b/srsenb/src/enb_cfg_parser.h
@@ -33,9 +33,9 @@
 #include <libconfig.h++>
 #include <string.h>
 #include <iostream>
-#include "parser.h"
+#include "srsenb/hdr/parser.h"
 
-#include "upper/rrc.h"
+#include "srsenb/hdr/upper/rrc.h"
 #include "srslte/asn1/liblte_rrc.h"
 
 namespace srsenb {
diff --git a/srsenb/src/mac/mac.cc b/srsenb/src/mac/mac.cc
index 8b76cc4f3..463da2e25 100644
--- a/srsenb/src/mac/mac.cc
+++ b/srsenb/src/mac/mac.cc
@@ -36,7 +36,7 @@
 #include <srslte/interfaces/sched_interface.h>
 
 #include "srslte/common/log.h"
-#include "mac/mac.h"
+#include "srsenb/hdr/mac/mac.h"
 
 //#define WRITE_SIB_PCAP
 
diff --git a/srsenb/src/mac/scheduler.cc b/srsenb/src/mac/scheduler.cc
index 2e0504193..53b3cd939 100644
--- a/srsenb/src/mac/scheduler.cc
+++ b/srsenb/src/mac/scheduler.cc
@@ -28,7 +28,7 @@
 
 #include "srslte/srslte.h"
 #include "srslte/common/pdu.h"
-#include "mac/scheduler.h"
+#include "srsenb/hdr/mac/scheduler.h"
 
 #define Error(fmt, ...)   log_h->error(fmt, ##__VA_ARGS__)
 #define Warning(fmt, ...) log_h->warning(fmt, ##__VA_ARGS__)
diff --git a/srsenb/src/mac/scheduler_harq.cc b/srsenb/src/mac/scheduler_harq.cc
index ad7986436..c860c7a14 100644
--- a/srsenb/src/mac/scheduler_harq.cc
+++ b/srsenb/src/mac/scheduler_harq.cc
@@ -28,7 +28,7 @@
 
 #include "srslte/srslte.h"
 #include "srslte/common/pdu.h"
-#include "mac/scheduler.h"
+#include "srsenb/hdr/mac/scheduler.h"
 
 #define Error(fmt, ...)   log_h->error(fmt, ##__VA_ARGS__)
 #define Warning(fmt, ...) log_h->warning(fmt, ##__VA_ARGS__)
diff --git a/srsenb/src/mac/scheduler_metric.cc b/srsenb/src/mac/scheduler_metric.cc
index 1d9cdb954..a15faebbd 100644
--- a/srsenb/src/mac/scheduler_metric.cc
+++ b/srsenb/src/mac/scheduler_metric.cc
@@ -25,8 +25,8 @@
  */
 
 #include <string.h>
-#include "mac/scheduler_harq.h"
-#include "mac/scheduler_metric.h"
+#include "srsenb/hdr/mac/scheduler_harq.h"
+#include "srsenb/hdr/mac/scheduler_metric.h"
 
 #define Error(fmt, ...)   log_h->error(fmt, ##__VA_ARGS__)
 #define Warning(fmt, ...) log_h->warning(fmt, ##__VA_ARGS__)
diff --git a/srsenb/src/mac/scheduler_ue.cc b/srsenb/src/mac/scheduler_ue.cc
index 6948f922a..6cb4462e8 100644
--- a/srsenb/src/mac/scheduler_ue.cc
+++ b/srsenb/src/mac/scheduler_ue.cc
@@ -28,8 +28,8 @@
 
 #include "srslte/srslte.h"
 #include "srslte/common/pdu.h"
-#include "mac/scheduler_ue.h"
-#include "mac/scheduler.h"
+#include "srsenb/hdr/mac/scheduler_ue.h"
+#include "srsenb/hdr/mac/scheduler.h"
 
 #define Error(fmt, ...)   log_h->error(fmt, ##__VA_ARGS__)
 #define Warning(fmt, ...) log_h->warning(fmt, ##__VA_ARGS__)
diff --git a/srsenb/src/mac/ue.cc b/srsenb/src/mac/ue.cc
index d6fe07d0a..39e8c88e2 100644
--- a/srsenb/src/mac/ue.cc
+++ b/srsenb/src/mac/ue.cc
@@ -28,7 +28,7 @@
 #include <string.h>
 
 #include "srslte/interfaces/enb_interfaces.h"
-#include "mac/ue.h"
+#include "srsenb/hdr/mac/ue.h"
 
 #define Error(fmt, ...)   log_h->error(fmt, ##__VA_ARGS__)
 #define Warning(fmt, ...) log_h->warning(fmt, ##__VA_ARGS__)
diff --git a/srsenb/src/main.cc b/srsenb/src/main.cc
index 3aedda25a..45dd028b0 100644
--- a/srsenb/src/main.cc
+++ b/srsenb/src/main.cc
@@ -36,8 +36,8 @@
 #include <boost/program_options.hpp>
 #include <boost/program_options/parsers.hpp>
 
-#include "enb.h"
-#include "metrics_stdout.h"
+#include "srsenb/hdr/enb.h"
+#include "srsenb/hdr/metrics_stdout.h"
 
 using namespace std;
 using namespace srsenb;
diff --git a/srsenb/src/metrics_stdout.cc b/srsenb/src/metrics_stdout.cc
index 5687f25e1..ca9137a24 100644
--- a/srsenb/src/metrics_stdout.cc
+++ b/srsenb/src/metrics_stdout.cc
@@ -24,7 +24,7 @@
  *
  */
 
-#include "metrics_stdout.h"
+#include "srsenb/hdr/metrics_stdout.h"
 
 #include <unistd.h>
 #include <sstream>
diff --git a/srsenb/src/parser.cc b/srsenb/src/parser.cc
index 82e088ab2..8a85789e9 100644
--- a/srsenb/src/parser.cc
+++ b/srsenb/src/parser.cc
@@ -24,7 +24,7 @@
  *
  */
 
-#include "parser.h"
+#include "srsenb/hdr/parser.h"
 #include <iostream>
 
 namespace srsenb {
diff --git a/srsenb/src/phy/phch_common.cc b/srsenb/src/phy/phch_common.cc
index 99bfc3d29..ce8026ca5 100644
--- a/srsenb/src/phy/phch_common.cc
+++ b/srsenb/src/phy/phch_common.cc
@@ -27,7 +27,7 @@
 #include "srslte/common/threads.h"
 #include "srslte/common/log.h"
 
-#include "phy/txrx.h"
+#include "srsenb/hdr/phy/txrx.h"
 
 #include <assert.h>
 
diff --git a/srsenb/src/phy/phch_worker.cc b/srsenb/src/phy/phch_worker.cc
index 5524be442..7ae174502 100644
--- a/srsenb/src/phy/phch_worker.cc
+++ b/srsenb/src/phy/phch_worker.cc
@@ -29,7 +29,7 @@
 #include "srslte/common/threads.h"
 #include "srslte/common/log.h"
 
-#include "phy/phch_worker.h"
+#include "srsenb/hdr/phy/phch_worker.h"
 
 #define Error(fmt, ...)   if (SRSLTE_DEBUG_ENABLED) log_h->error(fmt, ##__VA_ARGS__)
 #define Warning(fmt, ...) if (SRSLTE_DEBUG_ENABLED) log_h->warning(fmt, ##__VA_ARGS__)
diff --git a/srsenb/src/phy/phy.cc b/srsenb/src/phy/phy.cc
index 08b89d77f..120a3c7b5 100644
--- a/srsenb/src/phy/phy.cc
+++ b/srsenb/src/phy/phy.cc
@@ -34,7 +34,7 @@
 
 #include "srslte/common/threads.h"
 #include "srslte/common/log.h"
-#include "phy/phy.h"
+#include "srsenb/hdr/phy/phy.h"
 
 #define Error(fmt, ...)   if (SRSLTE_DEBUG_ENABLED) log_h->error(fmt, ##__VA_ARGS__)
 #define Warning(fmt, ...) if (SRSLTE_DEBUG_ENABLED) log_h->warning(fmt, ##__VA_ARGS__)
diff --git a/srsenb/src/phy/prach_worker.cc b/srsenb/src/phy/prach_worker.cc
index b4bd7da3f..a42849bbe 100644
--- a/srsenb/src/phy/prach_worker.cc
+++ b/srsenb/src/phy/prach_worker.cc
@@ -25,7 +25,7 @@
  */
 
 #include "srslte/srslte.h"
-#include "phy/prach_worker.h"
+#include "srsenb/hdr/phy/prach_worker.h"
 
 namespace srsenb {
 
diff --git a/srsenb/src/phy/txrx.cc b/srsenb/src/phy/txrx.cc
index 32c8aea00..7f6503b06 100644
--- a/srsenb/src/phy/txrx.cc
+++ b/srsenb/src/phy/txrx.cc
@@ -29,8 +29,8 @@
 #include "srslte/common/threads.h"
 #include "srslte/common/log.h"
 
-#include "phy/txrx.h"
-#include "phy/phch_worker.h"
+#include "srsenb/hdr/phy/txrx.h"
+#include "srsenb/hdr/phy/phch_worker.h"
 
 #define Error(fmt, ...)   if (SRSLTE_DEBUG_ENABLED) log_h->error(fmt, ##__VA_ARGS__)
 #define Warning(fmt, ...) if (SRSLTE_DEBUG_ENABLED) log_h->warning(fmt, ##__VA_ARGS__)
diff --git a/srsenb/src/upper/gtpu.cc b/srsenb/src/upper/gtpu.cc
index 2336f9047..0b0df8de2 100644
--- a/srsenb/src/upper/gtpu.cc
+++ b/srsenb/src/upper/gtpu.cc
@@ -24,7 +24,7 @@
  *
  */
 
-#include "upper/gtpu.h"
+#include "srsenb/hdr/upper/gtpu.h"
 #include <unistd.h>
 #include <sys/socket.h>
 #include <fcntl.h>
diff --git a/srsenb/src/upper/pdcp.cc b/srsenb/src/upper/pdcp.cc
index d3ed88c4e..99289ec4d 100644
--- a/srsenb/src/upper/pdcp.cc
+++ b/srsenb/src/upper/pdcp.cc
@@ -24,8 +24,8 @@
  *
  */
 
-#include "upper/pdcp.h"
-#include "upper/common_enb.h"
+#include "srsenb/hdr/upper/pdcp.h"
+#include "srsenb/hdr/upper/common_enb.h"
 
 namespace srsenb {
   
diff --git a/srsenb/src/upper/rlc.cc b/srsenb/src/upper/rlc.cc
index 0b7babbac..72d269c6c 100644
--- a/srsenb/src/upper/rlc.cc
+++ b/srsenb/src/upper/rlc.cc
@@ -24,8 +24,8 @@
  *
  */
 
-#include "upper/rlc.h"
-#include "upper/common_enb.h"
+#include "srsenb/hdr/upper/rlc.h"
+#include "srsenb/hdr/upper/common_enb.h"
 
 namespace srsenb {
   
diff --git a/srsenb/src/upper/rrc.cc b/srsenb/src/upper/rrc.cc
index 9fe1773f7..f47656c6d 100644
--- a/srsenb/src/upper/rrc.cc
+++ b/srsenb/src/upper/rrc.cc
@@ -26,10 +26,9 @@
 
 #include "srslte/interfaces/sched_interface.h"
 #include "srslte/asn1/liblte_rrc.h"
-#include "upper/rrc.h"
+#include "srsenb/hdr/upper/rrc.h"
 #include "srslte/srslte.h"
 #include "srslte/asn1/liblte_mme.h"
-#include "upper/rrc.h"
 
 using srslte::byte_buffer_t;
 using srslte::bit_buffer_t;
diff --git a/srsenb/src/upper/s1ap.cc b/srsenb/src/upper/s1ap.cc
index a3d937a57..b48e8a248 100644
--- a/srsenb/src/upper/s1ap.cc
+++ b/srsenb/src/upper/s1ap.cc
@@ -24,8 +24,8 @@
  *
  */
 
-#include "upper/s1ap.h"
-#include "upper/common_enb.h"
+#include "srsenb/hdr/upper/s1ap.h"
+#include "srsenb/hdr/upper/common_enb.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/srsenb/test/mac/scheduler_test.cc b/srsenb/test/mac/scheduler_test.cc
index 73dd531b0..50d4cb409 100644
--- a/srsenb/test/mac/scheduler_test.cc
+++ b/srsenb/test/mac/scheduler_test.cc
@@ -26,8 +26,8 @@
 
 #include <unistd.h>
 
-#include "mac/mac.h"
-#include "phy/phy.h"
+#include "srsenb/hdr/mac/mac.h"
+#include "srsenb/hdr/phy/phy.h"
 
 #include "srslte/interfaces/enb_interfaces.h"
 #include "srslte/interfaces/sched_interface.h"
diff --git a/srsenb/test/upper/ip_test.cc b/srsenb/test/upper/ip_test.cc
index 8052ed4d7..9361a9901 100644
--- a/srsenb/test/upper/ip_test.cc
+++ b/srsenb/test/upper/ip_test.cc
@@ -36,8 +36,8 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include "mac/mac.h"
-#include "phy/phy.h"
+#include "srsenb/hdr/mac/mac.h"
+#include "srsenb/hdr/phy/phy.h"
 #include "srslte/common/threads.h"
 #include "srslte/interfaces/enb_interfaces.h"
 #include "srslte/common/common.h"
diff --git a/srsenb/test/upper/plmn_test.cc b/srsenb/test/upper/plmn_test.cc
index ddf68d130..c8e9bdd69 100644
--- a/srsenb/test/upper/plmn_test.cc
+++ b/srsenb/test/upper/plmn_test.cc
@@ -8,7 +8,7 @@
  */
 
 #include <assert.h>
-#include "upper/common_enb.h"
+#include "srsenb/hdr/upper/common_enb.h"
 #include "srslte/asn1/liblte_rrc.h"
 
 void rrc_plmn_test()
diff --git a/srsepc/CMakeLists.txt b/srsepc/CMakeLists.txt
index 0006e5191..2b54d4a1e 100644
--- a/srsepc/CMakeLists.txt
+++ b/srsepc/CMakeLists.txt
@@ -35,7 +35,7 @@ endif()
 include_directories(
     ${Boost_INCLUDE_DIRS}
     ${SEC_INCLUDE_DIRS}
-    ${PROJECT_SOURCE_DIR}/srsepc/hdr
+    ${PROJECT_SOURCE_DIR}
 )
 
 link_directories(
diff --git a/srsepc/hdr/mme/mme_gtpc.h b/srsepc/hdr/mme/mme_gtpc.h
index 5f7ecc64c..ad2181c85 100644
--- a/srsepc/hdr/mme/mme_gtpc.h
+++ b/srsepc/hdr/mme/mme_gtpc.h
@@ -30,7 +30,7 @@
 #include "srslte/common/log_filter.h"
 #include "srslte/common/buffer_pool.h"
 #include "srslte/asn1/gtpc.h"
-#include "mme/s1ap_common.h"
+#include "s1ap_common.h"
 namespace srsepc
 {
 
diff --git a/srsepc/hdr/mme/s1ap.h b/srsepc/hdr/mme/s1ap.h
index 6f3c64d5c..5036c18cd 100644
--- a/srsepc/hdr/mme/s1ap.h
+++ b/srsepc/hdr/mme/s1ap.h
@@ -40,12 +40,12 @@
 #include <unistd.h>
 #include <map>
 #include <set>
-#include "mme/s1ap_common.h"
-#include "mme/s1ap_mngmt_proc.h"
-#include "mme/s1ap_nas_transport.h"
-#include "mme/s1ap_ctx_mngmt_proc.h"
-#include "mme/mme_gtpc.h"
-#include "hss/hss.h"
+#include "s1ap_common.h"
+#include "s1ap_mngmt_proc.h"
+#include "s1ap_nas_transport.h"
+#include "s1ap_ctx_mngmt_proc.h"
+#include "mme_gtpc.h"
+#include "srsepc/hdr/hss/hss.h"
 
 namespace srsepc{
 
diff --git a/srsepc/hdr/mme/s1ap_ctx_mngmt_proc.h b/srsepc/hdr/mme/s1ap_ctx_mngmt_proc.h
index 31a4ce6ba..e6182269f 100644
--- a/srsepc/hdr/mme/s1ap_ctx_mngmt_proc.h
+++ b/srsepc/hdr/mme/s1ap_ctx_mngmt_proc.h
@@ -28,9 +28,9 @@
 
 #include "srslte/asn1/liblte_s1ap.h"
 #include "srslte/common/common.h"
-#include "mme/s1ap_common.h"
+#include "s1ap_common.h"
 #include "srslte/common/log_filter.h"
-#include "mme/mme_gtpc.h"
+#include "mme_gtpc.h"
 #include "srslte/common/buffer_pool.h"
 
 namespace srsepc{
diff --git a/srsepc/hdr/mme/s1ap_mngmt_proc.h b/srsepc/hdr/mme/s1ap_mngmt_proc.h
index a8fd24df2..859a647e4 100644
--- a/srsepc/hdr/mme/s1ap_mngmt_proc.h
+++ b/srsepc/hdr/mme/s1ap_mngmt_proc.h
@@ -28,7 +28,7 @@
 
 #include "srslte/asn1/liblte_s1ap.h"
 #include "srslte/common/common.h"
-#include "mme/s1ap_common.h"
+#include "s1ap_common.h"
 #include "srslte/common/log_filter.h"
 
 namespace srsepc{
diff --git a/srsepc/hdr/mme/s1ap_nas_transport.h b/srsepc/hdr/mme/s1ap_nas_transport.h
index a3fc5cccc..9df615914 100644
--- a/srsepc/hdr/mme/s1ap_nas_transport.h
+++ b/srsepc/hdr/mme/s1ap_nas_transport.h
@@ -28,10 +28,10 @@
 
 #include "srslte/asn1/liblte_s1ap.h"
 #include "srslte/common/buffer_pool.h"
-#include "mme/s1ap_common.h"
+#include "s1ap_common.h"
 #include "srslte/asn1/gtpc.h"
-#include "hss/hss.h"
-#include "mme/mme_gtpc.h"
+#include "srsepc/hdr/hss/hss.h"
+#include "mme_gtpc.h"
 
 namespace srsepc{
 
diff --git a/srsepc/src/hss/hss.cc b/srsepc/src/hss/hss.cc
index 703928270..d9a55960b 100644
--- a/srsepc/src/hss/hss.cc
+++ b/srsepc/src/hss/hss.cc
@@ -28,7 +28,7 @@
 #include <string>
 #include <sstream>
 #include <iomanip>
-#include "hss/hss.h"
+#include "srsepc/hdr/hss/hss.h"
 #include "srslte/common/security.h"
 
 using namespace srslte;
diff --git a/srsepc/src/main.cc b/srsepc/src/main.cc
index 539b1b245..e2c006750 100644
--- a/srsepc/src/main.cc
+++ b/srsepc/src/main.cc
@@ -28,9 +28,9 @@
 #include <boost/program_options.hpp>
 #include <boost/algorithm/string.hpp>
 #include "srslte/common/bcd_helpers.h"
-#include "mme/mme.h"
-#include "hss/hss.h"
-#include "spgw/spgw.h"
+#include "srsepc/hdr/mme/mme.h"
+#include "srsepc/hdr/hss/hss.h"
+#include "srsepc/hdr/spgw/spgw.h"
 
 using namespace std;
 using namespace srsepc;
diff --git a/srsepc/src/mme/mme.cc b/srsepc/src/mme/mme.cc
index 4c63b5f6a..1a385d8dc 100644
--- a/srsepc/src/mme/mme.cc
+++ b/srsepc/src/mme/mme.cc
@@ -29,7 +29,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/sctp.h>
-#include "mme/mme.h"
+#include "srsepc/hdr/mme/mme.h"
 
 namespace srsepc{
 
diff --git a/srsepc/src/mme/mme_gtpc.cc b/srsepc/src/mme/mme_gtpc.cc
index e25ea05d1..1f53338c0 100644
--- a/srsepc/src/mme/mme_gtpc.cc
+++ b/srsepc/src/mme/mme_gtpc.cc
@@ -26,9 +26,9 @@
 
 #include <iostream>
 #include "srslte/asn1/gtpc.h"
-#include "mme/mme_gtpc.h"
-#include "mme/s1ap.h"
-#include "spgw/spgw.h"
+#include "srsepc/hdr/mme/mme_gtpc.h"
+#include "srsepc/hdr/mme/s1ap.h"
+#include "srsepc/hdr/spgw/spgw.h"
 
 namespace srsepc{
 
diff --git a/srsepc/src/mme/s1ap.cc b/srsepc/src/mme/s1ap.cc
index 0dce45c41..639725ee5 100644
--- a/srsepc/src/mme/s1ap.cc
+++ b/srsepc/src/mme/s1ap.cc
@@ -27,7 +27,7 @@
 #include <iostream>
 #include <cmath>
 #include "srslte/common/bcd_helpers.h"
-#include "mme/s1ap.h"
+#include "srsepc/hdr/mme/s1ap.h"
 #include "srslte/asn1/gtpc.h"
 #include "srslte/common/liblte_security.h"
 
diff --git a/srsepc/src/mme/s1ap_ctx_mngmt_proc.cc b/srsepc/src/mme/s1ap_ctx_mngmt_proc.cc
index 2938b128c..5500fa561 100644
--- a/srsepc/src/mme/s1ap_ctx_mngmt_proc.cc
+++ b/srsepc/src/mme/s1ap_ctx_mngmt_proc.cc
@@ -26,8 +26,8 @@
 
 //#include "srslte/upper/s1ap_common.h"
 #include "srslte/common/bcd_helpers.h"
-#include "mme/s1ap.h"
-#include "mme/s1ap_ctx_mngmt_proc.h"
+#include "srsepc/hdr/mme/s1ap.h"
+#include "srsepc/hdr/mme/s1ap_ctx_mngmt_proc.h"
 #include "srslte/common/liblte_security.h"
 
 
diff --git a/srsepc/src/mme/s1ap_mngmt_proc.cc b/srsepc/src/mme/s1ap_mngmt_proc.cc
index 4d4b16528..079eca100 100644
--- a/srsepc/src/mme/s1ap_mngmt_proc.cc
+++ b/srsepc/src/mme/s1ap_mngmt_proc.cc
@@ -26,8 +26,8 @@
 
 //#include "srslte/upper/s1ap_common.h"
 #include "srslte/common/bcd_helpers.h"
-#include "mme/s1ap.h"
-#include "mme/s1ap_mngmt_proc.h"
+#include "srsepc/hdr/mme/s1ap.h"
+#include "srsepc/hdr/mme/s1ap_mngmt_proc.h"
 
 namespace srsepc{
 
diff --git a/srsepc/src/mme/s1ap_nas_transport.cc b/srsepc/src/mme/s1ap_nas_transport.cc
index 183815fc6..687ced63b 100644
--- a/srsepc/src/mme/s1ap_nas_transport.cc
+++ b/srsepc/src/mme/s1ap_nas_transport.cc
@@ -27,8 +27,8 @@
 #include <iostream>
 #include <cmath>
 #include <inttypes.h> // for printing uint64_t
-#include "mme/s1ap.h"
-#include "mme/s1ap_nas_transport.h"
+#include "srsepc/hdr/mme/s1ap.h"
+#include "srsepc/hdr/mme/s1ap_nas_transport.h"
 #include "srslte/common/security.h"
 #include "srslte/common/liblte_security.h"
 
diff --git a/srsepc/src/spgw/spgw.cc b/srsepc/src/spgw/spgw.cc
index 1ef33a8f0..eec7bb4ec 100644
--- a/srsepc/src/spgw/spgw.cc
+++ b/srsepc/src/spgw/spgw.cc
@@ -33,8 +33,8 @@
 #include <linux/if.h>
 #include <linux/if_tun.h>
 #include <linux/ip.h>
-#include "spgw/spgw.h"
-#include "mme/mme_gtpc.h"
+#include "srsepc/hdr/spgw/spgw.h"
+#include "srsepc/hdr/mme/mme_gtpc.h"
 #include "srslte/upper/gtpu.h"
 
 namespace srsepc{
diff --git a/srsue/CMakeLists.txt b/srsue/CMakeLists.txt
index 85f391d6b..07a5f6b8f 100644
--- a/srsue/CMakeLists.txt
+++ b/srsue/CMakeLists.txt
@@ -31,7 +31,7 @@ endif()
 include_directories(
     ${Boost_INCLUDE_DIRS}
     ${SEC_INCLUDE_DIRS}
-    ${PROJECT_SOURCE_DIR}/srsue/hdr
+    ${PROJECT_SOURCE_DIR}
 )
 
 link_directories(
diff --git a/srsue/hdr/mac/dl_harq.h b/srsue/hdr/mac/dl_harq.h
index c6f07251a..37eadad91 100644
--- a/srsue/hdr/mac/dl_harq.h
+++ b/srsue/hdr/mac/dl_harq.h
@@ -34,8 +34,8 @@
 
 #include "srslte/common/log.h"
 #include "srslte/common/timers.h"
-#include "mac/demux.h"
-#include "mac/dl_sps.h"
+#include "demux.h"
+#include "dl_sps.h"
 #include "srslte/common/mac_pcap.h"
 
 #include "srslte/interfaces/ue_interfaces.h"
diff --git a/srsue/hdr/mac/mac.h b/srsue/hdr/mac/mac.h
index 0e427a8a7..7b119c27b 100644
--- a/srsue/hdr/mac/mac.h
+++ b/srsue/hdr/mac/mac.h
@@ -28,16 +28,16 @@
 #define SRSUE_MAC_H
 
 #include "srslte/common/log.h"
-#include "mac/dl_harq.h"
-#include "mac/ul_harq.h"
+#include "dl_harq.h"
+#include "ul_harq.h"
 #include "srslte/common/timers.h"
-#include "mac/mac_metrics.h"
-#include "mac/proc_ra.h"
-#include "mac/proc_sr.h"
-#include "mac/proc_bsr.h"
-#include "mac/proc_phr.h"
-#include "mac/mux.h"
-#include "mac/demux.h"
+#include "mac_metrics.h"
+#include "proc_ra.h"
+#include "proc_sr.h"
+#include "proc_bsr.h"
+#include "proc_phr.h"
+#include "mux.h"
+#include "demux.h"
 #include "srslte/common/mac_pcap.h"
 #include "srslte/interfaces/ue_interfaces.h"
 #include "srslte/common/tti_sync_cv.h"
diff --git a/srsue/hdr/mac/mux.h b/srsue/hdr/mac/mux.h
index 04f7e302b..2e621360f 100644
--- a/srsue/hdr/mac/mux.h
+++ b/srsue/hdr/mac/mux.h
@@ -34,8 +34,8 @@
 #include "srslte/common/log.h"
 #include "srslte/interfaces/ue_interfaces.h"
 #include "srslte/common/pdu.h"
-#include "mac/proc_bsr.h"
-#include "mac/proc_phr.h"
+#include "proc_bsr.h"
+#include "proc_phr.h"
 
 /* Logical Channel Multiplexing and Prioritization + Msg3 Buffer */   
 
diff --git a/srsue/hdr/mac/proc_ra.h b/srsue/hdr/mac/proc_ra.h
index 9163b8530..833173b75 100644
--- a/srsue/hdr/mac/proc_ra.h
+++ b/srsue/hdr/mac/proc_ra.h
@@ -31,8 +31,8 @@
 
 #include "srslte/common/log.h"
 #include "srslte/common/timers.h"
-#include "mac/mux.h"
-#include "mac/demux.h"
+#include "mux.h"
+#include "demux.h"
 #include "srslte/common/pdu.h"
 #include "srslte/common/mac_pcap.h"
 
diff --git a/srsue/hdr/mac/ul_harq.h b/srsue/hdr/mac/ul_harq.h
index 034c09cf6..6fb27be8a 100644
--- a/srsue/hdr/mac/ul_harq.h
+++ b/srsue/hdr/mac/ul_harq.h
@@ -34,8 +34,8 @@
 
 #include "srslte/interfaces/ue_interfaces.h"
 #include "srslte/common/log.h"
-#include "mac/mux.h"
-#include "mac/ul_sps.h"
+#include "mux.h"
+#include "ul_sps.h"
 #include "srslte/common/mac_pcap.h"
 #include "srslte/common/timers.h"
 #include "srslte/common/interfaces_common.h"
diff --git a/srsue/hdr/phy/phch_common.h b/srsue/hdr/phy/phch_common.h
index 2f9b75569..c9a1cd6a1 100644
--- a/srsue/hdr/phy/phch_common.h
+++ b/srsue/hdr/phy/phch_common.h
@@ -37,7 +37,7 @@
 #include "srslte/interfaces/ue_interfaces.h"
 #include "srslte/radio/radio.h"
 #include "srslte/common/log.h"
-#include "phy/phy_metrics.h"
+#include "phy_metrics.h"
 
 
 namespace srsue {
diff --git a/srsue/hdr/phy/phch_recv.h b/srsue/hdr/phy/phch_recv.h
index 7d3e2b25b..f18f52833 100644
--- a/srsue/hdr/phy/phch_recv.h
+++ b/srsue/hdr/phy/phch_recv.h
@@ -35,9 +35,9 @@
 #include "srslte/common/thread_pool.h"
 #include "srslte/common/tti_sync_cv.h"
 #include "srslte/radio/radio_multi.h"
-#include "phy/prach.h"
-#include "phy/phch_worker.h"
-#include "phy/phch_common.h"
+#include "prach.h"
+#include "phch_worker.h"
+#include "phch_common.h"
 #include "srslte/interfaces/ue_interfaces.h"
 
 namespace srsue {
diff --git a/srsue/hdr/phy/phch_worker.h b/srsue/hdr/phy/phch_worker.h
index a5e2338c2..53848905b 100644
--- a/srsue/hdr/phy/phch_worker.h
+++ b/srsue/hdr/phy/phch_worker.h
@@ -31,7 +31,7 @@
 #include "srslte/srslte.h"
 #include "srslte/common/thread_pool.h"
 #include "srslte/common/trace.h"
-#include "phy/phch_common.h"
+#include "phch_common.h"
 
 #define LOG_EXECTIME
 
diff --git a/srsue/hdr/phy/phy.h b/srsue/hdr/phy/phy.h
index 1c03c4f87..828a6b7e1 100644
--- a/srsue/hdr/phy/phy.h
+++ b/srsue/hdr/phy/phy.h
@@ -29,11 +29,11 @@
 
 #include "srslte/srslte.h"
 #include "srslte/common/log_filter.h"
-#include "phy/phy_metrics.h"
-#include "phy/phch_recv.h"
-#include "phy/prach.h"
-#include "phy/phch_worker.h"
-#include "phy/phch_common.h"
+#include "phy_metrics.h"
+#include "phch_recv.h"
+#include "prach.h"
+#include "phch_worker.h"
+#include "phch_common.h"
 #include "srslte/radio/radio.h"
 #include "srslte/common/task_dispatcher.h"
 #include "srslte/common/trace.h"
diff --git a/srsue/src/mac/demux.cc b/srsue/src/mac/demux.cc
index 3ddd98b69..3e0d2f44f 100644
--- a/srsue/src/mac/demux.cc
+++ b/srsue/src/mac/demux.cc
@@ -30,8 +30,8 @@
 #define Info(fmt, ...)    log_h->info(fmt, ##__VA_ARGS__)
 #define Debug(fmt, ...)   log_h->debug(fmt, ##__VA_ARGS__)
 
-#include "mac/mac.h"
-#include "mac/demux.h"
+#include "srsue/hdr/mac/mac.h"
+#include "srsue/hdr/mac/demux.h"
 #include "srslte/interfaces/ue_interfaces.h"
 
 namespace srsue {
diff --git a/srsue/src/mac/mac.cc b/srsue/src/mac/mac.cc
index 2531faafc..4033df888 100644
--- a/srsue/src/mac/mac.cc
+++ b/srsue/src/mac/mac.cc
@@ -35,7 +35,7 @@
 #include <unistd.h>
 
 #include "srslte/common/log.h"
-#include "mac/mac.h"
+#include "srsue/hdr/mac/mac.h"
 #include "srslte/common/pcap.h"
 
 
diff --git a/srsue/src/mac/mux.cc b/srsue/src/mac/mux.cc
index 33d048957..6d1edbebf 100644
--- a/srsue/src/mac/mux.cc
+++ b/srsue/src/mac/mux.cc
@@ -29,8 +29,8 @@
 #define Info(fmt, ...)    log_h->info(fmt, ##__VA_ARGS__)
 #define Debug(fmt, ...)   log_h->debug(fmt, ##__VA_ARGS__)
 
-#include "mac/mux.h"
-#include "mac/mac.h"
+#include "srsue/hdr/mac/mux.h"
+#include "srsue/hdr/mac/mac.h"
 
 #include <set>
 #include <algorithm>
diff --git a/srsue/src/mac/proc_bsr.cc b/srsue/src/mac/proc_bsr.cc
index f68b6eee8..19b214a74 100644
--- a/srsue/src/mac/proc_bsr.cc
+++ b/srsue/src/mac/proc_bsr.cc
@@ -29,9 +29,9 @@
 #define Info(fmt, ...)    log_h->info(fmt, ##__VA_ARGS__)
 #define Debug(fmt, ...)   log_h->debug(fmt, ##__VA_ARGS__)
 
-#include "mac/proc_bsr.h"
-#include "mac/mac.h"
-#include "mac/mux.h"
+#include "srsue/hdr/mac/proc_bsr.h"
+#include "srsue/hdr/mac/mac.h"
+#include "srsue/hdr/mac/mux.h"
 
 
   namespace srsue {
diff --git a/srsue/src/mac/proc_phr.cc b/srsue/src/mac/proc_phr.cc
index 3eb7c82f5..69a5c0de3 100644
--- a/srsue/src/mac/proc_phr.cc
+++ b/srsue/src/mac/proc_phr.cc
@@ -29,9 +29,9 @@
 #define Info(fmt, ...)    log_h->info(fmt, ##__VA_ARGS__)
 #define Debug(fmt, ...)   log_h->debug(fmt, ##__VA_ARGS__)
 
-#include "mac/proc_phr.h"
-#include "mac/mac.h"
-#include "mac/mux.h"
+#include "srsue/hdr/mac/proc_phr.h"
+#include "srsue/hdr/mac/mac.h"
+#include "srsue/hdr/mac/mux.h"
 #include "srslte/interfaces/ue_interfaces.h"
 
 
diff --git a/srsue/src/mac/proc_ra.cc b/srsue/src/mac/proc_ra.cc
index 3860fd809..d5efbea4f 100644
--- a/srsue/src/mac/proc_ra.cc
+++ b/srsue/src/mac/proc_ra.cc
@@ -33,9 +33,9 @@
 #include <stdint.h>
 #include <signal.h>
 
-#include "mac/proc_ra.h"
-#include "mac/mac.h"
-#include "mac/mux.h"
+#include "srsue/hdr/mac/proc_ra.h"
+#include "srsue/hdr/mac/mac.h"
+#include "srsue/hdr/mac/mux.h"
 
 /* Random access procedure as specified in Section 5.1 of 36.321 */
 
diff --git a/srsue/src/mac/proc_sr.cc b/srsue/src/mac/proc_sr.cc
index cb31a1c6d..57cd8bdd5 100644
--- a/srsue/src/mac/proc_sr.cc
+++ b/srsue/src/mac/proc_sr.cc
@@ -29,7 +29,7 @@
 #define Info(fmt, ...)    log_h->info(fmt, ##__VA_ARGS__)
 #define Debug(fmt, ...)   log_h->debug(fmt, ##__VA_ARGS__)
 
-#include "mac/proc_sr.h"
+#include "srsue/hdr/mac/proc_sr.h"
 
 
 namespace srsue {
diff --git a/srsue/src/main.cc b/srsue/src/main.cc
index 30a3e3b00..a30892cc7 100644
--- a/srsue/src/main.cc
+++ b/srsue/src/main.cc
@@ -36,10 +36,10 @@
 #include <boost/program_options.hpp>
 #include <boost/program_options/parsers.hpp>
 
-#include "ue.h"
+#include "srsue/hdr/ue.h"
 #include "srslte/srslte.h"
-#include "metrics_stdout.h"
-#include "metrics_csv.h"
+#include "srsue/hdr/metrics_stdout.h"
+#include "srsue/hdr/metrics_csv.h"
 #include "srslte/common/metrics_hub.h"
 #include "srslte/version.h"
 
diff --git a/srsue/src/metrics_csv.cc b/srsue/src/metrics_csv.cc
index 54702dc26..360c678f5 100644
--- a/srsue/src/metrics_csv.cc
+++ b/srsue/src/metrics_csv.cc
@@ -25,7 +25,7 @@
  *
  */
 
-#include "metrics_csv.h"
+#include "srsue/hdr/metrics_csv.h"
 
 #include <unistd.h>
 #include <sstream>
diff --git a/srsue/src/metrics_stdout.cc b/srsue/src/metrics_stdout.cc
index c8f373284..5d33f967d 100644
--- a/srsue/src/metrics_stdout.cc
+++ b/srsue/src/metrics_stdout.cc
@@ -25,7 +25,7 @@
  *
  */
 
-#include "metrics_stdout.h"
+#include "srsue/hdr/metrics_stdout.h"
 
 #include <unistd.h>
 #include <sstream>
diff --git a/srsue/src/phy/phch_common.cc b/srsue/src/phy/phch_common.cc
index 3c3cf1641..13cca2ec8 100644
--- a/srsue/src/phy/phch_common.cc
+++ b/srsue/src/phy/phch_common.cc
@@ -27,7 +27,7 @@
 #include <assert.h>
 #include <string.h>
 #include "srslte/srslte.h"
-#include "phy/phch_common.h"
+#include "srsue/hdr/phy/phch_common.h"
 
 #define Error(fmt, ...)   if (SRSLTE_DEBUG_ENABLED) log_h->error(fmt, ##__VA_ARGS__)
 #define Warning(fmt, ...) if (SRSLTE_DEBUG_ENABLED) log_h->warning(fmt, ##__VA_ARGS__)
diff --git a/srsue/src/phy/phch_recv.cc b/srsue/src/phy/phch_recv.cc
index 49b0af307..01e63cecd 100644
--- a/srsue/src/phy/phch_recv.cc
+++ b/srsue/src/phy/phch_recv.cc
@@ -28,8 +28,8 @@
 #include <algorithm>
 #include "srslte/srslte.h"
 #include "srslte/common/log.h"
-#include "phy/phch_worker.h"
-#include "phy/phch_recv.h"
+#include "srsue/hdr/phy/phch_worker.h"
+#include "srsue/hdr/phy/phch_recv.h"
 
 #define Error(fmt, ...)   if (SRSLTE_DEBUG_ENABLED) log_h->error(fmt, ##__VA_ARGS__)
 #define Warning(fmt, ...) if (SRSLTE_DEBUG_ENABLED) log_h->warning(fmt, ##__VA_ARGS__)
diff --git a/srsue/src/phy/phch_worker.cc b/srsue/src/phy/phch_worker.cc
index 47fdb9591..7ac2ed040 100644
--- a/srsue/src/phy/phch_worker.cc
+++ b/srsue/src/phy/phch_worker.cc
@@ -26,7 +26,7 @@
 
 #include <unistd.h>
 #include <string.h>
-#include "phy/phch_worker.h"
+#include "srsue/hdr/phy/phch_worker.h"
 #include "srslte/srslte.h"
 #include "srslte/interfaces/ue_interfaces.h"
 #include "srslte/asn1/liblte_rrc.h"
diff --git a/srsue/src/phy/phy.cc b/srsue/src/phy/phy.cc
index 27b389a4e..90dbc2833 100644
--- a/srsue/src/phy/phy.cc
+++ b/srsue/src/phy/phy.cc
@@ -36,7 +36,7 @@
 
 #include "srslte/common/threads.h"
 #include "srslte/common/log.h"
-#include "phy/phy.h"
+#include "srsue/hdr/phy/phy.h"
 
 #define Error(fmt, ...)   if (SRSLTE_DEBUG_ENABLED) log_h->error(fmt, ##__VA_ARGS__)
 #define Warning(fmt, ...) if (SRSLTE_DEBUG_ENABLED) log_h->warning(fmt, ##__VA_ARGS__)
diff --git a/srsue/src/phy/prach.cc b/srsue/src/phy/prach.cc
index a1bf96c85..5025e6b5d 100644
--- a/srsue/src/phy/prach.cc
+++ b/srsue/src/phy/prach.cc
@@ -30,8 +30,8 @@
 
 #include "srslte/srslte.h"
 #include "srslte/common/log.h"
-#include "phy/prach.h"
-#include "phy/phy.h"
+#include "srsue/hdr/phy/prach.h"
+#include "srsue/hdr/phy/phy.h"
 #include "srslte/interfaces/ue_interfaces.h"
 
 #define Error(fmt, ...)   if (SRSLTE_DEBUG_ENABLED) log_h->error(fmt, ##__VA_ARGS__)
diff --git a/srsue/src/ue.cc b/srsue/src/ue.cc
index ca8c9002b..fe59bee91 100644
--- a/srsue/src/ue.cc
+++ b/srsue/src/ue.cc
@@ -25,7 +25,7 @@
  */
 
 
-#include "ue.h"
+#include "srsue/hdr/ue.h"
 #include "srslte/srslte.h"
 #include <pthread.h>
 #include <iostream>
diff --git a/srsue/src/ue_base.cc b/srsue/src/ue_base.cc
index 71430fc9f..c4b4a2a52 100644
--- a/srsue/src/ue_base.cc
+++ b/srsue/src/ue_base.cc
@@ -24,8 +24,8 @@
  *
  */
 
-#include "ue_base.h"
-#include "ue.h"
+#include "srsue/hdr/ue_base.h"
+#include "srsue/hdr/ue.h"
 #include "srslte/srslte.h"
 #include "srslte/build_info.h"
 #include <pthread.h>
diff --git a/srsue/src/upper/gw.cc b/srsue/src/upper/gw.cc
index fbf4bca9f..34db4a226 100644
--- a/srsue/src/upper/gw.cc
+++ b/srsue/src/upper/gw.cc
@@ -25,7 +25,7 @@
  */
 
 
-#include "../../hdr/upper/gw.h"
+#include "srsue/hdr/upper/gw.h"
 
 #include <errno.h>
 #include <unistd.h>
diff --git a/srsue/src/upper/nas.cc b/srsue/src/upper/nas.cc
index 5b7f40920..882f1d977 100644
--- a/srsue/src/upper/nas.cc
+++ b/srsue/src/upper/nas.cc
@@ -31,7 +31,7 @@
 #include <fstream>
 #include <sstream>
 #include "srslte/asn1/liblte_rrc.h"
-#include "upper/nas.h"
+#include "srsue/hdr/upper/nas.h"
 #include "srslte/common/security.h"
 #include "srslte/common/bcd_helpers.h"
 
diff --git a/srsue/src/upper/rrc.cc b/srsue/src/upper/rrc.cc
index 53e85fac8..05286e05c 100644
--- a/srsue/src/upper/rrc.cc
+++ b/srsue/src/upper/rrc.cc
@@ -32,7 +32,7 @@
 #include <time.h>
 #include <inttypes.h> // for printing uint64_t
 #include <srslte/asn1/liblte_rrc.h>
-#include "upper/rrc.h"
+#include "srsue/hdr/upper/rrc.h"
 #include "srslte/asn1/liblte_rrc.h"
 #include "srslte/common/security.h"
 #include "srslte/common/bcd_helpers.h"
diff --git a/srsue/src/upper/usim.cc b/srsue/src/upper/usim.cc
index d344734ba..ca9075edb 100644
--- a/srsue/src/upper/usim.cc
+++ b/srsue/src/upper/usim.cc
@@ -26,7 +26,7 @@
 
 
 #include <sstream>
-#include "upper/usim.h"
+#include "srsue/hdr/upper/usim.h"
 #include "srslte/common/bcd_helpers.h"
 
 using namespace srslte;
diff --git a/srsue/test/mac/mac_test.cc b/srsue/test/mac/mac_test.cc
index 3d21720d4..820c4617e 100644
--- a/srsue/test/mac/mac_test.cc
+++ b/srsue/test/mac/mac_test.cc
@@ -30,10 +30,10 @@
 
 #include "srslte/asn1/liblte_rrc.h"
 #include "srslte/radio/radio_multi.h"
-#include "phy/phy.h"
+#include "srsue/hdr/phy/phy.h"
 #include "srslte/interfaces/ue_interfaces.h"
 #include "srslte/common/log_filter.h"
-#include "mac/mac.h"
+#include "srsue/hdr/mac/mac.h"
 #include "srslte/common/mac_pcap.h"
 
 
diff --git a/srsue/test/metrics_test.cc b/srsue/test/metrics_test.cc
index 52a5f98f9..4a23a55cf 100644
--- a/srsue/test/metrics_test.cc
+++ b/srsue/test/metrics_test.cc
@@ -29,10 +29,10 @@
 #include <stdlib.h>
 #include <strings.h>
 #include <unistd.h>
-#include "ue_metrics_interface.h"
+#include "srsue/hdr/ue_metrics_interface.h"
 #include "srslte/common/metrics_hub.h"
-#include "metrics_stdout.h"
-#include "metrics_csv.h"
+#include "srsue/hdr/metrics_stdout.h"
+#include "srsue/hdr/metrics_csv.h"
 
 using namespace srsue;
 
diff --git a/srsue/test/phy/ue_itf_test_prach.cc b/srsue/test/phy/ue_itf_test_prach.cc
index 810278c7c..e161139f9 100644
--- a/srsue/test/phy/ue_itf_test_prach.cc
+++ b/srsue/test/phy/ue_itf_test_prach.cc
@@ -27,7 +27,7 @@
 #include <unistd.h>
 
 #include "srslte/phy/utils/debug.h"
-#include "phy/phy.h"
+#include "srsue/hdr/phy/phy.h"
 #include "srslte/interfaces/ue_interfaces.h"
 #include "srslte/common/log_filter.h"
 #include "srslte/radio/radio_multi.h"
diff --git a/srsue/test/phy/ue_itf_test_sib1.cc b/srsue/test/phy/ue_itf_test_sib1.cc
index 23f8566be..f302fd7aa 100644
--- a/srsue/test/phy/ue_itf_test_sib1.cc
+++ b/srsue/test/phy/ue_itf_test_sib1.cc
@@ -27,7 +27,7 @@
 #include <unistd.h>
 
 #include "srslte/phy/utils/debug.h"
-#include "phy/phy.h"
+#include "srsue/hdr/phy/phy.h"
 #include "srslte/common/log_filter.h"
 #include "srslte/interfaces/ue_interfaces.h"
 #include "srslte/radio/radio_multi.h"
diff --git a/srsue/test/upper/ip_test.cc b/srsue/test/upper/ip_test.cc
index afed88ebc..a4f9743cc 100644
--- a/srsue/test/upper/ip_test.cc
+++ b/srsue/test/upper/ip_test.cc
@@ -16,15 +16,15 @@
 #include <assert.h>
 
 #include "srslte/phy/utils/debug.h"
-#include "mac/mac.h"
-#include "phy/phy.h"
+#include "srsue/hdr/mac/mac.h"
+#include "srsue/hdr/phy/phy.h"
 #include "srslte/common/threads.h"
 #include "srslte/common/common.h"
 #include "srslte/common/buffer_pool.h"
 #include "srslte/common/logger_file.h"
 #include "srslte/common/log_filter.h"
 #include "srslte/upper/rlc.h"
-#include "upper/rrc.h"
+#include "srsue/hdr/upper/rrc.h"
 #include "srslte/radio/radio_multi.h"
 
 #define START_TUNTAP
diff --git a/srsue/test/upper/nas_test.cc b/srsue/test/upper/nas_test.cc
index 2fb3efe95..51fc9f83b 100644
--- a/srsue/test/upper/nas_test.cc
+++ b/srsue/test/upper/nas_test.cc
@@ -26,11 +26,11 @@
 
 #include <iostream>
 #include <assert.h>
-#include "upper/usim.h"
-#include "upper/nas.h"
+#include "srsue/hdr/upper/usim.h"
+#include "srsue/hdr/upper/nas.h"
 #include "srslte/upper/rlc.h"
-#include "upper/rrc.h"
-#include "mac/mac.h"
+#include "srsue/hdr/upper/rrc.h"
+#include "srsue/hdr/mac/mac.h"
 #include "srslte/common/log_filter.h"
 #include "srslte/upper/pdcp_entity.h"
 #include "srslte/upper/pdcp.h"
diff --git a/srsue/test/upper/usim_test.cc b/srsue/test/upper/usim_test.cc
index bf60e124c..225bee36d 100644
--- a/srsue/test/upper/usim_test.cc
+++ b/srsue/test/upper/usim_test.cc
@@ -25,7 +25,7 @@
  */
 
 #include <iostream>
-#include "upper/usim.h"
+#include "srsue/hdr/upper/usim.h"
 #include "srslte/common/log_filter.h"
 #include <assert.h>