diff --git a/.clang-format b/.clang-format
index 6e95e1463..8b3f68c09 100755
--- a/.clang-format
+++ b/.clang-format
@@ -81,20 +81,24 @@ ForEachMacros:
   - BOOST_FOREACH
 IfMacros:
   - KJ_IF_MAYBE
-IncludeBlocks:   Preserve
+IncludeBlocks:   Regroup
 IncludeCategories:
-  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+  - Regex:           '^"ui_'
     Priority:        2
     SortPriority:    0
     CaseSensitive:   false
-  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
-    Priority:        3
-    SortPriority:    0
-    CaseSensitive:   false
-  - Regex:           '.*'
+  - Regex:           '^".+'
     Priority:        1
     SortPriority:    0
     CaseSensitive:   false
+  - Regex:           '^<[A-Z]'
+    Priority:        3
+    SortPriority:    0
+    CaseSensitive:   true
+  - Regex:           '^<[a-z0-9]'
+    Priority:        4
+    SortPriority:    0
+    CaseSensitive:   true
 IncludeIsMainRegex: '(Test)?$'
 IncludeIsMainSourceRegex: ''
 IndentAccessModifiers: true
diff --git a/src/librssguard-standard/src/gui/formdiscoverfeeds.h b/src/librssguard-standard/src/gui/formdiscoverfeeds.h
index a4d5fde12..dbf8015bd 100644
--- a/src/librssguard-standard/src/gui/formdiscoverfeeds.h
+++ b/src/librssguard-standard/src/gui/formdiscoverfeeds.h
@@ -3,16 +3,15 @@
 #ifndef FORMDISCOVERFEEDS_H
 #define FORMDISCOVERFEEDS_H
 
-#include <QDialog>
+#include "src/parsers/feedparser.h"
 
 #include "ui_formdiscoverfeeds.h"
 
-#include "src/parsers/feedparser.h"
+#include <QDialog>
+#include <QFutureWatcher>
 
 #include <librssguard/services/abstract/accountcheckmodel.h>
 
-#include <QFutureWatcher>
-
 class ServiceRoot;
 class RootItem;
 class Category;
diff --git a/src/librssguard-standard/src/gui/formstandardimportexport.h b/src/librssguard-standard/src/gui/formstandardimportexport.h
index 7150455ab..a36d80efe 100644
--- a/src/librssguard-standard/src/gui/formstandardimportexport.h
+++ b/src/librssguard-standard/src/gui/formstandardimportexport.h
@@ -3,11 +3,12 @@
 #ifndef FORMEXPORT_H
 #define FORMEXPORT_H
 
-#include <QDialog>
-
 #include "src/standardfeedsimportexportmodel.h"
+
 #include "ui_formstandardimportexport.h"
 
+#include <QDialog>
+
 namespace Ui {
   class FormStandardImportExport;
 }
@@ -19,7 +20,10 @@ class FormStandardImportExport : public QDialog {
     Q_OBJECT
 
   public:
-    enum class ConversionType { OPML20 = 0, TxtUrlPerLine = 1 };
+    enum class ConversionType {
+      OPML20 = 0,
+      TxtUrlPerLine = 1
+    };
 
     explicit FormStandardImportExport(StandardServiceRoot* service_root, QWidget* parent = nullptr);
     virtual ~FormStandardImportExport();
diff --git a/src/librssguard-standard/src/gui/standardaccountdetails.h b/src/librssguard-standard/src/gui/standardaccountdetails.h
index c1e977df8..bab0f9503 100644
--- a/src/librssguard-standard/src/gui/standardaccountdetails.h
+++ b/src/librssguard-standard/src/gui/standardaccountdetails.h
@@ -3,10 +3,10 @@
 #ifndef STANDARDACCOUNTDETAILS_H
 #define STANDARDACCOUNTDETAILS_H
 
-#include <QWidget>
-
 #include "ui_standardaccountdetails.h"
 
+#include <QWidget>
+
 namespace Ui {
   class StandardAccountDetails;
 }
diff --git a/src/librssguard-standard/src/gui/standardfeeddetails.h b/src/librssguard-standard/src/gui/standardfeeddetails.h
index 6f8017763..442b97f0a 100644
--- a/src/librssguard-standard/src/gui/standardfeeddetails.h
+++ b/src/librssguard-standard/src/gui/standardfeeddetails.h
@@ -3,13 +3,12 @@
 #ifndef STANDARDFEEDDETAILS_H
 #define STANDARDFEEDDETAILS_H
 
-#include <QWidget>
+#include "src/standardfeed.h"
 
 #include "ui_standardfeeddetails.h"
 
-#include "src/standardfeed.h"
-
 #include <QNetworkProxy>
+#include <QWidget>
 
 class Category;
 class RootItem;
diff --git a/src/librssguard-standard/src/parsers/atomparser.h b/src/librssguard-standard/src/parsers/atomparser.h
index addf9a431..39a1a4cb8 100644
--- a/src/librssguard-standard/src/parsers/atomparser.h
+++ b/src/librssguard-standard/src/parsers/atomparser.h
@@ -5,11 +5,11 @@
 
 #include "src/parsers/feedparser.h"
 
-#include <librssguard/core/message.h>
-
 #include <QDomDocument>
 #include <QList>
 
+#include <librssguard/core/message.h>
+
 class AtomParser : public FeedParser {
   public:
     explicit AtomParser(const QString& data);
diff --git a/src/librssguard-standard/src/parsers/feedparser.h b/src/librssguard-standard/src/parsers/feedparser.h
index d01bc14d2..640fd12a1 100644
--- a/src/librssguard-standard/src/parsers/feedparser.h
+++ b/src/librssguard-standard/src/parsers/feedparser.h
@@ -3,6 +3,8 @@
 #ifndef FEEDPARSER_H
 #define FEEDPARSER_H
 
+#include "src/standardfeed.h"
+
 #include <QDomDocument>
 #include <QJsonArray>
 #include <QJsonDocument>
@@ -11,7 +13,6 @@
 
 #include <librssguard/core/message.h>
 #include <librssguard/definitions/typedefs.h>
-#include "src/standardfeed.h"
 
 // Base class for all XML-based feed parsers.
 class FeedParser {
diff --git a/src/librssguard-standard/src/standardserviceentrypoint.cpp b/src/librssguard-standard/src/standardserviceentrypoint.cpp
index 0202f9d9e..d35c23078 100644
--- a/src/librssguard-standard/src/standardserviceentrypoint.cpp
+++ b/src/librssguard-standard/src/standardserviceentrypoint.cpp
@@ -10,7 +10,9 @@
 
 StandardServiceEntryPoint::StandardServiceEntryPoint(QObject* parent) : QObject(parent) {}
 
-StandardServiceEntryPoint::~StandardServiceEntryPoint() {}
+StandardServiceEntryPoint::~StandardServiceEntryPoint() {
+  qDebugNN << LOGSEC_CORE << "Destructing" << QUOTE_W_SPACE(QSL(SERVICE_CODE_STD_RSS)) << "plugin.";
+}
 
 QString StandardServiceEntryPoint::name() const {
   return QSL("RSS/RDF/ATOM/JSON");