diff --git a/src/lib/deskflow/ServerApp.cpp b/src/lib/deskflow/ServerApp.cpp
index c07495b58..69f794bc4 100644
--- a/src/lib/deskflow/ServerApp.cpp
+++ b/src/lib/deskflow/ServerApp.cpp
@@ -13,7 +13,6 @@
 #include "base/Log.h"
 #include "base/Path.h"
 #include "base/TMethodEventJob.h"
-#include "common/Settings.h"
 #include "deskflow/App.h"
 #include "deskflow/ArgParser.h"
 #include "deskflow/Screen.h"
@@ -28,6 +27,9 @@
 #include "server/PrimaryClient.h"
 #include "server/Server.h"
 
+// must be before screen header includes
+#include <QFileInfo>
+
 #if SYSAPI_WIN32
 #include "arch/win32/ArchMiscWindows.h"
 #endif
@@ -58,8 +60,6 @@
 #include "mt/Thread.h"
 #endif
 
-#include <QFileInfo>
-
 #include <fstream>
 #include <iostream>
 #include <sstream>