diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -19,7 +19,6 @@
     geotest.cpp
     keytest.cpp
     phonenumbertest.cpp
-    picturetest.cpp
     secrecytest.cpp
     soundtest.cpp
     timezonetest.cpp
@@ -41,5 +40,8 @@
     datetimetest.cpp
     clientpidmaptest.cpp
     vcardtool_benchmark.cpp
+    NAME_PREFIX "kcontacts-" LINK_LIBRARIES KF5Contacts Qt5::Test KF5::ConfigCore)
+
+ecm_add_tests(picturetest.cpp
     NAME_PREFIX "kcontacts-" LINK_LIBRARIES KF5Contacts Qt5::Test KF5::ConfigCore Qt5::Gui)
 
diff --git a/autotests/testroundtrip.cpp b/autotests/testroundtrip.cpp
--- a/autotests/testroundtrip.cpp
+++ b/autotests/testroundtrip.cpp
@@ -22,6 +22,7 @@
 #include "converter/vcardconverter.h"
 
 #include <qtest.h>
+#include <QDebug>
 #include <QDir>
 #include <QObject>
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -61,8 +61,8 @@
 target_link_libraries(KF5Contacts
 PUBLIC
     KF5::CoreAddons
-    Qt5::Gui
 PRIVATE
+    Qt5::Gui
     Qt5::DBus
     KF5::ConfigCore
     KF5::I18n
diff --git a/src/picture.h b/src/picture.h
--- a/src/picture.h
+++ b/src/picture.h
@@ -26,7 +26,8 @@
 #include <QtCore/QDataStream>
 #include <QtCore/QString>
 #include <QtCore/QSharedDataPointer>
-#include <QImage>
+
+class QImage;
 
 namespace KContacts
 {
diff --git a/src/picture.cpp b/src/picture.cpp
--- a/src/picture.cpp
+++ b/src/picture.cpp
@@ -23,6 +23,8 @@
 #include <QtCore/QBuffer>
 #include <QtCore/QSharedData>
 
+#include <QtGui/QImage>
+
 namespace KContacts
 {