diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp
index beb941c17..ce659df8c 100644
--- a/servatrice/src/serversocketinterface.cpp
+++ b/servatrice/src/serversocketinterface.cpp
@@ -37,7 +37,6 @@
 #include "main.h"
 #include "metrics_registry.h"
 #include "servatrice.h"
-#include "servatrice_database_interface.h"
 #include "server.h"
 #include "server_database_interface.h"
 #include "server_logger.h"
@@ -192,7 +191,7 @@ static const int protocolVersion = 14;
 static const int MAX_TCP_MESSAGE_SIZE = 1500000;
 
 AbstractServerSocketInterface::AbstractServerSocketInterface(Servatrice *_server,
-                                                             Servatrice_DatabaseInterface *_databaseInterface,
+                                                             Server_DatabaseInterface *_databaseInterface,
                                                              QObject *parent)
     : Server_ProtocolHandler(_server, _databaseInterface, parent), servatrice(_server)
 {
@@ -3674,7 +3673,7 @@ Response::ResponseCode AbstractServerSocketInterface::cmdUpdateAdminNotes(const
 }
 
 TcpServerSocketInterface::TcpServerSocketInterface(Servatrice *_server,
-                                                   Servatrice_DatabaseInterface *_databaseInterface,
+                                                   Server_DatabaseInterface *_databaseInterface,
                                                    QObject *parent)
     : AbstractServerSocketInterface(_server, _databaseInterface, parent), messageInProgress(false),
       handshakeStarted(false)
@@ -3869,7 +3868,7 @@ bool TcpServerSocketInterface::initTcpSession()
 }
 
 WebsocketServerSocketInterface::WebsocketServerSocketInterface(Servatrice *_server,
-                                                               Servatrice_DatabaseInterface *_databaseInterface,
+                                                               Server_DatabaseInterface *_databaseInterface,
                                                                QObject *parent)
     : AbstractServerSocketInterface(_server, _databaseInterface, parent), socket(nullptr)
 {
diff --git a/servatrice/src/serversocketinterface.h b/servatrice/src/serversocketinterface.h
index 5cb314dbc..8103c897b 100644
--- a/servatrice/src/serversocketinterface.h
+++ b/servatrice/src/serversocketinterface.h
@@ -37,7 +37,7 @@
 #include <server_protocolhandler.h>
 
 class Servatrice;
-class Servatrice_DatabaseInterface;
+class Server_DatabaseInterface;
 class DeckList;
 class ServerInfo_DeckStorage_Folder;
 class Command_AddToList;
@@ -247,7 +247,7 @@ private:
 
 public:
     AbstractServerSocketInterface(Servatrice *_server,
-                                  Servatrice_DatabaseInterface *_databaseInterface,
+                                  Server_DatabaseInterface *_databaseInterface,
                                   QObject *parent = 0);
     ~AbstractServerSocketInterface()
     {
@@ -264,9 +264,7 @@ class TcpServerSocketInterface : public AbstractServerSocketInterface
 {
     Q_OBJECT
 public:
-    TcpServerSocketInterface(Servatrice *_server,
-                             Servatrice_DatabaseInterface *_databaseInterface,
-                             QObject *parent = 0);
+    TcpServerSocketInterface(Servatrice *_server, Server_DatabaseInterface *_databaseInterface, QObject *parent = 0);
     ~TcpServerSocketInterface();
 
     QHostAddress getPeerAddress() const
@@ -312,7 +310,7 @@ class WebsocketServerSocketInterface : public AbstractServerSocketInterface
     Q_OBJECT
 public:
     WebsocketServerSocketInterface(Servatrice *_server,
-                                   Servatrice_DatabaseInterface *_databaseInterface,
+                                   Server_DatabaseInterface *_databaseInterface,
                                    QObject *parent = nullptr);
     ~WebsocketServerSocketInterface();