Updated copyright statements upon Git audit

After going through all the files and the history of commits on them
it was clear that some copyright statements are obsolete (the code has
been overwritten since) and some are missing. This commit tries best to
remedy that, along with adding SPDX tags where they were still not used.
Also, a minimal SPDX convention is documented for further contributions.
Closes #426.

47 files changed, 110 insertions, 197 deletions

diff --git a/lib/events/accountdataevents.h b/lib/events/accountdataevents.h
index d0abf577..8cea0ec8 100644
--- a/lib/events/accountdataevents.h
+++ b/lib/events/accountdataevents.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #pragma once
 
diff --git a/lib/events/callanswerevent.cpp b/lib/events/callanswerevent.cpp
index f3d0a9a0..be83d9d0 100644
--- a/lib/events/callanswerevent.cpp
+++ b/lib/events/callanswerevent.cpp
@@ -1,8 +1,6 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
+// SPDX-FileCopyrightText: 2018 Josip Delic <delijati@googlemail.com>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "callanswerevent.h"
 
diff --git a/lib/events/callanswerevent.h b/lib/events/callanswerevent.h
index d7214468..6132cb44 100644
--- a/lib/events/callanswerevent.h
+++ b/lib/events/callanswerevent.h
@@ -1,8 +1,6 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
+// SPDX-FileCopyrightText: 2018 Josip Delic <delijati@googlemail.com>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #pragma once
 
diff --git a/lib/events/callcandidatesevent.cpp b/lib/events/callcandidatesevent.cpp
index 9b765064..b87c8e9b 100644
--- a/lib/events/callcandidatesevent.cpp
+++ b/lib/events/callcandidatesevent.cpp
@@ -1,8 +1,6 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
+// SPDX-FileCopyrightText: 2018 Josip Delic <delijati@googlemail.com>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "callcandidatesevent.h"
 
diff --git a/lib/events/callcandidatesevent.h b/lib/events/callcandidatesevent.h
index ae3bb150..b9de7556 100644
--- a/lib/events/callcandidatesevent.h
+++ b/lib/events/callcandidatesevent.h
@@ -1,8 +1,7 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
+// SPDX-FileCopyrightText: 2018 Josip Delic <delijati@googlemail.com>
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #pragma once
 
