diff --git a/autotests/integration/dbstate.h b/autotests/integration/dbstate.h
--- a/autotests/integration/dbstate.h
+++ b/autotests/integration/dbstate.h
@@ -21,6 +21,7 @@
 #ifndef BALOO_DBSTATE_H
 #define BALOO_DBSTATE_H
 
+#include "idutils.h"
 #include "transaction.h"
 #include "postingdb.h"
 #include "documentdb.h"
@@ -37,17 +38,17 @@
     QMap<QByteArray, PostingList> postingDb;
     QMap<QByteArray, QVector<PositionInfo>> positionDb;
 
-    QMap<quint64, QVector<QByteArray>> docTermsDb;
-    QMap<quint64, QVector<QByteArray>> docFileNameTermsDb;
-    QMap<quint64, QVector<QByteArray>> docXAttrTermsDb;
+    QMap<DocId, QVector<QByteArray>> docTermsDb;
+    QMap<DocId, QVector<QByteArray>> docFileNameTermsDb;
+    QMap<DocId, QVector<QByteArray>> docXAttrTermsDb;
 
-    QMap<quint64, DocumentTimeDB::TimeInfo> docTimeDb;
-    QMap<quint32, quint64> mtimeDb;
+    QMap<DocId, DocumentTimeDB::TimeInfo> docTimeDb;
+    QMap<quint32, DocId> mtimeDb;
 
