diff --git a/desktop-widgets/about.cpp b/desktop-widgets/about.cpp
index 2d721fb12..6d30a41fa 100644
--- a/desktop-widgets/about.cpp
+++ b/desktop-widgets/about.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "desktop-widgets/about.h"
 #include "core/version.h"
 #include <QDesktopServices>
diff --git a/desktop-widgets/about.h b/desktop-widgets/about.h
index 60d477f99..7a6930698 100644
--- a/desktop-widgets/about.h
+++ b/desktop-widgets/about.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef ABOUT_H
 #define ABOUT_H
 
diff --git a/desktop-widgets/btdeviceselectiondialog.cpp b/desktop-widgets/btdeviceselectiondialog.cpp
index 546f50ea3..9a5e9ddab 100644
--- a/desktop-widgets/btdeviceselectiondialog.cpp
+++ b/desktop-widgets/btdeviceselectiondialog.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <QShortcut>
 #include <QDebug>
 #include <QMessageBox>
diff --git a/desktop-widgets/btdeviceselectiondialog.h b/desktop-widgets/btdeviceselectiondialog.h
index 7651f164b..f3cfa3413 100644
--- a/desktop-widgets/btdeviceselectiondialog.h
+++ b/desktop-widgets/btdeviceselectiondialog.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef BTDEVICESELECTIONDIALOG_H
 #define BTDEVICESELECTIONDIALOG_H
 
diff --git a/desktop-widgets/configuredivecomputerdialog.cpp b/desktop-widgets/configuredivecomputerdialog.cpp
index fce32c892..83114d7b5 100644
--- a/desktop-widgets/configuredivecomputerdialog.cpp
+++ b/desktop-widgets/configuredivecomputerdialog.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "desktop-widgets/configuredivecomputerdialog.h"
 
 #include "core/helpers.h"
diff --git a/desktop-widgets/configuredivecomputerdialog.h b/desktop-widgets/configuredivecomputerdialog.h
index f3ea97de5..7daea3b11 100644
--- a/desktop-widgets/configuredivecomputerdialog.h
+++ b/desktop-widgets/configuredivecomputerdialog.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef CONFIGUREDIVECOMPUTERDIALOG_H
 #define CONFIGUREDIVECOMPUTERDIALOG_H
 
diff --git a/desktop-widgets/divecomputermanagementdialog.cpp b/desktop-widgets/divecomputermanagementdialog.cpp
index 41572355c..62d0d4e28 100644
--- a/desktop-widgets/divecomputermanagementdialog.cpp
+++ b/desktop-widgets/divecomputermanagementdialog.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "desktop-widgets/divecomputermanagementdialog.h"
 #include "desktop-widgets/mainwindow.h"
 #include "core/helpers.h"
diff --git a/desktop-widgets/divecomputermanagementdialog.h b/desktop-widgets/divecomputermanagementdialog.h
index d065a0208..8c1c3c8a9 100644
--- a/desktop-widgets/divecomputermanagementdialog.h
+++ b/desktop-widgets/divecomputermanagementdialog.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef DIVECOMPUTERMANAGEMENTDIALOG_H
 #define DIVECOMPUTERMANAGEMENTDIALOG_H
 #include <QDialog>
diff --git a/desktop-widgets/divelistview.cpp b/desktop-widgets/divelistview.cpp
index 4ff822ae3..fdc8bdd30 100644
--- a/desktop-widgets/divelistview.cpp
+++ b/desktop-widgets/divelistview.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * divelistview.cpp
  *
diff --git a/desktop-widgets/divelistview.h b/desktop-widgets/divelistview.h
index fc8e48f31..5081c8a07 100644
--- a/desktop-widgets/divelistview.h
+++ b/desktop-widgets/divelistview.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * divelistview.h
  *
diff --git a/desktop-widgets/divelogexportdialog.cpp b/desktop-widgets/divelogexportdialog.cpp
index 9f5787c07..890bfa0f7 100644
--- a/desktop-widgets/divelogexportdialog.cpp
+++ b/desktop-widgets/divelogexportdialog.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <QFileDialog>
 #include <QShortcut>
 #include <QSettings>
diff --git a/desktop-widgets/divelogexportdialog.h b/desktop-widgets/divelogexportdialog.h
index 5d5ad146f..7e734e6e1 100644
--- a/desktop-widgets/divelogexportdialog.h
+++ b/desktop-widgets/divelogexportdialog.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef DIVELOGEXPORTDIALOG_H
 #define DIVELOGEXPORTDIALOG_H
 
