include cleanup: halo, hotkeys, intro, leader_list

src/halo.hpp

@@ -1,7 +1,7 @@
 #ifndef HALO_HPP_INCLUDED
 #define HALO_HPP_INCLUDED
 
-#include "display.hpp"
+class display;
 #include "animated.hpp"
 
 #include <string>

src/hotkeys.hpp

@@ -13,10 +13,9 @@
 #ifndef HOTKEYS_HPP_INCLUDED
 #define HOTKEYS_HPP_INCLUDED
 
-#include "config.hpp"
-#include "display.hpp"
-#include "events.hpp"
-#include "key.hpp"
+class config;
+class display;
+#include "SDL.h"
 
 //the hotkey system allows hotkey definitions to be loaded from
 //configuration objects, and then detect if a keyboard event

src/intro.hpp

@@ -13,10 +13,9 @@
 #ifndef INTRO_HPP_INCLUDED
 #define INTRO_HPP_INCLUDED
 
+class config;
+class display;
 #include "SDL.h"
-#include "config.hpp"
-#include "display.hpp"
-#include "gamestatus.hpp"
 
 #include <string>
 

src/leader_list.cpp

@@ -16,6 +16,7 @@
 #include "leader_list.hpp"
 #include "wml_separators.hpp"
 #include "serialization/string_utils.hpp"
+#include "widgets/combo.hpp"
 #include "widgets/menu.hpp"
 
 const std::string leader_list_manager::random_enemy_picture("random-enemy.png");

src/leader_list.hpp

@@ -14,9 +14,10 @@
 #ifndef LEADER_LIST_HPP_INCLUDED
 #define LEADER_LIST_HPP_INCLUDED
 
-#include "config.hpp"
-#include "widgets/combo.hpp"
-#include "gamestatus.hpp"
+class config;
+namespace gui { class combo; }
+
+#include "unit_types.hpp"
 #include <string>
 
 class leader_list_manager