diff --git a/src/flyable.cpp b/src/flyable.cpp
index 624e2dfd8..53d0e37ab 100644
--- a/src/flyable.cpp
+++ b/src/flyable.cpp
@@ -21,6 +21,7 @@
 
 #include "flyable.hpp"
 #include "track.hpp"
+#include "constants.hpp"
 #include "callback_manager.hpp"
 #include "scene.hpp"
 #include "race_manager.hpp"
diff --git a/src/grand_prix_data.hpp b/src/grand_prix_data.hpp
index dba20f561..a68ea0863 100644
--- a/src/grand_prix_data.hpp
+++ b/src/grand_prix_data.hpp
@@ -25,8 +25,6 @@
 #include <vector>
 #include <cassert>
 
-#include "items/item_manager.hpp"
-
 /** Simple class that hold the data relevant to a 'grand_prix', aka. a number
     of races that has to be completed one after the other */
 class GrandPrixData
diff --git a/src/gui/help_page_one.cpp b/src/gui/help_page_one.cpp
index 88589c2c8..c195ebeb1 100644
--- a/src/gui/help_page_one.cpp
+++ b/src/gui/help_page_one.cpp
@@ -22,6 +22,7 @@
 #include "menu_manager.hpp"
 #include "user_config.hpp"
 #include "translation.hpp"
+#include "items/item_manager.hpp"
 
 enum WidgetTokens
 {
diff --git a/src/gui/race_gui.cpp b/src/gui/race_gui.cpp
index 1da689f46..e9ee80294 100644
--- a/src/gui/race_gui.cpp
+++ b/src/gui/race_gui.cpp
@@ -24,6 +24,7 @@
 #include "sdldrv.hpp"
 
 #include "user_config.hpp"
+#include "constants.hpp"
 #include "history.hpp"
 #include "track.hpp"
 #include "material_manager.hpp"
diff --git a/src/items/powerup.cpp b/src/items/powerup.cpp
index 6afdff1c7..25544f33b 100644
--- a/src/items/powerup.cpp
+++ b/src/items/powerup.cpp
@@ -24,6 +24,7 @@
 #include "stk_config.hpp"
 #include "audio/sfx_base.hpp"
 #include "audio/sfx_manager.hpp"
+#include "items/item_manager.hpp"
 #include "items/projectile_manager.hpp"
 #include "karts/kart.hpp"
 #include "modes/world.hpp"
diff --git a/src/modes/linear_world.cpp b/src/modes/linear_world.cpp
index 48daee964..47d88384a 100644
--- a/src/modes/linear_world.cpp
+++ b/src/modes/linear_world.cpp
@@ -23,6 +23,7 @@
 
 #include "gui/race_gui.hpp"
  
+#include "constants.hpp"
 #include "track.hpp"
 #include "gui/menu_manager.hpp"
 #include "translation.hpp"
diff --git a/src/moving_physics.cpp b/src/moving_physics.cpp
index e2cac43e9..1a1f77865 100644
--- a/src/moving_physics.cpp
+++ b/src/moving_physics.cpp
@@ -26,6 +26,7 @@
 
 #include "string_utils.hpp"
 #include "scene.hpp"
+#include "utils/coord.hpp"
 #include "utils/ssg_help.hpp"
 #include "modes/world.hpp"
 
diff --git a/src/network/race_state.cpp b/src/network/race_state.cpp
index 2d7767851..fd9628612 100644
--- a/src/network/race_state.cpp
+++ b/src/network/race_state.cpp
@@ -20,6 +20,7 @@
 #include "modes/world.hpp"
 #include "network/network_manager.hpp"
 #include "network/race_state.hpp"
+#include "items/item_manager.hpp"
 #include "items/projectile_manager.hpp"
 
 RaceState *race_state=NULL;
diff --git a/src/race_manager.hpp b/src/race_manager.hpp
index 2cac6c30c..149610bc3 100644
--- a/src/race_manager.hpp
+++ b/src/race_manager.hpp
@@ -29,6 +29,7 @@
 
 class World;
 class Track;
+class Kart;
 
 /** The race manager has two functions:
  *  1) it stores information about the race the user selected (e.g. number
@@ -149,7 +150,7 @@ private:
     }
 
 public:
-    bool                             m_active_race; //True if there is a race
+    bool   m_active_race; //True if there is a race
 
     static World* getWorld();
     static void setWorld(World* world);