diff --git a/src/libs/database/impl/Migration.cpp b/src/libs/database/impl/Migration.cpp
index 62922926..4833d28d 100644
--- a/src/libs/database/impl/Migration.cpp
+++ b/src/libs/database/impl/Migration.cpp
@@ -26,7 +26,6 @@
 #include "core/ITraceLogger.hpp"
 #include "database/Session.hpp"
 #include "database/objects/ScanSettings.hpp"
-#include "database/objects/User.hpp"
 
 #include "Db.hpp"
 #include "Utils.hpp"
diff --git a/src/libs/database/impl/Session.cpp b/src/libs/database/impl/Session.cpp
index d480c8da..8d03aaef 100644
--- a/src/libs/database/impl/Session.cpp
+++ b/src/libs/database/impl/Session.cpp
@@ -19,6 +19,8 @@
 
 #include "database/Session.hpp"
 
+#include <Wt/Dbo/WtSqlTraits.h>
+
 #include "core/ILogger.hpp"
 #include "core/ITraceLogger.hpp"
 #include "database/objects/Artist.hpp"
diff --git a/src/libs/database/impl/objects/Artist.cpp b/src/libs/database/impl/objects/Artist.cpp
index 0ecda221..86d0b029 100644
--- a/src/libs/database/impl/objects/Artist.cpp
+++ b/src/libs/database/impl/objects/Artist.cpp
@@ -18,6 +18,7 @@
  */
 #include "database/objects/Artist.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "core/ILogger.hpp"
@@ -26,13 +27,17 @@
 #include "database/objects/Cluster.hpp"
 #include "database/objects/Directory.hpp"
 #include "database/objects/Release.hpp"
+#include "database/objects/StarredArtist.hpp"
 #include "database/objects/Track.hpp"
