20 files changed, 41 insertions, 66 deletions
diff --git a/plugin/src/Caelestia/audiocollector.cpp b/plugin/src/Caelestia/audiocollector.cpp
index 036a383..b9dfc23 100644
--- a/plugin/src/Caelestia/audiocollector.cpp
+++ b/plugin/src/Caelestia/audiocollector.cpp
@@ -1,11 +1,11 @@
 #include "audiocollector.hpp"
-#include "service.hpp"
 
-#include <QDebug>
+#include "service.hpp"
 #include <algorithm>
 #include <cstdint>
 #include <mutex>
 #include <pipewire/pipewire.h>
+#include <qdebug.h>
 #include <spa/param/audio/format-utils.h>
 #include <spa/param/latency-utils.h>
 #include <stop_token>
diff --git a/plugin/src/Caelestia/audiocollector.hpp b/plugin/src/Caelestia/audiocollector.hpp
index 420452c..283b758 100644
--- a/plugin/src/Caelestia/audiocollector.hpp
+++ b/plugin/src/Caelestia/audiocollector.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "service.hpp"
-#include <QObject>
 #include <atomic>
 #include <cstdint>
 #include <mutex>
diff --git a/plugin/src/Caelestia/audioprovider.cpp b/plugin/src/Caelestia/audioprovider.cpp
index 1b0eed3..4188460 100644
--- a/plugin/src/Caelestia/audioprovider.cpp
+++ b/plugin/src/Caelestia/audioprovider.cpp
@@ -2,9 +2,8 @@
 
 #include "audiocollector.hpp"
 #include "service.hpp"
-#include <QDebug>
-#include <QObject>
-#include <QThread>
+#include <qdebug.h>
+#include <qthread.h>
 
 namespace caelestia {
 
diff --git a/plugin/src/Caelestia/audioprovider.hpp b/plugin/src/Caelestia/audioprovider.hpp
index 1edefff..aa7fb83 100644
--- a/plugin/src/Caelestia/audioprovider.hpp
+++ b/plugin/src/Caelestia/audioprovider.hpp
@@ -1,11 +1,9 @@
 #pragma once
 
 #include "service.hpp"
-#include <QObject>
-#include <QThread>
-#include <QTimer>
 #include <cstdint>
 #include <qqmlintegration.h>
+#include <qtimer.h>
 
 namespace caelestia {
 
diff --git a/plugin/src/Caelestia/beattracker.cpp b/plugin/src/Caelestia/beattracker.cpp
index d82da6e..a23d052 100644
--- a/plugin/src/Caelestia/beattracker.cpp
+++ b/plugin/src/Caelestia/beattracker.cpp
@@ -2,7 +2,6 @@
 
 #include "audiocollector.hpp"
 #include "audioprovider.hpp"
-#include <QObject>
 #include <aubio/aubio.h>
 
 namespace caelestia {
diff --git a/plugin/src/Caelestia/beattracker.hpp b/plugin/src/Caelestia/beattracker.hpp
index fa0ce8a..c7737e1 100644
--- a/plugin/src/Caelestia/beattracker.hpp
+++ b/plugin/src/Caelestia/beattracker.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "audioprovider.hpp"
-#include <QObject>
 #include <aubio/aubio.h>
 #include <qqmlintegration.h>
 
diff --git a/plugin/src/Caelestia/cachingimagemanager.cpp b/plugin/src/Caelestia/cachingimagemanager.cpp
index f50e8a2..3394f89 100644
--- a/plugin/src/Caelestia/cachingimagemanager.cpp
+++ b/plugin/src/Caelestia/cachingimagemanager.cpp
@@ -1,16 +1,13 @@
 #include "cachingimagemanager.hpp"
 
-#include <QCryptographicHash>
-#include <QDir>
-#include <QFile>
-#include <QFutureWatcher>
-#include <QImageReader>
-#include <QObject>
-#include <QPainter>
-#include <QThreadPool>
-#include <QtConcurrent>
-#include <QtQuick/QQuickItem>
-#include <QtQuick/QQuickWindow>
+#include <QtQuick/qquickwindow.h>
+#include <qcryptographichash.h>
+#include <qdir.h>
+#include <qfileinfo.h>
+#include <qfuturewatcher.h>
+#include <qimagereader.h>
+#include <qpainter.h>
+#include <qtconcurrentrun.h>
 
 namespace caelestia {
 
diff --git a/plugin/src/Caelestia/cachingimagemanager.hpp b/plugin/src/Caelestia/cachingimagemanager.hpp
index cb98e49..f05ea34 100644
--- a/plugin/src/Caelestia/cachingimagemanager.hpp
+++ b/plugin/src/Caelestia/cachingimagemanager.hpp
@@ -1,8 +1,7 @@
 #pragma once
 
-#include <QFuture>
-#include <QObject>
-#include <QtQuick/QQuickItem>
+#include <QtQuick/qquickitem.h>
+#include <qobject.h>
 #include <qqmlintegration.h>
 
 namespace caelestia {
diff --git a/plugin/src/Caelestia/cavaprovider.cpp b/plugin/src/Caelestia/cavaprovider.cpp
index 8c3c3c9..d053702 100644
--- a/plugin/src/Caelestia/cavaprovider.cpp
+++ b/plugin/src/Caelestia/cavaprovider.cpp
@@ -2,11 +2,10 @@
 
 #include "audiocollector.hpp"
 #include "audioprovider.hpp"
-#include <QDebug>
-#include <QObject>
 #include <cava/cavacore.h>
 #include <cmath>
 #include <cstddef>
+#include <qdebug.h>
 
 namespace caelestia {
 
diff --git a/plugin/src/Caelestia/cavaprovider.hpp b/plugin/src/Caelestia/cavaprovider.hpp
index 6cc6aba..131e166 100644
--- a/plugin/src/Caelestia/cavaprovider.hpp
+++ b/plugin/src/Caelestia/cavaprovider.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "audioprovider.hpp"
-#include <QObject>
 #include <cava/cavacore.h>
 #include <qqmlintegration.h>
 
diff --git a/plugin/src/Caelestia/cutils.cpp b/plugin/src/Caelestia/cutils.cpp
index 59a33ba..0e0ded5 100644
--- a/plugin/src/Caelestia/cutils.cpp
+++ b/plugin/src/Caelestia/cutils.cpp
@@ -1,12 +1,11 @@
 #include "cutils.hpp"
 
-#include <QDir>
-#include <QObject>
-#include <QQmlEngine>
-#include <QThreadPool>
-#include <QtQuick/QQuickItem>
-#include <QtQuick/QQuickItemGrabResult>
-#include <QtQuick/QQuickWindow>
+#include <QtQuick/qquickitemgrabresult.h>
+#include <QtQuick/qquickwindow.h>
+#include <qdir.h>
+#include <qfileinfo.h>
+#include <qqmlengine.h>
+#include <qthreadpool.h>
 
 namespace caelestia {
 
diff --git a/plugin/src/Caelestia/cutils.hpp b/plugin/src/Caelestia/cutils.hpp
index 654c333..892ff86 100644
--- a/plugin/src/Caelestia/cutils.hpp
+++ b/plugin/src/Caelestia/cutils.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QtQuick/QQuickItem>
+#include <QtQuick/qquickitem.h>
 #include <qobject.h>
 #include <qqmlintegration.h>
 
@@ -12,13 +12,14 @@ class CUtils : public QObject {
     QML_SINGLETON
 
 public:
+    // clang-format off
     Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path);
     Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path, const QRect& rect);
     Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path, QJSValue onSaved);
     Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path, QJSValue onSaved, QJSValue onFailed);
     Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path, const QRect& rect, QJSValue onSaved);
-    Q_INVOKABLE void saveItem(
-        QQuickItem* target, const QUrl& path, const QRect& rect, QJSValue onSaved, QJSValue onFailed);
+    Q_INVOKABLE void saveItem(QQuickItem* target, const QUrl& path, const QRect& rect, QJSValue onSaved, QJSValue onFailed);
+    // clang-format on
 
     Q_INVOKABLE bool copyFile(const QUrl& source, const QUrl& target) const;
     Q_INVOKABLE bool copyFile(const QUrl& source, const QUrl& target, bool overwrite) const;
diff --git a/plugin/src/Caelestia/filesystemmodel.cpp b/plugin/src/Caelestia/filesystemmodel.cpp
index 15de489..9a435a8 100644
--- a/plugin/src/Caelestia/filesystemmodel.cpp
+++ b/plugin/src/Caelestia/filesystemmodel.cpp
@@ -1,14 +1,8 @@
 #include "filesystemmodel.hpp"
 
-#include <QAbstractListModel>
-#include <QDir>
-#include <QDirIterator>
-#include <QFileInfo>
-#include <QFutureWatcher>
-#include <QImageReader>
-#include <QObject>
-#include <QtConcurrent>
-#include <qqmlintegration.h>
+#include <qdiriterator.h>
+#include <qfuturewatcher.h>
+#include <qtconcurrentrun.h>
 
 namespace caelestia {
 
diff --git a/plugin/src/Caelestia/filesystemmodel.hpp b/plugin/src/Caelestia/filesystemmodel.hpp
index 4115e30..db9fff9 100644
--- a/plugin/src/Caelestia/filesystemmodel.hpp
+++ b/plugin/src/Caelestia/filesystemmodel.hpp
@@ -1,13 +1,12 @@
 #pragma once
 
-#include <QAbstractListModel>
-#include <QDir>
-#include <QFileInfo>
-#include <QFileSystemWatcher>
-#include <QFuture>
-#include <QImageReader>
-#include <QMimeDatabase>
-#include <QObject>
+#include <qabstractitemmodel.h>
+#include <qdir.h>
+#include <qfilesystemwatcher.h>
+#include <qfuture.h>
+#include <qimagereader.h>
+#include <qmimedatabase.h>
+#include <qobject.h>
 #include <qqmlintegration.h>
 
 namespace caelestia {
diff --git a/plugin/src/Caelestia/qalculator.cpp b/plugin/src/Caelestia/qalculator.cpp
index 2755c08..44e8d21 100644
--- a/plugin/src/Caelestia/qalculator.cpp
+++ b/plugin/src/Caelestia/qalculator.cpp
@@ -1,6 +1,5 @@
 #include "qalculator.hpp"
 
-#include <QObject>
 #include <libqalculate/qalculate.h>
 
 namespace caelestia {
diff --git a/plugin/src/Caelestia/qalculator.hpp b/plugin/src/Caelestia/qalculator.hpp
index 1791999..a07a8a2 100644
--- a/plugin/src/Caelestia/qalculator.hpp
+++ b/plugin/src/Caelestia/qalculator.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QObject>
+#include <qobject.h>
 #include <qqmlintegration.h>
 
 namespace caelestia {
diff --git a/plugin/src/Caelestia/service.cpp b/plugin/src/Caelestia/service.cpp
index 5d5232b..7c0df92 100644
--- a/plugin/src/Caelestia/service.cpp
+++ b/plugin/src/Caelestia/service.cpp
@@ -1,8 +1,6 @@
 #include "service.hpp"
 
-#include <QDebug>
-#include <QMutexLocker>
-#include <QObject>
+#include <qdebug.h>
 
 namespace caelestia {
 
diff --git a/plugin/src/Caelestia/service.hpp b/plugin/src/Caelestia/service.hpp
index 40e9110..6422b1f 100644
--- a/plugin/src/Caelestia/service.hpp
+++ b/plugin/src/Caelestia/service.hpp
@@ -1,8 +1,7 @@
 #pragma once
 
-#include <QMutex>
-#include <QObject>
-
+#include <qmutex.h>
+#include <qobject.h>
 namespace caelestia {
 
 class Service : public QObject {
diff --git a/plugin/src/Caelestia/serviceref.cpp b/plugin/src/Caelestia/serviceref.cpp
index ebda663..dc82811 100644
--- a/plugin/src/Caelestia/serviceref.cpp
+++ b/plugin/src/Caelestia/serviceref.cpp
@@ -1,7 +1,6 @@
 #include "serviceref.hpp"
-#include "service.hpp"
 
-#include <QObject>
+#include "service.hpp"
 
 namespace caelestia {
 
diff --git a/plugin/src/Caelestia/serviceref.hpp b/plugin/src/Caelestia/serviceref.hpp
index fb48a47..072419e 100644
--- a/plugin/src/Caelestia/serviceref.hpp
+++ b/plugin/src/Caelestia/serviceref.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "service.hpp"
-#include <QObject>
 #include <qqmlintegration.h>
 
 namespace caelestia {