diff --git a/src/cmd/simplesslerrorhandler.cpp b/src/cmd/simplesslerrorhandler.cpp
index 437438507..b25e9958f 100644
--- a/src/cmd/simplesslerrorhandler.cpp
+++ b/src/cmd/simplesslerrorhandler.cpp
@@ -11,7 +11,6 @@
  * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
  * for more details.
  */
-#include "configfile.h"
 #include "common/utility.h"
 #include "account.h"
 #include "simplesslerrorhandler.h"
diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index 715e81e9a..8f4b3f1ba 100644
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -51,6 +51,7 @@
 #include <QTranslator>
 #include <QMenu>
 #include <QMessageBox>
+#include <QDesktopServices>
 
 class QSocket;
 
diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp
index 674ab34f9..7907ea530 100644
--- a/src/libsync/account.cpp
+++ b/src/libsync/account.cpp
@@ -15,7 +15,6 @@
 #include "account.h"
 #include "cookiejar.h"
 #include "networkjobs.h"
-#include "configfile.h"
 #include "accessmanager.h"
 #include "creds/abstractcredentials.h"
 #include "capabilities.h"
@@ -33,6 +32,7 @@
 #include <QDir>
 #include <QSslKey>
 #include <QAuthenticator>
+#include <QStandardPaths>
 
 namespace OCC {
 
@@ -206,8 +206,7 @@ void Account::lendCookieJarTo(QNetworkAccessManager *guest)
 
 QString Account::cookieJarPath()
 {
-    ConfigFile cfg;
-    return cfg.configPath() + "/cookies" + id() + ".db";
+    return QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/cookies" + id() + ".db";
 }
 
 void Account::resetNetworkAccessManager()
diff --git a/src/libsync/capabilities.cpp b/src/libsync/capabilities.cpp
index fcf71b7e9..333410373 100644
--- a/src/libsync/capabilities.cpp
+++ b/src/libsync/capabilities.cpp
@@ -14,8 +14,6 @@
 
 #include "capabilities.h"
 
-#include "configfile.h"
-
 #include <QVariantMap>
 
 namespace OCC {