Header cleanup

src/network/protocol_manager.cpp

@@ -27,6 +27,7 @@
 #include "utils/time.hpp"
 #include "utils/vs.hpp"
 
+#include <algorithm>
 #include <assert.h>
 #include <cstdlib>
 #include <errno.h>
@@ -229,8 +230,9 @@ void ProtocolManager::startProtocol(std::shared_ptr<Protocol> protocol)
     protocol->setup();
     protocol->setState(PROTOCOL_STATE_RUNNING);
     opt.unlock();
+    Protocol* protocol_ptr = protocol.get();
     Log::info("ProtocolManager",
-        "A %s protocol has been started.", typeid(*protocol).name());
+        "A %s protocol has been started.", typeid(*protocol_ptr).name());
 
     // setup the protocol and notify it that it's started
 }   // startProtocol
@@ -278,9 +280,10 @@ void ProtocolManager::OneProtocolType::removeProtocol(std::shared_ptr<Protocol>
                   m_protocols.getData().end(),   p);
     if (i == m_protocols.getData().end())
     {
+        Protocol* protocol_ptr = p.get();
         Log::error("ProtocolManager",
                    "Trying to delete protocol '%s', which was not found",
-                   typeid(*p).name());
+                   typeid(*protocol_ptr).name());
     }
     else
     {
@@ -305,8 +308,9 @@ void ProtocolManager::terminateProtocol(std::shared_ptr<Protocol> protocol)
     opt.unlock();
     protocol->setState(PROTOCOL_STATE_TERMINATED);
     protocol->terminated();
+    Protocol* protocol_ptr = protocol.get();
     Log::info("ProtocolManager",
-        "A %s protocol has been terminated.", typeid(*protocol).name());
+        "A %s protocol has been terminated.", typeid(*protocol_ptr).name());
 }   // terminateProtocol
 
 // ----------------------------------------------------------------------------

src/network/protocols/game_protocol.cpp

@@ -22,7 +22,6 @@
 #include "karts/controller/player_controller.hpp"
 #include "network/event.hpp"
 #include "network/network_config.hpp"
-#include "network/network_player_profile.hpp"
 #include "network/game_setup.hpp"
 #include "network/network_config.hpp"
 #include "network/network_string.hpp"

src/network/stk_host.hpp

@@ -23,9 +23,7 @@
 #define STK_HOST_HPP
 
 #include "network/network.hpp"
-#include "network/network_config.hpp"
 #include "network/network_string.hpp"
-#include "network/stk_peer.hpp"
 #include "network/transport_address.hpp"
 #include "utils/synchronised.hpp"
 
@@ -44,6 +42,7 @@
 #include <thread>
 
 class GameSetup;
+class NetworkPlayerProfile;
 class Server;
 class SeparateProcess;
 

src/states_screens/network_kart_selection.cpp

@@ -27,6 +27,7 @@
 #include "items/item_manager.hpp"
 #include "karts/kart_properties.hpp"
 #include "karts/kart_properties_manager.hpp"
+#include "network/network_config.hpp"
 #include "network/network_player_profile.hpp"
 #include "network/protocol_manager.hpp"
 #include "network/protocols/client_lobby.hpp"

src/states_screens/networking_lobby.cpp

@@ -33,6 +33,7 @@
 #include "input/device_manager.hpp"
 #include "input/input_manager.hpp"
 #include "io/file_manager.hpp"
+#include "network/network_config.hpp"
 #include "network/network_player_profile.hpp"
 #include "network/protocols/client_lobby.hpp"
 #include "network/protocols/server_lobby.hpp"

src/states_screens/race_result_gui.cpp

@@ -44,6 +44,7 @@
 #include "modes/overworld.hpp"
 #include "modes/soccer_world.hpp"
 #include "modes/world_with_rank.hpp"
+#include "network/network_config.hpp"
 #include "network/stk_host.hpp"
 #include "network/protocols/client_lobby.hpp"
 #include "race/highscores.hpp"

src/states_screens/tracks_screen.cpp

@@ -27,6 +27,7 @@
 #include "io/file_manager.hpp"
 #include "network/network_player_profile.hpp"
 #include "network/protocols/client_lobby.hpp"
+#include "network/network_config.hpp"
 #include "network/stk_host.hpp"
 #include "states_screens/state_manager.hpp"
 #include "states_screens/track_info_screen.hpp"