diff --git a/src/editor/generalinfoeditor/autotests/CMakeLists.txt b/src/editor/generalinfoeditor/autotests/CMakeLists.txt
index 81f77005445c31793977f4b132e6e641fc70a964..42bbece99a551ad2b8cb31e4bd1ba9085c610688 100644
--- a/src/editor/generalinfoeditor/autotests/CMakeLists.txt
+++ b/src/editor/generalinfoeditor/autotests/CMakeLists.txt
@@ -1,12 +1,11 @@
-set(phonewidgettest_SRCS phonewidgettest.cpp ../phone/phonewidget.cpp ../phone/phonecomboboxtype.cpp ../phone/phonetypedialog.cpp
-    ../../widgets/preferredlineeditwidget.cpp)
+set(phonewidgettest_SRCS phonewidgettest.cpp)
 add_executable(phonewidgettest ${phonewidgettest_SRCS})
 add_test(phonewidgettest phonewidgettest)
 ecm_mark_as_test(phonewidgettest)
 target_link_libraries(phonewidgettest Qt5::Test  Qt5::Widgets KF5::AkonadiContact KF5::Contacts KF5::I18n KF5::Completion KF5::IconThemes)
 
 
-set(mailwidgettest_SRCS mailwidgettest.cpp ../mail/mailwidget.cpp ../../widgets/preferredlineeditwidget.cpp)
+set(mailwidgettest_SRCS mailwidgettest.cpp ../../widgets/preferredlineeditwidget.cpp)
 add_executable(mailwidgettest ${mailwidgettest_SRCS})
 add_test(mailwidgettest mailwidgettest)
 ecm_mark_as_test(mailwidgettest)
diff --git a/src/editor/generalinfoeditor/mail/mailwidget.h b/src/editor/generalinfoeditor/mail/mailwidget.h
index 4fb8eab331da2552e53d3cb0b0a74bfba9217d69..e185febd1568f94438a1a7e2bcff596d183ef71b 100644
--- a/src/editor/generalinfoeditor/mail/mailwidget.h
+++ b/src/editor/generalinfoeditor/mail/mailwidget.h
@@ -25,12 +25,13 @@
 
 #include <QWidget>
 #include <KContacts/Email>
+#include "akonadicontact_private_export.h"
 class QToolButton;
 namespace Akonadi
 {
 class PreferredLineEditWidget;
 class AkonadiContactSelectTypeCombobox;
-class MailWidget : public QWidget
+class AKONADI_CONTACTS_TESTS_EXPORT MailWidget : public QWidget
 {
     Q_OBJECT
 public:
diff --git a/src/editor/generalinfoeditor/phone/phonecomboboxtype.h b/src/editor/generalinfoeditor/phone/phonecomboboxtype.h
index 3e4bfbd087acc885c45e86e5b6c5da3a64d7de61..01a2bb3dbe351c13ab05c711bd13969ae58b78b8 100644
--- a/src/editor/generalinfoeditor/phone/phonecomboboxtype.h
+++ b/src/editor/generalinfoeditor/phone/phonecomboboxtype.h
@@ -25,13 +25,13 @@
 
 #include <editor/widgets/akonadicontactcombobox.h>
 #include <kcontacts/addressee.h>
-
+#include "akonadicontact_private_export.h"
 namespace Akonadi
 {
 /**
  * @short A combobox to select a phone number type.
  */
-class PhoneComboBoxType : public Akonadi::AkonadiContactComboBox
+class AKONADI_CONTACTS_TESTS_EXPORT PhoneComboBoxType : public Akonadi::AkonadiContactComboBox
 {
     Q_OBJECT
 
diff --git a/src/editor/generalinfoeditor/phone/phonelistwidget.h b/src/editor/generalinfoeditor/phone/phonelistwidget.h
index 2c058e416bd7eab60743368ee5567c54f24f04c6..9558adfe838daf89f999e62d82077fb6a0cc94a0 100644
--- a/src/editor/generalinfoeditor/phone/phonelistwidget.h
+++ b/src/editor/generalinfoeditor/phone/phonelistwidget.h
@@ -24,7 +24,7 @@
 #define PHONELISTWIDGET_H
 
 #include <QWidget>
-
+#include "akonadicontact_private_export.h"
 namespace KContacts
 {
 class Addressee;
@@ -32,7 +32,7 @@ class Addressee;
 namespace Akonadi
 {
 class PhoneWidgetLister;
-class PhoneListWidget : public QWidget
+class AKONADI_CONTACTS_TESTS_EXPORT PhoneListWidget : public QWidget
 {
     Q_OBJECT
 public:
diff --git a/src/editor/generalinfoeditor/phone/phonetypedialog.h b/src/editor/generalinfoeditor/phone/phonetypedialog.h
index e686bc1508300b8e96af35663d896c873ac1c30b..329e2d10bea5d0cc0c59a47a80a3a78d9b89d69e 100644
--- a/src/editor/generalinfoeditor/phone/phonetypedialog.h
+++ b/src/editor/generalinfoeditor/phone/phonetypedialog.h
@@ -23,6 +23,7 @@
 
 #include <QDialog>
 #include <KContacts/PhoneNumber>
+#include "akonadicontact_private_export.h"
 class QButtonGroup;
 
 namespace Akonadi
@@ -30,7 +31,7 @@ namespace Akonadi
 /**
  * A dialog for editing phone number types.
  */
-class PhoneTypeDialog : public QDialog
+class AKONADI_CONTACTS_TESTS_EXPORT PhoneTypeDialog : public QDialog
 {
     Q_OBJECT
 public:
diff --git a/src/editor/generalinfoeditor/phone/phonewidget.h b/src/editor/generalinfoeditor/phone/phonewidget.h
index d7891fdfc8e1e73905697296c1ca23a441aac069..bf9ed210a133e1bd24d1e502962e81de94190019 100644
--- a/src/editor/generalinfoeditor/phone/phonewidget.h
+++ b/src/editor/generalinfoeditor/phone/phonewidget.h
@@ -24,6 +24,7 @@
 #define PHONEWIDGET_H
 
 #include <QWidget>
+#include "akonadicontact_private_export.h"
 class QToolButton;
 namespace KContacts
 {
@@ -33,7 +34,7 @@ namespace Akonadi
 {
 class PreferredLineEditWidget;
 class PhoneComboBoxType;
-class PhoneWidget : public QWidget
+class AKONADI_CONTACTS_TESTS_EXPORT PhoneWidget : public QWidget
 {
     Q_OBJECT
 public:
diff --git a/src/editor/generalinfoeditor/phone/phonewidgetlister.h b/src/editor/generalinfoeditor/phone/phonewidgetlister.h
index 45afd961c63dbffb0b71c6468c02b92b9c138b9b..a3add645bc7c5896ec448b53e7d3833c5494d7e9 100644
--- a/src/editor/generalinfoeditor/phone/phonewidgetlister.h
+++ b/src/editor/generalinfoeditor/phone/phonewidgetlister.h
@@ -24,6 +24,7 @@
 #define PHONEWIDGETLISTER_H
 
 #include "../../widgets/kwidgetlister_p.h"
+#include "akonadicontact_private_export.h"
 namespace KContacts
 {
 class Addressee;
@@ -31,7 +32,7 @@ class Addressee;
 namespace Akonadi
 {
 class PhoneWidget;
-class PhoneWidgetLister : public KWidgetLister
+class AKONADI_CONTACTS_TESTS_EXPORT PhoneWidgetLister : public KWidgetLister
 {
     Q_OBJECT
 public: