Change include path absolut to project dir

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 {
   

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(

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 {
   

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 {
   

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 {
   

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
 

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"

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 {
     

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"

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 {

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 {
 

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"

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 {
 

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 {

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 {

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
 

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__)

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__)

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__)

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__)

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__)

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;

srsenb/src/metrics_stdout.cc

@@ -24,7 +24,7 @@
  *
  */
 
-#include "metrics_stdout.h"
+#include "srsenb/hdr/metrics_stdout.h"
 
 #include <unistd.h>
 #include <sstream>

srsenb/src/parser.cc

@@ -24,7 +24,7 @@
  *
  */
 
-#include "parser.h"
+#include "srsenb/hdr/parser.h"
 #include <iostream>
 
 namespace srsenb {

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>
 

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__)

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__)

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 {
 

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__)

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>

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 {
   

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 {
   

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;

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>

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"

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"

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()

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(

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
 {
 

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{
 

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{

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{

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{
 

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;

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;

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{
 

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{
 

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"
 

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"
 
 

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{
 

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"
 

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{

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(

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"

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"

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 */   
 

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"
 

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"

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 {

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 {

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
 

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"

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 {

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"
 
 

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>

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 {

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"
 
 

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 */
 

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 {

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"
 

srsue/src/metrics_csv.cc

@@ -25,7 +25,7 @@
  *
  */
 
-#include "metrics_csv.h"
+#include "srsue/hdr/metrics_csv.h"
 
 #include <unistd.h>
 #include <sstream>

srsue/src/metrics_stdout.cc

@@ -25,7 +25,7 @@
  *
  */
 
-#include "metrics_stdout.h"
+#include "srsue/hdr/metrics_stdout.h"
 
 #include <unistd.h>
 #include <sstream>

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__)

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__)

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"

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__)

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__)

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>

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>

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>

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"
 

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"

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;

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"
 
 

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;
 

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"

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"

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

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"

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>