diff --git a/desktop-widgets/divelogimportdialog.cpp b/desktop-widgets/divelogimportdialog.cpp
index 5e65c8944..5e019958f 100644
--- a/desktop-widgets/divelogimportdialog.cpp
+++ b/desktop-widgets/divelogimportdialog.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "desktop-widgets/divelogimportdialog.h"
 #include "desktop-widgets/mainwindow.h"
 #include "core/color.h"
diff --git a/desktop-widgets/divelogimportdialog.h b/desktop-widgets/divelogimportdialog.h
index 734cc7df3..f01ec282d 100644
--- a/desktop-widgets/divelogimportdialog.h
+++ b/desktop-widgets/divelogimportdialog.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef DIVELOGIMPORTDIALOG_H
 #define DIVELOGIMPORTDIALOG_H
 
diff --git a/desktop-widgets/divepicturewidget.cpp b/desktop-widgets/divepicturewidget.cpp
index ac3c03ea3..92a61cba7 100644
--- a/desktop-widgets/divepicturewidget.cpp
+++ b/desktop-widgets/divepicturewidget.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "desktop-widgets/divepicturewidget.h"
 #include "qt-models/divepicturemodel.h"
 #include "core/metrics.h"
diff --git a/desktop-widgets/divepicturewidget.h b/desktop-widgets/divepicturewidget.h
index 87e8eec33..7980acc54 100644
--- a/desktop-widgets/divepicturewidget.h
+++ b/desktop-widgets/divepicturewidget.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef DIVEPICTUREWIDGET_H
 #define DIVEPICTUREWIDGET_H
 
diff --git a/desktop-widgets/diveplanner.cpp b/desktop-widgets/diveplanner.cpp
index 3b4a5484b..0cffc5a91 100644
--- a/desktop-widgets/diveplanner.cpp
+++ b/desktop-widgets/diveplanner.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "desktop-widgets/diveplanner.h"
 #include "desktop-widgets/modeldelegates.h"
 #include "desktop-widgets/mainwindow.h"
diff --git a/desktop-widgets/diveplanner.h b/desktop-widgets/diveplanner.h
index 0c8d29b42..ee757abd2 100644
--- a/desktop-widgets/diveplanner.h
+++ b/desktop-widgets/diveplanner.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef DIVEPLANNER_H
 #define DIVEPLANNER_H
 
diff --git a/desktop-widgets/diveshareexportdialog.cpp b/desktop-widgets/diveshareexportdialog.cpp
index 4460a44df..7d4c156aa 100644
--- a/desktop-widgets/diveshareexportdialog.cpp
+++ b/desktop-widgets/diveshareexportdialog.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "desktop-widgets/diveshareexportdialog.h"
 #include "ui_diveshareexportdialog.h"
 #include "desktop-widgets/mainwindow.h"
diff --git a/desktop-widgets/diveshareexportdialog.h b/desktop-widgets/diveshareexportdialog.h
index 85dadf5f1..8384ea3c2 100644
--- a/desktop-widgets/diveshareexportdialog.h
+++ b/desktop-widgets/diveshareexportdialog.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef DIVESHAREEXPORTDIALOG_H
 #define DIVESHAREEXPORTDIALOG_H
 
diff --git a/desktop-widgets/downloadfromdivecomputer.cpp b/desktop-widgets/downloadfromdivecomputer.cpp
index a46c5f141..76796b781 100644
--- a/desktop-widgets/downloadfromdivecomputer.cpp
+++ b/desktop-widgets/downloadfromdivecomputer.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "desktop-widgets/downloadfromdivecomputer.h"
 #include "core/helpers.h"
 #include "desktop-widgets/mainwindow.h"
diff --git a/desktop-widgets/downloadfromdivecomputer.h b/desktop-widgets/downloadfromdivecomputer.h
index 33c3ef0a8..419e96453 100644
--- a/desktop-widgets/downloadfromdivecomputer.h
+++ b/desktop-widgets/downloadfromdivecomputer.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef DOWNLOADFROMDIVECOMPUTER_H
 #define DOWNLOADFROMDIVECOMPUTER_H
 
diff --git a/desktop-widgets/globe.cpp b/desktop-widgets/globe.cpp
index 2aef1438b..74053ec6e 100644
--- a/desktop-widgets/globe.cpp
+++ b/desktop-widgets/globe.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "desktop-widgets/globe.h"
 #ifndef NO_MARBLE
 #include "desktop-widgets/mainwindow.h"
diff --git a/desktop-widgets/globe.h b/desktop-widgets/globe.h
index 8cc1265e4..39696fe23 100644
--- a/desktop-widgets/globe.h
+++ b/desktop-widgets/globe.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef GLOBE_H
 #define GLOBE_H
 
diff --git a/desktop-widgets/groupedlineedit.cpp b/desktop-widgets/groupedlineedit.cpp
index 0358a94b8..fb2e26a8e 100644
--- a/desktop-widgets/groupedlineedit.cpp
+++ b/desktop-widgets/groupedlineedit.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2013 Maximilian Güntner <maximilian.guentner@gmail.com>
  *
