diff --git a/src/1905_tlvs.h b/src/1905_tlvs.h
index c0990979dbfd90bfb21c48467c13b670cbeaa275..65afe998c14718227bd1aadbb63e8a42df970fa5 100644
--- a/src/1905_tlvs.h
+++ b/src/1905_tlvs.h
@@ -1,12 +1,11 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * 1905_tlvs.h: 1905 tlvs definition in flat format.
  *
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
- *
- * See LICENSE file for license related information.
- *
  */
 
 #ifndef _1905_TLVS_H_
diff --git a/src/cmdu.c b/src/cmdu.c
index 5fc9f848228403e97a749bcc984d374430306be5..07c501b07916b9b6871fa6b3515c823e87ebfa4d 100644
--- a/src/cmdu.c
+++ b/src/cmdu.c
@@ -1,15 +1,14 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * cmdu.c - IEEE1905 CMDU and TLV handling
  *
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025-2024 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
  *
- * See LICENSE file for license related information.
- *
  */
 
-
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/cmdu.h b/src/cmdu.h
index 35dd1d3142a9435078e161881bff6367f9e2c00e..98cc11475dab1d0fac949081cba2c628eda54db6 100644
--- a/src/cmdu.h
+++ b/src/cmdu.h
@@ -1,17 +1,14 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * cmdu.h
  * defines structs and functions for TLVs and CMDU manipulation.
  *
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
- *
- * See LICENSE file for license related information.
- *
  */
 
-
-
 #ifndef CMDU_H
 #define CMDU_H
 
diff --git a/src/cmdu_ackq.c b/src/cmdu_ackq.c
index 66d5dc17dc9f0f86ee3d832102e27af283b80a37..727d59fdd48de3bdc5df2e5f8764a58daacaa415 100644
--- a/src/cmdu_ackq.c
+++ b/src/cmdu_ackq.c
@@ -1,13 +1,13 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * cmdu_ackq.c
  * CMDU response and ack queue management
  *
- * Copyright (C) 2020 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2020-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
  *
- * See LICENSE file for license related information.
- *
  */
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/cmdu_ackq.h b/src/cmdu_ackq.h
index 1f5ecb4d5332bb4434d4e13de029c567ca16a948..07e4c9e27a78c499b08b71f3433181e3b56b52c3 100644
--- a/src/cmdu_ackq.h
+++ b/src/cmdu_ackq.h
@@ -1,13 +1,12 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * cmdu_ackq.h
  * CMDU pending response and ack queue management
  *
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
- *
- * See LICENSE file for license related information.
- *
  */
 
 #ifndef CMDU_ACKQ_H
diff --git a/src/cmdu_input.c b/src/cmdu_input.c
index eb6da6392bdfcbe6c0d74f06119adf889bcf9713..3673c5fd63b0c59b5a858023f35ddf0a2e975c12 100644
--- a/src/cmdu_input.c
+++ b/src/cmdu_input.c
@@ -1,12 +1,12 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * cmdu_input.c - received CMDU and TLV handling
  *
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
  *
- * See LICENSE file for license related information.
- *
  */
 
 #include <stdio.h>
diff --git a/src/cmdu_output.c b/src/cmdu_output.c
index e25e5afe39a72f166f029ef839da687008a59176..be5109ab18912c7edeae29ccd5c1f33024ac73ee 100644
--- a/src/cmdu_output.c
+++ b/src/cmdu_output.c
@@ -1,12 +1,12 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * cmdu_output.c - handle CMDUs for transmit
  *
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
  *
- * See LICENSE file for license related information.
- *
  */
 
 #include <stdio.h>
diff --git a/src/cmdufrag.c b/src/cmdufrag.c
index e6d5e59a2ffc13a27aeec1ebbc15664945561317..b20b91fba0ef705097e47d4a68d4790d99346f60 100644
--- a/src/cmdufrag.c
+++ b/src/cmdufrag.c
@@ -1,12 +1,12 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * cmdufrag.c - IEEE1905 CMDU fragmentation and defragmentation handling
  *
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
  *
- * See LICENSE file for license related information.
- *
  */
 
 
diff --git a/src/cmdufrag.h b/src/cmdufrag.h
index 4341da99493b54c15d012f2dc89a862d22796e62..98fd16940fc87760dd86f73cbc76b37a78b2cb38 100644
--- a/src/cmdufrag.h
+++ b/src/cmdufrag.h
@@ -1,16 +1,14 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * cmdufrag.h
  * implments structs and functions for CMDU fragments.
  *
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
- *
- * See LICENSE file for license related information.
- *
  */
 