+#include "database/objects/TrackArtistLink.hpp"
 #include "database/objects/User.hpp"
 
 #include "SqlQuery.hpp"
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::Artist)
+
 namespace lms::db
 {
     namespace
diff --git a/src/libs/database/impl/objects/ArtistInfo.cpp b/src/libs/database/impl/objects/ArtistInfo.cpp
index 2edd646f..b7acd5d4 100644
--- a/src/libs/database/impl/objects/ArtistInfo.cpp
+++ b/src/libs/database/impl/objects/ArtistInfo.cpp
@@ -19,6 +19,7 @@
 
 #include "database/objects/ArtistInfo.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "database/Session.hpp"
@@ -30,6 +31,8 @@
 #include "traits/IdTypeTraits.hpp"
 #include "traits/PathTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::ArtistInfo)
+
 namespace lms::db
 {
     ArtistInfo::pointer ArtistInfo::create(Session& session)
diff --git a/src/libs/database/impl/objects/Artwork.cpp b/src/libs/database/impl/objects/Artwork.cpp
index 2c8a350e..e91b7d84 100644
--- a/src/libs/database/impl/objects/Artwork.cpp
+++ b/src/libs/database/impl/objects/Artwork.cpp
@@ -19,6 +19,7 @@
 
 #include "database/objects/Artwork.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "database/Session.hpp"
@@ -29,6 +30,8 @@
 #include "traits/IdTypeTraits.hpp"
 #include "traits/PathTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::Artwork)
+
 namespace lms::db
 {
     Artwork::Artwork(ObjectPtr<TrackEmbeddedImage> trackEmbeddedImage)
diff --git a/src/libs/database/impl/objects/AuthToken.cpp b/src/libs/database/impl/objects/AuthToken.cpp
index 63ad027d..4f32c34b 100644
--- a/src/libs/database/impl/objects/AuthToken.cpp
+++ b/src/libs/database/impl/objects/AuthToken.cpp
@@ -19,6 +19,7 @@
 
 #include "database/objects/AuthToken.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "database/Session.hpp"
@@ -28,6 +29,8 @@
 #include "traits/IdTypeTraits.hpp"
 #include "traits/StringViewTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::AuthToken)
+
 namespace lms::db
 {
     AuthToken::AuthToken(std::string_view domain, std::string_view value, const Wt::WDateTime& expiry, std::optional<long> maxUseCount, ObjectPtr<User> user)
diff --git a/src/libs/database/impl/objects/Cluster.cpp b/src/libs/database/impl/objects/Cluster.cpp
index 7816cb68..1ce9a7ee 100644
--- a/src/libs/database/impl/objects/Cluster.cpp
+++ b/src/libs/database/impl/objects/Cluster.cpp
@@ -19,20 +19,27 @@
 
 #include "database/objects/Cluster.hpp"
 
+#include <Wt/Dbo/Impl.h>
+
 #include "database/Session.hpp"
 #include "database/objects/Artist.hpp"
 #include "database/objects/Artwork.hpp"
 #include "database/objects/Directory.hpp"
 #include "database/objects/MediaLibrary.hpp"
 #include "database/objects/Release.hpp"
-#include "database/objects/ScanSettings.hpp"
 #include "database/objects/Track.hpp"
+#include "database/objects/TrackArtistLink.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
+#include "database/objects/TrackEmbeddedImageLink.hpp"
+#include "database/objects/TrackLyrics.hpp"
 
-#include "SqlQuery.hpp"
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
 #include "traits/StringViewTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::Cluster)
+DBO_INSTANTIATE_TEMPLATES(lms::db::ClusterType)
+
 namespace lms::db
 {
     namespace
diff --git a/src/libs/database/impl/objects/Directory.cpp b/src/libs/database/impl/objects/Directory.cpp
index 9d180fd9..9e0a69f8 100644
--- a/src/libs/database/impl/objects/Directory.cpp
+++ b/src/libs/database/impl/objects/Directory.cpp
@@ -19,6 +19,8 @@
 
 #include "database/objects/Directory.hpp"
 
+#include <Wt/Dbo/Impl.h>
+
 #include "database/Session.hpp"
 #include "database/Types.hpp"
 #include "database/objects/MediaLibrary.hpp"
@@ -27,6 +29,8 @@
 #include "traits/IdTypeTraits.hpp"
 #include "traits/PathTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::Directory)
+
 namespace lms::db
 {
     namespace
diff --git a/src/libs/database/impl/objects/Image.cpp b/src/libs/database/impl/objects/Image.cpp
index 2010547d..ec63a4fd 100644
--- a/src/libs/database/impl/objects/Image.cpp
+++ b/src/libs/database/impl/objects/Image.cpp
@@ -19,6 +19,7 @@
 
 #include "database/objects/Image.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "database/Session.hpp"
@@ -29,6 +30,8 @@
 #include "traits/IdTypeTraits.hpp"
 #include "traits/PathTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::Image)
+
 namespace lms::db
 {
     namespace
diff --git a/src/libs/database/impl/objects/Listen.cpp b/src/libs/database/impl/objects/Listen.cpp
index ffd4294b..08874598 100644
--- a/src/libs/database/impl/objects/Listen.cpp
+++ b/src/libs/database/impl/objects/Listen.cpp
@@ -18,6 +18,10 @@
  */
 
 #include "database/objects/Listen.hpp"
+
+#include <Wt/Dbo/Impl.h>
+#include <Wt/Dbo/WtSqlTraits.h>
+
 #include "database/Session.hpp"
 #include "database/objects/Track.hpp"
 #include "database/objects/User.hpp"
@@ -26,6 +30,8 @@
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::Listen)
+
 namespace lms::db
 {
     namespace
diff --git a/src/libs/database/impl/objects/MediaLibrary.cpp b/src/libs/database/impl/objects/MediaLibrary.cpp
index 1b6ea7cb..73c0a60d 100644
--- a/src/libs/database/impl/objects/MediaLibrary.cpp
+++ b/src/libs/database/impl/objects/MediaLibrary.cpp
@@ -19,8 +19,9 @@
 
 #include "database/objects/MediaLibrary.hpp"
 
+#include <Wt/Dbo/Impl.h>
+
 #include "database/Session.hpp"
-#include "database/objects/ScanSettings.hpp"
 #include "database/objects/Track.hpp"
 
 #include "Utils.hpp"
@@ -28,6 +29,8 @@
 #include "traits/PathTraits.hpp"
 #include "traits/StringViewTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::MediaLibrary)
+
 namespace lms::db
 {
     MediaLibrary::MediaLibrary(std::string_view name, const std::filesystem::path& p)
diff --git a/src/libs/database/impl/objects/PlayListFile.cpp b/src/libs/database/impl/objects/PlayListFile.cpp
index 61f388f3..17bf4036 100644
--- a/src/libs/database/impl/objects/PlayListFile.cpp
+++ b/src/libs/database/impl/objects/PlayListFile.cpp
@@ -19,12 +19,14 @@
 
 #include "database/objects/PlayListFile.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "core/ILogger.hpp"
 #include "database/Session.hpp"
 #include "database/objects/Directory.hpp"
 #include "database/objects/MediaLibrary.hpp"
+#include "database/objects/Track.hpp"
 #include "database/objects/TrackList.hpp"
 #include "database/objects/User.hpp"
 
@@ -33,6 +35,8 @@
 #include "traits/PathTraits.hpp"
 #include "traits/StringViewTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::PlayListFile)
+
 namespace lms::db
 {
     PlayListFile::PlayListFile(const std::filesystem::path& file)
diff --git a/src/libs/database/impl/objects/PlayQueue.cpp b/src/libs/database/impl/objects/PlayQueue.cpp
index 22fa1fd0..ddbe913c 100644
--- a/src/libs/database/impl/objects/PlayQueue.cpp
+++ b/src/libs/database/impl/objects/PlayQueue.cpp
@@ -19,20 +19,29 @@
 
 #include "database/objects/PlayQueue.hpp"
 
-#include <Wt/Dbo/SqlTraits.h>
+#include <Wt/Dbo/Impl.h>
+#include <Wt/Dbo/WtSqlTraits.h>
 
 #include "database/Session.hpp"
+#include "database/objects/Artist.hpp"
 #include "database/objects/Artwork.hpp"
+#include "database/objects/Cluster.hpp"
 #include "database/objects/Directory.hpp"
 #include "database/objects/MediaLibrary.hpp"
 #include "database/objects/Release.hpp"
 #include "database/objects/Track.hpp"
+#include "database/objects/TrackArtistLink.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
+#include "database/objects/TrackEmbeddedImageLink.hpp"
+#include "database/objects/TrackLyrics.hpp"
 #include "database/objects/User.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
 #include "traits/StringViewTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::PlayQueue)
+
 namespace lms::db
 {
     PlayQueue::PlayQueue(const ObjectPtr<User>& user, std::string_view name)
diff --git a/src/libs/database/impl/objects/RatedArtist.cpp b/src/libs/database/impl/objects/RatedArtist.cpp
index 7952b530..45bafda5 100644
--- a/src/libs/database/impl/objects/RatedArtist.cpp
+++ b/src/libs/database/impl/objects/RatedArtist.cpp
@@ -19,6 +19,7 @@
 
 #include "database/objects/RatedArtist.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "database/Session.hpp"
@@ -28,6 +29,8 @@
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::RatedArtist)
+
 namespace lms::db
 {
     RatedArtist::RatedArtist(ObjectPtr<Artist> artist, ObjectPtr<User> user)
diff --git a/src/libs/database/impl/objects/RatedRelease.cpp b/src/libs/database/impl/objects/RatedRelease.cpp
index f5562327..f0686052 100644
--- a/src/libs/database/impl/objects/RatedRelease.cpp
+++ b/src/libs/database/impl/objects/RatedRelease.cpp
@@ -19,6 +19,7 @@
 
 #include "database/objects/RatedRelease.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "database/Session.hpp"
@@ -28,6 +29,8 @@
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::RatedRelease)
+
 namespace lms::db
 {
     RatedRelease::RatedRelease(ObjectPtr<Release> release, ObjectPtr<User> user)
diff --git a/src/libs/database/impl/objects/RatedTrack.cpp b/src/libs/database/impl/objects/RatedTrack.cpp
index 146b1d88..8a8a1d7d 100644
--- a/src/libs/database/impl/objects/RatedTrack.cpp
+++ b/src/libs/database/impl/objects/RatedTrack.cpp
@@ -19,6 +19,7 @@
 
 #include "database/objects/RatedTrack.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "database/Session.hpp"
@@ -28,6 +29,8 @@
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::RatedTrack)
+
 namespace lms::db
 {
     RatedTrack::RatedTrack(ObjectPtr<Track> track, ObjectPtr<User> user)
diff --git a/src/libs/database/impl/objects/Release.cpp b/src/libs/database/impl/objects/Release.cpp
index bb5d82b8..2c56eb8f 100644
--- a/src/libs/database/impl/objects/Release.cpp
+++ b/src/libs/database/impl/objects/Release.cpp
@@ -19,6 +19,7 @@
 
 #include "database/objects/Release.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "core/PartialDateTime.hpp"
@@ -28,7 +29,12 @@
 #include "database/objects/Artwork.hpp"
 #include "database/objects/Cluster.hpp"
 #include "database/objects/Directory.hpp"
+#include "database/objects/MediaLibrary.hpp"
 #include "database/objects/Track.hpp"
+#include "database/objects/TrackArtistLink.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
+#include "database/objects/TrackEmbeddedImageLink.hpp"
+#include "database/objects/TrackLyrics.hpp"
 #include "database/objects/User.hpp"
 
 #include "SqlQuery.hpp"
@@ -38,6 +44,11 @@
 #include "traits/PartialDateTimeTraits.hpp"
 #include "traits/StringViewTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::Country)
+DBO_INSTANTIATE_TEMPLATES(lms::db::Label)
+DBO_INSTANTIATE_TEMPLATES(lms::db::Release)
+DBO_INSTANTIATE_TEMPLATES(lms::db::ReleaseType)
+
 namespace lms::db
 {
     namespace
diff --git a/src/libs/database/impl/objects/ScanSettings.cpp b/src/libs/database/impl/objects/ScanSettings.cpp
index 961661b8..23907e24 100644
--- a/src/libs/database/impl/objects/ScanSettings.cpp
+++ b/src/libs/database/impl/objects/ScanSettings.cpp
@@ -19,6 +19,7 @@
 
 #include "database/objects/ScanSettings.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "core/String.hpp"
@@ -29,6 +30,8 @@
 #include "traits/IdTypeTraits.hpp"
 #include "traits/StringViewTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::ScanSettings)
+
 namespace lms::db
 {
     ScanSettings::ScanSettings(std::string_view name)
diff --git a/src/libs/database/impl/objects/StarredArtist.cpp b/src/libs/database/impl/objects/StarredArtist.cpp
index ec68c229..94474f86 100644
--- a/src/libs/database/impl/objects/StarredArtist.cpp
+++ b/src/libs/database/impl/objects/StarredArtist.cpp
@@ -19,6 +19,7 @@
 
 #include "database/objects/StarredArtist.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "database/Session.hpp"
@@ -28,6 +29,8 @@
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::StarredArtist)
+
 namespace lms::db
 {
     StarredArtist::StarredArtist(ObjectPtr<Artist> artist, ObjectPtr<User> user, FeedbackBackend backend)
diff --git a/src/libs/database/impl/objects/StarredRelease.cpp b/src/libs/database/impl/objects/StarredRelease.cpp
index 8ace864e..54b3eadb 100644
--- a/src/libs/database/impl/objects/StarredRelease.cpp
+++ b/src/libs/database/impl/objects/StarredRelease.cpp
@@ -19,6 +19,7 @@
 
 #include "database/objects/StarredRelease.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "database/Session.hpp"
@@ -28,6 +29,8 @@
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::StarredRelease)
+
 namespace lms::db
 {
     StarredRelease::StarredRelease(ObjectPtr<Release> release, ObjectPtr<User> user, FeedbackBackend backend)
diff --git a/src/libs/database/impl/objects/StarredTrack.cpp b/src/libs/database/impl/objects/StarredTrack.cpp
index 4fc4829e..74230219 100644
--- a/src/libs/database/impl/objects/StarredTrack.cpp
+++ b/src/libs/database/impl/objects/StarredTrack.cpp
@@ -19,6 +19,7 @@
 
 #include "database/objects/StarredTrack.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "database/Session.hpp"
@@ -28,6 +29,8 @@
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::StarredTrack)
+
 namespace lms::db
 {
     StarredTrack::StarredTrack(ObjectPtr<Track> track, ObjectPtr<User> user, FeedbackBackend backend)
diff --git a/src/libs/database/impl/objects/Track.cpp b/src/libs/database/impl/objects/Track.cpp
index 7dd20df1..ab731be5 100644
--- a/src/libs/database/impl/objects/Track.cpp
+++ b/src/libs/database/impl/objects/Track.cpp
@@ -19,6 +19,7 @@
 
 #include "database/objects/Track.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "core/ILogger.hpp"
@@ -43,6 +44,8 @@
 #include "traits/PathTraits.hpp"
 #include "traits/StringViewTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::Track)
+
 namespace lms::db
 {
     namespace
diff --git a/src/libs/database/impl/objects/TrackArtistLink.cpp b/src/libs/database/impl/objects/TrackArtistLink.cpp
index e2d15cac..d68d606e 100644
--- a/src/libs/database/impl/objects/TrackArtistLink.cpp
+++ b/src/libs/database/impl/objects/TrackArtistLink.cpp
@@ -19,6 +19,8 @@
 
 #include "database/objects/TrackArtistLink.hpp"
 
+#include <Wt/Dbo/Impl.h>
+
 #include "database/Session.hpp"
 #include "database/objects/Artist.hpp"
 #include "database/objects/Track.hpp"
@@ -26,6 +28,8 @@
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::TrackArtistLink)
+
 namespace lms::db
 {
     namespace
diff --git a/src/libs/database/impl/objects/TrackBookmark.cpp b/src/libs/database/impl/objects/TrackBookmark.cpp
index f24b3755..aa358bd7 100644
--- a/src/libs/database/impl/objects/TrackBookmark.cpp
+++ b/src/libs/database/impl/objects/TrackBookmark.cpp
@@ -19,6 +19,8 @@
 
 #include "database/objects/TrackBookmark.hpp"
 
+#include <Wt/Dbo/Impl.h>
+
 #include "database/Session.hpp"
 #include "database/objects/Track.hpp"
 #include "database/objects/User.hpp"
@@ -26,6 +28,8 @@
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::TrackBookmark)
+
 namespace lms::db
 {
     TrackBookmark::TrackBookmark(ObjectPtr<User> user, ObjectPtr<Track> track)
diff --git a/src/libs/database/impl/objects/TrackEmbeddedImage.cpp b/src/libs/database/impl/objects/TrackEmbeddedImage.cpp
index aebb8580..52e174f0 100644
--- a/src/libs/database/impl/objects/TrackEmbeddedImage.cpp
+++ b/src/libs/database/impl/objects/TrackEmbeddedImage.cpp
@@ -17,17 +17,22 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/objects/Directory.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
+
+#include <Wt/Dbo/Impl.h>
 
 #include "database/Session.hpp"
 #include "database/Types.hpp"
 #include "database/objects/Track.hpp"
-#include "database/objects/TrackEmbeddedImage.hpp"
+
+#include "database/objects/TrackEmbeddedImageLink.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
 #include "traits/ImageHashTypeTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::TrackEmbeddedImage)
+
 namespace lms::db
 {
     namespace
diff --git a/src/libs/database/impl/objects/TrackEmbeddedImageLink.cpp b/src/libs/database/impl/objects/TrackEmbeddedImageLink.cpp
index 9b074777..e39b2965 100644
--- a/src/libs/database/impl/objects/TrackEmbeddedImageLink.cpp
+++ b/src/libs/database/impl/objects/TrackEmbeddedImageLink.cpp
@@ -19,6 +19,9 @@
 
 #include "database/objects/TrackEmbeddedImageLink.hpp"
 
+#include <Wt/Dbo/Impl.h>
+#include <Wt/Dbo/WtSqlTraits.h>
+
 #include "database/Session.hpp"
 #include "database/Types.hpp"
 #include "database/objects/Track.hpp"
@@ -26,6 +29,9 @@
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
+#include "traits/ImageHashTypeTraits.hpp"
+
+DBO_INSTANTIATE_TEMPLATES(lms::db::TrackEmbeddedImageLink)
 
 namespace lms::db
 {
diff --git a/src/libs/database/impl/objects/TrackFeatures.cpp b/src/libs/database/impl/objects/TrackFeatures.cpp
index c2557560..46c9607a 100644
--- a/src/libs/database/impl/objects/TrackFeatures.cpp
+++ b/src/libs/database/impl/objects/TrackFeatures.cpp
@@ -19,6 +19,7 @@
 
 #include "database/objects/TrackFeatures.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/property_tree/ptree.hpp>
 
@@ -30,6 +31,8 @@
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::TrackFeatures)
+
 namespace lms::db
 {
 
diff --git a/src/libs/database/impl/objects/TrackList.cpp b/src/libs/database/impl/objects/TrackList.cpp
index 0ef495dc..de77c518 100644
--- a/src/libs/database/impl/objects/TrackList.cpp
+++ b/src/libs/database/impl/objects/TrackList.cpp
@@ -20,6 +20,9 @@
 
 #include <cassert>
 
+#include <Wt/Dbo/Impl.h>
+#include <Wt/Dbo/WtSqlTraits.h>
+
 #include "database/Session.hpp"
 #include "database/objects/Cluster.hpp"
 #include "database/objects/PlayListFile.hpp"
@@ -31,6 +34,9 @@
 #include "traits/IdTypeTraits.hpp"
 #include "traits/StringViewTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::TrackList)
+DBO_INSTANTIATE_TEMPLATES(lms::db::TrackListEntry)
+
 namespace lms::db
 {
     namespace
diff --git a/src/libs/database/impl/objects/TrackLyrics.cpp b/src/libs/database/impl/objects/TrackLyrics.cpp
index 3285e676..e580efbe 100644
--- a/src/libs/database/impl/objects/TrackLyrics.cpp
+++ b/src/libs/database/impl/objects/TrackLyrics.cpp
@@ -19,7 +19,7 @@
 
 #include "database/objects/TrackLyrics.hpp"
 
-#include <Wt/Dbo/SqlTraits.h>
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "database/Session.hpp"
@@ -32,6 +32,8 @@
 #include "traits/IdTypeTraits.hpp"
 #include "traits/PathTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::TrackLyrics)
+
 namespace lms::db
 {
     namespace
diff --git a/src/libs/database/impl/objects/UIState.cpp b/src/libs/database/impl/objects/UIState.cpp
index 4d495534..8b4b07cc 100644
--- a/src/libs/database/impl/objects/UIState.cpp
+++ b/src/libs/database/impl/objects/UIState.cpp
@@ -19,6 +19,8 @@
 
 #include "database/objects/UIState.hpp"
 
+#include <Wt/Dbo/Impl.h>
+
 #include "database/Session.hpp"
 #include "database/objects/User.hpp"
 
@@ -26,6 +28,8 @@
 #include "traits/IdTypeTraits.hpp"
 #include "traits/StringViewTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::UIState)
+
 namespace lms::db
 {
     UIState::UIState(std::string_view item, ObjectPtr<User> user)
diff --git a/src/libs/database/impl/objects/User.cpp b/src/libs/database/impl/objects/User.cpp
index bd1932ec..1bc03388 100644
--- a/src/libs/database/impl/objects/User.cpp
+++ b/src/libs/database/impl/objects/User.cpp
@@ -21,8 +21,12 @@
 
 #include <cassert>
 
+#include <Wt/Dbo/Impl.h>
+#include <Wt/Dbo/WtSqlTraits.h>
+
 #include "database/Session.hpp"
 #include "database/objects/Artist.hpp"
+#include "database/objects/AuthToken.hpp"
 #include "database/objects/Release.hpp"
 #include "database/objects/Track.hpp"
 #include "database/objects/UIState.hpp"
@@ -32,6 +36,8 @@
 #include "traits/IdTypeTraits.hpp"
 #include "traits/StringViewTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::User)
+
 namespace lms::db
 {
     User::User(std::string_view loginName)
diff --git a/src/libs/database/include/database/objects/Artist.hpp b/src/libs/database/include/database/objects/Artist.hpp
index 762e6f4a..b33e1705 100644
--- a/src/libs/database/include/database/objects/Artist.hpp
+++ b/src/libs/database/include/database/objects/Artist.hpp
@@ -25,7 +25,8 @@
 #include <string_view>
 #include <vector>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
+#include <Wt/Dbo/collection.h>
 #include <Wt/WDateTime.h>
 
 #include "core/EnumSet.hpp"
diff --git a/src/libs/database/include/database/objects/ArtistInfo.hpp b/src/libs/database/include/database/objects/ArtistInfo.hpp
index bf371220..28d5e4b8 100644
--- a/src/libs/database/include/database/objects/ArtistInfo.hpp
+++ b/src/libs/database/include/database/objects/ArtistInfo.hpp
@@ -24,7 +24,7 @@
 #include <string>
 #include <string_view>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"
diff --git a/src/libs/database/include/database/objects/Artwork.hpp b/src/libs/database/include/database/objects/Artwork.hpp
index 44e08075..50b7626a 100644
--- a/src/libs/database/include/database/objects/Artwork.hpp
+++ b/src/libs/database/include/database/objects/Artwork.hpp
@@ -21,7 +21,7 @@
 
 #include <filesystem>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"
diff --git a/src/libs/database/include/database/objects/AuthToken.hpp b/src/libs/database/include/database/objects/AuthToken.hpp
index 08a067ec..755d468d 100644
--- a/src/libs/database/include/database/objects/AuthToken.hpp
+++ b/src/libs/database/include/database/objects/AuthToken.hpp
@@ -22,11 +22,10 @@
 #include <optional>
 #include <string_view>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"
-#include "database/Types.hpp"
 #include "database/objects/AuthTokenId.hpp"
 #include "database/objects/UserId.hpp"
 
diff --git a/src/libs/database/include/database/objects/Cluster.hpp b/src/libs/database/include/database/objects/Cluster.hpp
index 7c7c37cd..f30e343d 100644
--- a/src/libs/database/include/database/objects/Cluster.hpp
+++ b/src/libs/database/include/database/objects/Cluster.hpp
@@ -22,10 +22,10 @@
 #include <optional>
 #include <string>
 #include <string_view>
-#include <tuple>
 #include <vector>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
+#include <Wt/Dbo/collection.h>
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"
diff --git a/src/libs/database/include/database/objects/Directory.hpp b/src/libs/database/include/database/objects/Directory.hpp
index 7a1eda7b..58390b03 100644
--- a/src/libs/database/include/database/objects/Directory.hpp
+++ b/src/libs/database/include/database/objects/Directory.hpp
@@ -21,11 +21,12 @@
 
 #include <filesystem>
 #include <functional>
+#include <optional>
 #include <string>
 #include <string_view>
 #include <vector>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
 
 #include "core/EnumSet.hpp"
 #include "database/Object.hpp"
diff --git a/src/libs/database/include/database/objects/Image.hpp b/src/libs/database/include/database/objects/Image.hpp
index 79985fee..da4c48bf 100644
--- a/src/libs/database/include/database/objects/Image.hpp
+++ b/src/libs/database/include/database/objects/Image.hpp
@@ -21,8 +21,9 @@
 
 #include <filesystem>
 #include <functional>
+#include <optional>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"
diff --git a/src/libs/database/include/database/objects/Listen.hpp b/src/libs/database/include/database/objects/Listen.hpp
index a028da5e..b6882fa2 100644
--- a/src/libs/database/include/database/objects/Listen.hpp
+++ b/src/libs/database/include/database/objects/Listen.hpp
@@ -21,7 +21,7 @@
 
 #include <optional>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"
diff --git a/src/libs/database/include/database/objects/MediaLibrary.hpp b/src/libs/database/include/database/objects/MediaLibrary.hpp
index c52881ef..484f4e5a 100644
--- a/src/libs/database/include/database/objects/MediaLibrary.hpp
+++ b/src/libs/database/include/database/objects/MediaLibrary.hpp
@@ -24,7 +24,7 @@
 #include <string>
 #include <string_view>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
 
 #include "database/Object.hpp"
 #include "database/objects/MediaLibraryId.hpp"
diff --git a/src/libs/database/include/database/objects/PlayListFile.hpp b/src/libs/database/include/database/objects/PlayListFile.hpp
index bfcc6811..c6443d0e 100644
--- a/src/libs/database/include/database/objects/PlayListFile.hpp
+++ b/src/libs/database/include/database/objects/PlayListFile.hpp
@@ -24,7 +24,9 @@
 #include <string>
 #include <string_view>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
+#include <Wt/Dbo/collection.h>
+#include <Wt/Dbo/weak_ptr.h>
 #include <Wt/WDateTime.h>
 
 #include "database/IdRange.hpp"
diff --git a/src/libs/database/include/database/objects/PlayQueue.hpp b/src/libs/database/include/database/objects/PlayQueue.hpp
index 68e39d4e..845db082 100644
--- a/src/libs/database/include/database/objects/PlayQueue.hpp
+++ b/src/libs/database/include/database/objects/PlayQueue.hpp
@@ -20,15 +20,14 @@
 #pragma once
 
 #include <chrono>
-#include <span>
 #include <string>
 #include <string_view>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
+#include <Wt/Dbo/collection.h>
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"
-#include "database/Types.hpp"
 #include "database/objects/TrackId.hpp"
 #include "database/objects/UserId.hpp"
 
diff --git a/src/libs/database/include/database/objects/RatedArtist.hpp b/src/libs/database/include/database/objects/RatedArtist.hpp
index ac21bc6a..0a336d08 100644
--- a/src/libs/database/include/database/objects/RatedArtist.hpp
+++ b/src/libs/database/include/database/objects/RatedArtist.hpp
@@ -19,7 +19,9 @@
 
 #pragma once
 
-#include <Wt/Dbo/Dbo.h>
+#include <optional>
+
+#include <Wt/Dbo/Field.h>
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"
diff --git a/src/libs/database/include/database/objects/RatedRelease.hpp b/src/libs/database/include/database/objects/RatedRelease.hpp
index 374de014..4096f380 100644
--- a/src/libs/database/include/database/objects/RatedRelease.hpp
+++ b/src/libs/database/include/database/objects/RatedRelease.hpp
@@ -19,7 +19,9 @@
 
 #pragma once
 
-#include <Wt/Dbo/Dbo.h>
+#include <optional>
+
+#include <Wt/Dbo/Field.h>
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"
diff --git a/src/libs/database/include/database/objects/RatedTrack.hpp b/src/libs/database/include/database/objects/RatedTrack.hpp
index 32d49b87..de944e5b 100644
--- a/src/libs/database/include/database/objects/RatedTrack.hpp
+++ b/src/libs/database/include/database/objects/RatedTrack.hpp
@@ -19,7 +19,9 @@
 
 #pragma once
 
-#include <Wt/Dbo/Dbo.h>
+#include <optional>
+
+#include <Wt/Dbo/Field.h>
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"
diff --git a/src/libs/database/include/database/objects/Release.hpp b/src/libs/database/include/database/objects/Release.hpp
index 9895b8c2..1f8085c0 100644
--- a/src/libs/database/include/database/objects/Release.hpp
+++ b/src/libs/database/include/database/objects/Release.hpp
@@ -24,7 +24,8 @@
 #include <string_view>
 #include <vector>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
+#include <Wt/Dbo/collection.h>
 #include <Wt/WDateTime.h>
 
 #include "core/EnumSet.hpp"
diff --git a/src/libs/database/include/database/objects/ScanSettings.hpp b/src/libs/database/include/database/objects/ScanSettings.hpp
index 4da2ef94..83f3e7ac 100644
--- a/src/libs/database/include/database/objects/ScanSettings.hpp
+++ b/src/libs/database/include/database/objects/ScanSettings.hpp
@@ -24,7 +24,7 @@
 #include <string_view>
 #include <vector>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
 #include <Wt/WTime.h>
 
 #include "database/IdType.hpp"
diff --git a/src/libs/database/include/database/objects/StarredArtist.hpp b/src/libs/database/include/database/objects/StarredArtist.hpp
index bcc69e79..3bca8939 100644
--- a/src/libs/database/include/database/objects/StarredArtist.hpp
+++ b/src/libs/database/include/database/objects/StarredArtist.hpp
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"
diff --git a/src/libs/database/include/database/objects/StarredRelease.hpp b/src/libs/database/include/database/objects/StarredRelease.hpp
index 4fc66cdf..6f172d38 100644
--- a/src/libs/database/include/database/objects/StarredRelease.hpp
+++ b/src/libs/database/include/database/objects/StarredRelease.hpp
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"
diff --git a/src/libs/database/include/database/objects/StarredTrack.hpp b/src/libs/database/include/database/objects/StarredTrack.hpp
index bcd127ee..352b1ba7 100644
--- a/src/libs/database/include/database/objects/StarredTrack.hpp
+++ b/src/libs/database/include/database/objects/StarredTrack.hpp
@@ -19,7 +19,9 @@
 
 #pragma once
 
-#include <Wt/Dbo/Dbo.h>
+#include <optional>
+
+#include <Wt/Dbo/Field.h>
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"
diff --git a/src/libs/database/include/database/objects/Track.hpp b/src/libs/database/include/database/objects/Track.hpp
index 1d9e1013..39c5b624 100644
--- a/src/libs/database/include/database/objects/Track.hpp
+++ b/src/libs/database/include/database/objects/Track.hpp
@@ -27,8 +27,8 @@
 #include <string_view>
 #include <vector>
 
-#include <Wt/Dbo/Dbo.h>
-#include <Wt/Dbo/WtSqlTraits.h>
+#include <Wt/Dbo/Field.h>
+#include <Wt/Dbo/collection.h>
 #include <Wt/WDateTime.h>
 
 #include "core/EnumSet.hpp"
diff --git a/src/libs/database/include/database/objects/TrackArtistLink.hpp b/src/libs/database/include/database/objects/TrackArtistLink.hpp
index 6ad1801e..1f9e6117 100644
--- a/src/libs/database/include/database/objects/TrackArtistLink.hpp
+++ b/src/libs/database/include/database/objects/TrackArtistLink.hpp
@@ -23,7 +23,7 @@
 #include <string>
 #include <string_view>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
 
 #include "core/EnumSet.hpp"
 #include "database/IdType.hpp"
diff --git a/src/libs/database/include/database/objects/TrackBookmark.hpp b/src/libs/database/include/database/objects/TrackBookmark.hpp
index 016f69be..833747e8 100644
--- a/src/libs/database/include/database/objects/TrackBookmark.hpp
+++ b/src/libs/database/include/database/objects/TrackBookmark.hpp
@@ -22,7 +22,7 @@
 #include <chrono>
 #include <optional>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
 
 #include "database/IdType.hpp"
 #include "database/Object.hpp"
diff --git a/src/libs/database/include/database/objects/TrackEmbeddedImage.hpp b/src/libs/database/include/database/objects/TrackEmbeddedImage.hpp
index c4187ddc..c9ea94a3 100644
--- a/src/libs/database/include/database/objects/TrackEmbeddedImage.hpp
+++ b/src/libs/database/include/database/objects/TrackEmbeddedImage.hpp
@@ -23,7 +23,8 @@
 #include <string>
 #include <string_view>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
+#include <Wt/Dbo/collection.h>
 
 #include "core/EnumSet.hpp"
 #include "database/Object.hpp"
diff --git a/src/libs/database/include/database/objects/TrackEmbeddedImageLink.hpp b/src/libs/database/include/database/objects/TrackEmbeddedImageLink.hpp
index fe94213a..ea670888 100644
--- a/src/libs/database/include/database/objects/TrackEmbeddedImageLink.hpp
+++ b/src/libs/database/include/database/objects/TrackEmbeddedImageLink.hpp
@@ -22,7 +22,7 @@
 #include <string>
 #include <string_view>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
 
 #include "database/Object.hpp"
 #include "database/Types.hpp"
diff --git a/src/libs/database/include/database/objects/TrackFeatures.hpp b/src/libs/database/include/database/objects/TrackFeatures.hpp
index 6530a214..bea09c34 100644
--- a/src/libs/database/include/database/objects/TrackFeatures.hpp
+++ b/src/libs/database/include/database/objects/TrackFeatures.hpp
@@ -25,7 +25,7 @@
 #include <unordered_set>
 #include <vector>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
 
 #include "database/IdType.hpp"
 #include "database/Object.hpp"
diff --git a/src/libs/database/include/database/objects/TrackList.hpp b/src/libs/database/include/database/objects/TrackList.hpp
index 27fe17fe..37647203 100644
--- a/src/libs/database/include/database/objects/TrackList.hpp
+++ b/src/libs/database/include/database/objects/TrackList.hpp
@@ -24,7 +24,8 @@
 #include <string_view>
 #include <vector>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
+#include <Wt/Dbo/collection.h>
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"
diff --git a/src/libs/database/include/database/objects/TrackLyrics.hpp b/src/libs/database/include/database/objects/TrackLyrics.hpp
index e8d7bbee..dd7c5c9c 100644
--- a/src/libs/database/include/database/objects/TrackLyrics.hpp
+++ b/src/libs/database/include/database/objects/TrackLyrics.hpp
@@ -22,10 +22,11 @@
 #include <chrono>
 #include <filesystem>
 #include <map>
+#include <optional>
 #include <span>
 #include <string>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
 
 #include "database/IdType.hpp"
 #include "database/Object.hpp"
diff --git a/src/libs/database/include/database/objects/UIState.hpp b/src/libs/database/include/database/objects/UIState.hpp
index fcd4320f..458350e4 100644
--- a/src/libs/database/include/database/objects/UIState.hpp
+++ b/src/libs/database/include/database/objects/UIState.hpp
@@ -19,11 +19,12 @@
 
 #pragma once
 
-#include <Wt/Dbo/Dbo.h>
+#include <string>
+#include <string_view>
+
+#include <Wt/Dbo/Field.h>
 
-#include "core/String.hpp"
 #include "database/Object.hpp"
-#include "database/Types.hpp"
 #include "database/objects/UIStateId.hpp"
 #include "database/objects/UserId.hpp"
 
diff --git a/src/libs/database/include/database/objects/User.hpp b/src/libs/database/include/database/objects/User.hpp
index 78ae5a75..ba731886 100644
--- a/src/libs/database/include/database/objects/User.hpp
+++ b/src/libs/database/include/database/objects/User.hpp
@@ -22,7 +22,8 @@
 #include <optional>
 #include <string_view>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
+#include <Wt/Dbo/collection.h>
 #include <Wt/WDateTime.h>
 
 #include "core/EnumSet.hpp"
diff --git a/src/libs/services/feedback/impl/listenbrainz/FeedbacksSynchronizer.cpp b/src/libs/services/feedback/impl/listenbrainz/FeedbacksSynchronizer.cpp
index 7b69456d..1a07b794 100644
--- a/src/libs/services/feedback/impl/listenbrainz/FeedbacksSynchronizer.cpp
+++ b/src/libs/services/feedback/impl/listenbrainz/FeedbacksSynchronizer.cpp
@@ -21,6 +21,7 @@
 
 #include <Wt/Json/Array.h>
 #include <Wt/Json/Object.h>
+#include <Wt/Json/Parser.h>
 #include <Wt/Json/Serializer.h>
 #include <Wt/Json/Value.h>
 #include <boost/asio/bind_executor.hpp>
diff --git a/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp b/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp
index 9d78f95c..192695fa 100644
--- a/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp
+++ b/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp
@@ -21,6 +21,7 @@
 
 #include <Wt/Json/Array.h>
 #include <Wt/Json/Object.h>
+#include <Wt/Json/Parser.h>
 #include <Wt/Json/Serializer.h>
 #include <Wt/Json/Value.h>
 #include <boost/asio/bind_executor.hpp>
diff --git a/src/lms/ui/MediaPlayer.cpp b/src/lms/ui/MediaPlayer.cpp
index 7bddd090..0bc6d444 100644
--- a/src/lms/ui/MediaPlayer.cpp
+++ b/src/lms/ui/MediaPlayer.cpp
@@ -20,6 +20,7 @@
 #include "MediaPlayer.hpp"
 
 #include <Wt/Json/Object.h>
+#include <Wt/Json/Parser.h>
 #include <Wt/Json/Serializer.h>
 #include <Wt/Json/Value.h>
 #include <Wt/WPushButton.h>