diff --git a/src/lib/deskflow/PlatformScreen.cpp b/src/lib/deskflow/PlatformScreen.cpp
index 7ed5d3a30..362a98afa 100644
--- a/src/lib/deskflow/PlatformScreen.cpp
+++ b/src/lib/deskflow/PlatformScreen.cpp
@@ -7,7 +7,6 @@
 
 #include "deskflow/PlatformScreen.h"
 #include "base/DirectionTypes.h"
-#include "common/Settings.h"
 #include "deskflow/App.h"
 
 PlatformScreen::PlatformScreen(IEventQueue *events, bool invertScrolling)
diff --git a/src/lib/deskflow/PlatformScreen.h b/src/lib/deskflow/PlatformScreen.h
index 6e7bb2d0c..512682f71 100644
--- a/src/lib/deskflow/PlatformScreen.h
+++ b/src/lib/deskflow/PlatformScreen.h
@@ -7,11 +7,8 @@
 
 #pragma once
 
-#include "common/Settings.h"
 #include "deskflow/IPlatformScreen.h"
 
-#include <stdexcept>
-
 //! Base screen implementation
 /*!
 This screen implementation is the superclass of all other screen
diff --git a/src/lib/deskflow/win32/AppUtilWindows.cpp b/src/lib/deskflow/win32/AppUtilWindows.cpp
index b03b2e7af..801d89a81 100644
--- a/src/lib/deskflow/win32/AppUtilWindows.cpp
+++ b/src/lib/deskflow/win32/AppUtilWindows.cpp
@@ -14,6 +14,7 @@
 #include "base/IEventQueue.h"
 #include "base/Log.h"
 #include "base/LogOutputters.h"
+#include "common/Constants.h"
 #include "deskflow/App.h"
 #include "deskflow/DeskflowException.h"
 #include "deskflow/Screen.h"
diff --git a/src/lib/platform/EiScreen.h b/src/lib/platform/EiScreen.h
index e7992d4f5..8de39351c 100644
--- a/src/lib/platform/EiScreen.h
+++ b/src/lib/platform/EiScreen.h
@@ -11,6 +11,7 @@
 #include "platform/XDGPowerManager.h"
 
 #include <libei.h>
+#include <map>
 #include <mutex>
 #include <vector>