-
 #ifndef CMDUFRAG_H
 #define CMDUFRAG_H
 
diff --git a/src/config.c b/src/config.c
index 59e0e1a880df70645a5c449fc413bf0789ebb998..1f63fc794d6d69c7359cfd89edfb7e21ad302014 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1,12 +1,12 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * config.c - IEEE-1905 config handling.
  *
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
  *
- * See LICENSE file for license related information.
- *
  */
 
 
diff --git a/src/config.h b/src/config.h
index 43481f954683e50373faeff3e7dfde86c22de705..cafd00bc7bc68d7e0f169daa39fa7074cc9a2eec 100644
--- a/src/config.h
+++ b/src/config.h
@@ -1,16 +1,14 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * config.h
  * IEEE-1905 configuration structs and functions.
  *
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
- *
- * See LICENSE file for license related information.
- *
  */
 
-
 #ifndef CONFIG_H
 #define CONFIG_H
 
diff --git a/src/debug.c b/src/debug.c
index a9fc4cf4560a0d836530b6061d155e027c6f13f2..97f4909080d3911495984c2db53decc2c5d4f98d 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -1,12 +1,12 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * debug.c - for debug and logging
  *
  * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
  *
- * See LICENSE file for license related information.
- *
  */
 
 #include <stdlib.h>
diff --git a/src/debug.h b/src/debug.h
index e120f394a2a2baed6de78bed90ef0f34693de3b1..8f1d3b9eeade554a102d2a645e7534d7e8ecfee9 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -1,11 +1,11 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * debug.h - header file for debug and log messages.
  *
  * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
- *
- * See LICENSE file for license related information.
  */
 
 #ifndef DEBUG_H
diff --git a/src/extensions/map/aes-siv.c b/src/extensions/map/aes-siv.c
index d4eb9435488c557655bd5934a094b6ec617ab571..c721ab76ac23c218a195ed454fe7e692d52cf71d 100644
--- a/src/extensions/map/aes-siv.c
+++ b/src/extensions/map/aes-siv.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * AES SIV (RFC 5297)
  * Copyright (c) 2013 Cozybit, Inc.
diff --git a/src/extensions/map/cmduchecker.c b/src/extensions/map/cmduchecker.c
index 841095d2f3e2fbad55151e2f8e9a02e0db70fe06..d5ac15010cf093db5697c67e1840b06ce2a02c85 100644
--- a/src/extensions/map/cmduchecker.c
+++ b/src/extensions/map/cmduchecker.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * Functions for the syntactic validation of EasyMesh CMDU payloads.
  *
diff --git a/src/extensions/map/cntlrsync.c b/src/extensions/map/cntlrsync.c
index 3bb6c01bfb7061c85df125fb255deac89320bc8b..dfcaa369fbbc848963448b1673ef90b75e0298e8 100644
--- a/src/extensions/map/cntlrsync.c
+++ b/src/extensions/map/cntlrsync.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * cntlrsync.c - APIs to sync dynamic controller config
  *
diff --git a/src/extensions/map/cntlrsync.h b/src/extensions/map/cntlrsync.h
index 3abdbab85ee079d153ad2bcb9894be0f81523b5e..06107bd12e6ef9552ddb6887cff3c9b150bad6b9 100644
--- a/src/extensions/map/cntlrsync.h
+++ b/src/extensions/map/cntlrsync.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
 #ifndef DYN_CNTLR_SYNC_H
 #define DYN_CNTLR_SYNC_H
 
diff --git a/src/extensions/map/easymesh.h b/src/extensions/map/easymesh.h
index 3a23e27788fad996edfbc2ad648b64980798988f..78184f0afaa65f32d596aa34f932f2d44cfa5541 100644
--- a/src/extensions/map/easymesh.h
+++ b/src/extensions/map/easymesh.h
@@ -1,12 +1,13 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * easymesh.h - WFA Easymesh CMDUs and TLVs definition in flat format.
  *
- * Copyright (C) 2021-2022 IOPSYS Software Solutions AB.
- * All rights reserved.
- *
- * See LICENSE file for license related information.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
+ * Author: anjan.chanda@iopsys.eu
  */
+
 #ifndef EASYMESH_H
 #define EASYMESH_H
 
