diff --git a/src/guiengine/skin.cpp b/src/guiengine/skin.cpp
index 778503fe4..a3b324071 100644
--- a/src/guiengine/skin.cpp
+++ b/src/guiengine/skin.cpp
@@ -25,12 +25,20 @@
 #include "config/user_config.hpp"
 #include "graphics/2dutils.hpp"
 #include "graphics/central_settings.hpp"
+#include "graphics/irr_driver.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/modaldialog.hpp"
 #include "guiengine/scalable_font.hpp"
 #include "guiengine/screen.hpp"
 #include "guiengine/screen_keyboard.hpp"
-#include "guiengine/widgets.hpp"
+#include "guiengine/widgets/bubble_widget.hpp"
+#include "guiengine/widgets/check_box_widget.hpp"
+#include "guiengine/widgets/list_widget.hpp"
+#include "guiengine/widgets/model_view_widget.hpp"
+#include "guiengine/widgets/progress_bar_widget.hpp"
+#include "guiengine/widgets/rating_bar_widget.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
+#include "guiengine/widgets/spinner_widget.hpp"
 #include "io/file_manager.hpp"
 #include "states_screens/state_manager.hpp"
 #include "utils/log.hpp"
diff --git a/src/network/protocols/client_lobby.cpp b/src/network/protocols/client_lobby.cpp
index b1242272f..be9e3745d 100644
--- a/src/network/protocols/client_lobby.cpp
+++ b/src/network/protocols/client_lobby.cpp
@@ -30,6 +30,7 @@
 #include "guiengine/screen_keyboard.hpp"
 #include "input/device_manager.hpp"
 #include "input/input_device.hpp"
+#include "io/file_manager.hpp"
 #include "items/network_item_manager.hpp"
 #include "items/powerup_manager.hpp"
 #include "karts/abstract_kart.hpp"
diff --git a/src/states_screens/addons_screen.cpp b/src/states_screens/addons_screen.cpp
index 142fca0b9..d0a403956 100644
--- a/src/states_screens/addons_screen.cpp
+++ b/src/states_screens/addons_screen.cpp
@@ -20,11 +20,13 @@
 #include "addons/addons_manager.hpp"
 #include "addons/news_manager.hpp"
 #include "config/user_config.hpp"
+#include "graphics/irr_driver.hpp"
 #include "guiengine/CGUISpriteBank.hpp"
 #include "guiengine/modaldialog.hpp"
 #include "guiengine/scalable_font.hpp"
 #include "guiengine/widget.hpp"
 #include "guiengine/widgets/ribbon_widget.hpp"
+#include "guiengine/widgets/spinner_widget.hpp"
 #include "io/file_manager.hpp"
 #include "online/request_manager.hpp"
 #include "states_screens/dialogs/addons_loading.hpp"
diff --git a/src/states_screens/addons_screen.hpp b/src/states_screens/addons_screen.hpp
index 8d929c040..53f51efda 100644
--- a/src/states_screens/addons_screen.hpp
+++ b/src/states_screens/addons_screen.hpp
@@ -20,15 +20,15 @@
 
 #include "addons/addons_manager.hpp"
 #include "guiengine/screen.hpp"
-#include "guiengine/widgets/label_widget.hpp"
+#include "guiengine/widgets/list_widget.hpp"
 #include "guiengine/widgets/text_box_widget.hpp"
-#include "states_screens/dialogs/addons_loading.hpp"
 
 /* used for the installed/unsinstalled icons*/
 namespace irr { namespace gui { class STKModifiedSpriteBank; } }
 
-namespace GUIEngine { class Widget; }
+namespace GUIEngine { class LabelWidget; class Widget; }
 
