diff --git a/src/network/network_manager.cpp b/src/network/network_manager.cpp
index 666708c73..d5e475194 100644
--- a/src/network/network_manager.cpp
+++ b/src/network/network_manager.cpp
@@ -18,14 +18,8 @@
 
 #include "network/network_manager.hpp"
 
-#include "network/protocols/hide_public_address.hpp"
-#include "network/protocols/show_public_address.hpp"
-#include "network/protocols/get_public_address.hpp"
-
+#include "network/event.hpp"
 #include "network/protocol_manager.hpp"
-#include "network/client_network_manager.hpp"
-#include "network/server_network_manager.hpp"
-
 #include "utils/log.hpp"
 
 #include <pthread.h>
diff --git a/src/network/network_manager.hpp b/src/network/network_manager.hpp
index a2dcb1efb..662ca1923 100644
--- a/src/network/network_manager.hpp
+++ b/src/network/network_manager.hpp
@@ -28,13 +28,14 @@
 
 #include "network/protocol_manager.hpp"
 #include "network/types.hpp"
-#include "network/event.hpp"
 #include "network/game_setup.hpp"
 #include "utils/singleton.hpp"
 #include "utils/synchronised.hpp"
 
 #include <vector>
 
+class Event;
+
 /** \class NetworkManager
  *  \brief Gives the general functions to use network communication.
  *  This class is in charge of storing the peers connected to this host.
diff --git a/src/network/protocol.cpp b/src/network/protocol.cpp
index 02f9b5eb9..49013a0e7 100644
--- a/src/network/protocol.cpp
+++ b/src/network/protocol.cpp
@@ -18,8 +18,9 @@
 
 #include "network/protocol.hpp"
 
-#include "network/protocol_manager.hpp"
+#include "network/event.hpp"
 #include "network/network_manager.hpp"
+#include "network/protocol_manager.hpp"
 
 Protocol::Protocol(CallbackObject* callback_object, PROTOCOL_TYPE type)
 {
diff --git a/src/network/protocol.hpp b/src/network/protocol.hpp
index b7e63ad4f..3c061a623 100644
--- a/src/network/protocol.hpp
+++ b/src/network/protocol.hpp
@@ -23,10 +23,11 @@
 #ifndef PROTOCOL_HPP
 #define PROTOCOL_HPP
 
-#include "network/event.hpp"
+#include "network/network_string.hpp"
 #include "network/types.hpp"
 #include "utils/types.hpp"
 
+class Event;
 class ProtocolManager;
 
 /** \enum PROTOCOL_TYPE
diff --git a/src/network/protocols/client_lobby_room_protocol.hpp b/src/network/protocols/client_lobby_room_protocol.hpp
index d57fd067e..890426df8 100644
--- a/src/network/protocols/client_lobby_room_protocol.hpp
+++ b/src/network/protocols/client_lobby_room_protocol.hpp
@@ -2,6 +2,9 @@
 #define CLIENT_LOBBY_ROOM_PROTOCOL_HPP
 
 #include "network/protocols/lobby_room_protocol.hpp"
+#include "network/types.hpp"
+
+class STKPeer;
 
 class ClientLobbyRoomProtocol : public LobbyRoomProtocol
 {
diff --git a/src/network/protocols/controller_events_protocol.cpp b/src/network/protocols/controller_events_protocol.cpp
index 3842e6286..ddd6b61ce 100644
--- a/src/network/protocols/controller_events_protocol.cpp
+++ b/src/network/protocols/controller_events_protocol.cpp
@@ -2,6 +2,7 @@
 
 #include "modes/world.hpp"
 #include "karts/abstract_kart.hpp"
+#include "karts/controller/controller.hpp"
 #include "network/network_manager.hpp"
 #include "network/network_world.hpp"
 #include "utils/log.hpp"
diff --git a/src/network/protocols/controller_events_protocol.hpp b/src/network/protocols/controller_events_protocol.hpp
index 9a65c0d2c..7242633a7 100644
--- a/src/network/protocols/controller_events_protocol.hpp
+++ b/src/network/protocols/controller_events_protocol.hpp
@@ -4,7 +4,9 @@
 #include "network/protocol.hpp"
 
 #include "input/input.hpp"
-#include "karts/controller/controller.hpp"
+
+class Controller;
+class STKPeer;
 
 class ControllerEventsProtocol : public Protocol
 {
diff --git a/src/network/protocols/get_public_address.hpp b/src/network/protocols/get_public_address.hpp
index 4eb92a85e..48de87984 100644
--- a/src/network/protocols/get_public_address.hpp
+++ b/src/network/protocols/get_public_address.hpp
@@ -23,6 +23,8 @@
 
 #include <string>
 
+class STKHost;
+
 class GetPublicAddress : public Protocol
 {
     public:
diff --git a/src/network/protocols/kart_update_protocol.hpp b/src/network/protocols/kart_update_protocol.hpp
index fceb22616..c5eda673a 100644
--- a/src/network/protocols/kart_update_protocol.hpp
+++ b/src/network/protocols/kart_update_protocol.hpp
@@ -4,7 +4,9 @@
 #include "network/protocol.hpp"
 #include "utils/vec3.hpp"
 #include "LinearMath/btQuaternion.h"
+
 #include <list>
+#include "pthread.h"
 
 class AbstractKart;