diff --git a/desktop-widgets/groupedlineedit.h b/desktop-widgets/groupedlineedit.h
index c9cd1a0e0..1f63a5f22 100644
--- a/desktop-widgets/groupedlineedit.h
+++ b/desktop-widgets/groupedlineedit.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2013 Maximilian Güntner <maximilian.guentner@gmail.com>
  *
diff --git a/desktop-widgets/kmessagewidget.cpp b/desktop-widgets/kmessagewidget.cpp
index 0f261569c..f293e7527 100644
--- a/desktop-widgets/kmessagewidget.cpp
+++ b/desktop-widgets/kmessagewidget.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: LGPL-2.1+
 /* This file is part of the KDE libraries
  *
  * Copyright (c) 2011 Aurélien Gâteau <agateau@kde.org>
diff --git a/desktop-widgets/kmessagewidget.h b/desktop-widgets/kmessagewidget.h
index 885d2a78f..73fb97ce1 100644
--- a/desktop-widgets/kmessagewidget.h
+++ b/desktop-widgets/kmessagewidget.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: LGPL-2.1+
 /* This file is part of the KDE libraries
  *
  * Copyright (c) 2011 Aurélien Gâteau <agateau@kde.org>
diff --git a/desktop-widgets/locationinformation.cpp b/desktop-widgets/locationinformation.cpp
index 3e8a85fb6..74f659593 100644
--- a/desktop-widgets/locationinformation.cpp
+++ b/desktop-widgets/locationinformation.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "desktop-widgets/locationinformation.h"
 #include "core/dive.h"
 #include "desktop-widgets/mainwindow.h"
diff --git a/desktop-widgets/locationinformation.h b/desktop-widgets/locationinformation.h
index 243df939b..9b245fe6e 100644
--- a/desktop-widgets/locationinformation.h
+++ b/desktop-widgets/locationinformation.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef LOCATIONINFORMATION_H
 #define LOCATIONINFORMATION_H
 
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp
index afb2f9c77..3e0bfa137 100644
--- a/desktop-widgets/mainwindow.cpp
+++ b/desktop-widgets/mainwindow.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * mainwindow.cpp
  *
diff --git a/desktop-widgets/mainwindow.h b/desktop-widgets/mainwindow.h
index 0fcb1dd29..10fe6d44d 100644
--- a/desktop-widgets/mainwindow.h
+++ b/desktop-widgets/mainwindow.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * mainwindow.h
  *
diff --git a/desktop-widgets/marble/GeoDataTreeModel.h b/desktop-widgets/marble/GeoDataTreeModel.h
index 39eff8388..b6d36b5c3 100644
--- a/desktop-widgets/marble/GeoDataTreeModel.h
+++ b/desktop-widgets/marble/GeoDataTreeModel.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: LGPL-2.1+
 //
 // This file is part of the Marble Virtual Globe.
 //
diff --git a/desktop-widgets/modeldelegates.cpp b/desktop-widgets/modeldelegates.cpp
index f8ebb2591..9ab02cd88 100644
--- a/desktop-widgets/modeldelegates.cpp
+++ b/desktop-widgets/modeldelegates.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "desktop-widgets/modeldelegates.h"
 #include "core/dive.h"
 #include "core/gettextfromc.h"
diff --git a/desktop-widgets/modeldelegates.h b/desktop-widgets/modeldelegates.h
index 82a5e1c7d..4c46d9b7c 100644
--- a/desktop-widgets/modeldelegates.h
+++ b/desktop-widgets/modeldelegates.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef MODELDELEGATES_H
 #define MODELDELEGATES_H
 
diff --git a/desktop-widgets/notificationwidget.cpp b/desktop-widgets/notificationwidget.cpp
index 103c0d068..952adef4f 100644
--- a/desktop-widgets/notificationwidget.cpp
+++ b/desktop-widgets/notificationwidget.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "notificationwidget.h"
 
 NotificationWidget::NotificationWidget(QWidget *parent) : KMessageWidget(parent)
diff --git a/desktop-widgets/notificationwidget.h b/desktop-widgets/notificationwidget.h
index 388982191..90b3e3c43 100644
--- a/desktop-widgets/notificationwidget.h
+++ b/desktop-widgets/notificationwidget.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef NOTIFICATIONWIDGET_H
 #define NOTIFICATIONWIDGET_H
 
diff --git a/desktop-widgets/plugins/facebook/facebook_integration.cpp b/desktop-widgets/plugins/facebook/facebook_integration.cpp
index b07d78f66..adb798eec 100644
--- a/desktop-widgets/plugins/facebook/facebook_integration.cpp
+++ b/desktop-widgets/plugins/facebook/facebook_integration.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "facebook_integration.h"
 #include "facebookconnectwidget.h"
 
diff --git a/desktop-widgets/plugins/facebook/facebook_integration.h b/desktop-widgets/plugins/facebook/facebook_integration.h
index ce4793cad..6f6a58c27 100644
--- a/desktop-widgets/plugins/facebook/facebook_integration.h
+++ b/desktop-widgets/plugins/facebook/facebook_integration.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef FACEBOOK_INTEGRATION_H
 #define FACEBOOK_INTEGRATION_H
 
diff --git a/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp b/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp
index 969f7a118..f5861775a 100644
--- a/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp
+++ b/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "facebookconnectwidget.h"
 
 #include <QJsonDocument>
diff --git a/desktop-widgets/plugins/facebook/facebookconnectwidget.h b/desktop-widgets/plugins/facebook/facebookconnectwidget.h
index 8fbf249e2..d7714945e 100644
--- a/desktop-widgets/plugins/facebook/facebookconnectwidget.h
+++ b/desktop-widgets/plugins/facebook/facebookconnectwidget.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef FACEBOOKCONNECTWIDGET_H
 #define FACEBOOKCONNECTWIDGET_H
 
diff --git a/desktop-widgets/preferences/abstractpreferenceswidget.cpp b/desktop-widgets/preferences/abstractpreferenceswidget.cpp
index 54d2417f9..1b2aeaae5 100644
--- a/desktop-widgets/preferences/abstractpreferenceswidget.cpp
+++ b/desktop-widgets/preferences/abstractpreferenceswidget.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "abstractpreferenceswidget.h"
 
 AbstractPreferencesWidget::AbstractPreferencesWidget(const QString& name, const QIcon& icon, float positionHeight)
diff --git a/desktop-widgets/preferences/abstractpreferenceswidget.h b/desktop-widgets/preferences/abstractpreferenceswidget.h
index 89abc5080..7e303d182 100644
--- a/desktop-widgets/preferences/abstractpreferenceswidget.h
+++ b/desktop-widgets/preferences/abstractpreferenceswidget.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef ABSTRACTPREFERENCESWIDGET_H
 #define ABSTRACTPREFERENCESWIDGET_H
 
diff --git a/desktop-widgets/preferences/preferences_defaults.cpp b/desktop-widgets/preferences/preferences_defaults.cpp
index 0cfbc0a40..552c1aeea 100644
--- a/desktop-widgets/preferences/preferences_defaults.cpp
+++ b/desktop-widgets/preferences/preferences_defaults.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "preferences_defaults.h"
 #include "ui_preferences_defaults.h"
 #include "core/dive.h"
diff --git a/desktop-widgets/preferences/preferences_defaults.h b/desktop-widgets/preferences/preferences_defaults.h
index eb588c097..1674dd2ad 100644
--- a/desktop-widgets/preferences/preferences_defaults.h
+++ b/desktop-widgets/preferences/preferences_defaults.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef PREFERENCES_DEFAULTS_H
 #define PREFERENCES_DEFAULTS_H
 
diff --git a/desktop-widgets/preferences/preferences_georeference.cpp b/desktop-widgets/preferences/preferences_georeference.cpp
index dfa841c88..6600326ea 100644
--- a/desktop-widgets/preferences/preferences_georeference.cpp
+++ b/desktop-widgets/preferences/preferences_georeference.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "preferences_georeference.h"
 #include "ui_prefs_georeference.h"
 #include "core/prefs-macros.h"
diff --git a/desktop-widgets/preferences/preferences_georeference.h b/desktop-widgets/preferences/preferences_georeference.h
index 5dd4bc445..8f76294cd 100644
--- a/desktop-widgets/preferences/preferences_georeference.h
+++ b/desktop-widgets/preferences/preferences_georeference.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef PREFERENCES_GEOREFERENCE_H
 #define PREFERENCES_GEOREFERENCE_H
 
@@ -18,4 +19,4 @@ private:
 	Ui::PreferencesGeoreference *ui;
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/desktop-widgets/preferences/preferences_graph.cpp b/desktop-widgets/preferences/preferences_graph.cpp
index b4fd81fd1..703868cb8 100644
--- a/desktop-widgets/preferences/preferences_graph.cpp
+++ b/desktop-widgets/preferences/preferences_graph.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "preferences_graph.h"
 #include "ui_preferences_graph.h"
 #include "core/prefs-macros.h"
diff --git a/desktop-widgets/preferences/preferences_graph.h b/desktop-widgets/preferences/preferences_graph.h
index 328f348a2..d38275729 100644
--- a/desktop-widgets/preferences/preferences_graph.h
+++ b/desktop-widgets/preferences/preferences_graph.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef PREFERENCES_GRAPH_H
 #define PREFERENCES_GRAPH_H
 
diff --git a/desktop-widgets/preferences/preferences_language.cpp b/desktop-widgets/preferences/preferences_language.cpp
index dbcffccd8..387d55ea0 100644
--- a/desktop-widgets/preferences/preferences_language.cpp
+++ b/desktop-widgets/preferences/preferences_language.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "preferences_language.h"
 #include "ui_prefs_language.h"
 #include "core/helpers.h"
diff --git a/desktop-widgets/preferences/preferences_language.h b/desktop-widgets/preferences/preferences_language.h
index 43014c0fd..aaff67eed 100644
--- a/desktop-widgets/preferences/preferences_language.h
+++ b/desktop-widgets/preferences/preferences_language.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef PREFERENCES_LANGUAGE_H
 #define PREFERENCES_LANGUAGE_H
 
@@ -18,4 +19,4 @@ private:
 	Ui::PreferencesLanguage *ui;
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/desktop-widgets/preferences/preferences_network.cpp b/desktop-widgets/preferences/preferences_network.cpp
index 68c8a9427..fb782e5b7 100644
--- a/desktop-widgets/preferences/preferences_network.cpp
+++ b/desktop-widgets/preferences/preferences_network.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "preferences_network.h"
 #include "ui_preferences_network.h"
 #include "core/dive.h"
diff --git a/desktop-widgets/preferences/preferences_network.h b/desktop-widgets/preferences/preferences_network.h
index b56d7bb1a..dedc2dc77 100644
--- a/desktop-widgets/preferences/preferences_network.h
+++ b/desktop-widgets/preferences/preferences_network.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef PREFERENCES_NETWORK_H
 #define PREFERENCES_NETWORK_H
 
diff --git a/desktop-widgets/preferences/preferences_units.cpp b/desktop-widgets/preferences/preferences_units.cpp
index aa324ec59..2717688a6 100644
--- a/desktop-widgets/preferences/preferences_units.cpp
+++ b/desktop-widgets/preferences/preferences_units.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "preferences_units.h"
 #include "ui_preferences_units.h"
 #include "core/prefs-macros.h"
diff --git a/desktop-widgets/preferences/preferences_units.h b/desktop-widgets/preferences/preferences_units.h
index 21a7f4404..fb20588a2 100644
--- a/desktop-widgets/preferences/preferences_units.h
+++ b/desktop-widgets/preferences/preferences_units.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef PREFERENCES_UNITS_H
 #define PREFERENCES_UNITS_H
 
@@ -18,4 +19,4 @@ private:
 	Ui::PreferencesUnits *ui;
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/desktop-widgets/preferences/preferencesdialog.cpp b/desktop-widgets/preferences/preferencesdialog.cpp
index 3d989199a..14098bdad 100644
--- a/desktop-widgets/preferences/preferencesdialog.cpp
+++ b/desktop-widgets/preferences/preferencesdialog.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "preferencesdialog.h"
 
 #include "abstractpreferenceswidget.h"
diff --git a/desktop-widgets/preferences/preferencesdialog.h b/desktop-widgets/preferences/preferencesdialog.h
index 9210dddb0..34d542b03 100644
--- a/desktop-widgets/preferences/preferencesdialog.h
+++ b/desktop-widgets/preferences/preferencesdialog.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef PREFERENCES_WIDGET_H
 #define PREFERENCES_WIDGET_H
 
diff --git a/desktop-widgets/printdialog.cpp b/desktop-widgets/printdialog.cpp
index e9f11ca53..e8aeb5176 100644
--- a/desktop-widgets/printdialog.cpp
+++ b/desktop-widgets/printdialog.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "printdialog.h"
 #include "printoptions.h"
 #include "mainwindow.h"
diff --git a/desktop-widgets/printdialog.h b/desktop-widgets/printdialog.h
index c615744e8..6f0095a50 100644
--- a/desktop-widgets/printdialog.h
+++ b/desktop-widgets/printdialog.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef PRINTDIALOG_H
 #define PRINTDIALOG_H
 
diff --git a/desktop-widgets/printer.cpp b/desktop-widgets/printer.cpp
index 1ea275cfe..7381b5f7f 100644
--- a/desktop-widgets/printer.cpp
+++ b/desktop-widgets/printer.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "printer.h"
 #include "templatelayout.h"
 #include "core/statistics.h"
diff --git a/desktop-widgets/printer.h b/desktop-widgets/printer.h
index fc867bb3c..661ec8324 100644
--- a/desktop-widgets/printer.h
+++ b/desktop-widgets/printer.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef PRINTER_H
 #define PRINTER_H
 
diff --git a/desktop-widgets/printoptions.cpp b/desktop-widgets/printoptions.cpp
index e7b5f5a69..77920f888 100644
--- a/desktop-widgets/printoptions.cpp
+++ b/desktop-widgets/printoptions.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "printoptions.h"
 #include "templateedit.h"
 #include "core/helpers.h"
diff --git a/desktop-widgets/printoptions.h b/desktop-widgets/printoptions.h
index b8248b7e5..9aaf8de70 100644
--- a/desktop-widgets/printoptions.h
+++ b/desktop-widgets/printoptions.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef PRINTOPTIONS_H
 #define PRINTOPTIONS_H
 
diff --git a/desktop-widgets/simplewidgets.cpp b/desktop-widgets/simplewidgets.cpp
index 992c681f3..331426318 100644
--- a/desktop-widgets/simplewidgets.cpp
+++ b/desktop-widgets/simplewidgets.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "desktop-widgets/simplewidgets.h"
 #include "qt-models/filtermodels.h"
 
diff --git a/desktop-widgets/simplewidgets.h b/desktop-widgets/simplewidgets.h
index c804bd738..18278e132 100644
--- a/desktop-widgets/simplewidgets.h
+++ b/desktop-widgets/simplewidgets.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef SIMPLEWIDGETS_H
 #define SIMPLEWIDGETS_H
 
diff --git a/desktop-widgets/starwidget.cpp b/desktop-widgets/starwidget.cpp
index 67e22ddb7..503b094ad 100644
--- a/desktop-widgets/starwidget.cpp
+++ b/desktop-widgets/starwidget.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "desktop-widgets/starwidget.h"
 #include "core/metrics.h"
 #include <QSvgRenderer>
diff --git a/desktop-widgets/starwidget.h b/desktop-widgets/starwidget.h
index 989aa527d..0b5b5071b 100644
--- a/desktop-widgets/starwidget.h
+++ b/desktop-widgets/starwidget.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef STARWIDGET_H
 #define STARWIDGET_H
 
diff --git a/desktop-widgets/statistics/statisticswidget.cpp b/desktop-widgets/statistics/statisticswidget.cpp
index 50d5f3149..b8b2ab42b 100644
--- a/desktop-widgets/statistics/statisticswidget.cpp
+++ b/desktop-widgets/statistics/statisticswidget.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "desktop-widgets/statistics/statisticswidget.h"
 #include "qt-models/yearlystatisticsmodel.h"
 #include <QModelIndex>
diff --git a/desktop-widgets/statistics/statisticswidget.h b/desktop-widgets/statistics/statisticswidget.h
index ae988292d..9579f68c3 100644
--- a/desktop-widgets/statistics/statisticswidget.h
+++ b/desktop-widgets/statistics/statisticswidget.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef YEARLYSTATISTICSWIDGET_H
 #define YEARLYSTATISTICSWIDGET_H
 
@@ -20,4 +21,4 @@ private:
 	YearlyStatisticsModel *m_model;
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/desktop-widgets/subsurfacewebservices.cpp b/desktop-widgets/subsurfacewebservices.cpp
index 156f724e0..2d8681a8a 100644
--- a/desktop-widgets/subsurfacewebservices.cpp
+++ b/desktop-widgets/subsurfacewebservices.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "desktop-widgets/subsurfacewebservices.h"
 #include "core/helpers.h"
 #include "core/webservice.h"
diff --git a/desktop-widgets/subsurfacewebservices.h b/desktop-widgets/subsurfacewebservices.h
index f7d15d0fd..e890bf648 100644
--- a/desktop-widgets/subsurfacewebservices.h
+++ b/desktop-widgets/subsurfacewebservices.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef SUBSURFACEWEBSERVICES_H
 #define SUBSURFACEWEBSERVICES_H
 
diff --git a/desktop-widgets/tab-widgets/TabBase.cpp b/desktop-widgets/tab-widgets/TabBase.cpp
index 127cce6e4..4252d8b2f 100644
--- a/desktop-widgets/tab-widgets/TabBase.cpp
+++ b/desktop-widgets/tab-widgets/TabBase.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "TabBase.h"
 
 TabBase::TabBase(QWidget *parent) : QWidget(parent)
diff --git a/desktop-widgets/tab-widgets/TabBase.h b/desktop-widgets/tab-widgets/TabBase.h
index b2caf5ffc..054bc9f30 100644
--- a/desktop-widgets/tab-widgets/TabBase.h
+++ b/desktop-widgets/tab-widgets/TabBase.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef TAB_BASE_H
 #define TAB_BASE_H
 
diff --git a/desktop-widgets/tab-widgets/TabDiveExtraInfo.cpp b/desktop-widgets/tab-widgets/TabDiveExtraInfo.cpp
index 0560da7b3..cc46fb957 100644
--- a/desktop-widgets/tab-widgets/TabDiveExtraInfo.cpp
+++ b/desktop-widgets/tab-widgets/TabDiveExtraInfo.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "TabDiveExtraInfo.h"
 #include "ui_TabDiveExtraInfo.h"
 
diff --git a/desktop-widgets/tab-widgets/TabDiveExtraInfo.h b/desktop-widgets/tab-widgets/TabDiveExtraInfo.h
index 11ec18f7a..86ed7abbe 100644
--- a/desktop-widgets/tab-widgets/TabDiveExtraInfo.h
+++ b/desktop-widgets/tab-widgets/TabDiveExtraInfo.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef TAB_DIVE_EXTRA_INFO_H
 #define TAB_DIVE_EXTRA_INFO_H
 
diff --git a/desktop-widgets/tab-widgets/TabDiveInformation.cpp b/desktop-widgets/tab-widgets/TabDiveInformation.cpp
index c9f9a4c44..8410c022c 100644
--- a/desktop-widgets/tab-widgets/TabDiveInformation.cpp
+++ b/desktop-widgets/tab-widgets/TabDiveInformation.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "TabDiveInformation.h"
 #include "ui_TabDiveInformation.h"
 #include "../tagwidget.h"
diff --git a/desktop-widgets/tab-widgets/TabDiveInformation.h b/desktop-widgets/tab-widgets/TabDiveInformation.h
index 7e1f85f3f..80579dbd1 100644
--- a/desktop-widgets/tab-widgets/TabDiveInformation.h
+++ b/desktop-widgets/tab-widgets/TabDiveInformation.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef TAB_DIVE_INFORMATION_H
 #define TAB_DIVE_INFORMATION_H
 
diff --git a/desktop-widgets/tab-widgets/TabDivePhotos.cpp b/desktop-widgets/tab-widgets/TabDivePhotos.cpp
index 2531cd247..143c3a02a 100644
--- a/desktop-widgets/tab-widgets/TabDivePhotos.cpp
+++ b/desktop-widgets/tab-widgets/TabDivePhotos.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "TabDivePhotos.h"
 #include "ui_TabDivePhotos.h"
 
diff --git a/desktop-widgets/tab-widgets/TabDivePhotos.h b/desktop-widgets/tab-widgets/TabDivePhotos.h
index 99196a84f..97f6f86d6 100644
--- a/desktop-widgets/tab-widgets/TabDivePhotos.h
+++ b/desktop-widgets/tab-widgets/TabDivePhotos.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef TAB_DIVE_PHOTOS_H
 #define TAB_DIVE_PHOTOS_H
 
diff --git a/desktop-widgets/tab-widgets/TabDiveStatistics.cpp b/desktop-widgets/tab-widgets/TabDiveStatistics.cpp
index 661aecfdc..80ac12e74 100644
--- a/desktop-widgets/tab-widgets/TabDiveStatistics.cpp
+++ b/desktop-widgets/tab-widgets/TabDiveStatistics.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "TabDiveStatistics.h"
 #include "ui_TabDiveStatistics.h"
 
diff --git a/desktop-widgets/tab-widgets/TabDiveStatistics.h b/desktop-widgets/tab-widgets/TabDiveStatistics.h
index 550fcf991..c763b2e88 100644
--- a/desktop-widgets/tab-widgets/TabDiveStatistics.h
+++ b/desktop-widgets/tab-widgets/TabDiveStatistics.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef TAB_DIVE_STATISTICS_H
 #define TAB_DIVE_STATISTICS_H
 
diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp
index 066679b2f..31b269b9b 100644
--- a/desktop-widgets/tab-widgets/maintab.cpp
+++ b/desktop-widgets/tab-widgets/maintab.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * maintab.cpp
  *
diff --git a/desktop-widgets/tab-widgets/maintab.h b/desktop-widgets/tab-widgets/maintab.h
index a33d6053b..d27b25d94 100644
--- a/desktop-widgets/tab-widgets/maintab.h
+++ b/desktop-widgets/tab-widgets/maintab.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * maintab.h
  *
diff --git a/desktop-widgets/tableview.cpp b/desktop-widgets/tableview.cpp
index d029c1808..29ccbdbd3 100644
--- a/desktop-widgets/tableview.cpp
+++ b/desktop-widgets/tableview.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "desktop-widgets/tableview.h"
 #include "desktop-widgets/modeldelegates.h"
 
diff --git a/desktop-widgets/tableview.h b/desktop-widgets/tableview.h
index c3afdaf12..313a474f4 100644
--- a/desktop-widgets/tableview.h
+++ b/desktop-widgets/tableview.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef TABLEVIEW_H
 #define TABLEVIEW_H
 
diff --git a/desktop-widgets/tagwidget.cpp b/desktop-widgets/tagwidget.cpp
index 754a8886f..b0e6e3249 100644
--- a/desktop-widgets/tagwidget.cpp
+++ b/desktop-widgets/tagwidget.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "tagwidget.h"
 #include "mainwindow.h"
 #include "tab-widgets/maintab.h"
diff --git a/desktop-widgets/tagwidget.h b/desktop-widgets/tagwidget.h
index 6a16129f3..f88b8a208 100644
--- a/desktop-widgets/tagwidget.h
+++ b/desktop-widgets/tagwidget.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef TAGWIDGET_H
 #define TAGWIDGET_H
 
diff --git a/desktop-widgets/templateedit.cpp b/desktop-widgets/templateedit.cpp
index 34f617b1a..4af1666e0 100644
--- a/desktop-widgets/templateedit.cpp
+++ b/desktop-widgets/templateedit.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "templateedit.h"
 #include "printoptions.h"
 #include "printer.h"
diff --git a/desktop-widgets/templateedit.h b/desktop-widgets/templateedit.h
index abbe8e20b..5ed416a61 100644
--- a/desktop-widgets/templateedit.h
+++ b/desktop-widgets/templateedit.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef TEMPLATEEDIT_H
 #define TEMPLATEEDIT_H
 
diff --git a/desktop-widgets/templatelayout.cpp b/desktop-widgets/templatelayout.cpp
index b463b220b..a059a2dad 100644
--- a/desktop-widgets/templatelayout.cpp
+++ b/desktop-widgets/templatelayout.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <string>
 
 #include "templatelayout.h"
diff --git a/desktop-widgets/templatelayout.h b/desktop-widgets/templatelayout.h
index 195441fcd..b4f197c64 100644
--- a/desktop-widgets/templatelayout.h
+++ b/desktop-widgets/templatelayout.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef TEMPLATELAYOUT_H
 #define TEMPLATELAYOUT_H
 
diff --git a/desktop-widgets/undocommands.cpp b/desktop-widgets/undocommands.cpp
index 75fc810c6..e1852832d 100644
--- a/desktop-widgets/undocommands.cpp
+++ b/desktop-widgets/undocommands.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "desktop-widgets/undocommands.h"
 #include "desktop-widgets/mainwindow.h"
 #include "core/divelist.h"
diff --git a/desktop-widgets/undocommands.h b/desktop-widgets/undocommands.h
index cca87ac2d..e01bb20b8 100644
--- a/desktop-widgets/undocommands.h
+++ b/desktop-widgets/undocommands.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef UNDOCOMMANDS_H
 #define UNDOCOMMANDS_H
 
diff --git a/desktop-widgets/updatemanager.cpp b/desktop-widgets/updatemanager.cpp
index 36c36bd65..f73ea0bce 100644
--- a/desktop-widgets/updatemanager.cpp
+++ b/desktop-widgets/updatemanager.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include "desktop-widgets/updatemanager.h"
 #include "core/helpers.h"
 #include "core/qthelper.h"
diff --git a/desktop-widgets/updatemanager.h b/desktop-widgets/updatemanager.h
index 4e95d740f..60211b028 100644
--- a/desktop-widgets/updatemanager.h
+++ b/desktop-widgets/updatemanager.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef UPDATEMANAGER_H
 #define UPDATEMANAGER_H
 
diff --git a/desktop-widgets/usermanual.cpp b/desktop-widgets/usermanual.cpp
index 8e75b432f..41cb09570 100644
--- a/desktop-widgets/usermanual.cpp
+++ b/desktop-widgets/usermanual.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <QDesktopServices>
 #include <QShortcut>
 #include <QFile>
diff --git a/desktop-widgets/usermanual.h b/desktop-widgets/usermanual.h
index 04ae15605..c9ae66323 100644
--- a/desktop-widgets/usermanual.h
+++ b/desktop-widgets/usermanual.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef USERMANUAL_H
 #define USERMANUAL_H
 
diff --git a/desktop-widgets/usersurvey.cpp b/desktop-widgets/usersurvey.cpp
index c60ff8c83..fe55b9279 100644
--- a/desktop-widgets/usersurvey.cpp
+++ b/desktop-widgets/usersurvey.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <QShortcut>
 #include <QMessageBox>
 #include <QSettings>
diff --git a/desktop-widgets/usersurvey.h b/desktop-widgets/usersurvey.h
index 1dd5aaab3..32acfa87b 100644
--- a/desktop-widgets/usersurvey.h
+++ b/desktop-widgets/usersurvey.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #ifndef USERSURVEY_H
 #define USERSURVEY_H