Merge pull request #159 from pily112/include_guards_unify

Include guards unify
7 years ago · 77894ff7ef
parent 2351ced98b 06d4559294
commit 77894ff7ef
274 changed files with 806 additions and 799 deletions
--- a/lib/include/srslte/asn1/gtpc.h
+++ b/lib/include/srslte/asn1/gtpc.h
@ -21,8 +21,8 @@
 * and at http://www.gnu.org/licenses/.
 *
 */
-#ifndef GTPC_V2_H
-#define GTPC_V2_H
+#ifndef SRSLTE_GTPC_H
+#define SRSLTE_GTPC_H

 #include <stdint.h>
 #include "srslte/asn1/gtpc_msg.h"
@ -94,4 +94,4 @@ typedef struct gtpc_pdu
  union gtpc_msg_choice choice;
 }gtpc_pdu_t;
 }//namespace
-#endif
+#endif // SRSLTE_GTPC_H
--- a/lib/include/srslte/asn1/gtpc_ies.h
+++ b/lib/include/srslte/asn1/gtpc_ies.h
@ -22,8 +22,8 @@
 *
 */

-#ifndef GTPC_IES_H
-#define GTPC_IES_H
+#ifndef SRSLTE_GTPC_IES_H
+#define SRSLTE_GTPC_IES_H

 #include "srslte/phy/io/netsource.h"

@ -426,4 +426,4 @@ typedef struct gtpc_f_teid_ie
 //locally, according to the rules of  TS 29.274 v10.14.0 Section 7.

 } //namespace
-#endif //GTPC_IES_H
+#endif // SRSLTE_GTPC_IES_H
--- a/lib/include/srslte/asn1/gtpc_msg.h
+++ b/lib/include/srslte/asn1/gtpc_msg.h
@ -21,8 +21,8 @@
 * and at http://www.gnu.org/licenses/.
 *
 */
-#ifndef GTPC_V2_MSG_H
-#define GTPC_V2_MSG_H
+#ifndef SRSLTE_GTPC_MSG_H
+#define SRSLTE_GTPC_MSG_H

 #include "srslte/asn1/gtpc_ies.h"

@ -442,4 +442,4 @@ struct gtpc_release_access_bearers_request


 } //namespace
-#endif //GTPC_V2_MSG_H
+#endif // SRSLTE_GTPC_MSG_H
--- a/lib/include/srslte/asn1/liblte_common.h
+++ b/lib/include/srslte/asn1/liblte_common.h
@ -33,8 +33,8 @@

 *******************************************************************************/

-#ifndef __LIBLTE_COMMON_H__
-#define __LIBLTE_COMMON_H__
+#ifndef SRSLTE_LIBLTE_COMMON_H
+#define SRSLTE_LIBLTE_COMMON_H

 /*******************************************************************************
                              INCLUDES
@ -244,4 +244,4 @@ void liblte_align_up(uint8_t **ptr, uint32_t align);
 *********************************************************************/
 void liblte_align_up_zero(uint8_t **ptr, uint32_t align);

-#endif /* __LIBLTE_COMMON_H__ */
+#endif // SRSLTE_LIBLTE_COMMON_H
--- a/lib/include/srslte/asn1/liblte_mme.h
+++ b/lib/include/srslte/asn1/liblte_mme.h
@ -35,8 +35,8 @@

 *******************************************************************************/

-#ifndef __LIBLTE_MME_H__
-#define __LIBLTE_MME_H__
+#ifndef SRSLTE_LIBLTE_MME_H
+#define SRSLTE_LIBLTE_MME_H

 /*******************************************************************************
                              INCLUDES
@ -4038,4 +4038,4 @@ LIBLTE_ERROR_ENUM liblte_mme_pack_pdn_disconnect_request_msg(LIBLTE_MME_PDN_DISC
 LIBLTE_ERROR_ENUM liblte_mme_unpack_pdn_disconnect_request_msg(LIBLTE_BYTE_MSG_STRUCT                       *msg,
                                                               LIBLTE_MME_PDN_DISCONNECT_REQUEST_MSG_STRUCT *pdn_discon_req);

-#endif /* __LIBLTE_MME_H__ */
+#endif // SRSLTE_LIBLTE_MME_H
--- a/lib/include/srslte/asn1/liblte_rrc.h
+++ b/lib/include/srslte/asn1/liblte_rrc.h
@ -51,8 +51,8 @@

 *******************************************************************************/

-#ifndef __LIBLTE_RRC_H__
-#define __LIBLTE_RRC_H__
+#ifndef SRSLTE_LIBLTE_RRC_H
+#define SRSLTE_LIBLTE_RRC_H

 /*******************************************************************************
                              INCLUDES
@ -7013,4 +7013,4 @@ LIBLTE_ERROR_ENUM liblte_rrc_pack_ul_dcch_msg(LIBLTE_RRC_UL_DCCH_MSG_STRUCT *ul_
 LIBLTE_ERROR_ENUM liblte_rrc_unpack_ul_dcch_msg(LIBLTE_BIT_MSG_STRUCT         *msg,
                                                LIBLTE_RRC_UL_DCCH_MSG_STRUCT *ul_dcch_msg);

-#endif /* __LIBLTE_RRC_H__ */
+#endif // SRSLTE_LIBLTE_RRC_H
--- a/lib/include/srslte/asn1/liblte_s1ap.h
+++ b/lib/include/srslte/asn1/liblte_s1ap.h
@ -4,8 +4,8 @@
 /*
 ********************************************************************************/

-#ifndef LIBLTE_S1AP_H
-#define LIBLTE_S1AP_H
+#ifndef SRSLTE_LIBLTE_S1AP_H
+#define SRSLTE_LIBLTE_S1AP_H

 /*******************************************************************************
 /* Warnings/Todos
@ -10352,4 +10352,4 @@ LIBLTE_ERROR_ENUM liblte_s1ap_pack_s1ap_pdu(
 LIBLTE_ERROR_ENUM liblte_s1ap_unpack_s1ap_pdu(
  LIBLTE_BYTE_MSG_STRUCT      *msg,
  LIBLTE_S1AP_S1AP_PDU_STRUCT *s1ap_pdu);
-#endif // LIBLTE_S1AP_H
+#endif // SRSLTE_LIBLTE_S1AP_H
--- a/lib/include/srslte/build_info.h.in
+++ b/lib/include/srslte/build_info.h.in
@ -25,8 +25,8 @@
 *
 */

-#ifndef BUILD_INFO_
-#define BUILD_INFO_
+#ifndef SRSLTE_BUILD_INFO_H_IN
+#define SRSLTE_BUILD_INFO_H_IN

 # ifdef __cplusplus
 extern "C" {
--- a/lib/include/srslte/common/bcd_helpers.h
+++ b/lib/include/srslte/common/bcd_helpers.h
@ -24,8 +24,8 @@
 *
 */

-#ifndef BCD_HELPERS
-#define BCD_HELPERS
+#ifndef SRSLTE_BCD_HELPERS_H
+#define SRSLTE_BCD_HELPERS_H

 #include <ctype.h>
 #include <stdint.h>
@ -194,4 +194,4 @@ inline void s1ap_mccmnc_to_plmn(uint16_t mcc, uint16_t mnc, uint32_t *plmn)

 } // namespace srslte

-#endif // BCD_HELPERS
+#endif // SRSLTE_BCD_HELPERS_H
--- a/lib/include/srslte/common/block_queue.h
+++ b/lib/include/srslte/common/block_queue.h
@ -24,8 +24,8 @@
 *
 */

-#ifndef BLOCK_QUEUE
-#define BLOCK_QUEUE
+#ifndef SRSLTE_BLOCK_QUEUE_H
+#define SRSLTE_BLOCK_QUEUE_H

 #include <queue>
 #include <memory>
@ -94,4 +94,4 @@ private:

 }

-#endif
+#endif // SRSLTE_BLOCK_QUEUE_H
--- a/lib/include/srslte/common/buffer_pool.h
+++ b/lib/include/srslte/common/buffer_pool.h
@ -24,8 +24,8 @@
 *
 */

-#ifndef BUFFER_POOL_H
-#define BUFFER_POOL_H
+#ifndef SRSLTE_BUFFER_POOL_H
+#define SRSLTE_BUFFER_POOL_H

 #include <pthread.h>
 #include <vector>
@ -187,4 +187,4 @@ private:

 } // namespace srsue

-#endif // BUFFER_POOL_H
+#endif // SRSLTE_BUFFER_POOL_H
--- a/lib/include/srslte/common/common.h
+++ b/lib/include/srslte/common/common.h
@ -24,8 +24,8 @@
 *
 */

