diff --git a/CMakeLists.txt b/CMakeLists.txt
index 168eca793..27cc90b66 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,7 +75,7 @@ macro(ADD_CXX_COMPILER_FLAG_IF_AVAILABLE flag have)
     include(CheckCXXCompilerFlag)
     CHECK_CXX_COMPILER_FLAG(${flag} ${have})
     if(${have})
-        add_definitions(${flag})
+        add_definitions(${flag})        
     endif(${have})
 endmacro(ADD_CXX_COMPILER_FLAG_IF_AVAILABLE)
 
diff --git a/cmake/modules/FindopenLTE.cmake b/cmake/modules/FindopenLTE.cmake
new file mode 100644
index 000000000..e48758940
--- /dev/null
+++ b/cmake/modules/FindopenLTE.cmake
@@ -0,0 +1,52 @@
+# - Try to find openLTE's liblte
+
+find_package(PkgConfig)
+pkg_check_modules(PC_OPENLTE QUIET srslte)
+set(OPENLTE_DEFINITIONS ${PC_OPENLTE_CFLAGS_OTHER})
+
+FIND_PATH(
+    OPENLTE_LIBLTE_DIRS
+    NAMES liblte_common.h typedefs.h
+    HINTS ${PC_OPENLTE_SRCDIR}/liblte/hdr
+          ${PC_OPENLTE_INCLUDEDIR}
+          ${PC_OPENLTE_INCLUDE_DIRS}
+          $ENV{OPENLTE_DIR}/liblte/hdr
+    PATHS /usr/local/include 
+          /usr/include 
+)
+
+FIND_PATH(
+    OPENLTE_COMMON_DIRS
+    NAMES typedefs.h
+    HINTS ${PC_OPENLTE_SRCDIR}/cmn_hdr
+          ${PC_OPENLTE_INCLUDEDIR}
+          ${PC_OPENLTE_INCLUDE_DIRS}
+          $ENV{OPENLTE_DIR}/liblte/hdr
+    PATHS /usr/local/include 
+          /usr/include 
+)
+
+FIND_LIBRARY(
+    OPENLTE_LIBRARIES
+    NAMES lte
+    HINTS ${PC_OPENLTE_BUILDDIR}/liblte
+          ${CMAKE_INSTALL_PREFIX}/lib
+          ${CMAKE_INSTALL_PREFIX}/lib64
+          $ENV{OPENLTE_DIR}/lib
+    PATHS /usr/local/lib
+          /usr/local/lib64
+          /usr/lib
+          /usr/lib64
+)
+
+IF(OPENLTE_LIBLTE_DIRS AND OPENLTE_COMMON_DIRS)
+  SET(OPENLTE_INCLUDE_DIRS ${OPENLTE_LIBLTE_DIRS} ${OPENLTE_COMMON_DIRS})
+ENDIF(OPENLTE_LIBLTE_DIRS AND OPENLTE_COMMON_DIRS)
+
+message(STATUS "OPENLTE LIBRARIES " ${OPENLTE_LIBRARIES})
+message(STATUS "OPENLTE INCLUDE DIRS " ${OPENLTE_INCLUDE_DIRS})
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENLTE DEFAULT_MSG OPENLTE_LIBRARIES OPENLTE_INCLUDE_DIRS)
+MARK_AS_ADVANCED(OPENLTE_LIBRARIES OPENLTE_INCLUDE_DIRS)
+
diff --git a/srsapps/CMakeLists.txt b/srsapps/CMakeLists.txt
index b45914ec2..02f0cd2b2 100644
--- a/srsapps/CMakeLists.txt
+++ b/srsapps/CMakeLists.txt
@@ -23,6 +23,8 @@
 # Install headers
 ########################################################################
 
+remove_definitions(-fvisibility=hidden)
+
 INCLUDE_DIRECTORIES(radio/include/)
 INCLUDE_DIRECTORIES(common/include/)
 
diff --git a/srsapps/common/include/srsapps/common/binsem.h b/srsapps/common/include/srsapps/common/binsem.h
index e116c7ef0..5a8cad53c 100644
--- a/srsapps/common/include/srsapps/common/binsem.h
+++ b/srsapps/common/include/srsapps/common/binsem.h
@@ -1,3 +1,30 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 The srsLTE Developers. See the
+ * COPYRIGHT file at the top-level directory of this distribution.
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsLTE library.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
 
 #include <pthread.h>
 
