Removed more includes of event.hpp in hpp files.

src/network/protocol_manager.cpp

@@ -18,6 +18,7 @@
 
 #include "network/protocol_manager.hpp"
 
+#include "network/event.hpp"
 #include "network/network_manager.hpp"
 #include "network/protocol.hpp"
 #include "utils/log.hpp"

src/network/protocol_manager.hpp

@@ -23,7 +23,6 @@
 #ifndef PROTOCOL_MANAGER_HPP
 #define PROTOCOL_MANAGER_HPP
 
-#include "network/event.hpp"
 #include "network/network_string.hpp"
 #include "network/protocol.hpp"
 #include "utils/no_copy.hpp"
@@ -33,6 +32,9 @@
 
 #include <vector>
 
+class Event;
+class STKPeer;
+
 #define TIME_TO_KEEP_EVENTS 1.0
 
 /*!

src/network/protocols/client_lobby_room_protocol.cpp

@@ -20,6 +20,7 @@
 
 #include "config/player_manager.hpp"
 #include "modes/world_with_rank.hpp"
+#include "network/event.hpp"
 #include "network/network_manager.hpp"
 #include "network/network_world.hpp"
 #include "network/protocols/start_game_protocol.hpp"

src/network/protocols/connect_to_peer.cpp

@@ -19,6 +19,7 @@
 #include "network/protocols/connect_to_peer.hpp"
 
 #include "network/client_network_manager.hpp"
+#include "network/event.hpp"
 #include "network/protocols/get_public_address.hpp"
 #include "network/protocols/get_peer_address.hpp"
 #include "network/protocols/show_public_address.hpp"

src/network/protocols/connect_to_server.cpp

@@ -19,6 +19,7 @@
 #include "network/protocols/connect_to_server.hpp"
 
 #include "network/client_network_manager.hpp"
+#include "network/event.hpp"
 #include "network/protocols/get_public_address.hpp"
 #include "network/protocols/get_peer_address.hpp"
 #include "network/protocols/show_public_address.hpp"

src/network/protocols/controller_events_protocol.cpp

@@ -3,6 +3,7 @@
 #include "modes/world.hpp"
 #include "karts/abstract_kart.hpp"
 #include "karts/controller/controller.hpp"
+#include "network/event.hpp"
 #include "network/network_manager.hpp"
 #include "network/network_world.hpp"
 #include "utils/log.hpp"

src/network/protocols/game_events_protocol.cpp

@@ -6,7 +6,9 @@
 #include "items/item_manager.hpp"
 #include "items/powerup.hpp"
 #include "modes/world.hpp"
+#include "network/event.hpp"
 #include "network/network_manager.hpp"
+
 #include <stdint.h>
 
 GameEventsProtocol::GameEventsProtocol() : Protocol(NULL, PROTOCOL_GAME_EVENTS)

src/network/protocols/kart_update_protocol.cpp

@@ -2,8 +2,9 @@
 
 #include "karts/abstract_kart.hpp"
 #include "modes/world.hpp"
-#include "network/protocol_manager.hpp"
+#include "network/event.hpp"
 #include "network/network_world.hpp"
+#include "network/protocol_manager.hpp"
 #include "utils/time.hpp"
 
 KartUpdateProtocol::KartUpdateProtocol()

src/network/protocols/server_lobby_room_protocol.cpp

@@ -21,6 +21,7 @@
 #include "config/player_manager.hpp"
 #include "config/user_config.hpp"
 #include "modes/world.hpp"
+#include "network/event.hpp"
 #include "network/network_world.hpp"
 #include "network/protocols/get_public_address.hpp"
 #include "network/protocols/show_public_address.hpp"

src/network/protocols/start_game_protocol.cpp

@@ -6,10 +6,11 @@
 #include "input/input_manager.hpp"
 #include "challenges/unlock_manager.hpp"
 #include "modes/world.hpp"
-#include "network/network_manager.hpp"
-#include "network/protocol_manager.hpp"
+#include "network/event.hpp"
 #include "network/game_setup.hpp"
+#include "network/network_manager.hpp"
 #include "network/network_world.hpp"
+#include "network/protocol_manager.hpp"
 #include "network/protocols/synchronization_protocol.hpp"
 #include "online/online_profile.hpp"
 #include "race/race_manager.hpp"

src/network/protocols/synchronization_protocol.cpp

@@ -1,5 +1,6 @@
 #include "network/protocols/synchronization_protocol.hpp"
 
+#include "network/event.hpp"
 #include "network/network_manager.hpp"
 #include "network/protocols/kart_update_protocol.hpp"
 #include "network/protocols/controller_events_protocol.hpp"

src/network/stk_host.cpp

@@ -20,6 +20,7 @@
 
 #include "config/user_config.hpp"
 #include "io/file_manager.hpp"
+#include "network/event.hpp"
 #include "network/network_manager.hpp"
 #include "utils/log.hpp"
 #include "utils/time.hpp"