diff --git a/src/extensions/map/i1905_eapol.c b/src/extensions/map/i1905_eapol.c
index 7a8d19078654eb5323bfd0972019230c04ff6165..b14dc187c6d449821e9dd0102b28f59dce418bac 100644
--- a/src/extensions/map/i1905_eapol.c
+++ b/src/extensions/map/i1905_eapol.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * i1905_eapol.c - implements EAPOL 4Way-HS as needed by 1905 security.
  *
diff --git a/src/extensions/map/i1905_eapol.h b/src/extensions/map/i1905_eapol.h
index 2db70ad2d8d0d3182c8b04a4f7ea445383f6add6..2747e69d8a15a347c8585e52ab43dcb44e05b0a3 100644
--- a/src/extensions/map/i1905_eapol.h
+++ b/src/extensions/map/i1905_eapol.h
@@ -1,12 +1,11 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * i1905_eapol.h - EAPOL frame definitions for 4Way-HS.
  *
- * Copyright (C) 2021-2022 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
- *
- * See LICENSE file for license related information.
- *
  */
 
 #ifndef I1905_EAPOL_H
diff --git a/src/extensions/map/i1905_security.c b/src/extensions/map/i1905_security.c
index 4ef5bdc8fc0ee2051db58a8903e4fe9131ff25b3..cbd411e3565ff47f7b4efd1c6bf8f4f181230dea 100644
--- a/src/extensions/map/i1905_security.c
+++ b/src/extensions/map/i1905_security.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * i1905_security.c - implements 1905 security as needed by Easymesh.
  *
diff --git a/src/extensions/map/map.c b/src/extensions/map/map.c
index 45838b22332391437be67d7aaa4dd5077eb1f644..e3e1d198c81e872540a4e9accf5e49699b6786b6 100644
--- a/src/extensions/map/map.c
+++ b/src/extensions/map/map.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * map.c - implements multi-ap plugin to ieee1905.
  *
diff --git a/src/extensions/map/map.h b/src/extensions/map/map.h
index a2622b46ca59378f768fb895da501206f21c2e8f..b1507ec79924ac8a2c38a131fc65fa280d13f001 100644
--- a/src/extensions/map/map.h
+++ b/src/extensions/map/map.h
@@ -1,10 +1,11 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * map.h - header for internal use of multi-ap plugin. Not for export.
  *
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
- *
- * See LICENSE file for license related information.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
+ * Author: anjan.chanda@iopsys.eu
  */
 
 #ifndef MAP2_I_H
diff --git a/src/extensions/map/map_module.c b/src/extensions/map/map_module.c
index 7a710af7e9772c98bc09479ea57764ee8c81caf8..dafe5fb93081e56c05f0c48d2bc48f8ec041ac2f 100644
--- a/src/extensions/map/map_module.c
+++ b/src/extensions/map/map_module.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * map_module.c - implements westside interface to map client applications.
  *
diff --git a/src/extensions/map/map_module.h b/src/extensions/map/map_module.h
index ee7b96305986b4d77b6516f9b946948055bbcbeb..79724491119788c42e9070cfc68b78f6fb4b10a3 100644
--- a/src/extensions/map/map_module.h
+++ b/src/extensions/map/map_module.h
@@ -1,9 +1,9 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * map_module.h - header file for westside interface to map client applications.
  *
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
- *
- * See LICENSE file for license related information.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  */
 
diff --git a/src/extensions/map/maputil.c b/src/extensions/map/maputil.c
index 162fb9ec8bd33f44952fe4d96a1e080395fe199b..89afaffb75b3ba4fa33e5fc5a9a1c3a3b1963f47 100644
--- a/src/extensions/map/maputil.c
+++ b/src/extensions/map/maputil.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * maputil.c - implements multi-ap helper functions for map applications.
  *
diff --git a/src/extensions/map/policy.c b/src/extensions/map/policy.c
index 8bfd7931f62352c3980bd8b7afa8cbbb37c8e396..32466207555d27c16dcce2c217cd7c0dddc77c07 100644
--- a/src/extensions/map/policy.c
+++ b/src/extensions/map/policy.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * policy.c - CMDU policy for Easymesh TLVs
  *
diff --git a/src/extensions/map/r1.c b/src/extensions/map/r1.c
index 29f89b799ed2f2b43a9f35dc8d5c45fb90a606ef..642329fa8030dc085b3a46d3e70f6fad52cd83a9 100644
--- a/src/extensions/map/r1.c
+++ b/src/extensions/map/r1.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * r1.c - Easymesh-R1 TLV policy
  *
