diff --git a/bbf_plugin/Makefile b/bbf_plugin/Makefile
index 8c22d6e410811b409f3d05cfc7b9f931a55c952f..819bf7b23082ea411c3d9b819295ea9fd324af39 100644
--- a/bbf_plugin/Makefile
+++ b/bbf_plugin/Makefile
@@ -3,7 +3,7 @@ LIB_BULKDATA = libbulkdata.so
 LIB_OBJS = datamodel.o
 
 LIB_CFLAGS = $(CFLAGS) -Wall -Werror -fstrict-aliasing
-LIB_LDFLAGS = $(LDFLAGS) -lbbf_api
+LIB_LDFLAGS = $(LDFLAGS)
 FPIC := -fPIC
 
 .PHONY: all clean
diff --git a/bbf_plugin/datamodel.c b/bbf_plugin/datamodel.c
index 92f9c34c635e08c287f3f23c3ea21936892cffa7..ddcebd90198b4cbb4295e302bf473f69278c4629 100644
--- a/bbf_plugin/datamodel.c
+++ b/bbf_plugin/datamodel.c
@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2021 iopsys Software Solutions AB
+ * datamodel.c - Bulkdata datamodel plugin
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1
- * as published by the Free Software Foundation
+ * Copyright (C) 2021-2022, IOPSYS Software Solutions AB.
+ *
+ * Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
+ *
+ * See LICENSE file for license related information.
  *
- *		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
  */
 
 #include <libbbf_api/dmbbf.h>
diff --git a/bbf_plugin/datamodel.h b/bbf_plugin/datamodel.h
index 79bac3565ab71b33bb2635298fafc1c5f12a037e..8f94abb8e15813b92ce617bc529a2ecb8a936763 100644
--- a/bbf_plugin/datamodel.h
+++ b/bbf_plugin/datamodel.h
@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2020 iopsys Software Solutions AB
+ * datamodel.h - Bulkdata datamodel plugin
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1
- * as published by the Free Software Foundation
+ * Copyright (C) 2021-2022, IOPSYS Software Solutions AB.
+ *
+ * Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
+ *
+ * See LICENSE file for license related information.
  *
- *		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
  */
 
 #ifndef _BULKDATA_H_
diff --git a/src/buci.c b/src/buci.c
index 31167f291107b62d72bc700e0d43fa159015699d..f50aca94eb5f42c1cccf2abd8ba9ab4d5034e1b7 100644
--- a/src/buci.c
+++ b/src/buci.c
@@ -1,13 +1,13 @@
 /*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2022 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*
-*/
+ * buci.c - uci utilities
+ *
+ * Copyright (C) 2021-2022, IOPSYS Software Solutions AB.
+ *
+ * Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
+ *
+ * See LICENSE file for license related information.
+ *
+ */
 
 #include <strings.h>
 #include <string.h>
diff --git a/src/buci.h b/src/buci.h
index 481fd4ab399c46d5962ba0dbbcdc1f4d744d9367..b409a8b7a88bd5f5b6a425c60b1c450a6e83e7be 100644
--- a/src/buci.h
+++ b/src/buci.h
@@ -1,13 +1,13 @@
 /*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2022 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*
-*/
+ * buci.h - uci utilities
+ *
+ * Copyright (C) 2021-2022, IOPSYS Software Solutions AB.
+ *
+ * Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
+ *
+ * See LICENSE file for license related information.
+ *
+ */
 
 #ifndef __BUCI_H
 #define __BUCI_H
diff --git a/src/bulkdata.c b/src/bulkdata.c
index fe96a64d29716365c7c087c029d56b1912eaea63..536767d5b768d8d4246c54259389444b0e42ae96 100644
--- a/src/bulkdata.c
+++ b/src/bulkdata.c
@@ -1,13 +1,14 @@
 /*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2022 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*				Omar Kallel <omar.kallel@pivasoftware.com>
-*/
+ * bulkdata.c - Bulkdata core
+ *
+ * Copyright (C) 2022, IOPSYS Software Solutions AB.
+ *
+ * Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
+ * Author: Omar Kallel <omar.kallel@pivasoftware.com>
+ *
+ * See LICENSE file for license related information.
+ *
+ */
 
 #include <stdio.h>
 #include <string.h>
diff --git a/src/config.c b/src/config.c
index d794d72ba808cc7b4a95049aed5a3f705f152511..2b54915f1f42aff3e2279d4867a2789d15c062e1 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1,13 +1,14 @@
 /*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2022 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*				Omar Kallel <omar.kallel@pivasoftware.com>
-*/
+ * config.c - common utility functions
+ *
+ * Copyright (C) 2022, IOPSYS Software Solutions AB.
+ *
+ * Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
+ * Author: Omar Kallel <omar.kallel@pivasoftware.com>
+ *
+ * See LICENSE file for license related information.
+ *
+ */
 
 #include <stdio.h>
 #include <strings.h>
diff --git a/src/config.h b/src/config.h
index 443e170d6eb3fb936df907782cc5fb90b2c8beec..7e727e8b90313f3f7b26934dc41988a3b7859113 100644
--- a/src/config.h
+++ b/src/config.h
@@ -1,13 +1,13 @@
 /*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2022 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*
-*/
+ * config.c - common utility functions
+ *
+ * Copyright (C) 2022, IOPSYS Software Solutions AB.
+ *
+ * Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
+ *
+ * See LICENSE file for license related information.
+ *
+ */
 
 #ifndef __CONFIG_H
 #define __CONFIG_H
diff --git a/src/report.c b/src/report.c
index 73ba38dc91c57d699c1d9becd4285db1ba9c4dc3..3da151775b000edca91fb859d734e4b42e2c77df 100644
--- a/src/report.c
+++ b/src/report.c
@@ -1,14 +1,14 @@
 /*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2022 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*		Author: Omar Kallel <omar.kallel@pivasoftware.com>
-*
-*/
+ * report.c - bulkdata report generation
+ *
+ * Copyright (C) 2022, IOPSYS Software Solutions AB.
+ *
+ * Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
+ * Author: Omar Kallel <omar.kallel@pivasoftware.com>
+ *
+ * See LICENSE file for license related information.
+ *
+ */
 
 #include <string.h>
 #include <json-c/json.h>
diff --git a/src/utils.c b/src/utils.c
index 3fc0e313efd7cdad2459d43a49f3cec5b9fe0bf8..5859cb22af375e3f8a07bb940e3f50f3dc1f07b1 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -1,13 +1,13 @@
 /*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2022 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*
-*/
+ * utils.c - common utility functions
+ *
+ * Copyright (C) 2022, IOPSYS Software Solutions AB.
+ *
+ * Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
+ *
+ * See LICENSE file for license related information.
+ *
+ */
 
 #include <curl/curl.h>
 #include <libubus.h>
diff --git a/src/utils.h b/src/utils.h
index 6f227d95666a842ad8a83545b8458e33e5539a09..e12b111a93ac063ae0b405ef7d26ca02753df0fc 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -1,13 +1,13 @@
 /*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2022 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*
-*/
+ * utils.c - common utility functions
+ *
+ * Copyright (C) 2022, IOPSYS Software Solutions AB.
+ *
+ * Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
+ *
+ * See LICENSE file for license related information.
+ *
+ */
 
 #ifndef __UTILS_H
 #define __UTILS_H