-#ifndef COMMON_H
-#define COMMON_H
+#ifndef SRSLTE_COMMON_H
+#define SRSLTE_COMMON_H

 /*******************************************************************************
                              INCLUDES
@ -239,6 +239,6 @@ private:

 };

-} // namespace srsue
+} // namespace srslte

-#endif // COMMON_H
+#endif // SRSLTE_COMMON_H
--- a/lib/include/srslte/common/config.h
+++ b/lib/include/srslte/common/config.h
@ -24,8 +24,8 @@
 *
 */

-#ifndef CONFIG_H
-#define CONFIG_H
+#ifndef SRSLTE_CONFIG_H
+#define SRSLTE_CONFIG_H

 // Generic helper definitions for shared library support
 #if defined _WIN32 || defined __CYGWIN__
@ -54,4 +54,4 @@
 // cf_t definition
 typedef _Complex float cf_t;

-#endif // CONFIG_H
+#endif // SRSLTE_CONFIG_H
--- a/lib/include/srslte/common/interfaces_common.h
+++ b/lib/include/srslte/common/interfaces_common.h
@ -24,8 +24,8 @@
 *
 */

-#ifndef INTERFACE_COMMON_H
-#define INTERFACE_COMMON_H
+#ifndef SRSLTE_INTERFACES_COMMON_H
+#define SRSLTE_INTERFACES_COMMON_H

 #include "srslte/common/timers.h"
 #include "srslte/common/security.h"
@ -96,4 +96,4 @@ public:

 }

-#endif
+#endif // SRSLTE_INTERFACES_COMMON_H
--- a/lib/include/srslte/common/liblte_security.h
+++ b/lib/include/srslte/common/liblte_security.h
@ -29,8 +29,8 @@

 *******************************************************************************/

-#ifndef __LIBLTE_SECURITY_H__
-#define __LIBLTE_SECURITY_H__
+#ifndef SRSLTE_LIBLTE_SECURITY_H
+#define SRSLTE_LIBLTE_SECURITY_H

 /*******************************************************************************
                              INCLUDES
@ -345,4 +345,4 @@ LIBLTE_ERROR_ENUM liblte_security_milenage_f5_star(uint8 *k,
                                                   uint8 *rand,
                                                   uint8 *ak);

-#endif /* __LIBLTE_SECURITY_H__ */
+#endif // SRSLTE_LIBLTE_SECURITY_H
--- a/lib/include/srslte/common/liblte_ssl.h
+++ b/lib/include/srslte/common/liblte_ssl.h
@ -1,5 +1,5 @@
-#ifndef __LIBLTE_SSL_H__
-#define __LIBLTE_SSL_H__
+#ifndef SRSLTE_LIBLTE_SSL_H
+#define SRSLTE_LIBLTE_SSL_H

 #ifdef HAVE_POLARSSL

@ -62,4 +62,4 @@ void sha256(const unsigned char *key, size_t keylen,

 #endif // HAVE_MBEDTLS

-#endif // __LIBLTE_SSL_H__
+#endif // SRSLTE_LIBLTE_SSL_H
--- a/lib/include/srslte/common/log.h
+++ b/lib/include/srslte/common/log.h
@ -32,8 +32,8 @@
 *  Reference:
 *****************************************************************************/

-#ifndef LOG_H
-#define LOG_H
+#ifndef SRSLTE_LOG_H
+#define SRSLTE_LOG_H

 #include <stdint.h>
 #include <string>
@ -149,5 +149,5 @@ protected:

 } // namespace srslte

-#endif // LOG_H
+#endif // SRSLTE_LOG_H

--- a/lib/include/srslte/common/log_filter.h
+++ b/lib/include/srslte/common/log_filter.h
@ -32,8 +32,8 @@
 *              common logger object.
 *****************************************************************************/

-#ifndef LOG_FILTER_H
-#define LOG_FILTER_H
+#ifndef SRSLTE_LOG_FILTER_H
+#define SRSLTE_LOG_FILTER_H

 #include <stdarg.h>
 #include <string>
@ -98,4 +98,4 @@ private:

 } // namespace srsue

-#endif // LOG_FILTER_H
+#endif // SRSLTE_LOG_FILTER_H
--- a/lib/include/srslte/common/logger.h
+++ b/lib/include/srslte/common/logger.h
@ -29,8 +29,8 @@
 * Description: Interface for logging output
 *****************************************************************************/

-#ifndef LOGGER_H
-#define LOGGER_H
+#ifndef SRSLTE_LOGGER_H
+#define SRSLTE_LOGGER_H

 #include <stdio.h>
 #include <string>
@ -45,4 +45,4 @@ public:

 } // namespace srslte

-#endif // LOGGER_H
+#endif // SRSLTE_LOGGER_H
--- a/lib/include/srslte/common/logger_file.h
+++ b/lib/include/srslte/common/logger_file.h
@ -32,8 +32,8 @@
 *              increase queue size. If empty, consumer blocks.
 *****************************************************************************/

-#ifndef LOGGER_FILE_H
-#define LOGGER_FILE_H
+#ifndef SRSLTE_LOGGER_FILE_H
+#define SRSLTE_LOGGER_FILE_H

 #include <stdio.h>
 #include <deque>
@ -74,6 +74,6 @@ private:
  std::deque<str_ptr> buffer;
 };

-} // namespace srsue
+} // namespace srslte

-#endif // LOGGER_H
+#endif // SRSLTE_LOGGER_FILE_H
--- a/lib/include/srslte/common/logger_stdout.h
+++ b/lib/include/srslte/common/logger_stdout.h
@ -29,8 +29,8 @@
 * Description: Interface for logging output
 *****************************************************************************/

-#ifndef LOGGER_STDOUT_H
-#define LOGGER_STDOUT_H
+#ifndef SRSLTE_LOGGER_STDOUT_H
+#define SRSLTE_LOGGER_STDOUT_H

 #include <stdio.h>
 #include <string>
@ -51,4 +51,4 @@ namespace srslte {

 } // namespace srslte

-#endif // LOGGER_H
+#endif // SRSLTE_LOGGER_STDOUT_H
--- a/lib/include/srslte/common/mac_pcap.h
+++ b/lib/include/srslte/common/mac_pcap.h
@ -24,8 +24,8 @@
 *
 */

-#ifndef MACPCAP_H
-#define MACPCAP_H
+#ifndef SRSLTE_MAC_PCAP_H
+#define SRSLTE_MAC_PCAP_H

 #include <stdint.h>
 #include "srslte/common/pcap.h"
@ -59,6 +59,6 @@ private:
                              uint16_t crnti_, uint8_t direction, uint8_t rnti_type);
 };

-} // namespace srsue
+} // namespace srslte

-#endif // MACPCAP_H
+#endif // SRSLTE_MAC_PCAP_H
--- a/lib/include/srslte/common/metrics_hub.h
+++ b/lib/include/srslte/common/metrics_hub.h
@ -5,8 +5,8 @@
 *              to get metrics 
 *****************************************************************************/

-#ifndef METRICS_HUB_H
-#define METRICS_HUB_H
+#ifndef SRSLTE_METRICS_HUB_H
+#define SRSLTE_METRICS_HUB_H

 #include <vector>
 #include "srslte/common/threads.h"
@ -79,4 +79,4 @@ private:

 } // namespace srslte

-#endif // METRICS_HUB_H
+#endif // SRSLTE_METRICS_HUB_H
--- a/lib/include/srslte/common/msg_queue.h
+++ b/lib/include/srslte/common/msg_queue.h
@ -30,8 +30,8 @@
 *  Reference:
 *****************************************************************************/

-#ifndef MSG_QUEUE_H
-#define MSG_QUEUE_H
+#ifndef SRSLTE_MSG_QUEUE_H
+#define SRSLTE_MSG_QUEUE_H

 #include "srslte/common/common.h"
 #include <pthread.h>
@ -149,7 +149,7 @@ private:
  uint32_t              tail;
 };

-} // namespace srsue
+} // namespace srslte


-#endif // MSG_QUEUE_H
+#endif // SRSLTE_MSG_QUEUE_H
--- a/lib/include/srslte/common/nas_pcap.h
+++ b/lib/include/srslte/common/nas_pcap.h
@ -1,5 +1,5 @@
-#ifndef NAS_PCAP_H
-#define NAS_PCAP_H
+#ifndef SRSLTE_NAS_PCAP_H
+#define SRSLTE_NAS_PCAP_H

 #include "srslte/common/pcap.h"

@ -20,6 +20,6 @@ private:
    void pack_and_write(uint8_t* pdu, uint32_t pdu_len_bytes);
 };

-} //namespace srsue
+} //namespace srslte

-#endif // NAS_PCAP_H
+#endif // SRSLTE_NAS_PCAP_H
--- a/lib/include/srslte/common/pcap.h
+++ b/lib/include/srslte/common/pcap.h
@ -24,8 +24,8 @@
 *
 */

-#ifndef UEPCAP_H
-#define UEPCAP_H
+#ifndef SRSLTE_PCAP_H
+#define SRSLTE_PCAP_H

 #include <stdio.h>
 #include <string.h>