diff --git a/src/extensions/map/r2.c b/src/extensions/map/r2.c
index a0cc962fe3ffbfa62608ede39a2dbfad2ba86cba..3071530d310a533088766a778a5b10557d3fcd7d 100644
--- a/src/extensions/map/r2.c
+++ b/src/extensions/map/r2.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * r2.c - Easymesh-R2 TLV policy
  *
diff --git a/src/extensions/map/r3.c b/src/extensions/map/r3.c
index a5d5259530df39fe1f47d7b6e5bc29a9ae876c81..756fbf4b113e5f046a3fd21faae226c70bce4ec1 100644
--- a/src/extensions/map/r3.c
+++ b/src/extensions/map/r3.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * r3.c - Easymesh-R3 TLV policy
  *
diff --git a/src/extensions/map/r4.c b/src/extensions/map/r4.c
index 2c0cf8d63ed0c0d992a0692636ff0d924dd0b0f1..a429316e5b33d9aa4251250fadfebd0c4fc3794a 100644
--- a/src/extensions/map/r4.c
+++ b/src/extensions/map/r4.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * r4.c - Easymesh-R4 TLV policy
  *
diff --git a/src/extensions/map/r6.c b/src/extensions/map/r6.c
index 41973409e44f9e4604a52cd0e21caa8baf6004ac..d096cf917633d6be37a344f640ad683b6808c8bb 100644
--- a/src/extensions/map/r6.c
+++ b/src/extensions/map/r6.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * r6.c - Easymesh-R6 TLV policy (subject to change).
  *
diff --git a/src/extensions/map/tlv_checker.c b/src/extensions/map/tlv_checker.c
index 6dd20234a681a78345a07201ca94885104776a3d..b3f5063182fd70a0fe72fe66337e5b96ac2fb22e 100644
--- a/src/extensions/map/tlv_checker.c
+++ b/src/extensions/map/tlv_checker.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * tlv_checker.c - check if EasyMesh TLV data is valid.
  *
diff --git a/src/extensions/map/tlv_checker.h b/src/extensions/map/tlv_checker.h
index 4c6335bc5a5e8c54c57f7f22df950f79a0b3036a..af47758bb0f584aa5a362ef4552f2b0ca4ef38ba 100644
--- a/src/extensions/map/tlv_checker.h
+++ b/src/extensions/map/tlv_checker.h
@@ -1,11 +1,11 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * tlv_checker.h - EasyMesh TLV data validation functions header file.
  *
  * Copyright (C) 2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
- *
- * See LICENSE file for license related information.
  */
 
 #ifndef TLV_CHECKER_H
diff --git a/src/extensions/snoop/snoop.c b/src/extensions/snoop/snoop.c
index 79c7c2d886be87d3a261583a09a1310135c9a8bb..362eedc9abef7ae8ea56dc80589e01a089a5fcde 100644
--- a/src/extensions/snoop/snoop.c
+++ b/src/extensions/snoop/snoop.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * snoop.c - snoop 1905 frames and dump them.
  *
diff --git a/src/extensions/topology/topology.c b/src/extensions/topology/topology.c
index 6aa27039f6063024cf55846ce1739b48d6d37712..6a6845f7254816aed046648412c3722fd8ca8c4f 100644
--- a/src/extensions/topology/topology.c
+++ b/src/extensions/topology/topology.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * topology.c - build full network topology of the 1905 nodes.
  *
diff --git a/src/i1905.c b/src/i1905.c
index de5e68fd26f13fb5dd57d3b5dd7f4105f32b6d8b..bbce3c1aedaa145ebdbc993547832fee54d40395 100644
--- a/src/i1905.c
+++ b/src/i1905.c
@@ -1,12 +1,12 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * i1905.c - IEEE-1905 core functions.
  *
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
  *
- * See LICENSE file for license related information.
- *
  */
 
 #include <stdio.h>
diff --git a/src/i1905.h b/src/i1905.h
index 8057c4305c660e30fe771b7abe61f835f0b61ffd..bc9b005fdddbefc5b93cec1184ce18997bc2ab7f 100644
--- a/src/i1905.h
+++ b/src/i1905.h
@@ -1,15 +1,13 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * i1905.h - header file for ieee1905d daemon.
  *
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
- *
- * See LICENSE file for license related information.
- *
  */
 
