diff --git a/src/lib/arch/Arch.h b/src/lib/arch/Arch.h
index 16ff5151c..d6c90acae 100644
--- a/src/lib/arch/Arch.h
+++ b/src/lib/arch/Arch.h
@@ -25,8 +25,6 @@
 
 #pragma once
 
-#include "common/Common.h"
-
 #if SYSAPI_WIN32
 
 #include "arch/win32/ArchDaemonWindows.h"
diff --git a/src/lib/platform/XWindowsScreen.cpp b/src/lib/platform/XWindowsScreen.cpp
index 9d0dddf02..45c7544ac 100644
--- a/src/lib/platform/XWindowsScreen.cpp
+++ b/src/lib/platform/XWindowsScreen.cpp
@@ -26,6 +26,8 @@
 #include "platform/XWindowsScreenSaver.h"
 #include "platform/XWindowsUtil.h"
 
+#include "Config.h"
+
 #include <X11/X.h>
 #include <X11/Xutil.h>
 #include <algorithm>
diff --git a/src/lib/platform/XWindowsScreen.h b/src/lib/platform/XWindowsScreen.h
index ced24c707..72f8f0317 100644
--- a/src/lib/platform/XWindowsScreen.h
+++ b/src/lib/platform/XWindowsScreen.h
@@ -8,11 +8,12 @@
 
 #pragma once
 
-#include "arch/Arch.h"
 #include "deskflow/KeyMap.h"
 #include "deskflow/PlatformScreen.h"
 #include "platform/XDGPowerManager.h"
 
+#include "Config.h"
+
 #include <set>
 #include <vector>
 
diff --git a/src/lib/platform/XWindowsScreenSaver.cpp b/src/lib/platform/XWindowsScreenSaver.cpp
index 50500092e..4211e3a6a 100644
--- a/src/lib/platform/XWindowsScreenSaver.cpp
+++ b/src/lib/platform/XWindowsScreenSaver.cpp
@@ -12,9 +12,10 @@
 
 #include "base/Event.h"
 #include "base/IEventQueue.h"
-#include "deskflow/IPlatformScreen.h"
 #include "platform/XWindowsUtil.h"
 
+#include "Config.h"
+
 #include <X11/Xatom.h>
 #if HAVE_X11_EXTENSIONS_XTEST_H
 #include <X11/extensions/XTest.h>