diff --git a/lib/events/callhangupevent.cpp b/lib/events/callhangupevent.cpp
index 45b84cd4..43bc4db0 100644
--- a/lib/events/callhangupevent.cpp
+++ b/lib/events/callhangupevent.cpp
@@ -1,5 +1,6 @@
 /******************************************************************************
  * SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
+ * SPDX-FileCopyrightText: 2018 Josip Delic <delijati@googlemail.com>
  *
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
diff --git a/lib/events/callhangupevent.h b/lib/events/callhangupevent.h
index 432f72f5..24382ac2 100644
--- a/lib/events/callhangupevent.h
+++ b/lib/events/callhangupevent.h
@@ -1,8 +1,6 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
+// SPDX-FileCopyrightText: 2018 Josip Delic <delijati@googlemail.com>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #pragma once
 
diff --git a/lib/events/callinviteevent.cpp b/lib/events/callinviteevent.cpp
index 86478ada..5ea54662 100644
--- a/lib/events/callinviteevent.cpp
+++ b/lib/events/callinviteevent.cpp
@@ -1,8 +1,6 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
+// SPDX-FileCopyrightText: 2018 Josip Delic <delijati@googlemail.com>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "callinviteevent.h"
 
diff --git a/lib/events/callinviteevent.h b/lib/events/callinviteevent.h
index 304c89ac..d3454c4f 100644
--- a/lib/events/callinviteevent.h
+++ b/lib/events/callinviteevent.h
@@ -1,8 +1,6 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Marius Gripsgard <marius@ubports.com>
+// SPDX-FileCopyrightText: 2018 Josip Delic <delijati@googlemail.com>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #pragma once
 
diff --git a/lib/events/directchatevent.cpp b/lib/events/directchatevent.cpp
index 39d11072..0ee1f7b0 100644
--- a/lib/events/directchatevent.cpp
+++ b/lib/events/directchatevent.cpp
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "directchatevent.h"
 
diff --git a/lib/events/directchatevent.h b/lib/events/directchatevent.h
index 373e36dc..e2143779 100644
--- a/lib/events/directchatevent.h
+++ b/lib/events/directchatevent.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #pragma once
 
diff --git a/lib/events/encryptedevent.cpp b/lib/events/encryptedevent.cpp
index dc9eaf2d..0290f973 100644
--- a/lib/events/encryptedevent.cpp
+++ b/lib/events/encryptedevent.cpp
@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2019 Alexey Andreyev <aa13q@ya.ru>
-//
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "encryptedevent.h"
diff --git a/lib/events/encryptedevent.h b/lib/events/encryptedevent.h
index 9de08b00..eb7123eb 100644
--- a/lib/events/encryptedevent.h
+++ b/lib/events/encryptedevent.h
@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2019 Alexey Andreyev <aa13q@ya.ru>
-//
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
 #pragma once
diff --git a/lib/events/encryptionevent.cpp b/lib/events/encryptionevent.cpp
index f1bde621..490a5e8a 100644
--- a/lib/events/encryptionevent.cpp
+++ b/lib/events/encryptionevent.cpp
@@ -1,3 +1,7 @@
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-FileCopyrightText: 2019 Alexey Andreyev <aa13q@ya.ru>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
 #include "encryptionevent.h"
 
 #include "e2ee.h"
diff --git a/lib/events/encryptionevent.h b/lib/events/encryptionevent.h
index 3431ddd8..f9bbab12 100644
--- a/lib/events/encryptionevent.h
+++ b/lib/events/encryptionevent.h
@@ -1,8 +1,6 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-FileCopyrightText: 2019 Alexey Andreyev <aa13q@ya.ru>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #pragma once
 
diff --git a/lib/events/event.cpp b/lib/events/event.cpp
index 97edb4e0..3d66ab55 100644
--- a/lib/events/event.cpp
+++ b/lib/events/event.cpp
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2016 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "event.h"
 
diff --git a/lib/events/event.h b/lib/events/event.h
index c5752a7a..f8f8311d 100644
--- a/lib/events/event.h
+++ b/lib/events/event.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2016 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #pragma once
 
diff --git a/lib/events/eventcontent.cpp b/lib/events/eventcontent.cpp
index 18b1b94b..b249b160 100644
--- a/lib/events/eventcontent.cpp
+++ b/lib/events/eventcontent.cpp
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "eventcontent.h"
 
diff --git a/lib/events/eventcontent.h b/lib/events/eventcontent.h
index e247adbf..60d1f7b7 100644
--- a/lib/events/eventcontent.h
+++ b/lib/events/eventcontent.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #pragma once
 
diff --git a/lib/events/eventloader.h b/lib/events/eventloader.h
index 0d95daf5..978668f2 100644
--- a/lib/events/eventloader.h
+++ b/lib/events/eventloader.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #pragma once
 
diff --git a/lib/events/reactionevent.cpp b/lib/events/reactionevent.cpp
index 9b43e372..b53fffd6 100644
--- a/lib/events/reactionevent.cpp
+++ b/lib/events/reactionevent.cpp
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2019 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2019 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "reactionevent.h"
 
diff --git a/lib/events/reactionevent.h b/lib/events/reactionevent.h
index 09166b24..777905f2 100644
--- a/lib/events/reactionevent.h
+++ b/lib/events/reactionevent.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2019 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2019 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #pragma once
 
diff --git a/lib/events/receiptevent.cpp b/lib/events/receiptevent.cpp
index b6f0fcdd..4185d92d 100644
--- a/lib/events/receiptevent.cpp
+++ b/lib/events/receiptevent.cpp
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2016 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 /*
 Example of a Receipt Event:
diff --git a/lib/events/receiptevent.h b/lib/events/receiptevent.h
index ec297a6c..4feec9ea 100644
--- a/lib/events/receiptevent.h
+++ b/lib/events/receiptevent.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2016 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #pragma once
 
diff --git a/lib/events/redactionevent.cpp b/lib/events/redactionevent.cpp
deleted file mode 100644
index 5889773c..00000000
--- a/lib/events/redactionevent.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// SPDX-FileCopyrightText: 2019 Kitsune Ral <Kitsune-Ral@users.sf.net>
-//
-// SPDX-License-Identifier: CC0-1.0
-
-#include "redactionevent.h"
diff --git a/lib/events/redactionevent.h b/lib/events/redactionevent.h
index 320db6f2..ed560331 100644
--- a/lib/events/redactionevent.h
+++ b/lib/events/redactionevent.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #pragma once
 
diff --git a/lib/events/roomavatarevent.h b/lib/events/roomavatarevent.h
index 649412e8..a4257895 100644
--- a/lib/events/roomavatarevent.h
+++ b/lib/events/roomavatarevent.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #pragma once
 
diff --git a/lib/events/roomcanonicalaliasevent.h b/lib/events/roomcanonicalaliasevent.h
index eda94d2d..bb8654e5 100644
--- a/lib/events/roomcanonicalaliasevent.h
+++ b/lib/events/roomcanonicalaliasevent.h
@@ -1,8 +1,6 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2020 QMatrixClient project
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2020 Ram Nad <ramnad1999@gmail.com>
+// SPDX-FileCopyrightText: 2020 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
  
 #pragma once
 
diff --git a/lib/events/roomcreateevent.cpp b/lib/events/roomcreateevent.cpp
index 3d9ec4a3..6558bade 100644
--- a/lib/events/roomcreateevent.cpp
+++ b/lib/events/roomcreateevent.cpp
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2019 QMatrixClient project
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2019 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "roomcreateevent.h"
 
diff --git a/lib/events/roomcreateevent.h b/lib/events/roomcreateevent.h
index 8328d38a..05e623ed 100644
--- a/lib/events/roomcreateevent.h
+++ b/lib/events/roomcreateevent.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2019 QMatrixClient project
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2019 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #pragma once
 
diff --git a/lib/events/roomevent.cpp b/lib/events/roomevent.cpp
index 2b6ac2be..4fec9d2b 100644
--- a/lib/events/roomevent.cpp
+++ b/lib/events/roomevent.cpp
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "roomevent.h"
 
diff --git a/lib/events/roomevent.h b/lib/events/roomevent.h
index 3fafecfd..fea509c0 100644
--- a/lib/events/roomevent.h
+++ b/lib/events/roomevent.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #pragma once
 
diff --git a/lib/events/roomkeyevent.cpp b/lib/events/roomkeyevent.cpp
index 66580430..332be3f7 100644
--- a/lib/events/roomkeyevent.cpp
+++ b/lib/events/roomkeyevent.cpp
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2019 Alexey Andreyev <aa13q@ya.ru>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
 #include "roomkeyevent.h"
 
 using namespace Quotient;
diff --git a/lib/events/roomkeyevent.h b/lib/events/roomkeyevent.h
index b8cd2eae..14e80324 100644
--- a/lib/events/roomkeyevent.h
+++ b/lib/events/roomkeyevent.h
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2019 Alexey Andreyev <aa13q@ya.ru>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
 #pragma once
 
 #include "event.h"
diff --git a/lib/events/roommemberevent.cpp b/lib/events/roommemberevent.cpp
index d093286c..9634ca3a 100644
--- a/lib/events/roommemberevent.cpp
+++ b/lib/events/roommemberevent.cpp
@@ -1,8 +1,6 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-FileCopyrightText: 2019 Karol Kosek <krkkx@protonmail.com>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "roommemberevent.h"
 
diff --git a/lib/events/roommemberevent.h b/lib/events/roommemberevent.h
index b7a7c9df..f2fbe689 100644
--- a/lib/events/roommemberevent.h
+++ b/lib/events/roommemberevent.h
@@ -1,8 +1,7 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-FileCopyrightText: 2019 Karol Kosek <krkkx@protonmail.com>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #pragma once
 
diff --git a/lib/events/roommessageevent.cpp b/lib/events/roommessageevent.cpp
index 19d460b8..14824277 100644
--- a/lib/events/roommessageevent.cpp
+++ b/lib/events/roommessageevent.cpp
@@ -1,8 +1,7 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
+// SPDX-FileCopyrightText: 2016 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-FileCopyrightText: 2017 Roman Plášil <me@rplasil.name>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "roommessageevent.h"
 
diff --git a/lib/events/roommessageevent.h b/lib/events/roommessageevent.h
index ebc9d564..8303ce4e 100644
--- a/lib/events/roommessageevent.h
+++ b/lib/events/roommessageevent.h
@@ -1,8 +1,7 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
+// SPDX-FileCopyrightText: 2016 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-FileCopyrightText: 2017 Roman Plášil <me@rplasil.name>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #pragma once
 
diff --git a/lib/events/roompowerlevelsevent.cpp b/lib/events/roompowerlevelsevent.cpp
index 0a401752..8d262ddf 100644
--- a/lib/events/roompowerlevelsevent.cpp
+++ b/lib/events/roompowerlevelsevent.cpp
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
 #include "roompowerlevelsevent.h"
 
 #include <QJsonDocument>
diff --git a/lib/events/roompowerlevelsevent.h b/lib/events/roompowerlevelsevent.h
index b832230e..0346fc0d 100644
--- a/lib/events/roompowerlevelsevent.h
+++ b/lib/events/roompowerlevelsevent.h
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
 #pragma once
 
 #include "eventcontent.h"
diff --git a/lib/events/roomtombstoneevent.cpp b/lib/events/roomtombstoneevent.cpp
index 163e1d3a..080d269c 100644
--- a/lib/events/roomtombstoneevent.cpp
+++ b/lib/events/roomtombstoneevent.cpp
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2019 QMatrixClient project
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2019 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "roomtombstoneevent.h"
 
diff --git a/lib/events/roomtombstoneevent.h b/lib/events/roomtombstoneevent.h
index 8d50aba0..30e53738 100644
--- a/lib/events/roomtombstoneevent.h
+++ b/lib/events/roomtombstoneevent.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2019 QMatrixClient project
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2019 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #pragma once
 
diff --git a/lib/events/simplestateevents.h b/lib/events/simplestateevents.h
index 58ba3b5a..d6261a8f 100644
--- a/lib/events/simplestateevents.h
+++ b/lib/events/simplestateevents.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #pragma once
 
diff --git a/lib/events/stateevent.cpp b/lib/events/stateevent.cpp
index 7bde12bb..42fc9054 100644
--- a/lib/events/stateevent.cpp
+++ b/lib/events/stateevent.cpp
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "stateevent.h"
 
diff --git a/lib/events/stateevent.h b/lib/events/stateevent.h
index 0db37767..1415f709 100644
--- a/lib/events/stateevent.h
+++ b/lib/events/stateevent.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #pragma once
 
diff --git a/lib/events/typingevent.cpp b/lib/events/typingevent.cpp
index 7d3f71e5..e97e978f 100644
--- a/lib/events/typingevent.cpp
+++ b/lib/events/typingevent.cpp
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "typingevent.h"
 
diff --git a/lib/events/typingevent.h b/lib/events/typingevent.h
index 8ca4f8e4..7456100a 100644
--- a/lib/events/typingevent.h
+++ b/lib/events/typingevent.h
@@ -1,8 +1,5 @@
-/******************************************************************************
- * SPDX-FileCopyrightText: 2015 Felix Rohrbach <kde@fxrh.de>
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
+// SPDX-FileCopyrightText: 2017 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #pragma once