@ -247,4 +247,4 @@ inline int LTE_PCAP_NAS_WritePDU(FILE *fd, NAS_Context_Info_t *context,
    return 1;
 }

-#endif /* UEPCAP_H */
+#endif // SRSLTE_PCAP_H
--- a/lib/include/srslte/common/pdu.h
+++ b/lib/include/srslte/common/pdu.h
@ -24,8 +24,8 @@
 *
 */

-#ifndef MACPDU_H
-#define MACPDU_H
+#ifndef SRSLTE_PDU_H
+#define SRSLTE_PDU_H

 #include <stdint.h>
 #include "srslte/common/log.h"
@ -338,6 +338,6 @@ private:
  uint8_t    backoff_indicator; 
 };

-} // namespace srsue
+} // namespace srslte

-#endif // MACPDU_H
+#endif // SRSLTE_PDU_H
--- a/lib/include/srslte/common/pdu_queue.h
+++ b/lib/include/srslte/common/pdu_queue.h
@ -24,8 +24,8 @@
 *
 */

-#ifndef PDUPROC_H
-#define PDUPROC_H
+#ifndef SRSLTE_PDU_QUEUE_H
+#define SRSLTE_PDU_QUEUE_H

 #include "srslte/common/log.h"
 #include "srslte/common/block_queue.h"
@ -79,7 +79,7 @@ private:

 } // namespace srslte

-#endif // PDUPROC_H
+#endif // SRSLTE_PDU_QUEUE_H



--- a/lib/include/srslte/common/security.h
+++ b/lib/include/srslte/common/security.h
@ -24,8 +24,8 @@
 *
 */

-#ifndef SECURITY_H
-#define SECURITY_H
+#ifndef SRSLTE_SECURITY_H
+#define SRSLTE_SECURITY_H

 /******************************************************************************
 * Common security header - wraps ciphering/integrity check algorithms.
@ -175,6 +175,6 @@ uint8_t security_milenage_f5_star( uint8_t *k,
                                   uint8_t *ak);


-} // namespace srsue
+} // namespace srslte

-#endif // SECURITY_H
+#endif // SRSLTE_SECURITY_H
--- a/lib/include/srslte/common/snow_3g.h
+++ b/lib/include/srslte/common/snow_3g.h
@ -9,6 +9,8 @@
 * and Integrity Algorithms UEA2 & UIA2.
 * Document 2: SNOW 3G Specification"
 *---------------------------------------------------------*/
+#ifndef SRSLTE_SNOW_3G_H
+#define SRSLTE_SNOW_3G_H

 #include <stdio.h>
 #include <stdlib.h>
@ -69,3 +71,4 @@ void snow3g_f8( u8 *key, u32 count, u32 bearer, u32 dir, \
 u8* snow3g_f9( u8* key, u32 count, u32 fresh, u32 dir, \
                 u8 *data, u64 length);

+#endif // SRSLTE_SNOW_3G_H
--- a/lib/include/srslte/common/task_dispatcher.h
+++ b/lib/include/srslte/common/task_dispatcher.h
@ -30,8 +30,8 @@
 *  Reference:
 *****************************************************************************/

-#ifndef TASK_DISPATCHER_H
-#define TASK_DISPATCHER_H
+#ifndef SRSLTE_TASK_DISPATCHER_H
+#define SRSLTE_TASK_DISPATCHER_H

 #include <pthread.h>
 #include <stdint.h>
@ -56,6 +56,6 @@ private:
  bool running;
 };

-} // namespace srsue
+} // namespace srslte
  
-#endif // TASK_DISPATCHER_H
+#endif // SRSLTE_TASK_DISPATCHER_H
--- a/lib/include/srslte/common/thread_pool.h
+++ b/lib/include/srslte/common/thread_pool.h
@ -31,8 +31,8 @@
 *  Reference:
 *****************************************************************************/

-#ifndef THREAD_POOL_H
-#define THREAD_POOL_H
+#ifndef SRSLTE_THREAD_POOL_H
+#define SRSLTE_THREAD_POOL_H

 #include <stdint.h>
 #include <string>
@ -102,4 +102,4 @@ private:
 };
 }
  
-#endif
+#endif // SRSLTE_THREAD_POOL_H
--- a/lib/include/srslte/common/threads.h
+++ b/lib/include/srslte/common/threads.h
@ -24,6 +24,7 @@
 *
 */

+
 #include <pthread.h>
 #include <stdint.h>
 #include <sys/timerfd.h>
@ -46,8 +47,8 @@
 #ifdef __cplusplus
 }
  
-#ifndef THREADS_
-#define THREADS_   
+#ifndef SRSLTE_THREADS_H
+#define SRSLTE_THREADS_H  
  
 class thread
 {
@ -159,7 +160,7 @@ private:



-#endif // THREADS_
+#endif // SRSLTE_THREADS_H

 #endif // __cplusplus

--- a/lib/include/srslte/common/timeout.h
+++ b/lib/include/srslte/common/timeout.h
@ -31,8 +31,8 @@
 *  Reference:
 *****************************************************************************/

-#ifndef TIMEOUT_H
-#define TIMEOUT_H
+#ifndef SRSLTE_TIMEOUT_H
+#define SRSLTE_TIMEOUT_H

 #include <stdint.h>
 #include <pthread.h>
@ -126,6 +126,6 @@ private:
  int duration_msec;
 };

-} // namespace srsue
+} // namespace srslte
  
-#endif // TIMEOUT_H
+#endif // SRSLTE_TIMEOUT_H
--- a/lib/include/srslte/common/timers.h
+++ b/lib/include/srslte/common/timers.h
@ -32,8 +32,8 @@
 *  Reference:
 *****************************************************************************/

-#ifndef TIMERS_H
-#define TIMERS_H
+#ifndef SRSLTE_TIMERS_H
+#define SRSLTE_TIMERS_H

 #include <stdio.h>
 #include <stdint.h>
@ -173,4 +173,4 @@ private:

 } // namespace srslte
  
-#endif // TIMERS_H
+#endif // SRSLTE_TIMERS_H
--- a/lib/include/srslte/common/trace.h
+++ b/lib/include/srslte/common/trace.h
@ -30,8 +30,8 @@
 *  Reference:
 *****************************************************************************/

-#ifndef TRACE_H
-#define TRACE_H
+#ifndef SRSLTE_TRACE_H
+#define SRSLTE_TRACE_H

 #include <stdio.h>
 #include <string>
@ -98,4 +98,4 @@ private:

 } // namespace srslte
  
-#endif // TRACE_H
+#endif // SRSLTE_TRACE_H
--- a/lib/include/srslte/common/tti_sync.h
+++ b/lib/include/srslte/common/tti_sync.h
@ -33,8 +33,8 @@
 *  Reference:
 *****************************************************************************/

-#ifndef TTISYNC_H
-#define TTISYNC_H
+#ifndef SRSLTE_TTI_SYNC_H
+#define SRSLTE_TTI_SYNC_H

 #include <stdint.h>

@ -77,4 +77,4 @@ class tti_sync

 } // namespace srsue

-#endif // TTISYNC_H
+#endif // SRSLTE_TTI_SYNC_H
--- a/lib/include/srslte/common/tti_sync_cv.h
+++ b/lib/include/srslte/common/tti_sync_cv.h
@ -30,8 +30,8 @@
 *  Reference:
 *****************************************************************************/

-#ifndef TTISYNC_CV_H
-#define TTISYNC_CV_H
+#ifndef SRSLTE_TTI_SYNC_CV_H
+#define SRSLTE_TTI_SYNC_CV_H

 #include <pthread.h>
 #include "srslte/common/tti_sync.h"
@ -54,6 +54,6 @@ class tti_sync_cv : public tti_sync
    pthread_mutex_t mutex; 
 }; 

-} // namespace srsue
+} // namespace srslte

-#endif // TTISYNC_CV_H
+#endif // SRSLTE_TTI_SYNC_CV_H
--- a/lib/include/srslte/config.h
+++ b/lib/include/srslte/config.h
@ -24,8 +24,8 @@
 *
 */

-#ifndef CONFIG_H
-#define CONFIG_H
+#ifndef SRSLTE_CONFIG_H
+#define SRSLTE_CONFIG_H

 // Generic helper definitions for shared library support
 #if defined _WIN32 || defined __CYGWIN__
@ -64,4 +64,4 @@ typedef _Complex float cf_t;
 typedef _Complex short int c16_t;
 #endif /* ENABLE_C16 */

-#endif // CONFIG_H
+#endif // SRSLTE_CONFIG_H
--- a/lib/include/srslte/interfaces/enb_interfaces.h
+++ b/lib/include/srslte/interfaces/enb_interfaces.h
@ -36,8 +36,8 @@

 #include <vector>

