diff --git a/librz/bin/pdb/dbi.c b/librz/bin/pdb/dbi.c
index e3f37f1bfb9..7b48bc83695 100644
--- a/librz/bin/pdb/dbi.c
+++ b/librz/bin/pdb/dbi.c
@@ -1,4 +1,6 @@
+// SPDX-FileCopyrightText: 2014-2020 inisider <inisider@gmail.com>
 // SPDX-License-Identifier: LGPL-3.0-only
+
 #include "types.h"
 #include "dbi.h"
 #include "stream_file.h"
diff --git a/librz/bin/pdb/fpo.c b/librz/bin/pdb/fpo.c
index 9dc6f7092b3..4a92d6abcb9 100644
--- a/librz/bin/pdb/fpo.c
+++ b/librz/bin/pdb/fpo.c
@@ -1,4 +1,6 @@
+// SPDX-FileCopyrightText: 2014-2020 inisider <inisider@gmail.com>
 // SPDX-License-Identifier: LGPL-3.0-only
+
 #include "types.h"
 #include "fpo.h"
 #include "stream_file.h"
diff --git a/librz/bin/pdb/gdata.c b/librz/bin/pdb/gdata.c
index 7adf4a3eda4..e3d05bd4a57 100644
--- a/librz/bin/pdb/gdata.c
+++ b/librz/bin/pdb/gdata.c
@@ -1,4 +1,6 @@
+// SPDX-FileCopyrightText: 2014-2020 inisider <inisider@gmail.com>
 // SPDX-License-Identifier: LGPL-3.0-only
+
 #include "types.h"
 #include "gdata.h"
 #include "stream_file.h"
diff --git a/librz/core/cdebug.c b/librz/core/cdebug.c
index 95bb8e0b457..525a887f553 100644
--- a/librz/core/cdebug.c
+++ b/librz/core/cdebug.c
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2009-2020 pancake <pancake@nopcode.org>
+// SPDX-FileCopyrightText: 2021 Anton Kochkov <anton.kochkov@gmail.com>
+// SPDX-FileCopyrightText: 2021 ret2libc <sirmy15@gmail.com>
 // SPDX-License-Identifier: LGPL-3.0-only
 
 #include <rz_core.h>
diff --git a/librz/core/cmd_interpret.c b/librz/core/cmd_interpret.c
index e891b171093..c3030416bb2 100644
--- a/librz/core/cmd_interpret.c
+++ b/librz/core/cmd_interpret.c
@@ -1,4 +1,6 @@
+// SPDX-FileCopyrightText: 2020 ret2libc <sirmy15@gmail.com>
 // SPDX-License-Identifier: LGPL-3.0-only
+
 #include <rz_cmd.h>
 #include <rz_core.h>
 #include "cmd_descs/cmd_descs.h"
@@ -69,4 +71,4 @@ RZ_IPI RzCmdStatus rz_interpret_system_handler(RzCore *core, int argc, const cha
 RZ_IPI RzCmdStatus rz_interpret_macro_handler(RzCore *core, int argc, const char **argv) {
 	rz_cmd_macro_call(&core->rcmd->macro, argv[1]);
 	return RZ_CMD_STATUS_OK;
-}
\ No newline at end of file
+}
diff --git a/librz/core/cmd_plugins.c b/librz/core/cmd_plugins.c
index cf021085903..be9a4d2bcdc 100644
--- a/librz/core/cmd_plugins.c
+++ b/librz/core/cmd_plugins.c
@@ -1,3 +1,5 @@
+// SPDX-FileCopyrightText: 2009-2020 pancake <pancake@nopcode.org>
+// SPDX-FileCopyrightText: 2020 ret2libc <sirmy15@gmail.com>
 // SPDX-License-Identifier: LGPL-3.0-only
 
 #include <string.h>
diff --git a/librz/core/cmd_tasks.c b/librz/core/cmd_tasks.c
index 1a129dbc137..8d4d2844e10 100644
--- a/librz/core/cmd_tasks.c
+++ b/librz/core/cmd_tasks.c
@@ -1,3 +1,4 @@
+// SPDX-FileCopyrightText: 2020 ret2libc <sirmy15@gmail.com>
 // SPDX-License-Identifier: LGPL-3.0-only
 
 #include <rz_cmd.h>
diff --git a/librz/core/serialize_core.c b/librz/core/serialize_core.c
index 062292f5f58..7ad3d881b57 100644
--- a/librz/core/serialize_core.c
+++ b/librz/core/serialize_core.c
@@ -1,3 +1,4 @@
+// SPDX-FileCopyrightText: 2020 Florian Märkl <info@florianmaerkl.de>
 // SPDX-License-Identifier: LGPL-3.0-only
 
 #include <rz_util/rz_serialize.h>
diff --git a/librz/flag/serialize_flag.c b/librz/flag/serialize_flag.c
index 6ee2d89fe58..7ab8e551001 100644
--- a/librz/flag/serialize_flag.c
+++ b/librz/flag/serialize_flag.c
@@ -1,3 +1,4 @@
+// SPDX-FileCopyrightText: 2020 Florian Märkl <info@florianmaerkl.de>
 // SPDX-License-Identifier: LGPL-3.0-only
 
 #include <rz_util/rz_serialize.h>
diff --git a/shlr/rar/cpu.c b/shlr/rar/cpu.c
index 0f1930945ab..9b4692a1738 100644
--- a/shlr/rar/cpu.c
+++ b/shlr/rar/cpu.c
@@ -1,5 +1,5 @@
-/* RAR-VM assembler/disassembler by pancake for rizin with love */
-/* this implementation is licensed under LGPLv3 - 2012 */
+// SPDX-FileCopyrightText: 2012 pancake <pancake@nopcode.org>
+// SPDX-License-Identifier: LGPL-3.0-only
 
 #include <stdio.h>
 #include <string.h>