diff --git a/servatrice/src/isl_interface.cpp b/servatrice/src/isl_interface.cpp
index 034228046..2269ff314 100644
--- a/servatrice/src/isl_interface.cpp
+++ b/servatrice/src/isl_interface.cpp
@@ -5,8 +5,6 @@
 
 #include <QSslSocket>
 #include <google/protobuf/descriptor.h>
-#include <server_protocolhandler.h>
-#include <server_room.h>
 #include <libcockatrice/protocol/debug_pb_message.h>
 #include <libcockatrice/protocol/get_pb_extension.h>
 #include <libcockatrice/protocol/pb/event_game_joined.pb.h>
@@ -20,6 +18,8 @@
 #include <libcockatrice/protocol/pb/event_user_left.pb.h>
 #include <libcockatrice/protocol/pb/event_user_message.pb.h>
 #include <libcockatrice/protocol/pb/isl_message.pb.h>
+#include <server_protocolhandler.h>
+#include <server_room.h>
 
 void IslInterface::sharedCtor(const QSslCertificate &cert, const QSslKey &privateKey)
 {
diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp
index e8a1a5041..ea3d783bd 100644
--- a/servatrice/src/servatrice.cpp
+++ b/servatrice/src/servatrice.cpp
@@ -40,11 +40,11 @@
 #include <QUrl>
 #include <iostream>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <server_room.h>
 #include <libcockatrice/protocol/featureset.h>
 #include <libcockatrice/protocol/pb/event_connection_closed.pb.h>
 #include <libcockatrice/protocol/pb/event_server_message.pb.h>
 #include <libcockatrice/protocol/pb/event_server_shutdown.pb.h>
+#include <server_room.h>
 
 Servatrice_GameServer::Servatrice_GameServer(Servatrice *_server,
                                              int _numberPools,
diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp
index 2703b70fd..4b33aad12 100644
--- a/servatrice/src/serversocketinterface.cpp
+++ b/servatrice/src/serversocketinterface.cpp
@@ -35,11 +35,9 @@
 #include <QSqlError>
 #include <QSqlQuery>
 #include <QString>
+#include <game/server_player.h>
 #include <iostream>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <game/server_player.h>
-#include <server_response_containers.h>
-#include <server_room.h>
 #include <libcockatrice/protocol/pb/command_deck_del.pb.h>
 #include <libcockatrice/protocol/pb/command_deck_del_dir.pb.h>
 #include <libcockatrice/protocol/pb/command_deck_download.pb.h>
@@ -81,6 +79,8 @@
 #include <libcockatrice/protocol/pb/serverinfo_replay.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 #include <libcockatrice/utility/trice_limits.h>
+#include <server_response_containers.h>
+#include <server_room.h>
 #include <string>
 
 static const int protocolVersion = 14;