-
 #ifndef I1905_H
 #define I1905_H
 
diff --git a/src/i1905_al.c b/src/i1905_al.c
index b8f989123d57a5f31f1414244d5b1f885244bdb1..23cc09fc6281de55b6480ab0faebd781837036de 100644
--- a/src/i1905_al.c
+++ b/src/i1905_al.c
@@ -1,12 +1,12 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * i1905_al.c - IEEE-1905 AL functions
  *
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
  *
- * See LICENSE file for license related information.
- *
  */
 
 #include <stdio.h>
diff --git a/src/i1905_cmd.c b/src/i1905_cmd.c
index 73dfa4578a3bbaa29d08c1740ed150a3f0e93aba..8ac3d8d1414ca09f6548e59b5cc159caf1a75823 100644
--- a/src/i1905_cmd.c
+++ b/src/i1905_cmd.c
@@ -1,12 +1,12 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * i1905_cmd.c - contains CLI commands for status and mgmt of ieee1905d.
  *
- * Copyright (C) 2023 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2023-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
  *
- * See LICENSE file for license related information.
- *
  */
 
 #include <stdio.h>
diff --git a/src/i1905_cmdresp.c b/src/i1905_cmdresp.c
index c8d5dda7f2937016a4ab6fc6106acbdc67b18320..a57680c14dd113b903de1d159225a0d2dd5bfce6 100644
--- a/src/i1905_cmdresp.c
+++ b/src/i1905_cmdresp.c
@@ -1,12 +1,12 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * i1905_cmdresp.c - implements CLI commands.
  *
- * Copyright (C) 2023 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2023-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
  *
- * See LICENSE file for license related information.
- *
  */
 
 #include <stdio.h>
diff --git a/src/i1905_dm.c b/src/i1905_dm.c
index 1e810289f62455526fd6bdf3b44b4a669fb5f7db..b39df7f777156f2a335cd742031d2beed837fdb4 100644
--- a/src/i1905_dm.c
+++ b/src/i1905_dm.c
@@ -1,15 +1,14 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * i1905_dm.c - IEEE-1905 datamodel related functions.
  *
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
  *
- * See LICENSE file for license related information.
- *
  */
 
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
diff --git a/src/i1905_dm.h b/src/i1905_dm.h
index d97fb4fbec5e0409992211b694e904b6b6b0fd76..4d7647c3a704d070ecea8f736df6e502aad9e2ca 100644
--- a/src/i1905_dm.h
+++ b/src/i1905_dm.h
@@ -1,13 +1,12 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * 1905_dm.h
  * IEEE-1905 data model definitions as per TR-181.
  *
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
- *
- * See LICENSE file for license related information.
- *
  */
 
 #ifndef I1905_DM_H
diff --git a/src/i1905_extension.c b/src/i1905_extension.c
index eb957c51f63ea882cdf2e0a3ec10b109fcd562ae..f9f6439f82b2e1ed4bb7e375bec080ffecb37b52 100644
--- a/src/i1905_extension.c
+++ b/src/i1905_extension.c
@@ -1,12 +1,11 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * i1905_extension.c - for extending core IEEE-1905 CMDUs.
  *
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
- *
- * See LICENSE file for license related information.
- *
  */
 
 #include <stdio.h>
diff --git a/src/i1905_extension.h b/src/i1905_extension.h
index f24b84e96cbcf2af40eebc5e8176c6121084c93d..a8e1ee52cadce5db1382d029c935ef93799a7a6c 100644
--- a/src/i1905_extension.h
+++ b/src/i1905_extension.h
@@ -1,13 +1,12 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * i1905_extension.h
  * IEEE-1905 extension modules definitions and functions.
  *
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
- *
- * See LICENSE file for license related information.
- *
  */
 
 #ifndef I1905_EXTENSION_H
diff --git a/src/i1905_netlink.c b/src/i1905_netlink.c
index 134758e47736eef3cc1405f414975df3a42915c3..c206ced7640e042da976f328bc120c8694e9f158 100644
--- a/src/i1905_netlink.c
+++ b/src/i1905_netlink.c
@@ -1,15 +1,13 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * i1905_netlink.c - netlink interface to kernel.
  *
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
- *
- * See LICENSE file for license related information.
- *
  */
 
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/i1905_security.h b/src/i1905_security.h
index 3f2c32002f3b151046266f4dc54bca46d587197b..70a1e3a76e18d140df408c4e450075acd9a7a17c 100644
--- a/src/i1905_security.h
+++ b/src/i1905_security.h
@@ -1,12 +1,11 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * i1905_security.h - 1905 security header file.
  *