-#ifndef ENBINTERFACES_H
-#define ENBINTERFACES_H
+#ifndef SRSLTE_ENB_INTERFACES_H
+#define SRSLTE_ENB_INTERFACES_H

 namespace srsenb {

@ -272,4 +272,4 @@ public:

 }

-#endif
+#endif // SRSLTE_ENB_INTERFACES_H
--- a/lib/include/srslte/interfaces/enb_metrics_interface.h
+++ b/lib/include/srslte/interfaces/enb_metrics_interface.h
@ -24,18 +24,18 @@
 *
 */

-#ifndef ENB_METRICS_INTERFACE_H
-#define ENB_METRICS_INTERFACE_H
+#ifndef SRSLTE_ENB_METRICS_INTERFACE_H
+#define SRSLTE_ENB_METRICS_INTERFACE_H

 #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 {
  
@ -64,4 +64,4 @@ public:

 } // namespace srsenb

-#endif // ENB_METRICS_INTERFACE_H
+#endif // SRSLTE_ENB_METRICS_INTERFACE_H
--- a/lib/include/srslte/interfaces/epc_interfaces.h
+++ b/lib/include/srslte/interfaces/epc_interfaces.h
@ -1,5 +1,5 @@
-#ifndef EPC_INTERFACE_H
-#define EPC_INTERFACE_H
+#ifndef SRSLTE_EPC_INTERFACES_H
+#define SRSLTE_EPC_INTERFACES_H

 #include "srslte/srslte.h"

@ -15,4 +15,4 @@ public:
 };

 }
-#endif // ENB_METRICS_INTERFACE_H
+#endif // SRSLTE_EPC_INTERFACES_H
--- a/lib/include/srslte/interfaces/sched_interface.h
+++ b/lib/include/srslte/interfaces/sched_interface.h
@ -26,8 +26,8 @@

 #include "srslte/srslte.h"

-#ifndef SCHED_INTERFACE_H
-#define SCHED_INTERFACE_H
+#ifndef SRSLTE_SCHED_INTERFACE_H
+#define SRSLTE_SCHED_INTERFACE_H

 namespace srsenb {

@ -248,4 +248,4 @@ public:

 }

-#endif
+#endif // SRSLTE_SCHED_INTERFACE_H
--- a/lib/include/srslte/interfaces/ue_interfaces.h
+++ b/lib/include/srslte/interfaces/ue_interfaces.h
@ -30,8 +30,8 @@
 *              to other layers.
 *****************************************************************************/

-#ifndef INTERFACES_H
-#define INTERFACES_H
+#ifndef SRSLTE_UE_INTERFACES_H
+#define SRSLTE_UE_INTERFACES_H

 #include <string>

@ -599,6 +599,6 @@ public:
 };
  

-} // namespace srslte
+} // namespace srsue

-#endif // INTERFACES_H
+#endif // SRSLTE_UE_INTERFACES_H
--- a/lib/include/srslte/phy/agc/agc.h
+++ b/lib/include/srslte/phy/agc/agc.h
@ -33,8 +33,8 @@
 *  Reference:
 *********************************************************************************************/

-#ifndef AGC_
-#define AGC_
+#ifndef SRSLTE_AGC_H
+#define SRSLTE_AGC_H

 #include <stdbool.h>
 #include <stdint.h>
@ -101,4 +101,4 @@ SRSLTE_API void srslte_agc_process(srslte_agc_t *q,
                                   cf_t *signal,
                                   uint32_t len);

-#endif // AGC_
+#endif // SRSLTE_AGC_H
--- a/lib/include/srslte/phy/ch_estimation/chest_common.h
+++ b/lib/include/srslte/phy/ch_estimation/chest_common.h
@ -24,8 +24,8 @@
 *
 */

-#ifndef CHEST_
-#define CHEST_
+#ifndef SRSLTE_CHEST_COMMON_H
+#define SRSLTE_CHEST_COMMON_H

 #include <stdint.h>
 #include "srslte/config.h"