+class AddonsLoading;
 struct DateFilter {
     core::stringw label;
     int year;
@@ -61,8 +61,6 @@ private:
 
     irr::gui::STKModifiedSpriteBank
                     *m_icon_bank;
-    GUIEngine::LabelWidget
-                    *m_update_status;
 
     /** Currently selected type. */
     std::string      m_type;
diff --git a/src/states_screens/dialogs/addons_loading.cpp b/src/states_screens/dialogs/addons_loading.cpp
index 0a02fdd36..e65b0a87a 100644
--- a/src/states_screens/dialogs/addons_loading.cpp
+++ b/src/states_screens/dialogs/addons_loading.cpp
@@ -25,7 +25,11 @@
 #include "guiengine/engine.hpp"
 #include "guiengine/message_queue.hpp"
 #include "guiengine/scalable_font.hpp"
-#include "guiengine/widgets.hpp"
+#include "guiengine/widgets/bubble_widget.hpp"
+#include "guiengine/widgets/label_widget.hpp"
+#include "guiengine/widgets/rating_bar_widget.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
+#include "guiengine/widgets/progress_bar_widget.hpp"
 #include "input/input_manager.hpp"
 #include "io/file_manager.hpp"
 #include "network/protocols/client_lobby.hpp"
diff --git a/src/states_screens/dialogs/addons_loading.hpp b/src/states_screens/dialogs/addons_loading.hpp
index c5e00a6cb..9d6ad773a 100644
--- a/src/states_screens/dialogs/addons_loading.hpp
+++ b/src/states_screens/dialogs/addons_loading.hpp
@@ -21,11 +21,11 @@
 
 #include "addons/addon.hpp"
 #include "addons/addons_manager.hpp"
-#include "guiengine/widgets.hpp"
 #include "guiengine/modaldialog.hpp"
 #include "utils/cpp2011.hpp"
 #include "utils/synchronised.hpp"
 
+namespace GUIEngine { class IconButtonWidget; class ProgressBarWidget; }
 namespace Online { class HTTPRequest; }
 
 /**
diff --git a/src/states_screens/dialogs/addons_pack.cpp b/src/states_screens/dialogs/addons_pack.cpp
index e9c10b085..a6aedb0d8 100644
--- a/src/states_screens/dialogs/addons_pack.cpp
+++ b/src/states_screens/dialogs/addons_pack.cpp
@@ -26,6 +26,11 @@
 #include "karts/kart_properties.hpp"
 #include "karts/kart_properties_manager.hpp"
 #include "guiengine/message_queue.hpp"
+#include "guiengine/widgets/bubble_widget.hpp"
+#include "guiengine/widgets/icon_button_widget.hpp"
+#include "guiengine/widgets/label_widget.hpp"
+#include "guiengine/widgets/progress_bar_widget.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
 #include "network/protocols/client_lobby.hpp"
 #include "online/http_request.hpp"
 #include "states_screens/addons_screen.hpp"
diff --git a/src/states_screens/dialogs/addons_pack.hpp b/src/states_screens/dialogs/addons_pack.hpp
index 24b7ae3be..d4c4a1cb0 100644
--- a/src/states_screens/dialogs/addons_pack.hpp
+++ b/src/states_screens/dialogs/addons_pack.hpp
@@ -18,11 +18,11 @@
 #ifndef HEADER_ADDONS_PACK_HPP
 #define HEADER_ADDONS_PACK_HPP
 
-#include "guiengine/widgets.hpp"
 #include "guiengine/modaldialog.hpp"
 #include "utils/cpp2011.hpp"
 
 class AddonsPackRequest;
+namespace GUIEngine { class LabelWidget; class ProgressBarWidget; }
 
 /**
   * \ingroup states_screens
diff --git a/src/states_screens/dialogs/change_password_dialog.cpp b/src/states_screens/dialogs/change_password_dialog.cpp
index 556189cc4..3784cf330 100644
--- a/src/states_screens/dialogs/change_password_dialog.cpp
+++ b/src/states_screens/dialogs/change_password_dialog.cpp
@@ -20,7 +20,10 @@
 #include "audio/sfx_manager.hpp"
 #include "config/player_manager.hpp"
 #include "guiengine/engine.hpp"
-#include "guiengine/widgets.hpp"
+#include "guiengine/widgets/icon_button_widget.hpp"
+#include "guiengine/widgets/label_widget.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
+#include "guiengine/widgets/text_box_widget.hpp"
 #include "online/xml_request.hpp"
 #include "states_screens/dialogs/message_dialog.hpp"
 #include "states_screens/state_manager.hpp"
diff --git a/src/states_screens/dialogs/download_assets.cpp b/src/states_screens/dialogs/download_assets.cpp
index 13f5556d8..e3dacf24c 100644
--- a/src/states_screens/dialogs/download_assets.cpp
+++ b/src/states_screens/dialogs/download_assets.cpp
@@ -20,9 +20,14 @@
 #include "states_screens/dialogs/download_assets.hpp"
 
 #include "config/user_config.hpp"
-#include "states_screens/dialogs/message_dialog.hpp"
+#include "guiengine/widgets/bubble_widget.hpp"
+#include "guiengine/widgets/icon_button_widget.hpp"
+#include "guiengine/widgets/label_widget.hpp"
+#include "guiengine/widgets/progress_bar_widget.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
 #include "io/file_manager.hpp"
 #include "online/http_request.hpp"
+#include "states_screens/dialogs/message_dialog.hpp"
 #include "states_screens/state_manager.hpp"
 #include "utils/extract_mobile_assets.hpp"
 #include "utils/download_assets_size.hpp"
diff --git a/src/states_screens/dialogs/download_assets.hpp b/src/states_screens/dialogs/download_assets.hpp
index 98b8ace97..15814bf0f 100644
--- a/src/states_screens/dialogs/download_assets.hpp
+++ b/src/states_screens/dialogs/download_assets.hpp
@@ -20,11 +20,11 @@
 
 #ifdef MOBILE_STK
 
-#include "guiengine/widgets.hpp"
 #include "guiengine/modaldialog.hpp"
 #include "utils/cpp2011.hpp"
 
 class DownloadAssetsRequest;
+namespace GUIEngine { class IconButtonWidget; class ProgressBarWidget; }
 
 /**
   * \ingroup states_screens
diff --git a/src/states_screens/dialogs/ghost_replay_info_dialog.cpp b/src/states_screens/dialogs/ghost_replay_info_dialog.cpp
index adf89159e..7585a815c 100644
--- a/src/states_screens/dialogs/ghost_replay_info_dialog.cpp
+++ b/src/states_screens/dialogs/ghost_replay_info_dialog.cpp
@@ -21,6 +21,11 @@
 #include "config/player_manager.hpp"
 #include "guiengine/CGUISpriteBank.hpp"
 #include "graphics/stk_tex_manager.hpp"
+#include "guiengine/widgets/check_box_widget.hpp"
+#include "guiengine/widgets/icon_button_widget.hpp"
+#include "guiengine/widgets/label_widget.hpp"
+#include "guiengine/widgets/list_widget.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
 #include "karts/kart_properties.hpp"
 #include "karts/kart_properties_manager.hpp"
 #include "race/race_manager.hpp"
diff --git a/src/states_screens/dialogs/ghost_replay_info_dialog.hpp b/src/states_screens/dialogs/ghost_replay_info_dialog.hpp
index a8d9d1771..f83069348 100644
--- a/src/states_screens/dialogs/ghost_replay_info_dialog.hpp
+++ b/src/states_screens/dialogs/ghost_replay_info_dialog.hpp
@@ -20,9 +20,14 @@
 #define HEADER_GHOST_REPLAY_INFO_DIALOG_HPP
 
 #include "guiengine/modaldialog.hpp"
-#include "guiengine/widgets.hpp"
 #include "replay/replay_play.hpp"
 
+namespace GUIEngine
+{
+    class CheckBoxWidget; class IconButtonWidget; class ListWidget;
+    class RibbonWidget;
+}
+
 /** \brief Dialog that allows a user to do action with ghost replay file
  * \ingroup states_screens
  */
diff --git a/src/states_screens/dialogs/high_score_info_dialog.cpp b/src/states_screens/dialogs/high_score_info_dialog.cpp
index 82459d3bb..91ef7aa72 100644
--- a/src/states_screens/dialogs/high_score_info_dialog.cpp
+++ b/src/states_screens/dialogs/high_score_info_dialog.cpp
@@ -22,6 +22,10 @@
 #include "config/user_config.hpp"
 #include "guiengine/CGUISpriteBank.hpp"
 #include "graphics/stk_tex_manager.hpp"
+#include "guiengine/widgets/icon_button_widget.hpp"
+#include "guiengine/widgets/label_widget.hpp"
+#include "guiengine/widgets/list_widget.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
 #include "input/device_manager.hpp"
 #include "input/input_manager.hpp"
 #include "karts/kart_properties.hpp"
diff --git a/src/states_screens/dialogs/high_score_info_dialog.hpp b/src/states_screens/dialogs/high_score_info_dialog.hpp
index 6664f82b3..1e6c012f7 100644
--- a/src/states_screens/dialogs/high_score_info_dialog.hpp
+++ b/src/states_screens/dialogs/high_score_info_dialog.hpp
@@ -20,10 +20,15 @@
 #define HEADER_HIGH_SCORE_INFO_DIALOG_HPP
 
 #include "guiengine/modaldialog.hpp"
-#include "guiengine/widgets.hpp"
 #include "race/grand_prix_data.hpp"
 #include "race/highscores.hpp"
 
+namespace GUIEngine
+{
+    class IconButtonWidget; class LabelWidget; class ListWidget;
+    class RibbonWidget;
+}
+
 /** \brief Dialog that allows a user to manage a high score
  * \ingroup states_screens
  */
diff --git a/src/states_screens/dialogs/recovery_dialog.cpp b/src/states_screens/dialogs/recovery_dialog.cpp
index 4d5e6d147..be128b7ab 100644
--- a/src/states_screens/dialogs/recovery_dialog.cpp
+++ b/src/states_screens/dialogs/recovery_dialog.cpp
@@ -20,6 +20,10 @@
 #include "audio/sfx_manager.hpp"
 #include "config/player_manager.hpp"
 #include "guiengine/engine.hpp"
+#include "guiengine/widgets/icon_button_widget.hpp"
+#include "guiengine/widgets/label_widget.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
+#include "guiengine/widgets/text_box_widget.hpp"
 #include "online/xml_request.hpp"
 #include "states_screens/state_manager.hpp"
 #include "utils/translation.hpp"
diff --git a/src/states_screens/dialogs/recovery_dialog.hpp b/src/states_screens/dialogs/recovery_dialog.hpp
index c2b2961ca..b6f25c98a 100644
--- a/src/states_screens/dialogs/recovery_dialog.hpp
+++ b/src/states_screens/dialogs/recovery_dialog.hpp
@@ -19,10 +19,13 @@
 #ifndef HEADER_RECOVERY_DIALOG_HPP
 #define HEADER_RECOVERY_DIALOG_HPP
 
-
 #include "guiengine/modaldialog.hpp"
-#include "guiengine/widgets.hpp"
 
+namespace GUIEngine
+{
+    class IconButtonWidget; class LabelWidget; class RibbonWidget;
+    class TextBoxWidget;
+}
 namespace Online
 {
     class XMLRequest;
diff --git a/src/states_screens/dialogs/registration_dialog.cpp b/src/states_screens/dialogs/registration_dialog.cpp
index e2784f178..76ec2775c 100644
--- a/src/states_screens/dialogs/registration_dialog.cpp
+++ b/src/states_screens/dialogs/registration_dialog.cpp
@@ -18,7 +18,8 @@
 #include "states_screens/dialogs/registration_dialog.hpp"
 
 #include "guiengine/engine.hpp"
-#include "guiengine/widgets.hpp"
+#include "guiengine/widgets/label_widget.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
 #include "states_screens/state_manager.hpp"
 #include "states_screens/online/register_screen.hpp"
 #include "utils/translation.hpp"
diff --git a/src/states_screens/dialogs/vote_dialog.cpp b/src/states_screens/dialogs/vote_dialog.cpp
index fe827530c..56b4bf0b4 100644
--- a/src/states_screens/dialogs/vote_dialog.cpp
+++ b/src/states_screens/dialogs/vote_dialog.cpp
@@ -21,6 +21,11 @@
 #include "audio/sfx_manager.hpp"
 #include "config/player_manager.hpp"
 #include "guiengine/engine.hpp"
+#include "guiengine/widgets/icon_button_widget.hpp"
+#include "guiengine/widgets/label_widget.hpp"
+#include "guiengine/widgets/rating_bar_widget.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
+#include "io/xml_node.hpp"
 #include "online/xml_request.hpp"
 #include "states_screens/state_manager.hpp"
 #include "utils/string_utils.hpp"
diff --git a/src/states_screens/dialogs/vote_dialog.hpp b/src/states_screens/dialogs/vote_dialog.hpp
index 714861dab..ceabd73aa 100644
--- a/src/states_screens/dialogs/vote_dialog.hpp
+++ b/src/states_screens/dialogs/vote_dialog.hpp
@@ -21,10 +21,10 @@
 
 
 #include "guiengine/modaldialog.hpp"
-#include "guiengine/widgets.hpp"
 
 #include <irrString.h>
 
+namespace GUIEngine { class IconButtonWidget; class LabelWidget; class RatingBarWidget; class RibbonWidget; }
 namespace Online
 {
     class XMLRequest;
diff --git a/src/states_screens/edit_track_screen.cpp b/src/states_screens/edit_track_screen.cpp
index a5c6a17ae..ec2ff8919 100644
--- a/src/states_screens/edit_track_screen.cpp
+++ b/src/states_screens/edit_track_screen.cpp
@@ -22,6 +22,7 @@
 #include "guiengine/widgets/button_widget.hpp"
 #include "guiengine/widgets/check_box_widget.hpp"
 #include "guiengine/widgets/dynamic_ribbon_widget.hpp"
+#include "guiengine/widgets/icon_button_widget.hpp"
 #include "guiengine/widgets/label_widget.hpp"
 #include "guiengine/widgets/ribbon_widget.hpp"
 #include "guiengine/widgets/spinner_widget.hpp"
diff --git a/src/states_screens/edit_track_screen.hpp b/src/states_screens/edit_track_screen.hpp
index d7cda62c0..c23ad30e2 100644
--- a/src/states_screens/edit_track_screen.hpp
+++ b/src/states_screens/edit_track_screen.hpp
@@ -19,9 +19,8 @@
 #define HEADER_EDIT_TRACK_SCREEN_HPP
 
 #include "guiengine/screen.hpp"
-#include "guiengine/widgets.hpp"
 
-namespace GUIEngine { class Widget; }
+namespace GUIEngine { class IconButtonWidget; class Widget; }
 
 namespace irr { namespace gui { class STKModifiedSpriteBank; } }
 
diff --git a/src/states_screens/ghost_replay_selection.cpp b/src/states_screens/ghost_replay_selection.cpp
index 6da76a686..17597aadc 100644
--- a/src/states_screens/ghost_replay_selection.cpp
+++ b/src/states_screens/ghost_replay_selection.cpp
@@ -20,8 +20,13 @@
 
 #include "config/player_manager.hpp"
 #include "config/user_config.hpp"
+#include "graphics/irr_driver.hpp"
 #include "graphics/material.hpp"
 #include "guiengine/CGUISpriteBank.hpp"
+#include "guiengine/widgets/check_box_widget.hpp"
+#include "guiengine/widgets/label_widget.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
+#include "io/file_manager.hpp"
 #include "karts/kart_properties.hpp"
 #include "karts/kart_properties_manager.hpp"
 #include "states_screens/dialogs/ghost_replay_info_dialog.hpp"
@@ -122,7 +127,6 @@ void GhostReplaySelection::loadedFromFile()
     m_compare_toggle_widget->setVisible(false);
     getWidget<LabelWidget>("compare-toggle-text")->setVisible(false);
 
-    m_mode_tabs = getWidget<GUIEngine::RibbonWidget>("race_mode");
     m_active_mode = RaceManager::MINOR_MODE_TIME_TRIAL;
     m_active_mode_is_linear = true;
     
diff --git a/src/states_screens/ghost_replay_selection.hpp b/src/states_screens/ghost_replay_selection.hpp
index 33d115820..34b4704b5 100644
--- a/src/states_screens/ghost_replay_selection.hpp
+++ b/src/states_screens/ghost_replay_selection.hpp
@@ -20,11 +20,11 @@
 #define HEADER_GHOST_REPLAY_SELECTION_HPP
 
 #include "guiengine/screen.hpp"
-#include "guiengine/widgets.hpp"
+#include "guiengine/widgets/list_widget.hpp"
 #include "race/race_manager.hpp"
 #include "states_screens/dialogs/message_dialog.hpp"
 
-namespace GUIEngine { class Widget; }
+namespace GUIEngine { class CheckBoxWidget; class Widget; }
 
 /**
   * \brief GhostReplaySelection
@@ -48,7 +48,6 @@ private:
     GUIEngine::CheckBoxWidget* m_replay_version_toggle_widget;
     GUIEngine::CheckBoxWidget* m_best_times_toggle_widget;
     GUIEngine::CheckBoxWidget* m_compare_toggle_widget;
-    GUIEngine::RibbonWidget*   m_mode_tabs;
     RaceManager::Difficulty    m_cur_difficulty;
     std::string                m_file_to_be_deleted;
     std::vector<unsigned int>  m_best_times_index;
diff --git a/src/states_screens/high_score_selection.cpp b/src/states_screens/high_score_selection.cpp
index 85a54a4f0..454257bab 100644
--- a/src/states_screens/high_score_selection.cpp
+++ b/src/states_screens/high_score_selection.cpp
@@ -20,8 +20,11 @@
 
 #include "config/player_manager.hpp"
 #include "config/user_config.hpp"
+#include "graphics/irr_driver.hpp"
 #include "graphics/material.hpp"
 #include "guiengine/CGUISpriteBank.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
+#include "io/file_manager.hpp"
 #include "karts/kart_properties.hpp"
 #include "karts/kart_properties_manager.hpp"
 #include "race/grand_prix_data.hpp"
diff --git a/src/states_screens/high_score_selection.hpp b/src/states_screens/high_score_selection.hpp
index 081383a9a..aa28af075 100644
--- a/src/states_screens/high_score_selection.hpp
+++ b/src/states_screens/high_score_selection.hpp
@@ -20,11 +20,11 @@
 #define HEADER_HIGH_SCORE_SELECTION_HPP
 
 #include "guiengine/screen.hpp"
-#include "guiengine/widgets.hpp"
+#include "guiengine/widgets/list_widget.hpp"
 #include "race/race_manager.hpp"
 #include "states_screens/dialogs/message_dialog.hpp"
 
-namespace GUIEngine { class Widget; }
+namespace GUIEngine { class ListWidget; class RibbonWidget; class Widget; }
 
 /**
   * \brief HighScoreSelection
diff --git a/src/states_screens/main_menu_screen.cpp b/src/states_screens/main_menu_screen.cpp
index 907df460c..199d034c5 100644
--- a/src/states_screens/main_menu_screen.cpp
+++ b/src/states_screens/main_menu_screen.cpp
@@ -27,6 +27,7 @@
 #include "graphics/irr_driver.hpp"
 #include "guiengine/dialog_queue.hpp"
 #include "guiengine/scalable_font.hpp"
+#include "guiengine/widgets/button_widget.hpp"
 #include "guiengine/widgets/label_widget.hpp"
 #include "guiengine/widgets/list_widget.hpp"
 #include "guiengine/widgets/ribbon_widget.hpp"
diff --git a/src/states_screens/online/tracks_screen.cpp b/src/states_screens/online/tracks_screen.cpp
index a39d4ab21..244cb0e6b 100644
--- a/src/states_screens/online/tracks_screen.cpp
+++ b/src/states_screens/online/tracks_screen.cpp
@@ -30,6 +30,7 @@
 #include "guiengine/widgets/check_box_widget.hpp"
 #include "guiengine/widgets/dynamic_ribbon_widget.hpp"
 #include "guiengine/widgets/icon_button_widget.hpp"
+#include "guiengine/widgets/label_widget.hpp"
 #include "guiengine/widgets/list_widget.hpp"
 #include "guiengine/widgets/progress_bar_widget.hpp"
 #include "guiengine/widgets/spinner_widget.hpp"
diff --git a/src/states_screens/options/user_screen.cpp b/src/states_screens/options/user_screen.cpp
index c6fb518fb..e150b8769 100644
--- a/src/states_screens/options/user_screen.cpp
+++ b/src/states_screens/options/user_screen.cpp
@@ -24,6 +24,7 @@
 #include "config/user_config.hpp"
 #include "graphics/central_settings.hpp"
 #include "guiengine/screen_keyboard.hpp"
+#include "guiengine/widgets/button_widget.hpp"
 #include "guiengine/widgets/check_box_widget.hpp"
 #include "guiengine/widgets/dynamic_ribbon_widget.hpp"
 #include "guiengine/widgets/label_widget.hpp"
diff --git a/src/states_screens/track_info_screen.cpp b/src/states_screens/track_info_screen.cpp
index 968b1304e..45b2d4413 100644
--- a/src/states_screens/track_info_screen.cpp
+++ b/src/states_screens/track_info_screen.cpp
@@ -21,6 +21,7 @@
 #include "challenges/unlock_manager.hpp"
 #include "config/player_manager.hpp"
 #include "config/user_config.hpp"
+#include "graphics/irr_driver.hpp"
 #include "graphics/material.hpp"
 #include "graphics/stk_tex_manager.hpp"
 #include "guiengine/CGUISpriteBank.hpp"
@@ -30,6 +31,7 @@
 #include "guiengine/widgets/check_box_widget.hpp"
 #include "guiengine/widgets/icon_button_widget.hpp"
 #include "guiengine/widgets/label_widget.hpp"
+#include "guiengine/widgets/list_widget.hpp"
 #include "guiengine/widgets/ribbon_widget.hpp"
 #include "guiengine/widgets/spinner_widget.hpp"
 #include "io/file_manager.hpp"
diff --git a/src/states_screens/track_info_screen.hpp b/src/states_screens/track_info_screen.hpp
index a28e5130d..6ccc66e62 100644
--- a/src/states_screens/track_info_screen.hpp
+++ b/src/states_screens/track_info_screen.hpp
@@ -21,13 +21,14 @@
 #define HEADER_TRACK_INFO_SCREEN_HPP
 
 #include "guiengine/screen.hpp"
-#include "guiengine/widgets.hpp"
 
+namespace irr { namespace gui { class STKModifiedSpriteBank; } }
 namespace GUIEngine
 {
     class CheckBoxWidget;
     class IconButtonWidget;
     class LabelWidget;
+    class ListWidget;
     class SpinnerWidget;
     class Widget;
 }