diff --git a/src/gui/socketapi.cpp b/src/gui/socketapi.cpp
index 0ca15c8c70..a13b413562 100644
--- a/src/gui/socketapi.cpp
+++ b/src/gui/socketapi.cpp
@@ -60,9 +60,6 @@
 
 #define DEBUG qDebug() << "SocketApi: "
 
-Q_DECLARE_METATYPE(OCC::SocketListener)
-
-
 static inline QString removeTrailingSlash(QString path)
 {
     Q_ASSERT(path.endsWith(QLatin1Char('/')));
@@ -113,7 +110,7 @@ class SocketListener {
 public:
     QIODevice* socket;
 
-    SocketListener(QIODevice* socket = nullptr) : socket(socket) { }
+    SocketListener(QIODevice* socket = 0) : socket(socket) { }
 
     void sendMessage(const QString& message, bool doWait = false) const
     {
@@ -517,3 +514,5 @@ QString SocketApi::buildRegisterPathMessage(const QString& path)
 }
 
 } // namespace OCC
+
+Q_DECLARE_METATYPE(OCC::SocketListener)
diff --git a/test/syncenginetestutils.h b/test/syncenginetestutils.h
index 8fbe3d56df..5a938a99a6 100644
--- a/test/syncenginetestutils.h
+++ b/test/syncenginetestutils.h
@@ -226,7 +226,7 @@ public:
                 etag = file->etag;
             return file;
         }
-        return nullptr;
+        return 0;
     }
 
     FileInfo *createDir(const QString &relativePath) {