@ -51,5 +51,5 @@ SRSLTE_API float srslte_chest_estimate_noise_pilots(cf_t *noisy,
 SRSLTE_API void srslte_chest_set_triangle_filter(float *fil, 
                                                 int filter_len); 

-#endif
+#endif // SRSLTE_CHEST_COMMON_H

--- a/lib/include/srslte/phy/ch_estimation/chest_dl.h
+++ b/lib/include/srslte/phy/ch_estimation/chest_dl.h
@ -38,8 +38,8 @@
 *  Reference:
 *********************************************************************************************/

-#ifndef CHEST_DL_
-#define CHEST_DL_
+#ifndef SRSLTE_CHEST_DL_H
+#define SRSLTE_CHEST_DL_H

 #include <stdio.h>

@ -193,4 +193,4 @@ SRSLTE_API float srslte_chest_dl_get_rsrp(srslte_chest_dl_t *q);

 SRSLTE_API float srslte_chest_dl_get_rsrp_neighbour(srslte_chest_dl_t *q);

-#endif
+#endif // SRSLTE_CHEST_DL_H
--- a/lib/include/srslte/phy/ch_estimation/chest_ul.h
+++ b/lib/include/srslte/phy/ch_estimation/chest_ul.h
@ -36,8 +36,8 @@
 *  Reference:
 *********************************************************************************************/

-#ifndef CHEST_UL_
-#define CHEST_UL_
+#ifndef SRSLTE_CHEST_UL_H
+#define SRSLTE_CHEST_UL_H

 #include <stdio.h>

@ -118,4 +118,4 @@ SRSLTE_API float srslte_chest_ul_get_noise_estimate(srslte_chest_ul_t *q);
 SRSLTE_API float srslte_chest_ul_get_snr(srslte_chest_ul_t *q);


-#endif
+#endif // SRSLTE_CHEST_UL_H
--- a/lib/include/srslte/phy/ch_estimation/refsignal_dl.h
+++ b/lib/include/srslte/phy/ch_estimation/refsignal_dl.h
@ -32,8 +32,8 @@
 *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.10
 *********************************************************************************************/

-#ifndef SRSLTE_REFSIGNAL_DL_
-#define SRSLTE_REFSIGNAL_DL_
+#ifndef SRSLTE_REFSIGNAL_DL_H
+#define SRSLTE_REFSIGNAL_DL_H

 #include "srslte/config.h"
 #include "srslte/phy/common/phy_common.h"
@ -118,4 +118,4 @@ SRSLTE_API  int srslte_refsignal_mbsfn_gen_seq(srslte_refsignal_t * q,
                                               uint32_t N_mbsfn_id);


-#endif
+#endif // SRSLTE_REFSIGNAL_DL_H
--- a/lib/include/srslte/phy/ch_estimation/refsignal_ul.h
+++ b/lib/include/srslte/phy/ch_estimation/refsignal_ul.h
@ -32,8 +32,8 @@
 *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 5.5
 *********************************************************************************************/

-#ifndef SRSLTE_REFSIGNAL_UL_
-#define SRSLTE_REFSIGNAL_UL_
+#ifndef SRSLTE_REFSIGNAL_UL_H
+#define SRSLTE_REFSIGNAL_UL_H

 #include "srslte/config.h"
 #include "srslte/phy/phch/pucch.h"
@ -209,4 +209,4 @@ SRSLTE_API uint32_t srslte_refsignal_srs_rb_L_cs(uint32_t bw_cfg,

 SRSLTE_API uint32_t srslte_refsignal_srs_M_sc(srslte_refsignal_ul_t *q); 

-#endif
+#endif // SRSLTE_REFSIGNAL_UL_H
--- a/lib/include/srslte/phy/channel/ch_awgn.h
+++ b/lib/include/srslte/phy/channel/ch_awgn.h
@ -37,8 +37,8 @@

 #include "srslte/config.h"

-#ifndef CH_AWGN_
-#define CH_AWGN_
+#ifndef SRSLTE_CH_AWGN_H
+#define SRSLTE_CH_AWGN_H

 SRSLTE_API void srslte_ch_awgn_c(const cf_t* input, 
                                 cf_t* output, 
@ -54,4 +54,4 @@ SRSLTE_API float srslte_ch_awgn_get_variance(float ebno_db,
                                             float rate);


-#endif
+#endif // SRSLTE_CH_AWGN_H
--- a/lib/include/srslte/phy/common/phy_common.h
+++ b/lib/include/srslte/phy/common/phy_common.h
@ -32,8 +32,8 @@
 *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10
 *********************************************************************************************/

-#ifndef _LTEBASE_
-#define _LTEBASE_
+#ifndef SRSLTE_PHY_COMMON_H
+#define SRSLTE_PHY_COMMON_H

 #include <stdio.h>
 #include <stdint.h>
@ -305,4 +305,4 @@ SRSLTE_API char *srslte_mimotype2str(srslte_mimo_type_t mimo_type);
 SRSLTE_API uint32_t srslte_tti_interval(uint32_t tti1,
                                        uint32_t tti2); 

-#endif
+#endif // SRSLTE_PHY_COMMON_H
--- a/lib/include/srslte/phy/common/phy_logger.h
+++ b/lib/include/srslte/phy/common/phy_logger.h
@ -29,8 +29,8 @@
 * Description: Interface for logging output
 *****************************************************************************/

-#ifndef PHY_LOGGER_H
-#define PHY_LOGGER_H
+#ifndef SRSLTE_PHY_LOGGER_H
+#define SRSLTE_PHY_LOGGER_H

 #include <stdio.h>
 #include <stdlib.h>
@ -56,4 +56,4 @@ void srslte_phy_log_register_handler(void *ctx, phy_log_handler_t handler);
 }
 #endif // C++ 

-#endif // LOGGER_H
+#endif // SRSLTE_PHY_LOGGER_H
--- a/lib/include/srslte/phy/common/sequence.h
+++ b/lib/include/srslte/phy/common/sequence.h
@ -33,8 +33,8 @@
 *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 7.2
 *********************************************************************************************/

-#ifndef LTESEQ_
-#define LTESEQ_
+#ifndef SRSLTE_SEQUENCE_H
+#define SRSLTE_SEQUENCE_H

 #include "srslte/config.h"
 #include "srslte/phy/common/phy_common.h"
@ -100,4 +100,4 @@ SRSLTE_API int srslte_sequence_pmch(srslte_sequence_t *seq,
                                    uint32_t mbsfn_id,
                                    uint32_t len);

-#endif
+#endif // SRSLTE_SEQUENCE_H
--- a/lib/include/srslte/phy/common/timestamp.h
+++ b/lib/include/srslte/phy/common/timestamp.h
@ -34,8 +34,8 @@
 *  Reference:
 *********************************************************************************************/

-#ifndef TIMESTAMP_
-#define TIMESTAMP_
+#ifndef SRSLTE_TIMESTAMP_H
+#define SRSLTE_TIMESTAMP_H

 #include <time.h>
 #include <stdint.h>
@ -65,4 +65,4 @@ SRSLTE_API double srslte_timestamp_real(srslte_timestamp_t *t);

 SRSLTE_API uint32_t srslte_timestamp_uint32(srslte_timestamp_t *t);

-#endif // TIMESTAMP_
+#endif // SRSLTE_TIMESTAMP_H
--- a/lib/include/srslte/phy/dft/dft.h
+++ b/lib/include/srslte/phy/dft/dft.h
@ -25,8 +25,8 @@
 */


-#ifndef DFT_H_
-#define DFT_H_
+#ifndef SRSLTE_DFT_H
+#define SRSLTE_DFT_H
 
 #include <stdbool.h>
 #include "srslte/config.h"
@ -157,5 +157,5 @@ SRSLTE_API void srslte_dft_run_r(srslte_dft_plan_t *plan,
                                 const float *in,
                                 float *out);

-#endif // DFT_H_
+#endif // SRSLTE_DFT_H

--- a/lib/include/srslte/phy/dft/dft_precoding.h
+++ b/lib/include/srslte/phy/dft/dft_precoding.h
@ -33,8 +33,8 @@
 *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 5.3.3
 *********************************************************************************************/

-#ifndef DFTPREC_
-#define DFTPREC_
+#ifndef SRSLTE_DFT_PRECODING_H
+#define SRSLTE_DFT_PRECODING_H

 #include "srslte/config.h"
 #include "srslte/phy/common/phy_common.h"
@ -68,4 +68,4 @@ SRSLTE_API int srslte_dft_precoding(srslte_dft_precoding_t *q,
                                    uint32_t nof_prb, 
                                    uint32_t nof_symbols);

-#endif
+#endif // SRSLTE_DFT_PRECODING_H
--- a/lib/include/srslte/phy/dft/ofdm.h
+++ b/lib/include/srslte/phy/dft/ofdm.h
@ -25,8 +25,8 @@
 */


-#ifndef LTEFFT_
-#define LTEFFT_
+#ifndef SRSLTE_OFDM_H
+#define SRSLTE_OFDM_H

 /**********************************************************************************************
 *  File:         ofdm.h
@ -158,4 +158,4 @@ SRSLTE_API void srslte_ofdm_set_non_mbsfn_region(srslte_ofdm_t *q,
                                               uint8_t non_mbsfn_region);


-#endif
+#endif // SRSLTE_OFDM_H
--- a/lib/include/srslte/phy/enb/enb_dl.h
+++ b/lib/include/srslte/phy/enb/enb_dl.h
@ -35,8 +35,8 @@
 *  Reference:
 *****************************************************************************/

-#ifndef ENBDL_H
-#define ENBDL_H
+#ifndef SRSLTE_ENB_DL_H
+#define SRSLTE_ENB_DL_H

 #include <stdbool.h>

@ -195,4 +195,4 @@ SRSLTE_API void srslte_enb_dl_save_signal(srslte_enb_dl_t *q,
                                          uint16_t rnti,
                                          uint32_t cfi);

-#endif
+#endif // SRSLTE_ENB_DL_H
--- a/lib/include/srslte/phy/enb/enb_ul.h
+++ b/lib/include/srslte/phy/enb/enb_ul.h
@ -35,8 +35,8 @@
 *  Reference:
 *****************************************************************************/

-#ifndef ENBUL_H
-#define ENBUL_H
+#ifndef SRSLTE_ENB_UL_H
+#define SRSLTE_ENB_UL_H

 #include <stdbool.h>

@ -153,4 +153,4 @@ SRSLTE_API int srslte_enb_ul_detect_prach(srslte_enb_ul_t *q,
                                          float *peak2avg);


-#endif
+#endif // SRSLTE_ENB_UL_H
--- a/lib/include/srslte/phy/fec/cbsegm.h
+++ b/lib/include/srslte/phy/fec/cbsegm.h
@ -29,8 +29,8 @@

 #include "srslte/config.h"

-#ifndef CBSEGM_H
-#define CBSEGM_H
+#ifndef SRSLTE_CBSEGM_H
+#define SRSLTE_CBSEGM_H

 #define SRSLTE_NOF_TC_CB_SIZES 188

@ -56,4 +56,4 @@ SRSLTE_API bool srslte_cbsegm_cbsize_isvalid(uint32_t size);

 SRSLTE_API int  srslte_cbsegm_cbindex(uint32_t long_cb);

-#endif
+#endif // SRSLTE_CBSEGM_H
--- a/lib/include/srslte/phy/fec/convcoder.h
+++ b/lib/include/srslte/phy/fec/convcoder.h
@ -34,8 +34,8 @@
 *  Reference:    3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.3.1
 *********************************************************************************************/

-#ifndef CONVCODER_
-#define CONVCODER_
+#ifndef SRSLTE_CONVCODER_H
+#define SRSLTE_CONVCODER_H

 #include <stdbool.h>
 #include "srslte/config.h"
@ -53,4 +53,4 @@ SRSLTE_API int srslte_convcoder_encode(srslte_convcoder_t *q,
                                       uint32_t frame_length);


-#endif
+#endif // SRSLTE_CONVCODER_H
--- a/lib/include/srslte/phy/fec/crc.h
+++ b/lib/include/srslte/phy/fec/crc.h
@ -34,8 +34,8 @@
 *  Reference:    3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.1
 *********************************************************************************************/

-#ifndef CRC_
-#define CRC_
+#ifndef SRSLTE_CRC_H
+#define SRSLTE_CRC_H

 #include "srslte/config.h"
 #include <stdint.h>
@ -73,4 +73,4 @@ SRSLTE_API uint32_t srslte_crc_checksum(srslte_crc_t *h,
                                        uint8_t *data, 
                                        int len);

-#endif
+#endif // SRSLTE_CRC_H
--- a/lib/include/srslte/phy/fec/rm_conv.h
+++ b/lib/include/srslte/phy/fec/rm_conv.h
@ -33,8 +33,8 @@
 *  Reference:    3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.4.2
 *********************************************************************************************/

-#ifndef RM_CONV_
-#define RM_CONV_
+#ifndef SRSLTE_RM_CONV_H
+#define SRSLTE_RM_CONV_H

 #include "srslte/config.h"

@ -63,4 +63,4 @@ SRSLTE_API int srslte_rm_conv_rx_s(int16_t *input,
                                   int16_t *output, 
                                   uint32_t out_len);

-#endif
+#endif // SRSLTE_RM_CONV_H
--- a/lib/include/srslte/phy/fec/rm_turbo.h
+++ b/lib/include/srslte/phy/fec/rm_turbo.h
@ -32,8 +32,8 @@
 *  Reference:    3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.4.1
 *********************************************************************************************/

-#ifndef RM_TURBO_
-#define RM_TURBO_
+#ifndef SRSLTE_RM_TURBO_H
+#define SRSLTE_RM_TURBO_H

 #include "srslte/config.h"

@ -85,4 +85,4 @@ SRSLTE_API int srslte_rm_turbo_rx_lut(int16_t *input,
                                      uint32_t rv_idx); 


-#endif
+#endif // SRSLTE_RM_TURBO_H
--- a/lib/include/srslte/phy/fec/softbuffer.h
+++ b/lib/include/srslte/phy/fec/softbuffer.h
@ -33,8 +33,8 @@
 *  Reference:
 *****************************************************************************/

-#ifndef SOFTBUFFER_
-#define SOFTBUFFER_
+#ifndef SRSLTE_SOFTBUFFER_H
+#define SRSLTE_SOFTBUFFER_H

 #include "srslte/config.h"
 #include "srslte/phy/common/phy_common.h"
@ -82,4 +82,4 @@ SRSLTE_API void srslte_softbuffer_tx_free(srslte_softbuffer_tx_t *p);



-#endif
+#endif // SRSLTE_SOFTBUFFER_H
--- a/lib/include/srslte/phy/fec/tc_interl.h
+++ b/lib/include/srslte/phy/fec/tc_interl.h
@ -32,8 +32,8 @@
 *  Reference:    3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.3.2.3
 *********************************************************************************************/

-#ifndef _TC_INTERL_H
-#define _TC_INTERL_H
+#ifndef SRSLTE_TC_INTERL_H
+#define SRSLTE_TC_INTERL_H

 #include "srslte/config.h"
 #include <stdint.h>
@ -55,4 +55,4 @@ SRSLTE_API int srslte_tc_interl_init(srslte_tc_interl_t *h,

 SRSLTE_API void srslte_tc_interl_free(srslte_tc_interl_t *h);

-#endif
+#endif // SRSLTE_TC_INTERL_H
--- a/lib/include/srslte/phy/fec/turbocoder.h
+++ b/lib/include/srslte/phy/fec/turbocoder.h
@ -35,8 +35,8 @@
 *  Reference:    3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.3.2
 *********************************************************************************************/

-#ifndef TURBOCODER_
-#define TURBOCODER_
+#ifndef SRSLTE_TURBOCODER_H
+#define SRSLTE_TURBOCODER_H

 #include "srslte/config.h"
 #include "srslte/phy/fec/tc_interl.h"
@ -75,5 +75,5 @@ SRSLTE_API int srslte_tcod_encode_lut(srslte_tcod_t *h,

 SRSLTE_API void srslte_tcod_gentable(); 

-#endif
+#endif // SRSLTE_TURBOCODER_H

--- a/lib/include/srslte/phy/fec/turbodecoder.h
+++ b/lib/include/srslte/phy/fec/turbodecoder.h
@ -36,8 +36,8 @@
 *  Reference:    3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.3.2
 *********************************************************************************************/

-#ifndef TURBODECODER_
-#define TURBODECODER_
+#ifndef SRSLTE_TURBODECODER_H
+#define SRSLTE_TURBODECODER_H

 #include "srslte/config.h"
 #include "srslte/phy/fec/tc_interl.h"
@ -117,4 +117,4 @@ SRSLTE_API int srslte_tdec_run_all_par(srslte_tdec_t * h,
                                       uint32_t nof_iterations, 
                                       uint32_t long_cb);

-#endif
+#endif // SRSLTE_TURBODECODER_H
--- a/lib/include/srslte/phy/fec/turbodecoder_gen.h
+++ b/lib/include/srslte/phy/fec/turbodecoder_gen.h
@ -36,8 +36,8 @@
 *  Reference:    3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.3.2
 *********************************************************************************************/

-#ifndef TURBODECODER_GEN_
-#define TURBODECODER_GEN_
+#ifndef SRSLTE_TURBODECODER_GEN_H
+#define SRSLTE_TURBODECODER_GEN_H

 #include "srslte/config.h"
 #include "srslte/phy/fec/tc_interl.h"
@ -96,4 +96,4 @@ SRSLTE_API int srslte_tdec_gen_run_all(srslte_tdec_gen_t * h,
                                   uint32_t nof_iterations, 
                                   uint32_t long_cb);

-#endif
+#endif // SRSLTE_TURBODECODER_GEN_H
--- a/lib/include/srslte/phy/fec/turbodecoder_simd.h
+++ b/lib/include/srslte/phy/fec/turbodecoder_simd.h
@ -36,8 +36,8 @@
 *  Reference:    3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.3.2
 *********************************************************************************************/

-#ifndef TURBODECODER_SSE_
-#define TURBODECODER_SSE_
+#ifndef SRSLTE_TURBODECODER_SIMD_H
+#define SRSLTE_TURBODECODER_SIMD_H

 #include "srslte/config.h"
 #include "srslte/phy/fec/tc_interl.h"
@ -119,4 +119,4 @@ SRSLTE_API int srslte_tdec_simd_run_all(srslte_tdec_simd_t * h,
                                        uint32_t nof_iterations, 
                                        uint32_t long_cb);

-#endif
+#endif // SRSLTE_TURBODECODER_SIMD_H
--- a/lib/include/srslte/phy/fec/turbodecoder_simd_inter.h
+++ b/lib/include/srslte/phy/fec/turbodecoder_simd_inter.h
@ -36,8 +36,8 @@
 *  Reference:    3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.3.2
 *********************************************************************************************/

-#ifndef TURBODECODER_SSE_INTER_
-#define TURBODECODER_SSE_INTER_
+#ifndef SRSLTE_TURBODECODER_SIMD_INTER_H
+#define SRSLTE_TURBODECODER_SIMD_INTER_H


 /** This is an simd inter-frame parallel turbo decoder. Parallizes 8 code-blocks using SSE
@ -116,4 +116,4 @@ SRSLTE_API int srslte_tdec_simd_inter_run_all(srslte_tdec_simd_inter_t * h,
                                        uint32_t nof_cb,
                                        uint32_t long_cb);

-#endif
+#endif // SRSLTE_TURBODECODER_SIMD_INTER_H
--- a/lib/include/srslte/phy/fec/turbodecoder_sse.h
+++ b/lib/include/srslte/phy/fec/turbodecoder_sse.h
@ -36,8 +36,8 @@
 *  Reference:    3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.1.3.2
 *********************************************************************************************/

-#ifndef TURBODECODER_SSE_
-#define TURBODECODER_SSE_
+#ifndef SRSLTE_TURBODECODER_SSE_
+#define SRSLTE_TURBODECODER_SSE_

 #include "srslte/config.h"
 #include "srslte/phy/fec/tc_interl.h"
@ -98,4 +98,4 @@ SRSLTE_API int srslte_tdec_sse_run_all(srslte_tdec_sse_t * h,
                                   uint32_t nof_iterations, 
                                   uint32_t long_cb);

-#endif
+#endif // SRSLTE_TURBODECODER_SSE_
--- a/lib/include/srslte/phy/fec/viterbi.h
+++ b/lib/include/srslte/phy/fec/viterbi.h
@ -33,8 +33,8 @@
 *  Reference:
 *****************************************************************************/

-#ifndef VITERBI_
-#define VITERBI_
+#ifndef SRSLTE_VITERBI_H
+#define SRSLTE_VITERBI_H

 #include <stdbool.h>
 #include "srslte/config.h"
@ -119,4 +119,4 @@ SRSLTE_API int srslte_viterbi_init_avx2(srslte_viterbi_t *q,



-#endif
+#endif // SRSLTE_VITERBI_H
--- a/lib/include/srslte/phy/io/binsource.h
+++ b/lib/include/srslte/phy/io/binsource.h
@ -32,8 +32,8 @@
 *  Reference:
 *****************************************************************************/

-#ifndef BINSOURCE_
-#define BINSOURCE_
+#ifndef SRSLTE_BINSOURCE_H
+#define SRSLTE_BINSOURCE_H


 #include <stdint.h>
@ -68,4 +68,4 @@ SRSLTE_API int srslte_binsource_generate(srslte_binsource_t* q,
                                         uint8_t *bits, 
                                         int nbits);

-#endif // BINSOURCE_
+#endif // SRSLTE_BINSOURCE_H
--- a/lib/include/srslte/phy/io/filesink.h
+++ b/lib/include/srslte/phy/io/filesink.h
@ -34,8 +34,8 @@
 *  Reference:
 *****************************************************************************/

-#ifndef FILESINK_
-#define FILESINK_
+#ifndef SRSLTE_FILESINK_H
+#define SRSLTE_FILESINK_H

 #include <stdint.h>
 #include <stdlib.h>
@ -64,4 +64,4 @@ SRSLTE_API int srslte_filesink_write_multi(srslte_filesink_t *q,
                                           int nsamples,
                                           int nchannels);

-#endif // FILESINK_
+#endif // SRSLTE_FILESINK_H
--- a/lib/include/srslte/phy/io/filesource.h
+++ b/lib/include/srslte/phy/io/filesource.h
@ -34,8 +34,8 @@
 *  Reference:
 *****************************************************************************/

-#ifndef FILESOURCE_
-#define FILESOURCE_
+#ifndef SRSLTE_FILESOURCE_H
+#define SRSLTE_FILESOURCE_H

 #include <stdint.h>
 #include <stdlib.h>
@ -67,4 +67,4 @@ SRSLTE_API int srslte_filesource_read_multi(srslte_filesource_t *q,
                                            int nsamples,
                                            int nof_channels);

-#endif // FILESOURCE_
+#endif // SRSLTE_FILESOURCE_H
--- a/lib/include/srslte/phy/io/format.h
+++ b/lib/include/srslte/phy/io/format.h
@ -25,8 +25,8 @@
 */


-#ifndef FORMAT_
-#define FORMAT_
+#ifndef SRSLTE_FORMAT_H
+#define SRSLTE_FORMAT_H

 typedef enum { 
  SRSLTE_FLOAT, 
@ -37,4 +37,4 @@ typedef enum {
  SRSLTE_COMPLEX_SHORT_BIN  
 } srslte_datatype_t;

-#endif // FORMAT_
+#endif // SRSLTE_FORMAT_H
--- a/lib/include/srslte/phy/io/netsink.h
+++ b/lib/include/srslte/phy/io/netsink.h
@ -33,8 +33,8 @@
 *  Reference:
 *****************************************************************************/

-#ifndef NETSINK_
-#define NETSINK_
+#ifndef SRSLTE_NETSINK_H
+#define SRSLTE_NETSINK_H

 #include <sys/socket.h>
 #include <netinet/in.h>
@ -71,4 +71,4 @@ SRSLTE_API int srslte_netsink_write(srslte_netsink_t *q,

 SRSLTE_API int srslte_netsink_set_nonblocking(srslte_netsink_t *q); 

-#endif // UDPSINK_
+#endif // SRSLTE_NETSINK_H
--- a/lib/include/srslte/phy/io/netsource.h
+++ b/lib/include/srslte/phy/io/netsource.h
@ -33,8 +33,8 @@
 *  Reference:
 *****************************************************************************/

-#ifndef NETSOURCE_
-#define NETSOURCE_
+#ifndef SRSLTE_NETSOURCE_H
+#define SRSLTE_NETSOURCE_H

 #include <stdbool.h>
 #include <sys/socket.h>
@ -75,4 +75,4 @@ SRSLTE_API int srslte_netsource_read(srslte_netsource_t *q,
 SRSLTE_API int srslte_netsource_set_timeout(srslte_netsource_t *q, 
                                            uint32_t microseconds); 

-#endif // UDPSOURCE_
+#endif // SRSLTE_NETSOURCE_H
--- a/lib/include/srslte/phy/mimo/layermap.h
+++ b/lib/include/srslte/phy/mimo/layermap.h
@ -34,8 +34,8 @@
 *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.3.3
 *****************************************************************************/

-#ifndef LAYERMAP_H_
-#define LAYERMAP_H_
+#ifndef SRSLTE_LAYERMAP_H
+#define SRSLTE_LAYERMAP_H

 #include "srslte/config.h"
 #include "srslte/phy/common/phy_common.h"
@ -91,4 +91,4 @@ SRSLTE_API int srslte_layerdemap_type(cf_t *x[SRSLTE_MAX_LAYERS],
                                      int nof_symbols[SRSLTE_MAX_CODEWORDS], 
                                      srslte_mimo_type_t type);

-#endif // LAYERMAP_H_
+#endif // SRSLTE_LAYERMAP_H
--- a/lib/include/srslte/phy/mimo/precoding.h
+++ b/lib/include/srslte/phy/mimo/precoding.h
@ -33,8 +33,8 @@
 *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.3.4
 *****************************************************************************/

-#ifndef PRECODING_H_
-#define PRECODING_H_
+#ifndef SRSLTE_PRECODING_H
+#define SRSLTE_PRECODING_H

 #include "srslte/config.h"
 #include "srslte/phy/common/phy_common.h"
@ -137,4 +137,4 @@ SRSLTE_API int srslte_precoding_cn(cf_t *h[SRSLTE_MAX_PORTS][SRSLTE_MAX_PORTS],
                                   float *cn);


-#endif /* PRECODING_H_ */
+#endif // SRSLTE_PRECODING_H
--- a/lib/include/srslte/phy/modem/demod_hard.h
+++ b/lib/include/srslte/phy/modem/demod_hard.h
@ -33,8 +33,8 @@
 *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 7.1
 *****************************************************************************/

-#ifndef DEMOD_HARD_
-#define DEMOD_HARD_
+#ifndef SRSLTE_DEMOD_HARD_H
+#define SRSLTE_DEMOD_HARD_H

 #include <complex.h>
 #include <stdint.h>
@ -57,4 +57,4 @@ SRSLTE_API int srslte_demod_hard_demodulate(srslte_demod_hard_t* q,
                                            uint8_t *bits, 
                                            uint32_t nsymbols);

-#endif // DEMOD_HARD_
+#endif // SRSLTE_DEMOD_HARD_H
--- a/lib/include/srslte/phy/modem/demod_soft.h
+++ b/lib/include/srslte/phy/modem/demod_soft.h
@ -33,8 +33,8 @@
 *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 7.1
 *****************************************************************************/

-#ifndef DEMOD_SOFT_
-#define DEMOD_SOFT_
+#ifndef SRSLTE_DEMOD_SOFT_H
+#define SRSLTE_DEMOD_SOFT_H

 #include <complex.h>
 #include <stdint.h>
@ -53,4 +53,4 @@ SRSLTE_API int srslte_demod_soft_demodulate_s(srslte_mod_t modulation,
                                              short* llr, 
                                              int nsymbols); 

-#endif // DEMOD_SOFT_
+#endif // SRSLTE_DEMOD_SOFT_H
--- a/lib/include/srslte/phy/modem/mod.h
+++ b/lib/include/srslte/phy/modem/mod.h
@ -33,8 +33,8 @@
 *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 7.1
 *****************************************************************************/

-#ifndef MOD_
-#define MOD_
+#ifndef SRSLTE_MOD_H
+#define SRSLTE_MOD_H

 #include <complex.h>
 #include <stdint.h>
@ -52,4 +52,4 @@ SRSLTE_API int srslte_mod_modulate_bytes(srslte_modem_table_t* q,
                                         cf_t* symbols, 
                                         uint32_t nbits); 

-#endif // MOD_
+#endif // SRSLTE_MOD_H
--- a/lib/include/srslte/phy/modem/modem_table.h
+++ b/lib/include/srslte/phy/modem/modem_table.h
@ -33,8 +33,8 @@
 *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 7.1
 *****************************************************************************/

-#ifndef MODEM_TABLE_
-#define MODEM_TABLE_
+#ifndef SRSLTE_MODEM_TABLE_H
+#define SRSLTE_MODEM_TABLE_H

 #include <stdbool.h>
 #include <complex.h>
@ -83,4 +83,4 @@ SRSLTE_API int srslte_modem_table_lte(srslte_modem_table_t* q,

 SRSLTE_API void srslte_modem_table_bytes(srslte_modem_table_t* q); 

-#endif // MODEM_TABLE_
+#endif // SRSLTE_MODEM_TABLE_H
--- a/lib/include/srslte/phy/phch/cqi.h
+++ b/lib/include/srslte/phy/phch/cqi.h
@ -32,8 +32,8 @@
 *  Reference:    3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.2.2.6, 5.2.3.3
 *****************************************************************************/

-#ifndef CQI_
-#define CQI_
+#ifndef SRSLTE_CQI_H
+#define SRSLTE_CQI_H

 #include <stdint.h>

@ -179,4 +179,4 @@ SRSLTE_API int srslte_cqi_hl_get_no_subbands(int num_prbs);

 SRSLTE_API void srslte_cqi_to_str(const uint8_t *cqi_value, int cqi_len, char *str, int str_len);

-#endif // CQI_
+#endif // SRSLTE_CQI_H
--- a/lib/include/srslte/phy/phch/dci.h
+++ b/lib/include/srslte/phy/phch/dci.h
@ -34,8 +34,8 @@
 *  Reference:    3GPP TS 36.212 version 10.0.0 Release 10 Sec. 5.3.3
 *****************************************************************************/

-#ifndef DCI_
-#define DCI_
+#ifndef SRSLTE_DCI_H
+#define SRSLTE_DCI_H

 #include <stdint.h>

--- a/lib/include/srslte/phy/phch/pbch.h
+++ b/lib/include/srslte/phy/phch/pbch.h
@ -34,8 +34,8 @@
 *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.6
 *****************************************************************************/

-#ifndef PBCH_
-#define PBCH_
+#ifndef SRSLTE_PBCH_H
+#define SRSLTE_PBCH_H

 #include "srslte/config.h"
 #include "srslte/phy/common/phy_common.h"
@ -115,4 +115,4 @@ SRSLTE_API void srslte_pbch_mib_pack(srslte_cell_t *cell,
                              uint32_t sfn, 
                              uint8_t *msg);

-#endif // PBCH_
+#endif // SRSLTE_PBCH_H
--- a/lib/include/srslte/phy/phch/pcfich.h
+++ b/lib/include/srslte/phy/phch/pcfich.h
@ -32,8 +32,8 @@
 *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.7
 *****************************************************************************/

-#ifndef PCFICH_
-#define PCFICH_
+#ifndef SRSLTE_PCFICH_H
+#define SRSLTE_PCFICH_H

 #include "srslte/config.h"
 #include "srslte/phy/common/phy_common.h"
@ -108,4 +108,4 @@ SRSLTE_API int srslte_pcfich_encode(srslte_pcfich_t *q,
                             cf_t *sf_symbols[SRSLTE_MAX_PORTS],
                             uint32_t subframe);

-#endif
+#endif // SRSLTE_PCFICH_H
--- a/lib/include/srslte/phy/phch/pdcch.h
+++ b/lib/include/srslte/phy/phch/pdcch.h
@ -32,8 +32,8 @@
 *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.8
 *****************************************************************************/

-#ifndef PDCCH_
-#define PDCCH_
+#ifndef SRSLTE_PDCCH_H
+#define SRSLTE_PDCCH_H

 #include "srslte/config.h"
 #include "srslte/phy/common/phy_common.h"
@ -186,4 +186,4 @@ SRSLTE_API uint32_t srslte_pdcch_common_locations_ncce(uint32_t nof_cce,
                                                       uint32_t max_candidates); 


-#endif
+#endif // SRSLTE_PDCCH_H
--- a/lib/include/srslte/phy/phch/pdsch.h
+++ b/lib/include/srslte/phy/phch/pdsch.h
@ -32,8 +32,8 @@
 *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.4
 *****************************************************************************/

-#ifndef PDSCH_
-#define PDSCH_
+#ifndef SRSLTE_PDSCH_H
+#define SRSLTE_PDSCH_H

 #include "srslte/config.h"
 #include "srslte/phy/common/phy_common.h"
@ -170,4 +170,4 @@ SRSLTE_API float srslte_pdsch_last_noi(srslte_pdsch_t *q);
 SRSLTE_API uint32_t srslte_pdsch_last_noi_cw(srslte_pdsch_t *q,
                                             uint32_t cw_idx);

-#endif
+#endif // SRSLTE_PDSCH_H
--- a/lib/include/srslte/phy/phch/pdsch_cfg.h
+++ b/lib/include/srslte/phy/phch/pdsch_cfg.h
@ -32,8 +32,8 @@
 *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.4
 *****************************************************************************/

-#ifndef PDSCHCFG_
-#define PDSCHCFG_
+#ifndef SRSLTE_PDSCH_CFG_H
+#define SRSLTE_PDSCH_CFG_H

 #include "srslte/phy/phch/ra.h"
 #include "srslte/phy/fec/softbuffer.h"
@ -58,5 +58,5 @@ typedef struct SRSLTE_API {
  bool tb_cw_swap;
 } srslte_pdsch_cfg_t;

-#endif
+#endif // SRSLTE_PDSCH_CFG_H

--- a/lib/include/srslte/phy/phch/phich.h
+++ b/lib/include/srslte/phy/phch/phich.h
@ -32,8 +32,8 @@
 *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.9
 *****************************************************************************/

-#ifndef PHICH_
-#define PHICH_
+#ifndef SRSLTE_PHICH_H
+#define SRSLTE_PHICH_H

 #include "srslte/config.h"
 #include "srslte/phy/common/phy_common.h"
@ -124,4 +124,4 @@ SRSLTE_API uint32_t srslte_phich_ngroups(srslte_phich_t *q);

 SRSLTE_API uint32_t srslte_phich_nsf(srslte_phich_t *q);

-#endif // PHICH_
+#endif // SRSLTE_PHICH_H
--- a/lib/include/srslte/phy/phch/pmch.h
+++ b/lib/include/srslte/phy/phch/pmch.h
@ -32,8 +32,8 @@
 *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.5
 *****************************************************************************/

-#ifndef PMCH_
-#define PMCH_
+#ifndef SRSLTE_PMCH_H
+#define SRSLTE_PMCH_H

 #include "srslte/config.h"
 #include "srslte/phy/common/phy_common.h"
@ -149,4 +149,4 @@ SRSLTE_API float srslte_pmch_average_noi(srslte_pmch_t *q);

 SRSLTE_API uint32_t srslte_pmch_last_noi(srslte_pmch_t *q);

-#endif
+#endif // SRSLTE_PMCH_H
--- a/lib/include/srslte/phy/phch/prach.h
+++ b/lib/include/srslte/phy/phch/prach.h
@ -32,8 +32,8 @@
 *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 5.7
 *****************************************************************************/

-#ifndef PRACH_
-#define PRACH_
+#ifndef SRSLTE_PRACH_H
+#define SRSLTE_PRACH_H

 #include <stdint.h>
 #include <stdlib.h>
@ -174,4 +174,4 @@ SRSLTE_API int srslte_prach_free(srslte_prach_t *p);

 SRSLTE_API int srslte_prach_print_seqs(srslte_prach_t *p);

-#endif // PRACH_
+#endif // SRSLTE_PRACH_H
--- a/lib/include/srslte/phy/phch/pucch.h
+++ b/lib/include/srslte/phy/phch/pucch.h
@ -32,8 +32,8 @@
 *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 5.4
 *****************************************************************************/

-#ifndef PUCCH_
-#define PUCCH_
+#ifndef SRSLTE_PUCCH_H
+#define SRSLTE_PUCCH_H

 #include "srslte/config.h"
 #include "srslte/phy/common/phy_common.h"
@ -211,4 +211,4 @@ SRSLTE_API bool srslte_n_pucch_isvalid(srslte_pucch_t *q,

 SRSLTE_API void srslte_pucch_cfg_default(srslte_pucch_cfg_t *cfg); 

-#endif
+#endif // SRSLTE_PUCCH_H
--- a/lib/include/srslte/phy/phch/pusch.h
+++ b/lib/include/srslte/phy/phch/pusch.h
@ -32,8 +32,8 @@
 *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 5.3
 *****************************************************************************/

-#ifndef PUSCH_
-#define PUSCH_
+#ifndef SRSLTE_PUSCH_H
+#define SRSLTE_PUSCH_H

 #include "srslte/config.h"
 #include "srslte/phy/common/phy_common.h"
@ -149,4 +149,4 @@ SRSLTE_API float srslte_pusch_average_noi(srslte_pusch_t *q);

 SRSLTE_API uint32_t srslte_pusch_last_noi(srslte_pusch_t *q); 

-#endif
+#endif // SRSLTE_PUSCH_H
--- a/lib/include/srslte/phy/phch/pusch_cfg.h
+++ b/lib/include/srslte/phy/phch/pusch_cfg.h
@ -32,8 +32,8 @@
 *  Reference:    3GPP TS 36.211 version 10.0.0 Release 10 Sec. 6.4
 *****************************************************************************/

-#ifndef PUSCHCFG_
-#define PUSCHCFG_
+#ifndef SRSLTE_PUSCH_CFG_H
+#define SRSLTE_PUSCH_CFG_H

 #include "srslte/phy/phch/ra.h"
 #include "srslte/phy/fec/softbuffer.h"
@ -57,5 +57,5 @@ typedef struct SRSLTE_API {
  uint32_t last_O_cqi;
 } srslte_pusch_cfg_t;

-#endif
+#endif // SRSLTE_PUSCH_CFG_H

--- a/lib/include/srslte/phy/phch/ra.h
+++ b/lib/include/srslte/phy/phch/ra.h
@ -33,8 +33,8 @@
 *  Reference:    3GPP TS 36.213 version 10.0.1 Release 10
 *****************************************************************************/

-#ifndef RB_ALLOC_H_
-#define RB_ALLOC_H_
+#ifndef SRSLTE_RA_H
+#define SRSLTE_RA_H

 #include <stdint.h>
 #include <stdbool.h>
@ -300,4 +300,4 @@ SRSLTE_API int srslte_dl_fill_ra_mcs_pmch(srslte_ra_mcs_t *mcs, uint32_t nprb);
 SRSLTE_API int srslte_dl_fill_ra_mcs(srslte_ra_mcs_t *mcs, uint32_t nprb);


-#endif /* RB_ALLOC_H_ */
+#endif // SRSLTE_RA_H
--- a/Show More
+++ b/Show More