diff --git a/lib/include/srslte/asn1/liblte_common.h b/lib/include/srslte/asn1/liblte_common.h
index c98e6da93..ea46ceb36 100644
--- a/lib/include/srslte/asn1/liblte_common.h
+++ b/lib/include/srslte/asn1/liblte_common.h
@@ -1,37 +1,14 @@
-/*******************************************************************************
-
- Copyright 2012-2014 Ben Wojtowicz
-
- This program 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.
-
- This program 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.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see .
-
-*******************************************************************************
-
- File: liblte_common.h
-
- Description: Contains all the common definitions for the LTE library.
-
- Revision History
- ---------- ------------- --------------------------------------------
- 02/26/2012 Ben Wojtowicz Created file.
- 07/21/2013 Ben Wojtowicz Added a common message structure.
- 06/15/2014 Ben Wojtowicz Split LIBLTE_MSG_STRUCT into bit and byte
- aligned messages.
- 08/03/2014 Ben Wojtowicz Commonized value_2_bits and bits_2_value.
- 11/29/2014 Ben Wojtowicz Added liblte prefix to value_2_bits and
- bits_2_value.
-
-*******************************************************************************/
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2012-2014 Ben Wojtowicz
+ *
+ * By using this file, you agree to the terms and conditions set
+ * forth in the LICENSE file which can be found at the top level of
+ * the distribution.
+ *
+ */
#ifndef SRSLTE_LIBLTE_COMMON_H
#define SRSLTE_LIBLTE_COMMON_H
diff --git a/lib/include/srslte/asn1/liblte_mme.h b/lib/include/srslte/asn1/liblte_mme.h
index 1882ca483..cea9ddd6f 100644
--- a/lib/include/srslte/asn1/liblte_mme.h
+++ b/lib/include/srslte/asn1/liblte_mme.h
@@ -1,39 +1,15 @@
-/*******************************************************************************
-
- Copyright 2014-2015 Ben Wojtowicz
-
- This program 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.
-
- This program 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.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see .
-
-*******************************************************************************
-
- File: liblte_mme.h
-
- Description: Contains all the definitions for the LTE Mobility Management
- Entity library.
-
- Revision History
- ---------- ------------- --------------------------------------------
- 06/15/2014 Ben Wojtowicz Created file.
- 08/03/2014 Ben Wojtowicz Added more decoding/encoding.
- 09/03/2014 Ben Wojtowicz Added more decoding/encoding.
- 11/01/2014 Ben Wojtowicz Added more decoding/encoding.
- 11/29/2014 Ben Wojtowicz Added more decoding/encoding.
- 12/16/2014 Ben Wojtowicz Added more decoding/encoding.
- 12/24/2014 Ben Wojtowicz Cleaned up the Time Zone and Time IE.
- 02/15/2015 Ben Wojtowicz Added more decoding/encoding.
-
-*******************************************************************************/
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2014-2015 Ben Wojtowicz
+ * 2016-2020 Software Radio Systems Limited
+ *
+ * By using this file, you agree to the terms and conditions set
+ * forth in the LICENSE file which can be found at the top level of
+ * the distribution.
+ *
+ */
#ifndef SRSLTE_LIBLTE_MME_H
#define SRSLTE_LIBLTE_MME_H
diff --git a/lib/include/srslte/common/liblte_security.h b/lib/include/srslte/common/liblte_security.h
index 2a86882c7..43d7a2553 100644
--- a/lib/include/srslte/common/liblte_security.h
+++ b/lib/include/srslte/common/liblte_security.h
@@ -1,33 +1,15 @@
-/*******************************************************************************
-
- Copyright 2014 Ben Wojtowicz
-
- This program 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.
-
- This program 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.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see .
-
-*******************************************************************************
-
- File: liblte_security.h
-
- Description: Contains all the definitions for the LTE security algorithm
- library.
-
- Revision History
- ---------- ------------- --------------------------------------------
- 08/03/2014 Ben Wojtowicz Created file.
- 09/03/2014 Ben Wojtowicz Added key generation and EIA2.
-
-*******************************************************************************/
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2014 Ben Wojtowicz
+ * 2016-2020 Software Radio Systems Limited
+ *
+ * By using this file, you agree to the terms and conditions set
+ * forth in the LICENSE file which can be found at the top level of
+ * the distribution.
+ *
+ */
#ifndef SRSLTE_LIBLTE_SECURITY_H
#define SRSLTE_LIBLTE_SECURITY_H
diff --git a/lib/src/asn1/liblte_common.cc b/lib/src/asn1/liblte_common.cc
index ac3794a72..744ecf808 100644
--- a/lib/src/asn1/liblte_common.cc
+++ b/lib/src/asn1/liblte_common.cc
@@ -1,33 +1,14 @@
-/*******************************************************************************
-
- Copyright 2014 Ben Wojtowicz
-
- This program 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.
-
- This program 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.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see .
-
-*******************************************************************************
-
- File: liblte_common.cc
-
- Description: Contains all the implementations for the LTE common library.
-
- Revision History
- ---------- ------------- --------------------------------------------
- 08/03/2014 Ben Wojtowicz Created file.
- 11/29/2014 Ben Wojtowicz Added liblte prefix to value_2_bits and
- bits_2_value.
-
-*******************************************************************************/
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2014 Ben Wojtowicz
+ *
+ * By using this file, you agree to the terms and conditions set
+ * forth in the LICENSE file which can be found at the top level of
+ * the distribution.
+ *
+ */
/*******************************************************************************
INCLUDES
diff --git a/lib/src/asn1/liblte_mme.cc b/lib/src/asn1/liblte_mme.cc
index 46d245626..c65a3729d 100644
--- a/lib/src/asn1/liblte_mme.cc
+++ b/lib/src/asn1/liblte_mme.cc
@@ -1,40 +1,15 @@
-/*******************************************************************************
-
- Copyright 2014-2015 Ben Wojtowicz
-
- This program 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.
-
- This program 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.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see .
-
-*******************************************************************************
-
- File: liblte_mme.cc
-
- Description: Contains all the implementations for the LTE Mobility
- Management Entity library.
-
- Revision History
- ---------- ------------- --------------------------------------------
- 06/15/2014 Ben Wojtowicz Created file.
- 08/03/2014 Ben Wojtowicz Added more decoding/encoding.
- 09/03/2014 Ben Wojtowicz Added more decoding/encoding and fixed MCC
- and MNC packing.
- 11/01/2014 Ben Wojtowicz Added more decoding/encoding.
- 11/29/2014 Ben Wojtowicz Added more decoding/encoding.
- 12/16/2014 Ben Wojtowicz Added more decoding/encoding.
- 12/24/2014 Ben Wojtowicz Cleaned up the Time Zone and Time IE.
- 02/15/2015 Ben Wojtowicz Added more decoding/encoding.
-
-*******************************************************************************/
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2014-2015 Ben Wojtowicz
+ * 2016-2020 Software Radio Systems Limited
+ *
+ * By using this file, you agree to the terms and conditions set
+ * forth in the LICENSE file which can be found at the top level of
+ * the distribution.
+ *
+ */
/*******************************************************************************
INCLUDES
diff --git a/lib/src/common/liblte_security.cc b/lib/src/common/liblte_security.cc
index 6f209812f..aba39008f 100644
--- a/lib/src/common/liblte_security.cc
+++ b/lib/src/common/liblte_security.cc
@@ -1,34 +1,15 @@
-/*******************************************************************************
-
- Copyright 2014 Ben Wojtowicz
-
- This program 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.
-
- This program 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.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see .
-
-*******************************************************************************
-
- File: liblte_security.cc
-
- Description: Contains all the implementations for the LTE security
- algorithm library.
-
- Revision History
- ---------- ------------- --------------------------------------------
- 08/03/2014 Ben Wojtowicz Created file.
- 09/03/2014 Ben Wojtowicz Added key generation and EIA2 and fixed MCC
- and MNC packing.
-
-*******************************************************************************/
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2014 Ben Wojtowicz
+ * 2016-2020 Software Radio Systems Limited
+ *
+ * By using this file, you agree to the terms and conditions set
+ * forth in the LICENSE file which can be found at the top level of
+ * the distribution.
+ *
+ */
/*******************************************************************************
INCLUDES