diff --git a/src/core/config.cpp b/src/core/config.cpp
index 2e1635d273d5f86eb861dc54b1c948a9bf2a5d62..f844df58cda51cdb2c39acf06f07da964636ae39 100644
--- a/src/core/config.cpp
+++ b/src/core/config.cpp
@@ -1,8 +1,8 @@
+#include "config.h"
+
 #include "../utility/file.h"
 #include "../utility/json.h"
 
-#include "config.h"
-
 namespace core {
 
 Config::Config(const QString &configsDir, QObject *parent) :
diff --git a/src/core/network.cpp b/src/core/network.cpp
index 7b14b54815dbe0fd5a2f495bdce01b4366990a0f..b7c9f93ef14e3c71f438d20be5b391928ae110b1 100644
--- a/src/core/network.cpp
+++ b/src/core/network.cpp
@@ -1,10 +1,10 @@
+#include "network.h"
+
 #include <QEventLoop>
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QNetworkReply>
 
-#include "network.h"
-
 namespace core {
 
 Network::Network(const bool &async, QObject *parent) :
diff --git a/src/handlers/xdgurl.cpp b/src/handlers/xdgurl.cpp
index fb0c1951296bebb9a2c6b8cd3b1d1a0c48d7bc75..51ea6502716f59bfb9a6f37b747551bc58c2850c 100644
--- a/src/handlers/xdgurl.cpp
+++ b/src/handlers/xdgurl.cpp
@@ -1,3 +1,5 @@
+#include "xdgurl.h"
+
 #include <QUrl>
 #include <QUrlQuery>
 #include <QTemporaryFile>
@@ -9,8 +11,6 @@
 #include "../utility/file.h"
 #include "../utility/package.h"
 
-#include "xdgurl.h"
-
 namespace handlers {
 
 XdgUrl::XdgUrl(const QString &xdgUrl, core::Config *config, core::Network *network, QObject *parent) :
diff --git a/src/utility/file.cpp b/src/utility/file.cpp
index 525278147e4b05bc6ba1527c6ac82d6c06aae158..42a6385efe59ca08156010335372157b81aecbda 100644
--- a/src/utility/file.cpp
+++ b/src/utility/file.cpp
@@ -1,11 +1,11 @@
+#include "file.h"
+
 #include <QIODevice>
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
 #include <QTextStream>
 
-#include "file.h"
-
 namespace utility {
 
 /**
diff --git a/src/utility/json.cpp b/src/utility/json.cpp
index 9546942afc9d7bdf633b14c48fff246676906e6e..b63d6ff1ce22f99209377fb97a784f7319f917ed 100644
--- a/src/utility/json.cpp
+++ b/src/utility/json.cpp
@@ -1,9 +1,9 @@
+#include "json.h"
+
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonParseError>
 
-#include "json.h"
-
 namespace utility {
 
 Json::Json(QObject *parent) : QObject(parent)
diff --git a/src/utility/package.cpp b/src/utility/package.cpp
index 033adc0892c6cab8625357cc6b64a06043c14b63..e22723b302dd26d5a3238205286b2f1713c2c6fb 100644
--- a/src/utility/package.cpp
+++ b/src/utility/package.cpp
@@ -1,9 +1,9 @@
+#include "package.h"
+
 #include <QJsonObject>
 #include <QMimeDatabase>
 #include <QProcess>
 
-#include "package.h"
-
 namespace utility {
 
 Package::Package(QObject *parent) : QObject(parent)