diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp
index aac7d1c2c8..f534a2ee6d 100644
--- a/src/mirall/folder.cpp
+++ b/src/mirall/folder.cpp
@@ -35,10 +35,8 @@
 #include <QUrl>
 #include <QDir>
 
-#ifndef TOKEN_AUTH_ONLY
 #include <QMessageBox>
 #include <QPushButton>
-#endif
 
 namespace Mirall {
 
@@ -715,7 +713,6 @@ void Folder::slotJobCompleted(const SyncFileItem &item)
 
 void Folder::slotAboutToRemoveAllFiles(SyncFileItem::Direction direction, bool *cancel)
 {
-#ifndef TOKEN_AUTH_ONLY
     QString msg = direction == SyncFileItem::Down ?
         tr("This sync would remove all the files in the local sync folder '%1'.\n"
            "If you or your administrator have reset your account on the server, choose "
@@ -739,7 +736,6 @@ void Folder::slotAboutToRemoveAllFiles(SyncFileItem::Direction direction, bool *
         _lastEtag = QString();
         QTimer::singleShot(50, this, SLOT(slotPollTimerTimeout()));
     }
-#endif
 }
 } // namespace Mirall
 
diff --git a/src/mirall/folderman.cpp b/src/mirall/folderman.cpp
index 5b55e4c01e..496608b8dc 100644
--- a/src/mirall/folderman.cpp
+++ b/src/mirall/folderman.cpp
@@ -27,9 +27,7 @@
 #include <shlobj.h>
 #endif
 
-#ifndef TOKEN_AUTH_ONLY
 #include <QMessageBox>
-#endif
 
 #include <QtCore>
 
@@ -164,7 +162,6 @@ int FolderMan::setupFolders()
 bool FolderMan::ensureJournalGone(const QString &localPath)
 {
 	// FIXME move this to UI, not libowncloudsync
-#ifndef TOKEN_AUTH_ONLY
     // remove old .csync_journal file
     QString stateDbFile = localPath+QLatin1String("/.csync_journal.db");
     while (QFile::exists(stateDbFile) && !QFile::remove(stateDbFile)) {
@@ -178,7 +175,6 @@ bool FolderMan::ensureJournalGone(const QString &localPath)
             return false;
         }
     }
-#endif
     return true;
 }