clean some includes

src/attack_prediction_display.hpp

@@ -19,7 +19,6 @@
 #include "global.hpp"
 
 #include "actions.hpp"
-#include "display.hpp"
 #include "show_dialog.hpp"
 #include "unit_map.hpp"
 

src/editor/editor_layout.cpp

@@ -19,6 +19,7 @@
  * Set various sizes for the screen-layout of the map editor.
  */
 
+#include "display.hpp"
 #include "editor_layout.hpp"
 
 

src/editor/editor_layout.hpp

@@ -19,7 +19,7 @@
 
 #include "global.hpp"
 
-#include "display.hpp"
+class display;
 
 namespace editor {
 

src/multiplayer_ui.cpp

@@ -23,6 +23,7 @@
 #include "lobby_preferences.hpp"
 #include "log.hpp"
 #include "marked-up_text.hpp"
+#include "menu_events.hpp"
 #include "multiplayer.hpp"
 #include "multiplayer_ui.hpp"
 #include "sound.hpp"

src/multiplayer_ui.hpp

@@ -14,18 +14,19 @@
 #ifndef MULTIPLAYER_UI_HPP_INCLUDED
 #define MULTIPLAYER_UI_HPP_INCLUDED
 
+#include "chat_events.hpp"
 #include "hotkeys.hpp"
 #include "network.hpp"
 #include "preferences_display.hpp"
 #include "widgets/label.hpp"
 #include "widgets/menu.hpp"
 #include "widgets/textbox.hpp"
-#include "menu_events.hpp"
 
 #include <deque>
 #include <string>
 
 class display;
+class game_display;
 class config;
 class game_state;