diff -u -r ../kdepimlibs-4.14.3-orig/./akonadi/tests/actionstatemanagertest.cpp ./akonadi/tests/actionstatemanagertest.cpp
--- ../kdepimlibs-4.14.3-orig/./akonadi/tests/actionstatemanagertest.cpp	2014-11-05 06:19:27.000000000 +0900
+++ ./akonadi/tests/actionstatemanagertest.cpp	2017-10-13 21:42:25.000000000 +0900
@@ -27,8 +27,6 @@
 #include "../actionstatemanager.cpp"
 #undef QT_NO_CLIPBOARD
 
-#include "../pastehelper.cpp"
-
 typedef QHash<Akonadi::StandardActionManager::Type, bool> StateMap;
 Q_DECLARE_METATYPE( StateMap )
 
diff -u -r ../kdepimlibs-4.14.3-orig/./akonadi/tests/collectionsynctest.cpp ./akonadi/tests/collectionsynctest.cpp
--- ../kdepimlibs-4.14.3-orig/./akonadi/tests/collectionsynctest.cpp	2014-11-05 06:19:27.000000000 +0900
+++ ./akonadi/tests/collectionsynctest.cpp	2017-10-13 21:41:45.000000000 +0900
@@ -25,9 +25,11 @@
 #include <akonadi/collection.h>
 #include <akonadi/collectionfetchjob.h>
 #include <akonadi/collectionfetchscope.h>
+#include <collectiondeletejob.h>
+#include <collectionmodifyjob.h>
 #include <akonadi/entitydisplayattribute.h>
 
-#include "../akonadi/collectionsync.cpp"
+#include "../akonadi/collectionsync_p.h"
 
 #include <krandom.h>