diff --git a/server/sernet.cpp b/server/sernet.cpp
index e42f94b3bf..e125aefc85 100644
--- a/server/sernet.cpp
+++ b/server/sernet.cpp
@@ -367,7 +367,7 @@ int server_make_connection(QIODevice *new_sock, const QString &client_addr,
    Open server socket to be used to accept client connections
    and open a server socket for server LAN announcements.
  */
-optional_socket_server server_open_socket()
+std::optional<socket_server> server_open_socket()
 {
   // Local socket mode
   if (!srvarg.local_addr.isEmpty()) {
diff --git a/server/sernet.h b/server/sernet.h
index 73c7f433e4..efe55f3329 100644
--- a/server/sernet.h
+++ b/server/sernet.h
@@ -30,9 +30,8 @@ struct connection;
 
 using socket_server =
     std::variant<std::unique_ptr<QTcpServer>, std::unique_ptr<QLocalServer>>;
-using optional_socket_server = std::optional<socket_server>;
 
-optional_socket_server server_open_socket();
+std::optional<socket_server> server_open_socket();
 void flush_packets();
 void incoming_client_packets(connection *pconn);
 void close_connections_and_socket();
diff --git a/server/server.cpp b/server/server.cpp
index 1e6a403e0c..4cf46c234e 100644
--- a/server/server.cpp
+++ b/server/server.cpp
@@ -129,7 +129,7 @@ void fc_interface_init_server()
 /**
    Server initialization.
  */
-optional_socket_server srv_prepare()
+std::optional<socket_server> srv_prepare()
 {
   // make sure it's initialized
   srv_init();