diff --git a/src/game_manager.cpp b/src/game_manager.cpp
index bb168ad9c..6c9e74205 100644
--- a/src/game_manager.cpp
+++ b/src/game_manager.cpp
@@ -33,7 +33,6 @@
 #include "material_manager.hpp"
 #include "race_manager.hpp"
 #include "world.hpp"
-#include "widget_set.hpp"
 #include "user_config.hpp"
 #include "scene.hpp"
 #include "history.hpp"
diff --git a/src/sdldrv.cpp b/src/sdldrv.cpp
index c91643ec0..758d447f8 100755
--- a/src/sdldrv.cpp
+++ b/src/sdldrv.cpp
@@ -33,7 +33,7 @@
 #include "loader.hpp"
 #include "gui/menu_manager.hpp"
 #include "player.hpp"
-#include "widget_set.hpp"
+#include "gui/font.hpp"
 
 SDL_Surface *mainSurface;
 long flags;
@@ -114,7 +114,11 @@ void drv_toggleFullscreen(int resetTextures)
         attachment_manager      -> loadModels();
 
 	//        startScreen             -> installMaterial();
-        widgetSet               -> reInit();
+
+        //FIXME: the font reinit funcs should be inside the font class
+        //Reinit fonts
+        delete_fonts();
+        init_fonts();
     }
 #endif
 }
diff --git a/src/world.cpp b/src/world.cpp
index 21cf692b8..a88ec1dbb 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -47,7 +47,6 @@
 #include "history.hpp"
 #include "constants.hpp"
 #include "sound_manager.hpp"
-#include "widget_set.hpp"
 #include "ssg_help.hpp"
 #include "translation.hpp"
 #include "highscore_manager.hpp"