diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 4009af936..ed4060bf2 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -48,6 +48,8 @@ set(client_SRCS
     accountmanager.cpp
     accountsettings.cpp
     application.cpp
+    clientproxy.cpp
+    connectionvalidator.cpp
     folder.cpp
     folderman.cpp
     folderstatusmodel.cpp
diff --git a/src/libsync/clientproxy.cpp b/src/gui/clientproxy.cpp
similarity index 100%
rename from src/libsync/clientproxy.cpp
rename to src/gui/clientproxy.cpp
diff --git a/src/libsync/clientproxy.h b/src/gui/clientproxy.h
similarity index 91%
rename from src/libsync/clientproxy.h
rename to src/gui/clientproxy.h
index 169e1fb6e..6552d5e0f 100644
--- a/src/libsync/clientproxy.h
+++ b/src/gui/clientproxy.h
@@ -32,7 +32,7 @@ class ConfigFile;
  * @brief The ClientProxy class
  * @ingroup libsync
  */
-class OWNCLOUDSYNC_EXPORT ClientProxy : public QObject
+class ClientProxy : public QObject
 {
     Q_OBJECT
 public:
@@ -61,7 +61,7 @@ private:
     QUrl _url;
 };
 
-OWNCLOUDSYNC_EXPORT QString printQNetworkProxy(const QNetworkProxy &proxy);
+QString printQNetworkProxy(const QNetworkProxy &proxy);
 }
 
 #endif // CLIENTPROXY_H
diff --git a/src/libsync/connectionvalidator.cpp b/src/gui/connectionvalidator.cpp
similarity index 100%
rename from src/libsync/connectionvalidator.cpp
rename to src/gui/connectionvalidator.cpp
diff --git a/src/libsync/connectionvalidator.h b/src/gui/connectionvalidator.h
similarity index 96%
rename from src/libsync/connectionvalidator.h
rename to src/gui/connectionvalidator.h
index 46584661e..d8bb3d986 100644
--- a/src/libsync/connectionvalidator.h
+++ b/src/gui/connectionvalidator.h
@@ -79,7 +79,7 @@ namespace OCC {
     \endcode
  */
 
-class OWNCLOUDSYNC_EXPORT ConnectionValidator : public QObject
+class ConnectionValidator : public QObject
 {
     Q_OBJECT
 public:
@@ -113,7 +113,7 @@ public slots:
     void checkAuthentication();
 
 signals:
-    void connectionResult(ConnectionValidator::Status status, QStringList errors);
+    void connectionResult(ConnectionValidator::Status status, const QStringList &errors);
 
 protected slots:
     void slotCheckServerAndAuth();
diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt
index e03921cb6..b83061282 100644
--- a/src/libsync/CMakeLists.txt
+++ b/src/libsync/CMakeLists.txt
@@ -24,8 +24,6 @@ set(libsync_SRCS
     wordlist.cpp
     bandwidthmanager.cpp
     capabilities.cpp
-    clientproxy.cpp
-    connectionvalidator.cpp
     cookiejar.cpp
     discoveryphase.cpp
     filesystem.cpp
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index a2879a42b..5f36690a7 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -64,6 +64,8 @@ list(APPEND FolderMan_SRC ../src/gui/syncrunfilelog.cpp )
 list(APPEND FolderMan_SRC ../src/gui/lockwatcher.cpp )
 list(APPEND FolderMan_SRC ../src/gui/guiutility.cpp )
 list(APPEND FolderMan_SRC ../src/gui/navigationpanehelper.cpp )
+list(APPEND FolderMan_SRC ../src/gui/connectionvalidator.cpp )
+list(APPEND FolderMan_SRC ../src/gui/clientproxy.cpp )
 list(APPEND FolderMan_SRC ${FolderWatcher_SRC})
 list(APPEND FolderMan_SRC stub.cpp )
 owncloud_add_test(FolderMan "${FolderMan_SRC}")