diff --git a/src/collection/collectionbackend.cpp b/src/collection/collectionbackend.cpp
index 9f7ddb0cc..4ba290364 100644
--- a/src/collection/collectionbackend.cpp
+++ b/src/collection/collectionbackend.cpp
@@ -21,8 +21,6 @@
 
 #include "config.h"
 
-#include <cassert>
-
 #include <QtGlobal>
 #include <QObject>
 #include <QApplication>
@@ -93,7 +91,7 @@ void CollectionBackend::ExitAsync() {
 
 void CollectionBackend::Exit() {
 
-  assert(QThread::currentThread() == thread());
+  Q_ASSERT(QThread::currentThread() == thread());
 
   moveToThread(original_thread_);
   emit ExitFinished();
diff --git a/src/collection/collectionwatcher.cpp b/src/collection/collectionwatcher.cpp
index 29ce946ab..8811a437f 100644
--- a/src/collection/collectionwatcher.cpp
+++ b/src/collection/collectionwatcher.cpp
@@ -23,7 +23,6 @@
 
 #include <utility>
 #include <chrono>
-#include <cassert>
 
 #include <QObject>
 #include <QThread>
@@ -125,7 +124,7 @@ void CollectionWatcher::ExitAsync() {
 
 void CollectionWatcher::Exit() {
 
-  assert(QThread::currentThread() == thread());
+  Q_ASSERT(QThread::currentThread() == thread());
 
   Stop();
   if (backend_) backend_->Close();
diff --git a/src/core/database.cpp b/src/core/database.cpp
index 45be98d23..ab58f01d5 100644
--- a/src/core/database.cpp
+++ b/src/core/database.cpp
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <cstddef>
-#include <cassert>
 #include <sqlite3.h>
 #include <boost/scope_exit.hpp>
 
@@ -102,7 +101,7 @@ void Database::ExitAsync() {
 
 void Database::Exit() {
 
-  assert(QThread::currentThread() == thread());
+  Q_ASSERT(QThread::currentThread() == thread());
   Close();
   moveToThread(original_thread_);
   emit ExitFinished();
diff --git a/src/core/tagreaderclient.cpp b/src/core/tagreaderclient.cpp
index 374d6f307..675bb68b8 100644
--- a/src/core/tagreaderclient.cpp
+++ b/src/core/tagreaderclient.cpp
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <string>
-#include <cassert>
 
 #include <QtGlobal>
 #include <QObject>
@@ -60,7 +59,7 @@ void TagReaderClient::ExitAsync() {
 
 void TagReaderClient::Exit() {
 
-  assert(QThread::currentThread() == thread());
+  Q_ASSERT(QThread::currentThread() == thread());
   moveToThread(original_thread_);
   emit ExitFinished();
 
diff --git a/src/covermanager/albumcoverloader.cpp b/src/covermanager/albumcoverloader.cpp
index 72a89688f..5b4134357 100644
--- a/src/covermanager/albumcoverloader.cpp
+++ b/src/covermanager/albumcoverloader.cpp
@@ -84,7 +84,7 @@ void AlbumCoverLoader::ExitAsync() {
 
 void AlbumCoverLoader::Exit() {
 
-  assert(QThread::currentThread() == thread());
+  Q_ASSERT(QThread::currentThread() == thread());
   moveToThread(original_thread_);
   emit ExitFinished();
 
diff --git a/src/device/devicedatabasebackend.cpp b/src/device/devicedatabasebackend.cpp
index 10d4d3a10..d630dc067 100644
--- a/src/device/devicedatabasebackend.cpp
+++ b/src/device/devicedatabasebackend.cpp
@@ -21,8 +21,6 @@
 
 #include "config.h"
 
-#include <cassert>
-
 #include <QObject>
 #include <QThread>
 #include <QMutex>
@@ -67,7 +65,7 @@ void DeviceDatabaseBackend::ExitAsync() {
 
 void DeviceDatabaseBackend::Exit() {
 
-  assert(QThread::currentThread() == thread());
+  Q_ASSERT(QThread::currentThread() == thread());
   Close();
   moveToThread(original_thread_);
   emit ExitFinished();
diff --git a/src/device/filesystemdevice.cpp b/src/device/filesystemdevice.cpp
index 9900ffb84..d9703d98d 100644
--- a/src/device/filesystemdevice.cpp
+++ b/src/device/filesystemdevice.cpp
@@ -21,8 +21,6 @@
 
 #include "config.h"
 
-#include <cassert>
-
 #include <QThread>
 #include <QString>
 #include <QUrl>
@@ -90,7 +88,7 @@ void FilesystemDevice::CloseAsync() {
 
 void FilesystemDevice::Close() {
 
-  assert(QThread::currentThread() == thread());
+  Q_ASSERT(QThread::currentThread() == thread());
 
   wait_for_exit_ << backend_ << watcher_;
 
diff --git a/src/playlist/playlistbackend.cpp b/src/playlist/playlistbackend.cpp
index 98b0c0831..e087a8645 100644
--- a/src/playlist/playlistbackend.cpp
+++ b/src/playlist/playlistbackend.cpp
@@ -23,7 +23,6 @@
 
 #include <memory>
 #include <functional>
-#include <cassert>
 
 #include <QObject>
 #include <QApplication>
@@ -84,7 +83,7 @@ void PlaylistBackend::ExitAsync() {
 
 void PlaylistBackend::Exit() {
 
-  assert(QThread::currentThread() == thread());
+  Q_ASSERT(QThread::currentThread() == thread());
 
   moveToThread(original_thread_);
   emit ExitFinished();