diff --git a/src/server/collectionscheduler.cpp b/src/server/collectionscheduler.cpp
--- a/src/server/collectionscheduler.cpp
+++ b/src/server/collectionscheduler.cpp
@@ -21,7 +21,7 @@
 #include "storage/datastore.h"
 #include "storage/selectquerybuilder.h"
 #include "akonadiserver_debug.h"
-#include "utils.h"
+#include "helper_p.h"
 #include <private/tristate_p.h>
 
 #include <QDateTime>
diff --git a/src/server/handler/create.cpp b/src/server/handler/create.cpp
--- a/src/server/handler/create.cpp
+++ b/src/server/handler/create.cpp
@@ -23,7 +23,7 @@
 #include "storage/datastore.h"
 #include "storage/transaction.h"
 #include "storage/selectquerybuilder.h"
-#include "utils.h"
+#include "helper_p.h"
 
 #include <private/scope_p.h>
 
diff --git a/src/server/handler/fetchhelper.cpp b/src/server/handler/fetchhelper.cpp
--- a/src/server/handler/fetchhelper.cpp
+++ b/src/server/handler/fetchhelper.cpp
@@ -30,13 +30,13 @@
 #include "storage/parthelper.h"
 #include "storage/parttypehelper.h"
 #include "storage/transaction.h"
+#include "helper_p.h"
 #include "utils.h"
 #include "intervalcheck.h"
 #include "agentmanagerinterface.h"
 #include "dbusconnectionpool.h"
 #include "tagfetchhelper.h"
 #include "relationfetch.h"
-#include "utils.h"
 #include "akonadiserver_debug.h"
 
 #include <private/scope_p.h>
diff --git a/src/server/handler/list.cpp b/src/server/handler/list.cpp
--- a/src/server/handler/list.cpp
+++ b/src/server/handler/list.cpp
@@ -20,7 +20,7 @@
 #include "list.h"
 #include "akonadiserver_debug.h"
 
-#include "utils.h"
+#include "helper_p.h"
 #include "connection.h"
 #include "handlerhelper.h"
 #include "collectionreferencemanager.h"
diff --git a/src/server/handler/searchpersistent.cpp b/src/server/handler/searchpersistent.cpp
--- a/src/server/handler/searchpersistent.cpp
+++ b/src/server/handler/searchpersistent.cpp
@@ -19,7 +19,7 @@
 
 #include "searchpersistent.h"
 
-#include "utils.h"
+#include "helper_p.h"
 #include "connection.h"
 #include "handlerhelper.h"
 #include "storage/datastore.h"
diff --git a/src/server/notificationmanager.cpp b/src/server/notificationmanager.cpp
--- a/src/server/notificationmanager.cpp
+++ b/src/server/notificationmanager.cpp
@@ -23,7 +23,7 @@
 #include "storage/notificationcollector.h"
 #include "tracer.h"
 #include "akonadiserver_debug.h"
-#include "utils.h"
+#include "helper_p.h"
 
 #include <private/standarddirs_p.h>
 #include <private/xdgbasedirs_p.h>
diff --git a/src/server/preprocessormanager.cpp b/src/server/preprocessormanager.cpp
--- a/src/server/preprocessormanager.cpp
+++ b/src/server/preprocessormanager.cpp
@@ -29,7 +29,7 @@
 #include "entities.h" // Akonadi::Server::PimItem
 #include "storage/datastore.h"
 #include "tracer.h"
-#include "utils.h"
+#include "helper_p.h"
 #include "collectionreferencemanager.h"
 
 #include "preprocessormanageradaptor.h"
diff --git a/src/server/search/searchmanager.cpp b/src/server/search/searchmanager.cpp
--- a/src/server/search/searchmanager.cpp
+++ b/src/server/search/searchmanager.cpp
@@ -32,7 +32,7 @@
 #include "storage/transaction.h"
 #include "storage/selectquerybuilder.h"
 #include "handler/searchhelper.h"
-#include "utils.h"
+#include "helper_p.h"
 
 #include <private/xdgbasedirs_p.h>
 #include <private/protocol_p.h>
diff --git a/src/server/storage/querybuilder.cpp b/src/server/storage/querybuilder.cpp
--- a/src/server/storage/querybuilder.cpp
+++ b/src/server/storage/querybuilder.cpp
@@ -19,7 +19,7 @@
 
 #include "querybuilder.h"
 #include "akonadiserver_debug.h"
-#include "utils.h"
+#include "helper_p.h"
 
 #ifndef QUERYBUILDER_UNITTEST
 #include "storage/datastore.h"
@@ -29,6 +29,7 @@
 
 #include <QSqlRecord>
 #include <QSqlError>
+#include <QTime>
 
 using namespace Akonadi::Server;
 
diff --git a/src/server/utils.h b/src/server/utils.h
--- a/src/server/utils.h
+++ b/src/server/utils.h
@@ -29,22 +29,6 @@
 #include "storage/datastore.h"
 #include "storage/dbtype.h"
 
-#if QT_VERSION < QT_VERSION_CHECK(5,7,0)
-namespace QtPrivate
-{
-template <typename T> struct QAddConst {
-    typedef const T Type;
-};
-}
-
-// this adds const to non-const objects (like std::as_const)
-template <typename T>
-Q_DECL_CONSTEXPR typename QtPrivate::QAddConst<T>::Type &qAsConst(T &t) Q_DECL_NOTHROW { return t; }
-// prevent rvalue arguments:
-template <typename T>
-void qAsConst(const T &&) Q_DECL_EQ_DELETE;
-#endif
-
 namespace Akonadi
 {
 namespace Server