diff --git a/srsapps/common/include/srsapps/common/config.h b/srsapps/common/include/srsapps/common/config.h
new file mode 100644
index 000000000..defb66c37
--- /dev/null
+++ b/srsapps/common/include/srsapps/common/config.h
@@ -0,0 +1,64 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 The srsLTE Developers. See the
+ * COPYRIGHT file at the top-level directory of this distribution.
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsLTE library.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
+#ifndef CONFIG_H
+#define CONFIG_H
+
+// Generic helper definitions for shared library support
+#if defined _WIN32 || defined __CYGWIN__
+  #define SRSAPPS_IMPORT __declspec(dllimport)
+  #define SRSAPPS_EXPORT __declspec(dllexport)
+  #define SRSAPPS_LOCAL
+#else
+  #if __GNUC__ >= 4
+    #define SRSAPPS_IMPORT __attribute__ ((visibility ("default")))
+    #define SRSAPPS_EXPORT __attribute__ ((visibility ("default")))
+  #else
+    #define SRSAPPS_IMPORT
+    #define SRSAPPS_EXPORT
+    #define SRSAPPS_LOCAL
+  #endif
+#endif
+
+// Define SRSAPPS_API
+// is used for the public API symbols.
+#ifdef SRSAPPS_DLL_EXPORTS // defined if we are building the SRSAPPS DLL (instead of using it)
+  #define SRSAPPS_EXPORT
+#else
+  #define SRSAPPS_IMPORT
+#endif
+
+
+// Common error codes
+#define SRSAPPS_SUCCESS                0
+#define SRSAPPS_ERROR                  -1
+#define SRSAPPS_ERROR_INVALID_INPUTS   -2
+
+// cf_t definition
+typedef _Complex float cf_t;
+
+#endif // CONFIG_H
diff --git a/srsapps/common/include/srsapps/common/log.h b/srsapps/common/include/srsapps/common/log.h
index ad3432185..5dc22566a 100644
--- a/srsapps/common/include/srsapps/common/log.h
+++ b/srsapps/common/include/srsapps/common/log.h
@@ -25,6 +25,7 @@
  *
  */
 
+
 #include <stdint.h>
 #include <string>
 
diff --git a/srsapps/common/include/srsapps/common/log_stdout.h b/srsapps/common/include/srsapps/common/log_stdout.h
index 2dda1717b..23c38ab30 100644
--- a/srsapps/common/include/srsapps/common/log_stdout.h
+++ b/srsapps/common/include/srsapps/common/log_stdout.h
@@ -29,6 +29,7 @@
 #include <string>
 #include <stdarg.h>
 
+
 #include "srsapps/common/log.h"
 
 /******************************************************************************
diff --git a/srsapps/common/include/srsapps/common/params_db.h b/srsapps/common/include/srsapps/common/params_db.h
index b2c9ec020..bfeadff18 100644
--- a/srsapps/common/include/srsapps/common/params_db.h
+++ b/srsapps/common/include/srsapps/common/params_db.h
@@ -24,16 +24,18 @@
  * and at http://www.gnu.org/licenses/.
  *
  */
+
+
 #include <stdlib.h>
 
-#include "srslte/config.h"
+
 
 #ifndef PARAMS_H
 #define PARAMS_H
 
 namespace srslte {
 namespace ue {
-  class SRSLTE_API params_db
+  class params_db
   {
   public: 
     params_db(uint32_t nof_params_) {
diff --git a/srsapps/common/include/srsapps/common/qbuff.h b/srsapps/common/include/srsapps/common/qbuff.h
index fb885b525..4c04f911f 100644
--- a/srsapps/common/include/srsapps/common/qbuff.h
+++ b/srsapps/common/include/srsapps/common/qbuff.h
@@ -1,6 +1,33 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 The srsLTE Developers. See the
+ * COPYRIGHT file at the top-level directory of this distribution.
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsLTE library.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
 
 #include <stdint.h>
-#include "srslte/config.h"
+
 
 #ifndef QBUFF_H
 #define QBUFF_H
@@ -26,7 +53,7 @@
 
 namespace srslte {
 
-  class SRSLTE_API qbuff
+  class qbuff
   {
   public: 
     qbuff();
diff --git a/srsapps/common/include/srsapps/common/queue.h b/srsapps/common/include/srsapps/common/queue.h
index 5f81bf2eb..4d7889ea6 100644
--- a/srsapps/common/include/srsapps/common/queue.h
+++ b/srsapps/common/include/srsapps/common/queue.h
@@ -25,6 +25,8 @@
  *
  */
 
+
+
 #include <stdint.h>
 /******************************************************************************
  *  File:         queue.h
@@ -34,7 +36,7 @@
  *  Reference:
  *****************************************************************************/
 
-#include "srslte/config.h"
+
 
 #ifndef QUEUE_H
 #define QUEUE_H
@@ -42,7 +44,7 @@
 namespace srslte {
 namespace ue {
   
-class SRSLTE_API queue
+class queue
 {
 public:
 
diff --git a/srsapps/common/include/srsapps/common/timers.h b/srsapps/common/include/srsapps/common/timers.h
index cbb28e8f0..eed55c90d 100644
--- a/srsapps/common/include/srsapps/common/timers.h
+++ b/srsapps/common/include/srsapps/common/timers.h
@@ -1,22 +1,49 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 The srsLTE Developers. See the
+ * COPYRIGHT file at the top-level directory of this distribution.
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsLTE library.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
 
 #include <stdint.h>
-#include "srslte/config.h"
+
 
 #ifndef TIMERS_H
 #define TIMERS_H
 
 namespace srslte {
   
-class SRSLTE_API timer_callback 
+class timer_callback 
 {
   public: 
     virtual void timer_expired(uint32_t timer_id) = 0; 
 }; 
   
-class SRSLTE_API timers
+class timers
 {
 public:
-  class SRSLTE_API timer
+  class timer
   {
   public:
     timer() { counter = 0; timeout = 0; running = false; }; 
diff --git a/srsapps/common/include/srsapps/common/tti_sync.h b/srsapps/common/include/srsapps/common/tti_sync.h
index 421d23836..52cc8501f 100644
--- a/srsapps/common/include/srsapps/common/tti_sync.h
+++ b/srsapps/common/include/srsapps/common/tti_sync.h
@@ -1,4 +1,4 @@
-  /**
+/**
  *
  * \section COPYRIGHT
  *
@@ -25,8 +25,11 @@
  *
  */
 
+
+
+
 #include <stdint.h>
-#include "srslte/config.h"
+
 
 #ifndef TTISYNC_H
 #define TTISYNC_H
@@ -39,7 +42,7 @@ namespace ue {
    * The consumer waits while its counter is lower than the producer counter. 
    * The PHY is the consumer. The MAC is the producer. 
    */
-class SRSLTE_API tti_sync
+class tti_sync
 {
   public: 
     tti_sync(uint32_t modulus_) 
diff --git a/srsapps/common/include/srsapps/common/tti_sync_cv.h b/srsapps/common/include/srsapps/common/tti_sync_cv.h
index b08a263bd..35b020974 100644
--- a/srsapps/common/include/srsapps/common/tti_sync_cv.h
+++ b/srsapps/common/include/srsapps/common/tti_sync_cv.h
@@ -1,4 +1,4 @@
-  /**
+/**
  *
  * \section COPYRIGHT
  *
@@ -25,9 +25,11 @@
  *
  */
 
+
+
 #include <pthread.h>
 #include "srsapps/common/tti_sync.h"
-#include "srslte/config.h"
+
 
 #ifndef TTISYNC_CV_H
 #define TTISYNC_CV_H
@@ -39,7 +41,7 @@ namespace ue {
   /* Implements tti_sync interface with condition variables. 
    */
   
-class SRSLTE_API tti_sync_cv : public tti_sync
+class tti_sync_cv : public tti_sync
 {
   public: 
              tti_sync_cv(uint32_t modulus);
diff --git a/srsapps/common/src/qbuff.cc b/srsapps/common/src/qbuff.cc
index abdd811d2..cb9916b2a 100644
--- a/srsapps/common/src/qbuff.cc
+++ b/srsapps/common/src/qbuff.cc
@@ -1,3 +1,31 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 The srsLTE Developers. See the
+ * COPYRIGHT file at the top-level directory of this distribution.
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsLTE library.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/srsapps/radio/include/srsapps/radio/radio_uhd.h b/srsapps/radio/include/srsapps/radio/radio_uhd.h
index 7cf7c72fe..490200722 100644
--- a/srsapps/radio/include/srsapps/radio/radio_uhd.h
+++ b/srsapps/radio/include/srsapps/radio/radio_uhd.h
@@ -1,4 +1,4 @@
-  /**
+/**
  *
  * \section COPYRIGHT
  *
@@ -25,6 +25,8 @@
  *
  */
 
+
+
 #include "srslte/srslte.h"
 #include "srslte/common/radio.h"
 #include "srslte/cuhd/cuhd.h"
@@ -37,7 +39,7 @@ namespace srslte {
   
 /* Interface to the RF frontend. 
   */
-  class SRSLTE_API radio_uhd : public radio
+  class radio_uhd : public radio
   {
     public: 
       bool init();
diff --git a/srsapps/ue/mac/CMakeLists.txt b/srsapps/ue/mac/CMakeLists.txt
index 8ece6f709..525b13f91 100644
--- a/srsapps/ue/mac/CMakeLists.txt
+++ b/srsapps/ue/mac/CMakeLists.txt
@@ -33,3 +33,4 @@ SRSLTE_SET_PIC(srsapps_ue_mac)
 FILE(GLOB HEADERS_ALL "include/srsapps/ue/mac/*.h")
 ADD_CUSTOM_TARGET (add_ue_mac_headers SOURCES ${HEADERS_ALL})
 
+ADD_SUBDIRECTORY(test)
diff --git a/srsapps/ue/mac/include/srsapps/ue/mac/demux.h b/srsapps/ue/mac/include/srsapps/ue/mac/demux.h
index af386555f..824803b67 100644
--- a/srsapps/ue/mac/include/srsapps/ue/mac/demux.h
+++ b/srsapps/ue/mac/include/srsapps/ue/mac/demux.h
@@ -1,3 +1,31 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 The srsLTE Developers. See the
+ * COPYRIGHT file at the top-level directory of this distribution.
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsLTE library.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
+
 
 #include "srsapps/ue/phy/phy.h"
 #include "srsapps/common/log.h"
diff --git a/srsapps/ue/mac/include/srsapps/ue/mac/dl_harq.h b/srsapps/ue/mac/include/srsapps/ue/mac/dl_harq.h
index f1aab3755..befa2c1ff 100644
--- a/srsapps/ue/mac/include/srsapps/ue/mac/dl_harq.h
+++ b/srsapps/ue/mac/include/srsapps/ue/mac/dl_harq.h
@@ -1,3 +1,31 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 The srsLTE Developers. See the
+ * COPYRIGHT file at the top-level directory of this distribution.
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsLTE library.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
+
 
 
 #include "srsapps/common/log.h"
diff --git a/srsapps/ue/mac/include/srsapps/ue/mac/dl_sps.h b/srsapps/ue/mac/include/srsapps/ue/mac/dl_sps.h
index 4bbfeb0d4..c2e2d3c3a 100644
--- a/srsapps/ue/mac/include/srsapps/ue/mac/dl_sps.h
+++ b/srsapps/ue/mac/include/srsapps/ue/mac/dl_sps.h
@@ -1,3 +1,31 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 The srsLTE Developers. See the
+ * COPYRIGHT file at the top-level directory of this distribution.
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsLTE library.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
+
 
 
 #include "srsapps/common/log.h"
diff --git a/srsapps/ue/mac/include/srsapps/ue/mac/mac.h b/srsapps/ue/mac/include/srsapps/ue/mac/mac.h
index 6b77fdc29..d591a7020 100644
--- a/srsapps/ue/mac/include/srsapps/ue/mac/mac.h
+++ b/srsapps/ue/mac/include/srsapps/ue/mac/mac.h
@@ -1,3 +1,31 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 The srsLTE Developers. See the
+ * COPYRIGHT file at the top-level directory of this distribution.
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsLTE library.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
+
 
 
 #include "srsapps/common/log.h"
diff --git a/srsapps/ue/mac/include/srsapps/ue/mac/mac_io.h b/srsapps/ue/mac/include/srsapps/ue/mac/mac_io.h
index b2e98f92f..6b6cab6ea 100644
--- a/srsapps/ue/mac/include/srsapps/ue/mac/mac_io.h
+++ b/srsapps/ue/mac/include/srsapps/ue/mac/mac_io.h
@@ -1,3 +1,31 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 The srsLTE Developers. See the
+ * COPYRIGHT file at the top-level directory of this distribution.
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsLTE library.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
+
 #include <string.h>
 #include "srsapps/common/qbuff.h"
 
diff --git a/srsapps/ue/mac/include/srsapps/ue/mac/mac_params.h b/srsapps/ue/mac/include/srsapps/ue/mac/mac_params.h
index d640fdf17..aed3c23d3 100644
--- a/srsapps/ue/mac/include/srsapps/ue/mac/mac_params.h
+++ b/srsapps/ue/mac/include/srsapps/ue/mac/mac_params.h
@@ -1,3 +1,31 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 The srsLTE Developers. See the
+ * COPYRIGHT file at the top-level directory of this distribution.
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsLTE library.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
+
 
 #include "srslte/srslte.h"
 #include "srsapps/common/params_db.h"
diff --git a/srsapps/ue/mac/include/srsapps/ue/mac/mac_pdu.h b/srsapps/ue/mac/include/srsapps/ue/mac/mac_pdu.h
index 1e5bf219c..58bfb65e6 100644
--- a/srsapps/ue/mac/include/srsapps/ue/mac/mac_pdu.h
+++ b/srsapps/ue/mac/include/srsapps/ue/mac/mac_pdu.h
@@ -1,3 +1,31 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 The srsLTE Developers. See the
+ * COPYRIGHT file at the top-level directory of this distribution.
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsLTE library.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
+
 #include <stdint.h>
 #include "srsapps/common/log.h"
 
diff --git a/srsapps/ue/mac/include/srsapps/ue/mac/mux.h b/srsapps/ue/mac/include/srsapps/ue/mac/mux.h
index f976709aa..d35748749 100644
--- a/srsapps/ue/mac/include/srsapps/ue/mac/mux.h
+++ b/srsapps/ue/mac/include/srsapps/ue/mac/mux.h
@@ -1,3 +1,31 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 The srsLTE Developers. See the
+ * COPYRIGHT file at the top-level directory of this distribution.
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsLTE library.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
+
 #include <pthread.h>
 
 #include "srsapps/common/log.h"
diff --git a/srsapps/ue/mac/include/srsapps/ue/mac/proc.h b/srsapps/ue/mac/include/srsapps/ue/mac/proc.h
index 60189d57b..6f32b8913 100644
--- a/srsapps/ue/mac/include/srsapps/ue/mac/proc.h
+++ b/srsapps/ue/mac/include/srsapps/ue/mac/proc.h
@@ -1,3 +1,31 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 The srsLTE Developers. See the
+ * COPYRIGHT file at the top-level directory of this distribution.
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsLTE library.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
+
 
 #include <stdint.h>
 
diff --git a/srsapps/ue/mac/include/srsapps/ue/mac/proc_bsr.h b/srsapps/ue/mac/include/srsapps/ue/mac/proc_bsr.h
index bf96b7174..309a173cc 100644
--- a/srsapps/ue/mac/include/srsapps/ue/mac/proc_bsr.h
+++ b/srsapps/ue/mac/include/srsapps/ue/mac/proc_bsr.h
@@ -1,3 +1,31 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 The srsLTE Developers. See the
+ * COPYRIGHT file at the top-level directory of this distribution.
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsLTE library.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
+
 
 #include <stdint.h>
 
diff --git a/srsapps/ue/mac/include/srsapps/ue/mac/proc_phr.h b/srsapps/ue/mac/include/srsapps/ue/mac/proc_phr.h
index e44fcf61c..b05f37ceb 100644
--- a/srsapps/ue/mac/include/srsapps/ue/mac/proc_phr.h
+++ b/srsapps/ue/mac/include/srsapps/ue/mac/proc_phr.h
@@ -1,3 +1,31 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 The srsLTE Developers. See the
+ * COPYRIGHT file at the top-level directory of this distribution.
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsLTE library.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
+
 
 #include <stdint.h>
 
diff --git a/srsapps/ue/mac/include/srsapps/ue/mac/proc_ra.h b/srsapps/ue/mac/include/srsapps/ue/mac/proc_ra.h
index 19c3c3025..25f7c3cb8 100644
--- a/srsapps/ue/mac/include/srsapps/ue/mac/proc_ra.h
+++ b/srsapps/ue/mac/include/srsapps/ue/mac/proc_ra.h
@@ -1,3 +1,31 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 The srsLTE Developers. See the
+ * COPYRIGHT file at the top-level directory of this distribution.
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsLTE library.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
+
 
 #include <stdint.h>
 
diff --git a/srsapps/ue/mac/include/srsapps/ue/mac/proc_sr.h b/srsapps/ue/mac/include/srsapps/ue/mac/proc_sr.h
index bdc191786..d2cc3283b 100644
--- a/srsapps/ue/mac/include/srsapps/ue/mac/proc_sr.h
+++ b/srsapps/ue/mac/include/srsapps/ue/mac/proc_sr.h
@@ -1,3 +1,31 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 The srsLTE Developers. See the
+ * COPYRIGHT file at the top-level directory of this distribution.
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsLTE library.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
+
 
 #include <stdint.h>
 
diff --git a/srsapps/ue/mac/include/srsapps/ue/mac/ul_harq.h b/srsapps/ue/mac/include/srsapps/ue/mac/ul_harq.h
index 616d04fc6..e4a2b83ff 100644
--- a/srsapps/ue/mac/include/srsapps/ue/mac/ul_harq.h
+++ b/srsapps/ue/mac/include/srsapps/ue/mac/ul_harq.h
@@ -1,3 +1,31 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 The srsLTE Developers. See the
+ * COPYRIGHT file at the top-level directory of this distribution.
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsLTE library.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
+
 
 
 #include "srsapps/ue/phy/phy.h"
diff --git a/srsapps/ue/mac/include/srsapps/ue/mac/ul_sps.h b/srsapps/ue/mac/include/srsapps/ue/mac/ul_sps.h
index 944847a53..a5e707f45 100644
--- a/srsapps/ue/mac/include/srsapps/ue/mac/ul_sps.h
+++ b/srsapps/ue/mac/include/srsapps/ue/mac/ul_sps.h
@@ -1,3 +1,31 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 The srsLTE Developers. See the
+ * COPYRIGHT file at the top-level directory of this distribution.
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsLTE library.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
+
 
 
 #include "srsapps/common/log.h"
diff --git a/srsapps/ue/mac/src/demux.cc b/srsapps/ue/mac/src/demux.cc
index dcacd440a..898cb47e3 100644
--- a/srsapps/ue/mac/src/demux.cc
+++ b/srsapps/ue/mac/src/demux.cc
@@ -1,3 +1,30 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 The srsLTE Developers. See the
+ * COPYRIGHT file at the top-level directory of this distribution.
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsLTE library.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
 
 #include "srsapps/ue/mac/mac.h"
 #include "srsapps/ue/mac/demux.h"
diff --git a/srsapps/ue/mac/src/dl_harq.cc b/srsapps/ue/mac/src/dl_harq.cc
index 819e0d35e..3937e59bf 100644
--- a/srsapps/ue/mac/src/dl_harq.cc
+++ b/srsapps/ue/mac/src/dl_harq.cc
@@ -1,3 +1,30 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 The srsLTE Developers. See the
+ * COPYRIGHT file at the top-level directory of this distribution.
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsLTE library.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
 #include "srsapps/ue/phy/phy.h"
 #include "srsapps/ue/phy/dl_sched_grant.h"
 
diff --git a/srsapps/ue/mac/src/dl_sps.cc b/srsapps/ue/mac/src/dl_sps.cc
index 9073c37aa..b3356336e 100644
--- a/srsapps/ue/mac/src/dl_sps.cc
+++ b/srsapps/ue/mac/src/dl_sps.cc
@@ -1,3 +1,30 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 The srsLTE Developers. See the
+ * COPYRIGHT file at the top-level directory of this distribution.
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsLTE library.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
 #include "srsapps/ue/mac/dl_sps.h"
 
 namespace srslte {
diff --git a/srsapps/ue/mac/src/mac_pdu.cc b/srsapps/ue/mac/src/mac_pdu.cc
index 3cfe629da..af92e2dd6 100644
--- a/srsapps/ue/mac/src/mac_pdu.cc
+++ b/srsapps/ue/mac/src/mac_pdu.cc
@@ -1,3 +1,30 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 The srsLTE Developers. See the
+ * COPYRIGHT file at the top-level directory of this distribution.
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsLTE library.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
 #include "srsapps/ue/mac/mac_pdu.h"
 
 namespace srslte {
diff --git a/srsapps/ue/mac/src/mux.cc b/srsapps/ue/mac/src/mux.cc
index 1fb98c3af..5e85b6caf 100644
--- a/srsapps/ue/mac/src/mux.cc
+++ b/srsapps/ue/mac/src/mux.cc
@@ -1,3 +1,30 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 The srsLTE Developers. See the
+ * COPYRIGHT file at the top-level directory of this distribution.
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsLTE library.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
 
 #include "srsapps/ue/mac/mux.h"
 #include "srsapps/ue/mac/mac.h"
diff --git a/srsapps/ue/mac/src/proc_ra.cc b/srsapps/ue/mac/src/proc_ra.cc
index e8d01de36..0fa6c4e8f 100644
--- a/srsapps/ue/mac/src/proc_ra.cc
+++ b/srsapps/ue/mac/src/proc_ra.cc
@@ -1,3 +1,30 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 The srsLTE Developers. See the
+ * COPYRIGHT file at the top-level directory of this distribution.
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsLTE library.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
 
 #include <stdlib.h>
 #include <stdint.h>
diff --git a/srsapps/ue/mac/src/ul_harq.cc b/srsapps/ue/mac/src/ul_harq.cc
index 4cb5228c6..8c6fd431f 100644
--- a/srsapps/ue/mac/src/ul_harq.cc
+++ b/srsapps/ue/mac/src/ul_harq.cc
@@ -1,3 +1,30 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 The srsLTE Developers. See the
+ * COPYRIGHT file at the top-level directory of this distribution.
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsLTE library.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
 #include "srsapps/ue/phy/phy.h"
 #include "srsapps/common/log.h"
 
diff --git a/srsapps/ue/mac/test/CMakeLists.txt b/srsapps/ue/mac/test/CMakeLists.txt
index e69de29bb..412c8f966 100644
--- a/srsapps/ue/mac/test/CMakeLists.txt
+++ b/srsapps/ue/mac/test/CMakeLists.txt
@@ -0,0 +1,28 @@
+#
+# Copyright 2013-2015 The srsLTE Developers. See the
+# COPYRIGHT file at the top-level directory of this distribution.
+#
+# This file is part of the srsLTE library.
+#
+# srsLTE is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
+#
+# srsLTE is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# A copy of the GNU Affero General Public License can be found in
+# the LICENSE file in the top-level directory of this distribution
+# and at http://www.gnu.org/licenses/.
+#
+
+FIND_PACKAGE(openLTE)
+
+IF(UHD_FOUND AND OPENLTE_FOUND)  
+  INCLUDE_DIRECTORIES(${OPENLTE_INCLUDE_DIRS})
+  ADD_EXECUTABLE(mac_test mac_test.cc)
+  TARGET_LINK_LIBRARIES(mac_test  srsapps_ue_mac srsapps_ue_phy srsapps_common srsapps_radio srslte ${OPENLTE_LIBRARIES})
+ENDIF(UHD_FOUND AND OPENLTE_FOUND)
diff --git a/srsapps/ue/mac/test/mac_test.cc b/srsapps/ue/mac/test/mac_test.cc
index 84a7315fd..b8a8d812f 100644
--- a/srsapps/ue/mac/test/mac_test.cc
+++ b/srsapps/ue/mac/test/mac_test.cc
@@ -1,3 +1,30 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 The srsLTE Developers. See the
+ * COPYRIGHT file at the top-level directory of this distribution.
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsLTE library.
+ *
+ * srsLTE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsLTE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
 
 #include <unistd.h>
 
diff --git a/srsapps/ue/phy/include/srsapps/ue/phy/dl_buffer.h b/srsapps/ue/phy/include/srsapps/ue/phy/dl_buffer.h
index 54155af96..228777cc4 100644
--- a/srsapps/ue/phy/include/srsapps/ue/phy/dl_buffer.h
+++ b/srsapps/ue/phy/include/srsapps/ue/phy/dl_buffer.h
@@ -1,4 +1,4 @@
-  /**
+/**
  *
  * \section COPYRIGHT
  *
@@ -25,6 +25,8 @@
  *
  */
 
+
+
 #include "srslte/srslte.h"
 #include "srsapps/common/queue.h"
 #include "srsapps/ue/phy/ul_sched_grant.h"
@@ -40,7 +42,7 @@ namespace ue {
   /* Class for the processing of Downlink buffers. The MAC obtains a buffer for a given TTI and then 
     * gets ul/dl scheduling grants and/or processes phich/pdsch channels 
     */
-  class SRSLTE_API dl_buffer : public queue::element {
+  class dl_buffer : public queue::element {
   public:
     
     int buffer_id; 
diff --git a/srsapps/ue/phy/include/srsapps/ue/phy/dl_sched_grant.h b/srsapps/ue/phy/include/srsapps/ue/phy/dl_sched_grant.h
index af2af87d7..72f1e6b64 100644
--- a/srsapps/ue/phy/include/srsapps/ue/phy/dl_sched_grant.h
+++ b/srsapps/ue/phy/include/srsapps/ue/phy/dl_sched_grant.h
@@ -1,4 +1,4 @@
-  /**
+/**
  *
  * \section COPYRIGHT
  *
@@ -24,6 +24,9 @@
  * and at http://www.gnu.org/licenses/.
  *
  */
+
+
+
 #include <string.h>
 
 #include "srslte/srslte.h"
@@ -36,7 +39,7 @@ namespace srslte {
 namespace ue {  
 
   /* Uplink/Downlink scheduling grant generated by a successfully decoded PDCCH */ 
-  class SRSLTE_API dl_sched_grant : public sched_grant {
+  class dl_sched_grant : public sched_grant {
   public:
 
              dl_sched_grant(rnti_type_t type, uint16_t rnti) : sched_grant(type, rnti) {} 
diff --git a/srsapps/ue/phy/include/srsapps/ue/phy/phy.h b/srsapps/ue/phy/include/srsapps/ue/phy/phy.h
index 8085193fb..6840a186a 100644
--- a/srsapps/ue/phy/include/srsapps/ue/phy/phy.h
+++ b/srsapps/ue/phy/include/srsapps/ue/phy/phy.h
@@ -25,6 +25,9 @@
  *
  */
 
+
+
+
 #include "srslte/srslte.h"
 #include "srsapps/common/tti_sync.h"
 #include "srsapps/ue/phy/dl_buffer.h"
@@ -56,7 +59,7 @@ namespace ue {
   
 typedef _Complex float cf_t; 
 
-class SRSLTE_API phy
+class phy
 {
 public:
   phy() {
diff --git a/srsapps/ue/phy/include/srsapps/ue/phy/phy_params.h b/srsapps/ue/phy/include/srsapps/ue/phy/phy_params.h
index 2d2af146b..05cdcbfb4 100644
--- a/srsapps/ue/phy/include/srsapps/ue/phy/phy_params.h
+++ b/srsapps/ue/phy/include/srsapps/ue/phy/phy_params.h
@@ -25,6 +25,8 @@
  *
  */
 
+
+
 #include "srslte/srslte.h"
 #include "srsapps/common/params_db.h"
 
@@ -35,7 +37,7 @@
 namespace srslte {
 namespace ue {
 
-  class SRSLTE_API phy_params : public params_db
+  class phy_params : public params_db
   {
   public: 
 
diff --git a/srsapps/ue/phy/include/srsapps/ue/phy/prach.h b/srsapps/ue/phy/include/srsapps/ue/phy/prach.h
index 40a09bb8f..0e5d02a9c 100644
--- a/srsapps/ue/phy/include/srsapps/ue/phy/prach.h
+++ b/srsapps/ue/phy/include/srsapps/ue/phy/prach.h
@@ -1,4 +1,4 @@
-  /**
+/**
  *
  * \section COPYRIGHT
  *
@@ -25,6 +25,8 @@
  *
  */
 
+
+
 #include "srslte/srslte.h"
 #include "srslte/common/radio.h"
 #include "srsapps/common/queue.h"
@@ -36,7 +38,7 @@
 namespace srslte {
 namespace ue {
 
-  class SRSLTE_API prach {
+  class prach {
   public: 
     prach() {
       params_db = NULL; 
diff --git a/srsapps/ue/phy/include/srsapps/ue/phy/sched_grant.h b/srsapps/ue/phy/include/srsapps/ue/phy/sched_grant.h
index e40e72f0a..85e2c047b 100644
--- a/srsapps/ue/phy/include/srsapps/ue/phy/sched_grant.h
+++ b/srsapps/ue/phy/include/srsapps/ue/phy/sched_grant.h
@@ -1,4 +1,4 @@
-  /**
+/**
  *
  * \section COPYRIGHT
  *
@@ -25,6 +25,8 @@
  *
  */
 
+
+
 #include "srslte/srslte.h"
 #include "srsapps/common/queue.h"
 
@@ -35,7 +37,7 @@ namespace srslte {
 namespace ue {  
 
   /* Uplink/Downlink scheduling grant generated by a successfully decoded PDCCH */ 
-  class SRSLTE_API sched_grant {
+  class sched_grant {
   public:
     typedef enum {
       RNTI_TYPE_NOTDEFINED = 0,
diff --git a/srsapps/ue/phy/include/srsapps/ue/phy/ul_buffer.h b/srsapps/ue/phy/include/srsapps/ue/phy/ul_buffer.h
index 89812d248..bc6c14381 100644
--- a/srsapps/ue/phy/include/srsapps/ue/phy/ul_buffer.h
+++ b/srsapps/ue/phy/include/srsapps/ue/phy/ul_buffer.h
@@ -25,6 +25,7 @@
  *
  */
 
+
 #include "srslte/srslte.h"
 #include "srslte/common/radio.h"
 #include "srsapps/common/queue.h"
@@ -42,7 +43,7 @@ namespace ue {
   /* Uplink scheduling assignment. The MAC instructs the PHY to prepare an UL packet (PUSCH or PUCCH) 
    * for transmission. The MAC must call generate_data() to set the packet ready for transmission
    */
-  class SRSLTE_API ul_buffer : public queue::element {
+  class ul_buffer : public queue::element {
 
   public: 
     bool     init_cell(srslte_cell_t cell, phy_params *params_db);
diff --git a/srsapps/ue/phy/include/srsapps/ue/phy/ul_sched_grant.h b/srsapps/ue/phy/include/srsapps/ue/phy/ul_sched_grant.h
index 346d7a4c4..62ad34166 100644
--- a/srsapps/ue/phy/include/srsapps/ue/phy/ul_sched_grant.h
+++ b/srsapps/ue/phy/include/srsapps/ue/phy/ul_sched_grant.h
@@ -26,6 +26,7 @@
  */
 #include <string.h>
 
+
 #include "srslte/srslte.h"
 #include "srsapps/ue/phy/sched_grant.h"
 
@@ -36,7 +37,7 @@ namespace srslte {
 namespace ue {  
 
   /* Uplink/Downlink scheduling grant generated by a successfully decoded PDCCH */ 
-  class SRSLTE_API ul_sched_grant : public sched_grant {
+  class ul_sched_grant : public sched_grant {
   public:
 
              ul_sched_grant(rnti_type_t type, uint16_t rnti) : sched_grant(type, rnti) {}