diff --git a/src/collectionpage/autotests/CMakeLists.txt b/src/collectionpage/autotests/CMakeLists.txt
index c2585a6..5b38956 100644
--- a/src/collectionpage/autotests/CMakeLists.txt
+++ b/src/collectionpage/autotests/CMakeLists.txt
@@ -8,5 +8,4 @@ endmacro()
 
 add_mailcommon_collectionpage_test(expirecollectionattributetest
     expirecollectionattributetest.cpp
-    ../attributes/expirecollectionattribute.cpp
 )
diff --git a/src/filter/autotests/CMakeLists.txt b/src/filter/autotests/CMakeLists.txt
index 5eeae44..cd7755e 100644
--- a/src/filter/autotests/CMakeLists.txt
+++ b/src/filter/autotests/CMakeLists.txt
@@ -171,7 +171,6 @@ add_mailcommon_filter_test(filteractionforwardtest
 
 add_mailcommon_filter_test(invalidfilterinfowidgettest
     invalidfilterinfowidgettest.cpp
-    ../invalidfilters/invalidfilterinfowidget.cpp
     ${filter_common_SRCS}
 )
 
diff --git a/src/filter/dialog/filteractionmissingargumentdialog.h b/src/filter/dialog/filteractionmissingargumentdialog.h
index d586b4b..7575dab 100644
--- a/src/filter/dialog/filteractionmissingargumentdialog.h
+++ b/src/filter/dialog/filteractionmissingargumentdialog.h
@@ -19,8 +19,7 @@
 #ifndef MAILCOMMON_FILTERACTIONMISSINGARGUMENTDIALOG_H
 #define MAILCOMMON_FILTERACTIONMISSINGARGUMENTDIALOG_H
 
-#include "mailcommon_export.h"
-
+#include "mailcommon_private_export.h"
 #include <Collection>
 
 #include <QDialog>
@@ -37,7 +36,7 @@ namespace MailCommon
 class FolderRequester;
 }
 
-class MAILCOMMON_EXPORT FilterActionMissingCollectionDialog : public QDialog
+class MAILCOMMON_TESTS_EXPORT FilterActionMissingCollectionDialog : public QDialog
 {
     Q_OBJECT
 public:
diff --git a/src/filter/invalidfilters/invalidfilterdialog.h b/src/filter/invalidfilters/invalidfilterdialog.h
index daa80a4..93f7d27 100644
--- a/src/filter/invalidfilters/invalidfilterdialog.h
+++ b/src/filter/invalidfilters/invalidfilterdialog.h
@@ -18,7 +18,7 @@
 #ifndef INVALIDFILTERDIALOG_H
 #define INVALIDFILTERDIALOG_H
 
-#include "mailcommon_export.h"
+#include "mailcommon_private_export.h"
 #include "invalidfilterinfo.h"
 #include <QDialog>
 
@@ -26,7 +26,7 @@ namespace MailCommon
 {
 class InvalidFilterWidget;
 class InvalidFilterInfoWidget;
-class MAILCOMMON_EXPORT InvalidFilterDialog : public QDialog
+class MAILCOMMON_TESTS_EXPORT InvalidFilterDialog : public QDialog
 {
     Q_OBJECT
 public:
diff --git a/src/filter/invalidfilters/invalidfilterinfo.h b/src/filter/invalidfilters/invalidfilterinfo.h
index a98ac9d..0f57a76 100644
--- a/src/filter/invalidfilters/invalidfilterinfo.h
+++ b/src/filter/invalidfilters/invalidfilterinfo.h
@@ -19,10 +19,10 @@
 #define INVALIDFILTERINFO_H
 
 #include <QString>
-#include "mailcommon_export.h"
+#include "mailcommon_private_export.h"
 namespace MailCommon
 {
-class MAILCOMMON_EXPORT InvalidFilterInfo
+class MAILCOMMON_TESTS_EXPORT InvalidFilterInfo
 {
 public:
     InvalidFilterInfo();
diff --git a/src/filter/invalidfilters/invalidfilterinfowidget.h b/src/filter/invalidfilters/invalidfilterinfowidget.h
index 80ae897..b8f01f6 100644
--- a/src/filter/invalidfilters/invalidfilterinfowidget.h
+++ b/src/filter/invalidfilters/invalidfilterinfowidget.h
@@ -19,10 +19,10 @@
 #define INVALIDFILTERINFOWIDGET_H
 
 #include <KMessageWidget>
-#include "mailcommon_export.h"
+#include "mailcommon_private_export.h"
 namespace MailCommon
 {
-class MAILCOMMON_EXPORT InvalidFilterInfoWidget : public KMessageWidget
+class MAILCOMMON_TESTS_EXPORT InvalidFilterInfoWidget : public KMessageWidget
 {
     Q_OBJECT
 public: