diff --git a/SuspendResume/SuspendResume_Linux_FreeBSD.cpp b/SuspendResume/SuspendResume_Linux_FreeBSD.cpp
index bc2942e9f..b3ea4f5d0 100644
--- a/SuspendResume/SuspendResume_Linux_FreeBSD.cpp
+++ b/SuspendResume/SuspendResume_Linux_FreeBSD.cpp
@@ -9,8 +9,7 @@
 |   SPDX-License-Identifier: GPL-2.0-or-later               |
 \*---------------------------------------------------------*/
 
-#include <QDBusConnection>
-#include "SuspendResume.h"
+#include "SuspendResume_Linux_FreeBSD.h"
 
 SuspendResumeLoginManager::SuspendResumeLoginManager(SuspendResumeListener *srl) : srl(srl), bus(QDBusConnection::systemBus())
 {
diff --git a/SuspendResume/SuspendResume_Linux_FreeBSD.h b/SuspendResume/SuspendResume_Linux_FreeBSD.h
index d36c04014..180f4dc04 100644
--- a/SuspendResume/SuspendResume_Linux_FreeBSD.h
+++ b/SuspendResume/SuspendResume_Linux_FreeBSD.h
@@ -11,6 +11,7 @@
 
 #pragma once
 
+#include <QChar>
 #include <QDBusConnection>
 #include <QObject>
 #include "SuspendResume.h"
diff --git a/SuspendResume/SuspendResume_MacOS.cpp b/SuspendResume/SuspendResume_MacOS.cpp
index 0079fe0db..79de93b44 100644
--- a/SuspendResume/SuspendResume_MacOS.cpp
+++ b/SuspendResume/SuspendResume_MacOS.cpp
@@ -9,10 +9,7 @@
 |   SPDX-License-Identifier: GPL-2.0-or-later               |
 \*---------------------------------------------------------*/
 
-#include <stdint.h>
-#include "SuspendResume.h"
-#include "IOKit/pwr_mgt/IOPMLib.h"
-#include "IOKit/IOMessage.h"
+#include "SuspendResume_MacOS.h"
 
 SuspendResumeListener::SuspendResumeListener()
 {
diff --git a/SuspendResume/SuspendResume_Windows.cpp b/SuspendResume/SuspendResume_Windows.cpp
index 32297d08a..e39be8a5a 100644
--- a/SuspendResume/SuspendResume_Windows.cpp
+++ b/SuspendResume/SuspendResume_Windows.cpp
@@ -9,9 +9,7 @@
 |   SPDX-License-Identifier: GPL-2.0-or-later               |
 \*---------------------------------------------------------*/
 
-#include <QByteArray>
-#include <QCoreApplication>
-#include "SuspendResume.h"
+#include "SuspendResume_Windows.h"
 #include "windows.h"
 
 SuspendResumeListener::SuspendResumeListener()
diff --git a/SuspendResume/SuspendResume_Windows.h b/SuspendResume/SuspendResume_Windows.h
index da406af4c..3f188a7f8 100644
--- a/SuspendResume/SuspendResume_Windows.h
+++ b/SuspendResume/SuspendResume_Windows.h
@@ -13,6 +13,7 @@
 
 #include <QAbstractNativeEventFilter>
 #include <QByteArray>
+#include <QCoreApplication>
 #include "SuspendResume.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)