- * Copyright (C) 2021-2022 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
- *
- * See LICENSE file for license related information.
- *
  */
 
 #ifndef I1905_SECURITY_H
diff --git a/src/i1905_tlvs.c b/src/i1905_tlvs.c
index 8b137891791fe96927ad78e64b0aad7bded08bdc..706f311b3b87d861c4a682b5a84be6309f590271 100644
--- a/src/i1905_tlvs.c
+++ b/src/i1905_tlvs.c
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 
diff --git a/src/i1905_ubus.c b/src/i1905_ubus.c
index f41c4cb969457798ecfaa3a1af507668904ae451..910238a6dfe9e463db19c8a27c084c959d2178d5 100644
--- a/src/i1905_ubus.c
+++ b/src/i1905_ubus.c
@@ -1,12 +1,11 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * i1905_ubus.c - implements IEEE-1905 UBUS APIs.
  *
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
- *
- * See LICENSE file for license related information.
- *
  */
 
 #include <stdio.h>
diff --git a/src/i1905_wifi.c b/src/i1905_wifi.c
index 5dcba811f0194f6297e5b7ff5eea8d8e4f7d68e0..c03407732de1c5b6ac91c09ab737c4943951073f 100644
--- a/src/i1905_wifi.c
+++ b/src/i1905_wifi.c
@@ -1,12 +1,11 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * i1905_wifi.c - WiFi HAL API wrapper implementation for Easy-soc-libs libwifi.so
  *
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
- *
- * See LICENSE file for license related information.
- *
  */
 
 #include <stdio.h>
diff --git a/src/i1905_wifi.h b/src/i1905_wifi.h
index a55aac76c3e2649516dcdfa6b3d4db189873ed0b..e2de44c44b3655cd4448e85fab2733b992858273 100644
--- a/src/i1905_wifi.h
+++ b/src/i1905_wifi.h
@@ -1,12 +1,11 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * i1905_wifi.h - WiFi HAL API wrappers
  *
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
- *
- * See LICENSE file for license related information.
- *
  */
 
 #ifndef I1905_PLATFORM_H
diff --git a/src/i1905_wsc.c b/src/i1905_wsc.c
index eba3d2bc58b93a48c8a2cd40c767ccfa56779a0e..ba60749f92a9a987473f48f2f1c109c240b34775 100644
--- a/src/i1905_wsc.c
+++ b/src/i1905_wsc.c
@@ -1,15 +1,13 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * i1905_wsc.c - implements IEEE-1905 WSC CMDUs
  *
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
- *
- * See LICENSE file for license related information.
- *
  */
 
-
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/i1905_wsc.h b/src/i1905_wsc.h
index 4eeef9a5810df91e2ddbed8b3dcf14b1a97db315..234aeb744d61e7b7e1c69fc9c91ab256af872c29 100644
--- a/src/i1905_wsc.h
+++ b/src/i1905_wsc.h
@@ -1,16 +1,14 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * i1905_wcs.h
  * IEEE-1905 AP-autoconfig WSC messages defintions.
  *
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
- *
- * See LICENSE file for license related information.
- *
  */
 
-
 #ifndef I1905_WSC_H
 #define I1905_WSC_H
 
diff --git a/src/main.c b/src/main.c
index 8262d56c64987479f2430e27da1e0ff29d6bacc4..8aa7a95d5c4f80d4b2871d5110c24d9a850ede66 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * main.c - main entry point.
  *
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
- *
- * See LICENSE file for license related information.
- *
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  */
 
 #include <stdio.h>
diff --git a/src/midgen.c b/src/midgen.c
index fcfb1f646a7bd14f711ade86725648a8fa867dbf..980253493009abf000c86062113008acf2d8d0cb 100644
--- a/src/midgen.c
+++ b/src/midgen.c
@@ -1,12 +1,11 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * midgen.c - 1905 CMDU mid generator
  *
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
- *
- * See LICENSE file for license related information.
- *
  */
 
 #include <stdio.h>