-    QMap<quint64, QByteArray> docDataDb;
-    QMap<quint64, QByteArray> docUrlDb;
-    QVector<quint64> contentIndexingDb;
-    QVector<quint64> failedIdDb;
+    QMap<DocId, QByteArray> docDataDb;
+    QMap<DocId, QByteArray> docUrlDb;
+    QVector<DocId> contentIndexingDb;
+    QVector<DocId> failedIdDb;
 
     bool operator== (const DBState& st) const {
         return postingDb == st.postingDb && positionDb == st.positionDb && docTermsDb == st.docTermsDb
diff --git a/autotests/integration/filesearchstoretest.cpp b/autotests/integration/filesearchstoretest.cpp
--- a/autotests/integration/filesearchstoretest.cpp
+++ b/autotests/integration/filesearchstoretest.cpp
@@ -40,11 +40,11 @@
 {
     QBENCHMARK {
         QString url1(QLatin1String("/home/t/a"));
-        quint64 id1 = insertUrl(url1);
+        DocId id1 = insertUrl(url1);
         insertText(id1, QLatin1String("This is sample text"));
 
         QString url2(QLatin1String("/home/t/b"));
-        quint64 id2 = insertUrl(url2);
+        DocId id2 = insertUrl(url2);
         insertText(id2, QLatin1String("sample sample more sample text"));
 
         Query q;
@@ -74,11 +74,11 @@
 void FileSearchStoreTest::testPropertyValueEqual()
 {
     QString url1(QLatin1String("/home/t/a"));
-    quint64 id1 = insertUrl(url1);
+    DocId id1 = insertUrl(url1);
     insertText(id1, QLatin1String("This is sample text"));
 
     QString url2(QLatin1String("/home/t/b"));
-    quint64 id2 = insertUrl(url2);
+    DocId id2 = insertUrl(url2);
     insertText(id2, QLatin1String("sample sample more sample but not text"));
 
     Query q;
@@ -101,23 +101,23 @@
 void FileSearchStoreTest::testIncludeDir()
 {
     QString url1(QLatin1String("/home/t/a"));
-    quint64 id1 = insertUrl(url1);
+    DocId id1 = insertUrl(url1);
     insertText(id1, QLatin1String("This is sample text"));
 
     QString url2(QLatin1String("/home/t/b"));
-    quint64 id2 = insertUrl(url2);
+    DocId id2 = insertUrl(url2);
     insertText(id2, QLatin1String("sample sample more sample text"));
 
     QString url3(QLatin1String("/home/garden/b"));
-    quint64 id3 = insertUrl(url3);
+    DocId id3 = insertUrl(url3);
     insertText(id3, QLatin1String("The grass is green in the garden."));
 
     QString url4(QLatin1String("/home/tt/b"));
-    quint64 id4 = insertUrl(url4);
+    DocId id4 = insertUrl(url4);
     insertText(id4, QLatin1String("Let's see if this works."));
 
     QString url5(QLatin1String("/home/t/c"));
-    quint64 id5 = insertUrl(url5);
+    DocId id5 = insertUrl(url5);
     insertText(id5, QLatin1String("sample sample more sample text"));
 
     Query q;
@@ -148,23 +148,23 @@
 void FileSearchStoreTest::testRatings()
 {
     QString url1(QLatin1String("/home/t/a"));
-    quint64 id1 = insertUrl(url1);
+    DocId id1 = insertUrl(url1);
     insertRating(id1, 2);
 
     QString url2(QLatin1String("/home/t/b"));
-    quint64 id2 = insertUrl(url2);
+    DocId id2 = insertUrl(url2);
     insertRating(id2, 4);
 
     QString url3(QLatin1String("/home/garden/b"));
-    quint64 id3 = insertUrl(url3);
+    DocId id3 = insertUrl(url3);
     insertRating(id3, 6);
 
     QString url4(QLatin1String("/home/tt/b"));
-    quint64 id4 = insertUrl(url4);
+    DocId id4 = insertUrl(url4);
     insertRating(id4, 10);
 
     QString url5(QLatin1String("/home/tt/c"));
-    quint64 id5 = insertUrl(url5);
+    DocId id5 = insertUrl(url5);
     insertText(id5, QLatin1String("Test text"));
 
     //
@@ -199,23 +199,23 @@
 void FileSearchStoreTest::testEmptySearchString()
 {
     QString url1(QLatin1String("/home/t/a"));
-    quint64 id1 = insertUrl(url1);
+    DocId id1 = insertUrl(url1);
     insertText(id1, QLatin1String("File A"));
 
     QString url2(QLatin1String("/home/t/b"));
-    quint64 id2 = insertUrl(url2);
+    DocId id2 = insertUrl(url2);
     insertText(id2, QLatin1String("File B"));
 
     QString url3(QLatin1String("/home/garden/b"));
-    quint64 id3 = insertUrl(url3);
+    DocId id3 = insertUrl(url3);
     insertText(id3, QLatin1String("Garden B"));
 
     QString url4(QLatin1String("/home/tt/b"));
-    quint64 id4 = insertUrl(url4);
+    DocId id4 = insertUrl(url4);
     insertText(id4, QLatin1String("TT B"));
 
     QString url5(QLatin1String("/home/tt/c"));
-    quint64 id5 = insertUrl(url5);
+    DocId id5 = insertUrl(url5);
     insertText(id5, QLatin1String("TT C"));
 
     Query q;
@@ -240,15 +240,15 @@
 void FileSearchStoreTest::testAllVideos()
 {
     QString url1(QLatin1String("/home/t/a"));
-    quint64 id1 = insertUrl(url1);
+    DocId id1 = insertUrl(url1);
     insertType(id1, QLatin1String("Video"));
 
     QString url2(QLatin1String("/home/t/b"));
-    quint64 id2 = insertUrl(url2);
+    DocId id2 = insertUrl(url2);
     insertType(id2, QLatin1String("Image"));
 
     QString url3(QLatin1String("/home/garden/b"));
-    quint64 id3 = insertUrl(url3);
+    DocId id3 = insertUrl(url3);
     insertType(id3, QLatin1String("Video"));
 
     Query q;
@@ -267,21 +267,21 @@
 void FileSearchStoreTest::testFileNameSearch()
 {
     QString url1(QLatin1String("/home/t/a"));
-    quint64 id1 = insertUrl(url1);
+    DocId id1 = insertUrl(url1);
     insertExactText(id1, QLatin1String("flowering"), "F");
     insertExactText(id1, QLatin1String("dork"), "F");
     insertExactText(id1, QLatin1String("dork"), "A");
     insertExactText(id1, QLatin1String("dork"), "G");
 
     QString url2(QLatin1String("/home/t/b"));
-    quint64 id2 = insertUrl(url2);
+    DocId id2 = insertUrl(url2);
     insertExactText(id2, QLatin1String("powering"), "F");
     insertExactText(id2, QLatin1String("fire"), "F");
     insertExactText(id2, QLatin1String("dork"), "A");
     insertExactText(id2, QLatin1String("dork"), "G");
 
     QString url3(QLatin1String("/home/garden/b"));
-    quint64 id3 = insertUrl(url3);
+    DocId id3 = insertUrl(url3);
     insertExactText(id3, QLatin1String("does"), "F");
     insertExactText(id3, QLatin1String("not"), "F");
     insertExactText(id3, QLatin1String("dork"), "A");
diff --git a/autotests/integration/querytest.cpp b/autotests/integration/querytest.cpp
--- a/autotests/integration/querytest.cpp
+++ b/autotests/integration/querytest.cpp
@@ -60,7 +60,7 @@
     Database* db;
 
     void insertDocuments(Transaction* tr);
-    void addDocument(Transaction* tr,const QString& text, quint64 id, const QString& url)
+    void addDocument(Transaction* tr,const QString& text, DocId id, const QString& url)
     {
         Document doc;
         doc.setUrl(QFile::encodeName(url));
@@ -77,13 +77,13 @@
         tr->addDocument(doc);
     }
 
-    quint64 m_id1;
-    quint64 m_id2;
-    quint64 m_id3;
-    quint64 m_id4;
+    DocId m_id1;
+    DocId m_id2;
+    DocId m_id3;
+    DocId m_id4;
 };
 
-static quint64 touchFile(const QString& path) {
+static DocId touchFile(const QString& path) {
     QFile file(path);
     file.open(QIODevice::WriteOnly);
     file.write("data");
@@ -109,16 +109,16 @@
 {
     EngineQuery q("the");
 
-    QVector<quint64> result = {m_id1, m_id2, m_id4};
+    QVector<DocId> result = {m_id1, m_id2, m_id4};
     Transaction tr(db, Transaction::ReadOnly);
     QCOMPARE(tr.exec(q), result);
 }
 
 void QueryTest::testTermStartsWith()
 {
     EngineQuery q("for", EngineQuery::StartsWith);
 
-    QVector<quint64> result = {m_id3, m_id4};
+    QVector<DocId> result = {m_id3, m_id4};
     Transaction tr(db, Transaction::ReadOnly);
     QCOMPARE(tr.exec(q), result);
 }
@@ -131,7 +131,7 @@
 
     EngineQuery q(queries, EngineQuery::And);
 
-    QVector<quint64> result = {m_id3};
+    QVector<DocId> result = {m_id3};
     Transaction tr(db, Transaction::ReadOnly);
     QCOMPARE(tr.exec(q), result);
 }
@@ -144,7 +144,7 @@
 
     EngineQuery q(queries, EngineQuery::Or);
 
-    QVector<quint64> result = {m_id1, m_id2};
+    QVector<DocId> result = {m_id1, m_id2};
     Transaction tr(db, Transaction::ReadOnly);
     QCOMPARE(tr.exec(q), result);
 }
@@ -157,7 +157,7 @@
 
     EngineQuery q(queries, EngineQuery::Phrase);
 
-    QVector<quint64> result = {m_id1};
+    QVector<DocId> result = {m_id1};
     Transaction tr(db, Transaction::ReadOnly);
     QCOMPARE(tr.exec(q), result);
 }
diff --git a/autotests/integration/writetransactiontest.cpp b/autotests/integration/writetransactiontest.cpp
--- a/autotests/integration/writetransactiontest.cpp
+++ b/autotests/integration/writetransactiontest.cpp
@@ -54,7 +54,7 @@
     Database* db;
 };
 
-static quint64 touchFile(const QString& path) {
+static DocId touchFile(const QString& path) {
     QFile file(path);
     file.open(QIODevice::WriteOnly);
     file.write("data");
@@ -69,7 +69,7 @@
 
     const QByteArray url(dir->path().toUtf8() + "/file");
     touchFile(url);
-    quint64 id = filePathToId(url);
+    DocId id = filePathToId(url);
 
     QCOMPARE(tr.hasDocument(id), false);
 
@@ -145,8 +145,8 @@
 
     Transaction tr(db, Transaction::ReadOnly);
 
-    quint64 id1 = doc1.id();
-    quint64 id2 = doc2.id();
+    DocId id1 = doc1.id();
+    DocId id2 = doc2.id();
 
     DBState state;
     state.postingDb = {{"a", {id1, id2}}, {"abc", {id1}}, {"abcd", {id2}}, {"dab", {id1, id2}}, {"file1", {id1}}, {"file2", {id2}}};
diff --git a/autotests/unit/codecs/postingcodectest.cpp b/autotests/unit/codecs/postingcodectest.cpp
--- a/autotests/unit/codecs/postingcodectest.cpp
+++ b/autotests/unit/codecs/postingcodectest.cpp
@@ -33,11 +33,11 @@
     void test() {
         PostingCodec codec;
 
-        QVector<quint64> vec = {1, 2, 9, 12};
+        QVector<DocId> vec = {1, 2, 9, 12};
         QByteArray arr = codec.encode(vec);
         QVERIFY(!arr.isEmpty());
 
-        QVector<quint64> vec2 = codec.decode(arr);
+        QVector<DocId> vec2 = codec.decode(arr);
         QCOMPARE(vec2, vec);
     }
 
diff --git a/autotests/unit/engine/andpostingiteratortest.cpp b/autotests/unit/engine/andpostingiteratortest.cpp
--- a/autotests/unit/engine/andpostingiteratortest.cpp
+++ b/autotests/unit/engine/andpostingiteratortest.cpp
@@ -35,41 +35,41 @@
 
 void AndPostingIteratorTest::test()
 {
-    QVector<quint64> l1 = {1, 3, 5, 7};
-    QVector<quint64> l2 = {3, 4, 5, 7, 9, 11};
-    QVector<quint64> l3 = {1, 3, 7};
+    QVector<DocId> l1 = {1, 3, 5, 7};
+    QVector<DocId> l2 = {3, 4, 5, 7, 9, 11};
+    QVector<DocId> l3 = {1, 3, 7};
 
     VectorPostingIterator* it1 = new VectorPostingIterator(l1);
     VectorPostingIterator* it2 = new VectorPostingIterator(l2);
     VectorPostingIterator* it3 = new VectorPostingIterator(l3);
 
     QVector<PostingIterator*> vec = {it1, it2, it3};
     AndPostingIterator it(vec);
-    QCOMPARE(it.docId(), static_cast<quint64>(0));
+    QCOMPARE(it.docId(), static_cast<DocId>(0));
 
-    QVector<quint64> result = {3, 7};
-    for (quint64 val : result) {
-        QCOMPARE(it.next(), static_cast<quint64>(val));
-        QCOMPARE(it.docId(), static_cast<quint64>(val));
+    QVector<DocId> result = {3, 7};
+    for (DocId val : result) {
+        QCOMPARE(it.next(), static_cast<DocId>(val));
+        QCOMPARE(it.docId(), static_cast<DocId>(val));
     }
-    QCOMPARE(it.next(), static_cast<quint64>(0));
-    QCOMPARE(it.docId(), static_cast<quint64>(0));
+    QCOMPARE(it.next(), static_cast<DocId>(0));
+    QCOMPARE(it.docId(), static_cast<DocId>(0));
 }
 
 void AndPostingIteratorTest::testNullIterators()
 {
-    QVector<quint64> l1 = {1, 3, 5, 7};
-    QVector<quint64> l2 = {3, 4, 5, 7, 9, 11};
+    QVector<DocId> l1 = {1, 3, 5, 7};
+    QVector<DocId> l2 = {3, 4, 5, 7, 9, 11};
 
     VectorPostingIterator* it1 = new VectorPostingIterator(l1);
     VectorPostingIterator* it2 = new VectorPostingIterator(l2);
 
     QVector<PostingIterator*> vec = {it1, nullptr, it2};
 
     AndPostingIterator it(vec);
-    QCOMPARE(it.docId(), static_cast<quint64>(0));
-    QCOMPARE(it.next(), static_cast<quint64>(0));
-    QCOMPARE(it.docId(), static_cast<quint64>(0));
+    QCOMPARE(it.docId(), static_cast<DocId>(0));
+    QCOMPARE(it.next(), static_cast<DocId>(0));
+    QCOMPARE(it.docId(), static_cast<DocId>(0));
 }
 
 
diff --git a/autotests/unit/engine/documentiddbtest.cpp b/autotests/unit/engine/documentiddbtest.cpp
--- a/autotests/unit/engine/documentiddbtest.cpp
+++ b/autotests/unit/engine/documentiddbtest.cpp
@@ -61,8 +61,8 @@
     db.put(6);
     db.put(8);
 
-    QVector<quint64> acVec = db.fetchItems(10);
-    QVector<quint64> exVec = {1, 6, 8};
+    QVector<DocId> acVec = db.fetchItems(10);
+    QVector<DocId> exVec = {1, 6, 8};
 
     QCOMPARE(acVec, exVec);
 }
diff --git a/autotests/unit/engine/documenturldbtest.cpp b/autotests/unit/engine/documenturldbtest.cpp
--- a/autotests/unit/engine/documenturldbtest.cpp
+++ b/autotests/unit/engine/documenturldbtest.cpp
@@ -72,14 +72,14 @@
 
         QByteArray filePath(dir.path().toUtf8() + "/file");
         touchFile(filePath);
-        quint64 id = filePathToId(filePath);
+        DocId id = filePathToId(filePath);
 
         DocumentUrlDB db(IdTreeDB::create(m_txn), IdFilenameDB::create(m_txn), m_txn);
         db.put(id, filePath);
 
         QCOMPARE(db.get(id), filePath);
 
-        db.del(id, [](quint64) { return true; });
+        db.del(id, [](DocId) { return true; });
         QCOMPARE(db.get(id), QByteArray());
     }
 
@@ -92,9 +92,9 @@
 
         touchFile(filePath1);
         touchFile(filePath2);
-        quint64 did = filePathToId(dirPath);
-        quint64 id1 = filePathToId(filePath1);
-        quint64 id2 = filePathToId(filePath2);
+        DocId did = filePathToId(dirPath);
+        DocId id1 = filePathToId(filePath1);
+        DocId id2 = filePathToId(filePath2);
 
         DocumentUrlDB db(IdTreeDB::create(m_txn), IdFilenameDB::create(m_txn), m_txn);
         db.put(did, dirPath);
@@ -105,19 +105,19 @@
         QCOMPARE(db.get(id2), filePath2);
         QCOMPARE(db.get(did), dirPath);
 
-        db.del(id1, [=](quint64 id) { return id != did; });
+        db.del(id1, [=](DocId id) { return id != did; });
 
         QCOMPARE(db.get(id1), QByteArray());
         QCOMPARE(db.get(id2), filePath2);
         QCOMPARE(db.get(did), dirPath);
 
-        db.del(id2, [=](quint64 id) { return id != did; });
+        db.del(id2, [=](DocId id) { return id != did; });
 
         QCOMPARE(db.get(id1), QByteArray());
         QCOMPARE(db.get(id2), QByteArray());
         QCOMPARE(db.get(did), dirPath);
 
-        db.del(did, [=](quint64 id) { return id != did; });
+        db.del(did, [=](DocId id) { return id != did; });
 
         QCOMPARE(db.get(id1), QByteArray());
         QCOMPARE(db.get(id2), QByteArray());
@@ -130,14 +130,14 @@
     void testGetId() {
         QTemporaryDir dir;
         const QByteArray path = QFile::encodeName(dir.path());
-        quint64 id = filePathToId(path);
+        DocId id = filePathToId(path);
 
         QByteArray filePath1(path + "/file");
         touchFile(filePath1);
-        quint64 id1 = filePathToId(filePath1);
+        DocId id1 = filePathToId(filePath1);
         QByteArray filePath2(path + "/file2");
         touchFile(filePath2);
-        quint64 id2 = filePathToId(filePath2);
+        DocId id2 = filePathToId(filePath2);
 
         DocumentUrlDB db(IdTreeDB::create(m_txn), IdFilenameDB::create(m_txn), m_txn);
         db.put(id, path);
@@ -151,34 +151,34 @@
     void testSortedIdInsert()
     {
         // test sorted insert used in Baloo::DocumentUrlDB::add, bug 367991
-        std::vector<quint64> test;
+        std::vector<DocId> test;
         test.push_back(9);
 
         // shall not crash
-        sortedIdInsert(test, quint64(1));
+        sortedIdInsert(test, DocId(1));
 
         // stuff shall be ok inserted
         QVERIFY(test.size() == 2);
         QVERIFY(test[0] == 1);
         QVERIFY(test[1] == 9);
 
         // shall not crash
-        sortedIdInsert(test, quint64(1));
+        sortedIdInsert(test, DocId(1));
 
         // no insert please
         QVERIFY(test.size() == 2);
 
         // shall not crash
-        sortedIdInsert(test, quint64(10));
+        sortedIdInsert(test, DocId(10));
 
         // stuff shall be ok inserted
         QVERIFY(test.size() == 3);
         QVERIFY(test[0] == 1);
         QVERIFY(test[1] == 9);
         QVERIFY(test[2] == 10);
 
         // shall not crash
-        sortedIdInsert(test, quint64(2));
+        sortedIdInsert(test, DocId(2));
 
         // stuff shall be ok inserted
         QVERIFY(test.size() == 4);
@@ -188,7 +188,7 @@
         QVERIFY(test[3] == 10);
 
         // shall not crash
-        sortedIdInsert(test, quint64(2));
+        sortedIdInsert(test, DocId(2));
 
         // no insert please
         QVERIFY(test.size() == 4);
diff --git a/autotests/unit/engine/idtreedbtest.cpp b/autotests/unit/engine/idtreedbtest.cpp
--- a/autotests/unit/engine/idtreedbtest.cpp
+++ b/autotests/unit/engine/idtreedbtest.cpp
@@ -31,13 +31,13 @@
     void test() {
         IdTreeDB db(IdTreeDB::create(m_txn), m_txn);
 
-        QVector<quint64> val = {5, 6, 7};
+        QVector<DocId> val = {5, 6, 7};
         db.put(1, val);
 
         QCOMPARE(db.get(1), val);
 
         db.del(1);
-        QCOMPARE(db.get(1), QVector<quint64>());
+        QCOMPARE(db.get(1), QVector<DocId>());
     }
 
     void testIter() {
@@ -51,10 +51,10 @@
         PostingIterator* it = db.iter(1);
         QVERIFY(it);
 
-        QVector<quint64> result = {1, 5, 6, 7, 8, 9, 11, 13, 15, 18, 19};
-        for (quint64 val : result) {
-            QCOMPARE(it->next(), static_cast<quint64>(val));
-            QCOMPARE(it->docId(), static_cast<quint64>(val));
+        QVector<DocId> result = {1, 5, 6, 7, 8, 9, 11, 13, 15, 18, 19};
+        for (DocId val : result) {
+            QCOMPARE(it->next(), static_cast<DocId>(val));
+            QCOMPARE(it->docId(), static_cast<DocId>(val));
         }
     }
 };
diff --git a/autotests/unit/engine/mtimedbtest.cpp b/autotests/unit/engine/mtimedbtest.cpp
--- a/autotests/unit/engine/mtimedbtest.cpp
+++ b/autotests/unit/engine/mtimedbtest.cpp
@@ -32,9 +32,9 @@
         MTimeDB db(MTimeDB::create(m_txn), m_txn);
 
         db.put(5, 1);
-        QCOMPARE(db.get(5), QVector<quint64>() << 1);
+        QCOMPARE(db.get(5), QVector<DocId>() << 1);
         db.del(5, 1);
-        QCOMPARE(db.get(5), QVector<quint64>());
+        QCOMPARE(db.get(5), QVector<DocId>());
     }
 
     void testMultiple() {
@@ -44,9 +44,9 @@
         db.put(5, 2);
         db.put(5, 3);
 
-        QCOMPARE(db.get(5), QVector<quint64>() << 1 << 2 << 3);
+        QCOMPARE(db.get(5), QVector<DocId>() << 1 << 2 << 3);
         db.del(5, 2);
-        QCOMPARE(db.get(5), QVector<quint64>() << 1 << 3);
+        QCOMPARE(db.get(5), QVector<DocId>() << 1 << 3);
     }
 
     void testIter() {
@@ -62,19 +62,19 @@
         PostingIterator* it = db.iter(6, MTimeDB::GreaterEqual);
         QVERIFY(it);
 
-        QVector<quint64> result = {2, 3, 4, 5, 6};
-        for (quint64 val : result) {
-            QCOMPARE(it->next(), static_cast<quint64>(val));
-            QCOMPARE(it->docId(), static_cast<quint64>(val));
+        QVector<DocId> result = {2, 3, 4, 5, 6};
+        for (DocId val : result) {
+            QCOMPARE(it->next(), static_cast<DocId>(val));
+            QCOMPARE(it->docId(), static_cast<DocId>(val));
         }
 
         it = db.iter(7, MTimeDB::LessEqual);
         QVERIFY(it);
 
         result = {1, 2, 3};
-        for (quint64 val : result) {
-            QCOMPARE(it->next(), static_cast<quint64>(val));
-            QCOMPARE(it->docId(), static_cast<quint64>(val));
+        for (DocId val : result) {
+            QCOMPARE(it->next(), static_cast<DocId>(val));
+            QCOMPARE(it->docId(), static_cast<DocId>(val));
         }
     }
 
@@ -91,10 +91,10 @@
         PostingIterator* it = db.iterRange(6, 8);
         QVERIFY(it);
 
-        QVector<quint64> result = {2, 3, 4, 5};
-        for (quint64 val : result) {
-            QCOMPARE(it->next(), static_cast<quint64>(val));
-            QCOMPARE(it->docId(), static_cast<quint64>(val));
+        QVector<DocId> result = {2, 3, 4, 5};
+        for (DocId val : result) {
+            QCOMPARE(it->next(), static_cast<DocId>(val));
+            QCOMPARE(it->docId(), static_cast<DocId>(val));
         }
     }
 
@@ -108,27 +108,27 @@
         db.put(6, 3);
         db.put(7, 3);
 
-        QCOMPARE(db.get(6), QVector<quint64>() << 2 << 3 << 4);
+        QCOMPARE(db.get(6), QVector<DocId>() << 2 << 3 << 4);
 
         PostingIterator* it = db.iterRange(5, 7);
         QVERIFY(it);
 
         {
-            QVector<quint64> result = {1, 2, 3, 4};
-            for (quint64 val : result) {
-                QCOMPARE(it->next(), static_cast<quint64>(val));
-                QCOMPARE(it->docId(), static_cast<quint64>(val));
+            QVector<DocId> result = {1, 2, 3, 4};
+            for (DocId val : result) {
+                QCOMPARE(it->next(), static_cast<DocId>(val));
+                QCOMPARE(it->docId(), static_cast<DocId>(val));
             }
         }
 
         {
             it = db.iter(6, MTimeDB::GreaterEqual);
             QVERIFY(it);
 
-            QVector<quint64> result = {2, 3, 4};
-            for (quint64 val : result) {
-                QCOMPARE(it->next(), static_cast<quint64>(val));
-                QCOMPARE(it->docId(), static_cast<quint64>(val));
+            QVector<DocId> result = {2, 3, 4};
+            for (DocId val : result) {
+                QCOMPARE(it->next(), static_cast<DocId>(val));
+                QCOMPARE(it->docId(), static_cast<DocId>(val));
             }
         }
     }
diff --git a/autotests/unit/engine/orpostingiteratortest.cpp b/autotests/unit/engine/orpostingiteratortest.cpp
--- a/autotests/unit/engine/orpostingiteratortest.cpp
+++ b/autotests/unit/engine/orpostingiteratortest.cpp
@@ -35,48 +35,48 @@
 
 void OrPostingIteratorTest::test()
 {
-    QVector<quint64> l1 = {1, 3, 5, 7};
-    QVector<quint64> l2 = {3, 4, 5, 7, 9, 11};
-    QVector<quint64> l3 = {1, 3, 7};
+    QVector<DocId> l1 = {1, 3, 5, 7};
+    QVector<DocId> l2 = {3, 4, 5, 7, 9, 11};
+    QVector<DocId> l3 = {1, 3, 7};
 
     VectorPostingIterator* it1 = new VectorPostingIterator(l1);
     VectorPostingIterator* it2 = new VectorPostingIterator(l2);
     VectorPostingIterator* it3 = new VectorPostingIterator(l3);
 
     QVector<PostingIterator*> vec = {it1, it2, it3};
     OrPostingIterator it(vec);
-    QCOMPARE(it.docId(), static_cast<quint64>(0));
+    QCOMPARE(it.docId(), static_cast<DocId>(0));
 
-    QVector<quint64> result = {1, 3, 4, 5, 7, 9, 11};
-    for (quint64 val : result) {
-        QCOMPARE(it.next(), static_cast<quint64>(val));
-        QCOMPARE(it.docId(), static_cast<quint64>(val));
+    QVector<DocId> result = {1, 3, 4, 5, 7, 9, 11};
+    for (DocId val : result) {
+        QCOMPARE(it.next(), static_cast<DocId>(val));
+        QCOMPARE(it.docId(), static_cast<DocId>(val));
     }
-    QCOMPARE(it.next(), static_cast<quint64>(0));
-    QCOMPARE(it.docId(), static_cast<quint64>(0));
+    QCOMPARE(it.next(), static_cast<DocId>(0));
+    QCOMPARE(it.docId(), static_cast<DocId>(0));
 }
 
 void OrPostingIteratorTest::testNullIterators()
 {
-    QVector<quint64> l1 = {1, 3, 5, 7};
-    QVector<quint64> l2 = {3, 4, 5, 7, 9, 11};
-    QVector<quint64> l3 = {1, 3, 7};
+    QVector<DocId> l1 = {1, 3, 5, 7};
+    QVector<DocId> l2 = {3, 4, 5, 7, 9, 11};
+    QVector<DocId> l3 = {1, 3, 7};
 
     VectorPostingIterator* it1 = new VectorPostingIterator(l1);
     VectorPostingIterator* it2 = new VectorPostingIterator(l2);
     VectorPostingIterator* it3 = new VectorPostingIterator(l3);
 
     QVector<PostingIterator*> vec = {it1, nullptr, it2, nullptr, it3};
     OrPostingIterator it(vec);
-    QCOMPARE(it.docId(), static_cast<quint64>(0));
+    QCOMPARE(it.docId(), static_cast<DocId>(0));
 
-    QVector<quint64> result = {1, 3, 4, 5, 7, 9, 11};
-    for (quint64 val : result) {
-        QCOMPARE(it.next(), static_cast<quint64>(val));
-        QCOMPARE(it.docId(), static_cast<quint64>(val));
+    QVector<DocId> result = {1, 3, 4, 5, 7, 9, 11};
+    for (DocId val : result) {
+        QCOMPARE(it.next(), static_cast<DocId>(val));
+        QCOMPARE(it.docId(), static_cast<DocId>(val));
     }
-    QCOMPARE(it.next(), static_cast<quint64>(0));
-    QCOMPARE(it.docId(), static_cast<quint64>(0));
+    QCOMPARE(it.next(), static_cast<DocId>(0));
+    QCOMPARE(it.docId(), static_cast<DocId>(0));
 }
 
 
diff --git a/autotests/unit/engine/phraseanditeratortest.cpp b/autotests/unit/engine/phraseanditeratortest.cpp
--- a/autotests/unit/engine/phraseanditeratortest.cpp
+++ b/autotests/unit/engine/phraseanditeratortest.cpp
@@ -69,16 +69,16 @@
 
     QVector<PostingIterator*> vec = {it1, it2};
     PhraseAndIterator it(vec);
-    QCOMPARE(it.docId(), static_cast<quint64>(0));
+    QCOMPARE(it.docId(), static_cast<DocId>(0));
 
     // The Query is "term1 term2". term1 must appear one position before term2
-    QVector<quint64> result = {2};
-    for (quint64 val : result) {
-        QCOMPARE(it.next(), static_cast<quint64>(val));
-        QCOMPARE(it.docId(), static_cast<quint64>(val));
+    QVector<DocId> result = {2};
+    for (DocId val : result) {
+        QCOMPARE(it.next(), static_cast<DocId>(val));
+        QCOMPARE(it.docId(), static_cast<DocId>(val));
     }
-    QCOMPARE(it.next(), static_cast<quint64>(0));
-    QCOMPARE(it.docId(), static_cast<quint64>(0));
+    QCOMPARE(it.next(), static_cast<DocId>(0));
+    QCOMPARE(it.docId(), static_cast<DocId>(0));
 }
 
 void PhraseAndIteratorTest::testNullIterators()
@@ -104,9 +104,9 @@
 
     QVector<PostingIterator*> vec = {it1, nullptr, it2};
     PhraseAndIterator it(vec);
-    QCOMPARE(it.docId(), static_cast<quint64>(0));
-    QCOMPARE(it.next(), static_cast<quint64>(0));
-    QCOMPARE(it.docId(), static_cast<quint64>(0));
+    QCOMPARE(it.docId(), static_cast<DocId>(0));
+    QCOMPARE(it.next(), static_cast<DocId>(0));
+    QCOMPARE(it.docId(), static_cast<DocId>(0));
 }
 
 QTEST_MAIN(PhraseAndIteratorTest)
diff --git a/autotests/unit/engine/positiondbtest.cpp b/autotests/unit/engine/positiondbtest.cpp
--- a/autotests/unit/engine/positiondbtest.cpp
+++ b/autotests/unit/engine/positiondbtest.cpp
@@ -65,19 +65,19 @@
         db.put(word, list);
 
         PostingIterator* it = db.iter(word);
-        QCOMPARE(it->docId(), static_cast<quint64>(0));
+        QCOMPARE(it->docId(), static_cast<DocId>(0));
         QVERIFY(it->positions().isEmpty());
 
-        QCOMPARE(it->next(), static_cast<quint64>(1));
-        QCOMPARE(it->docId(), static_cast<quint64>(1));
+        QCOMPARE(it->next(), static_cast<DocId>(1));
+        QCOMPARE(it->docId(), static_cast<DocId>(1));
         QCOMPARE(it->positions(), pos1.positions);
 
-        QCOMPARE(it->next(), static_cast<quint64>(5));
-        QCOMPARE(it->docId(), static_cast<quint64>(5));
+        QCOMPARE(it->next(), static_cast<DocId>(5));
+        QCOMPARE(it->docId(), static_cast<DocId>(5));
         QCOMPARE(it->positions(), pos2.positions);
 
-        QCOMPARE(it->next(), static_cast<quint64>(0));
-        QCOMPARE(it->docId(), static_cast<quint64>(0));
+        QCOMPARE(it->next(), static_cast<DocId>(0));
+        QCOMPARE(it->docId(), static_cast<DocId>(0));
         QVERIFY(it->positions().isEmpty());
     }
 };
diff --git a/autotests/unit/engine/postingdbtest.cpp b/autotests/unit/engine/postingdbtest.cpp
--- a/autotests/unit/engine/postingdbtest.cpp
+++ b/autotests/unit/engine/postingdbtest.cpp
@@ -48,10 +48,10 @@
         PostingIterator* it = db.iter("fir");
         QVERIFY(it);
 
-        QVector<quint64> result = {1, 3, 5};
-        for (quint64 val : result) {
-            QCOMPARE(it->next(), static_cast<quint64>(val));
-            QCOMPARE(it->docId(), static_cast<quint64>(val));
+        QVector<DocId> result = {1, 3, 5};
+        for (DocId val : result) {
+            QCOMPARE(it->next(), static_cast<DocId>(val));
+            QCOMPARE(it->docId(), static_cast<DocId>(val));
         }
     }
 
@@ -66,10 +66,10 @@
         PostingIterator* it = db.prefixIter("fi");
         QVERIFY(it);
 
-        QVector<quint64> result = {1, 3, 5, 8, 9};
-        for (quint64 val : result) {
-            QCOMPARE(it->next(), static_cast<quint64>(val));
-            QCOMPARE(it->docId(), static_cast<quint64>(val));
+        QVector<DocId> result = {1, 3, 5, 8, 9};
+        for (DocId val : result) {
+            QCOMPARE(it->next(), static_cast<DocId>(val));
+            QCOMPARE(it->docId(), static_cast<DocId>(val));
         }
     }
 
@@ -85,10 +85,10 @@
         PostingIterator* it = db.regexpIter(QRegularExpression(QStringLiteral(".re")), QByteArray("f"));
         QVERIFY(it);
 
-        QVector<quint64> result = {1, 2, 3, 5, 8};
-        for (quint64 val : result) {
-            QCOMPARE(it->next(), static_cast<quint64>(val));
-            QCOMPARE(it->docId(), static_cast<quint64>(val));
+        QVector<DocId> result = {1, 2, 3, 5, 8};
+        for (DocId val : result) {
+            QCOMPARE(it->next(), static_cast<DocId>(val));
+            QCOMPARE(it->docId(), static_cast<DocId>(val));
         }
 
         // Non existing
@@ -107,18 +107,18 @@
         PostingIterator* it = db.compIter("R", "2", PostingDB::GreaterEqual);
         QVERIFY(it);
 
-        QVector<quint64> result = {1, 2, 3, 5, 8};
-        for (quint64 val : result) {
-            QCOMPARE(it->next(), static_cast<quint64>(val));
-            QCOMPARE(it->docId(), static_cast<quint64>(val));
+        QVector<DocId> result = {1, 2, 3, 5, 8};
+        for (DocId val : result) {
+            QCOMPARE(it->next(), static_cast<DocId>(val));
+            QCOMPARE(it->docId(), static_cast<DocId>(val));
         }
 
         it = db.compIter("R", "2", PostingDB::LessEqual);
         QVERIFY(it);
         result = {1, 3, 5, 7, 8};
-        for (quint64 val : result) {
-            QCOMPARE(it->next(), static_cast<quint64>(val));
-            QCOMPARE(it->docId(), static_cast<quint64>(val));
+        for (DocId val : result) {
+            QCOMPARE(it->next(), static_cast<DocId>(val));
+            QCOMPARE(it->docId(), static_cast<DocId>(val));
         }
     }
 
diff --git a/autotests/unit/engine/transactiontest.cpp b/autotests/unit/engine/transactiontest.cpp
--- a/autotests/unit/engine/transactiontest.cpp
+++ b/autotests/unit/engine/transactiontest.cpp
@@ -48,7 +48,7 @@
     Database* db;
 };
 
-static quint64 touchFile(const QString& path) {
+static DocId touchFile(const QString& path) {
     QFile file(path);
     file.open(QIODevice::WriteOnly);
     file.write("data");
@@ -63,7 +63,7 @@
 
     const QByteArray url(dir->path().toUtf8() + "/file");
     touchFile(url);
-    quint64 id = filePathToId(url);
+    DocId id = filePathToId(url);
 
     QCOMPARE(tr.hasDocument(id), false);
 
diff --git a/autotests/unit/file/basicindexingqueuetest.cpp b/autotests/unit/file/basicindexingqueuetest.cpp
--- a/autotests/unit/file/basicindexingqueuetest.cpp
+++ b/autotests/unit/file/basicindexingqueuetest.cpp
@@ -76,7 +76,7 @@
     BasicIndexingQueue queue(&db, &config);
     QCOMPARE(queue.isSuspended(), false);
 
-    QSignalSpy spy(&queue, SIGNAL(newDocument(quint64,Xapian::Document)));
+    QSignalSpy spy(&queue, SIGNAL(newDocument(DocId,Xapian::Document)));
     QSignalSpy spyStarted(&queue, SIGNAL(startedIndexing()));
     QSignalSpy spyFinished(&queue, SIGNAL(finishedIndexing()));
 
@@ -161,7 +161,7 @@
     const QString userComment(QLatin1String("UserComment"));
     QVERIFY(baloo_setxattr(fileName, QLatin1String("user.xdg.comment"), userComment) != -1);
 
-    QSignalSpy spy(&queue, SIGNAL(newDocument(quint64,Xapian::Document)));
+    QSignalSpy spy(&queue, SIGNAL(newDocument(DocId,Xapian::Document)));
 
     queue.enqueue(FileMapping(fileName), Baloo::ExtendedAttributesOnly);
 
@@ -284,7 +284,7 @@
     const QString userComment(QLatin1String("UserComment"));
     QVERIFY(baloo_setxattr(fileName, QLatin1String("user.xdg.comment"), userComment) != -1);
 
-    QSignalSpy spy(&queue, SIGNAL(newDocument(quint64,Xapian::Document)));
+    QSignalSpy spy(&queue, SIGNAL(newDocument(DocId,Xapian::Document)));
 
     queue.enqueue(FileMapping(fileName));
 
@@ -388,7 +388,7 @@
 
     const QString fileName = dir->path() + QStringLiteral("/home/1");
 
-    QSignalSpy spy(&queue, SIGNAL(newDocument(quint64,Xapian::Document)));
+    QSignalSpy spy(&queue, SIGNAL(newDocument(DocId,Xapian::Document)));
     queue.enqueue(FileMapping(fileName), Baloo::ExtendedAttributesOnly);
 
     QEventLoop loop;
@@ -424,7 +424,7 @@
 
     const QString fileName = dir->path() + QStringLiteral("/home/1");
 
-    QSignalSpy spy(&queue, SIGNAL(newDocument(quint64,Xapian::Document)));
+    QSignalSpy spy(&queue, SIGNAL(newDocument(DocId,Xapian::Document)));
     queue.enqueue(FileMapping(fileName), Baloo::AutoUpdateFolder);
 
     QEventLoop loop;
diff --git a/autotests/unit/file/metadatamovertest.cpp b/autotests/unit/file/metadatamovertest.cpp
--- a/autotests/unit/file/metadatamovertest.cpp
+++ b/autotests/unit/file/metadatamovertest.cpp
@@ -51,7 +51,7 @@
     void testMoveFolder();
 
 private:
-    quint64 insertUrl(const QString& url);
+    DocId insertUrl(const QString& url);
 
     Database* m_db;
     QTemporaryDir* m_tempDir;
@@ -80,7 +80,7 @@
     m_tempDir = nullptr;
 }
 
-quint64 MetadataMoverTest::insertUrl(const QString& url)
+DocId MetadataMoverTest::insertUrl(const QString& url)
 {
     BasicIndexingJob job(url, QStringLiteral("text/plain"));
     job.index();
@@ -96,7 +96,7 @@
     QTemporaryFile file;
     file.open();
     QString url = file.fileName();
-    quint64 fid = insertUrl(url);
+    DocId fid = insertUrl(url);
 
     {
         Transaction tr(m_db, Transaction::ReadOnly);
@@ -132,7 +132,7 @@
 
     QString url = dir.path() + "/file";
     touchFile(url);
-    quint64 fid = insertUrl(url);
+    DocId fid = insertUrl(url);
 
     {
         Transaction tr(m_db, Transaction::ReadOnly);
@@ -158,7 +158,7 @@
 
     QString url = dir.path() + "/a/b/c/file";
     touchFile(url);
-    quint64 fid = insertUrl(url);
+    DocId fid = insertUrl(url);
 
     {
         Transaction tr(m_db, Transaction::ReadOnly);
@@ -183,11 +183,11 @@
 
     QString folder = dir.path() + "/folder";
     mkdir(folder);
-    quint64 did = insertUrl(folder);
+    DocId did = insertUrl(folder);
 
     QString fileUrl = folder + "/file";
     touchFile(fileUrl);
-    quint64 fid = insertUrl(fileUrl);
+    DocId fid = insertUrl(fileUrl);
 
     {
         Transaction tr(m_db, Transaction::ReadOnly);