Include optimizations

SVN-Revision: 6022

diff --git a/src/gui/button.hpp b/src/gui/button.hpp
index 0194dc8..f66d868 100644 (file)
--- a/src/gui/button.hpp
+++ b/src/gui/button.hpp
@@ -19,7 +19,6 @@
 
 #include <SDL.h>
 #include <string>
-#include <vector>
 
 #include "math/vector.hpp"
 

diff --git a/src/gui/menu.cpp b/src/gui/menu.cpp
index 0276088..d92fff9 100644 (file)
--- a/src/gui/menu.cpp
+++ b/src/gui/menu.cpp
@@ -20,12 +20,14 @@
 
 #include "control/joystickkeyboardcontroller.hpp"
 #include "gui/menu_item.hpp"
+#include "gui/mousecursor.hpp"
 #include "supertux/main.hpp"
 #include "supertux/mainloop.hpp"
 #include "supertux/resources.hpp"
 #include "supertux/timer.hpp"
 #include "util/gettext.hpp"
 #include "video/drawing_context.hpp"
+#include "video/font.hpp"
 
 static const float MENU_REPEAT_INITIAL = 0.4f;
 static const float MENU_REPEAT_RATE    = 0.1f;

diff --git a/src/gui/menu.hpp b/src/gui/menu.hpp
index 8ac6db2..b74e931 100644 (file)
--- a/src/gui/menu.hpp
+++ b/src/gui/menu.hpp
@@ -21,12 +21,13 @@
 #include <memory>
 #include <SDL.h>
 
-#include "gui/mousecursor.hpp"
-#include "video/font.hpp"
-
-bool confirm_dialog(Surface* background, std::string text);
+#include "video/color.hpp"
 
+class DrawingContext;
 class MenuItem;
+class Surface;
+
+bool confirm_dialog(Surface* background, std::string text);
 
 class Menu
 {

diff --git a/src/gui/menu_item.cpp b/src/gui/menu_item.cpp
index 892c9e1..fd599d7 100644 (file)
--- a/src/gui/menu_item.cpp
+++ b/src/gui/menu_item.cpp
@@ -16,15 +16,9 @@
 
 #include "gui/menu_item.hpp"
 
-#include <math.h>
-
-#include "control/joystickkeyboardcontroller.hpp"
-#include "supertux/main.hpp"
-#include "supertux/mainloop.hpp"
 #include "supertux/resources.hpp"
 #include "supertux/timer.hpp"
-#include "util/gettext.hpp"
-#include "video/drawing_context.hpp"
+#include "video/font.hpp"
 
 static const float FLICK_CURSOR_TIME   = 0.5f;
 

diff --git a/src/gui/menu_item.hpp b/src/gui/menu_item.hpp
index dcebc2a..aab6e7e 100644 (file)
--- a/src/gui/menu_item.hpp
+++ b/src/gui/menu_item.hpp
@@ -22,8 +22,6 @@
 #include <SDL.h>
 
 #include "gui/menu.hpp"
-#include "gui/mousecursor.hpp"
-#include "video/font.hpp"
 
 /* Kinds of menu items */
 enum MenuItemKind {

diff --git a/src/object/block.cpp b/src/object/block.cpp
index 420a4b1..29b8b11 100644 (file)
--- a/src/object/block.cpp
+++ b/src/object/block.cpp
@@ -18,22 +18,12 @@
 
 #include "audio/sound_manager.hpp"
 #include "badguy/badguy.hpp"
-#include "lisp/list_iterator.hpp"
-#include "object/broken_brick.hpp"
 #include "object/coin.hpp"
 #include "object/flower.hpp"
-#include "object/bouncy_coin.hpp"
 #include "object/growup.hpp"
-#include "object/oneup.hpp"
 #include "object/player.hpp"
 #include "object/portable.hpp"
-#include "object/specialriser.hpp"
-#include "object/star.hpp"
-#include "sprite/sprite_manager.hpp"
 #include "supertux/constants.hpp"
-#include "supertux/level.hpp"
-#include "supertux/object_factory.hpp"
-#include "supertux/sector.hpp"
 
 static const float BOUNCY_BRICK_MAX_OFFSET = 8;
 static const float BOUNCY_BRICK_SPEED = 90;

diff --git a/src/object/bonus_block.cpp b/src/object/bonus_block.cpp
index 2663807..55481d7 100644 (file)
--- a/src/object/bonus_block.cpp
+++ b/src/object/bonus_block.cpp
@@ -20,7 +20,6 @@
 #include "badguy/badguy.hpp"
 #include "lisp/list_iterator.hpp"
 #include "object/broken_brick.hpp"
-#include "object/coin.hpp"
 #include "object/flower.hpp"
 #include "object/bouncy_coin.hpp"
 #include "object/growup.hpp"

diff --git a/src/object/brick.cpp b/src/object/brick.cpp
index d054752..8e3e01d 100644 (file)
--- a/src/object/brick.cpp
+++ b/src/object/brick.cpp
@@ -18,21 +18,12 @@
 
 #include "audio/sound_manager.hpp"
 #include "badguy/badguy.hpp"
-#include "lisp/list_iterator.hpp"
-#include "object/broken_brick.hpp"
-#include "object/coin.hpp"
 #include "object/flower.hpp"
 #include "object/bouncy_coin.hpp"
-#include "object/growup.hpp"
-#include "object/oneup.hpp"
 #include "object/player.hpp"
 #include "object/portable.hpp"
-#include "object/specialriser.hpp"
-#include "object/star.hpp"
 #include "sprite/sprite_manager.hpp"
 #include "supertux/constants.hpp"
-#include "supertux/level.hpp"
-#include "supertux/object_factory.hpp"
 #include "supertux/sector.hpp"
 
 Brick::Brick(const Vector& pos, int data)

diff --git a/src/supertux/profile_menu.cpp b/src/supertux/profile_menu.cpp
index 9ae1ff7..e97a640 100644 (file)
--- a/src/supertux/profile_menu.cpp
+++ b/src/supertux/profile_menu.cpp
@@ -14,6 +14,8 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include <sstream>
+
 #include "gui/menu.hpp"
 #include "gui/menu_item.hpp"
 #include "supertux/gameconfig.hpp"