diff --git a/src/neigh.c b/src/neigh.c
index 472e632872a541d64c882a04a6599549194e7a28..cf2e210f4947e1a3aaf056d749ca25927f4c8745 100644
--- a/src/neigh.c
+++ b/src/neigh.c
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
- *
- * See LICENSE file for license related information.
- *
  */
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/neigh.h b/src/neigh.h
index 194ae9372ed8d284a76b4119a1cc6bd0c3bd35f7..046d14846af66545e1a9b5342394e0a447479253 100644
--- a/src/neigh.h
+++ b/src/neigh.h
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB. All rights reserved.
  *
  * Author: anjan.chanda@iopsys.eu
- *
- * See LICENSE file for license related information.
- *
  */
 
 #ifndef NEIGH_H
diff --git a/src/policy.c b/src/policy.c
index 31543660f62908c4b8176b0b9068e3dfede61168..a02744fb866ccfc6166fbdfc3ed80d8e186b13c7 100644
--- a/src/policy.c
+++ b/src/policy.c
@@ -1,13 +1,13 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * policy.c - 1905 tlvs policy
  *
- * Copyright (C) 2022 IOPSYS Software Solutions AB. All rights reserved.
- *
- * See LICENSE file for license related information.
+ * Copyright (C) 2022-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
+ * @author: anjan.chanda@iopsys.eu
  */
 
-
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/tests/fuzz/recv/rxcmdu.c b/src/tests/fuzz/recv/rxcmdu.c
index 14cc32fba8524d494cdb5095a0143fbcd32614b8..0d7a450b5b00eb43e11b6dae6934c0d23c26b39c 100644
--- a/src/tests/fuzz/recv/rxcmdu.c
+++ b/src/tests/fuzz/recv/rxcmdu.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * rxcmdu.c - 1905 tlvs fuzzer to simulate received cmdus through 'rxcmdu'.
  *
diff --git a/src/tests/fuzz/send/sendcmdu.c b/src/tests/fuzz/send/sendcmdu.c
index 5ccc29321e89ae14fdbc1192607083fc67ef5d65..bb2754d4b776ef679e7aa7a9dba15b065e4fe5fe 100644
--- a/src/tests/fuzz/send/sendcmdu.c
+++ b/src/tests/fuzz/send/sendcmdu.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * sendcmdu.c - fuzz 1905 cmdus and send through 'cmdu' ubus command.
  *
diff --git a/src/timer.c b/src/timer.c
index 27ff0a23219f753c25b21a176528ea8d7dfa4476..def96671b89fda54359d2685cac2b8eb5611ed26 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -1,12 +1,11 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * timer.c - timer utility functions.
  *
- * Copyright (C) 2021-2022 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
- *
- * See LICENSE file for license related information.
- *
  */
 
 #include <stdio.h>
diff --git a/src/timer.h b/src/timer.h
index 51a590dfd47d2c32f4ea6795d80812d5b6c417eb..2aac3accc379028f0bdff949058f5e210e2629d6 100644
--- a/src/timer.h
+++ b/src/timer.h
@@ -1,13 +1,12 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * timer.h
  * Header file for timer utility functions.
  *
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
- *
- * See LICENSE file for license related information.
- *
  */
 
 #ifndef ATIMER_H
diff --git a/src/timer_impl.h b/src/timer_impl.h
index 0f5aed8cb091d3324228be1fc1f12743de4b0cb8..e2274dba352bc160fcb07fa83a633d25710daeff 100644
--- a/src/timer_impl.h
+++ b/src/timer_impl.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
 #ifndef TIMER_IMPL_H
 #define TIMER_IMPL_H
 
diff --git a/src/util.c b/src/util.c
index 6891b9e1b738f59a75bdbdd038f852c9524bca28..1b4dbdbf88f66a75311f4937eb42e2227d963106 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1,12 +1,11 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * util.c - implements utility functions.
  *
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Gnenexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
- *
- * See LICENSE file for license related information.
- *
  */
 
 #include <stdio.h>
diff --git a/src/util.h b/src/util.h
index 676582a210d310febbb4a48a7d11562724b89a7a..651c9df913936edd807d3ffacdc2ba1c6efef4a3 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,13 +1,12 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
  * util.h
  * implements utility functions and definitions.
  *
- * Copyright (C) 2021 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2021-2024 IOPSYS Software Solutions AB. All rights reserved.
+ * Copyright (C) 2025 Genexis AB.
  *
  * Author: anjan.chanda@iopsys.eu
- *
- * See LICENSE file for license related information.
- *
  */
 
 #ifndef UTIL_H