Move font.cpp/h into fonts directory.

54 files changed, 104 insertions, 60 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c75791cb4..404604a65 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -425,8 +425,8 @@ SET(SRCS
     gui/widgets/tabs/setup_visual.cpp
     gui/widgets/tabs/setup_visual.h
     gui/setupactiondata.h
-    gui/font.cpp
-    gui/font.h
+    gui/fonts/font.cpp
+    gui/fonts/font.h
     gui/windows/shopwindow.cpp
     gui/windows/shopwindow.h
     gui/windows/shortcutwindow.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 2802cb926..4fa1097d4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -522,8 +522,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/widgets/tabs/setup_visual.cpp \
 	      gui/widgets/tabs/setup_visual.h \
 	      gui/setupactiondata.h \
-	      gui/font.cpp \
-	      gui/font.h \
+	      gui/fonts/font.cpp \
+	      gui/fonts/font.h \
 	      gui/windows/shopwindow.cpp \
 	      gui/windows/shopwindow.h \
 	      gui/windows/shortcutwindow.cpp \
diff --git a/src/being/being.cpp b/src/being/being.cpp
index d3df414c5..479109c2e 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -43,9 +43,10 @@
 #include "particle/particle.h"
 #include "particle/particleinfo.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/popups/speechbubble.h"
 
 #include "gui/windows/equipmentwindow.h"
diff --git a/src/flooritem.cpp b/src/flooritem.cpp
index 3b5992883..4abe9047f 100644
--- a/src/flooritem.cpp
+++ b/src/flooritem.cpp
@@ -26,10 +26,11 @@
 
 #include "render/graphics.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/userpalette.h"
 
+#include "gui/fonts/font.h"
+
 #include "resources/iteminfo.h"
 
 #include "resources/db/itemdb.h"
diff --git a/src/game.cpp b/src/game.cpp
index 6b265424a..34305cec2 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -49,11 +49,12 @@
 #include "input/keyboardconfig.h"
 
 #include "gui/chatconsts.h"
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/viewport.h"
 #include "gui/windowmenu.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/windows/botcheckerwindow.h"
 #include "gui/windows/debugwindow.h"
 #include "gui/windows/didyouknowwindow.h"
diff --git a/src/gui/font.cpp b/src/gui/fonts/font.cpp
index 9eef7fbcd..d8abc1dcf 100644
--- a/src/gui/font.cpp
+++ b/src/gui/fonts/font.cpp
@@ -64,7 +64,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "gui/font.h"
+#include "gui/fonts/font.h"
 
 #include "logger.h"
 #include "main.h"
diff --git a/src/gui/font.h b/src/gui/fonts/font.h
index ee1742942..f6a64a2d8 100644
--- a/src/gui/font.h
+++ b/src/gui/fonts/font.h
@@ -64,8 +64,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef GUI_FONT_H
-#define GUI_FONT_H
+#ifndef GUI_FONTS_FONT_H
+#define GUI_FONTS_FONT_H
 
 #include "gui/color.h"
 
@@ -211,4 +211,4 @@ class Font final
 extern int sdlTextChunkCnt;
 #endif
 
-#endif  // GUI_FONT_H
+#endif  // GUI_FONTS_FONT_H
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 2841a5369..cb74090d2 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -66,12 +66,13 @@
 #include "gui/gui.h"
 
 #include "gui/focushandler.h"
-#include "gui/font.h"
 #include "gui/palette.h"
 #include "gui/sdlinput.h"
 #include "gui/theme.h"
 #include "gui/viewport.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/widgets/window.h"
 
 #include "client.h"
diff --git a/src/gui/models/serverslistmodel.h b/src/gui/models/serverslistmodel.h
index 5c7e73387..0b15aefae 100644
--- a/src/gui/models/serverslistmodel.h
+++ b/src/gui/models/serverslistmodel.h
@@ -25,9 +25,10 @@
 
 #include "net/serverinfo.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/windows/serverdialog.h"
 
 #include "utils/mutex.h"
diff --git a/src/gui/popups/beingpopup.cpp b/src/gui/popups/beingpopup.cpp
index dd1aaf028..b15ccc7ae 100644
--- a/src/gui/popups/beingpopup.cpp
+++ b/src/gui/popups/beingpopup.cpp
@@ -24,9 +24,10 @@
 #include "being/being.h"
 #include "being/playerrelations.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/widgets/label.h"
 
 #include "utils/gettext.h"
diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp
index 0a65ce3bc..9b0870261 100644
--- a/src/gui/popups/itempopup.cpp
+++ b/src/gui/popups/itempopup.cpp
@@ -27,9 +27,10 @@
 #include "item.h"
 #include "units.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/widgets/icon.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/textbox.h"
diff --git a/src/gui/popups/speechbubble.cpp b/src/gui/popups/speechbubble.cpp
index 44699499f..3f01651d8 100644
--- a/src/gui/popups/speechbubble.cpp
+++ b/src/gui/popups/speechbubble.cpp
@@ -23,11 +23,12 @@
 
 #include "gui/popups/speechbubble.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
 #include "gui/viewport.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/label.h"
 
diff --git a/src/gui/popups/statuspopup.cpp b/src/gui/popups/statuspopup.cpp
index 7dd3c3634..2c149f755 100644
--- a/src/gui/popups/statuspopup.cpp
+++ b/src/gui/popups/statuspopup.cpp
@@ -33,7 +33,7 @@
 
 #include "utils/stringutils.h"
 
-#include "gui/font.h"
+#include "gui/fonts/font.h"
 
 #include "debug.h"
 
diff --git a/src/gui/popups/textpopup.cpp b/src/gui/popups/textpopup.cpp
index d5cc918d3..c16c188ef 100644
--- a/src/gui/popups/textpopup.cpp
+++ b/src/gui/popups/textpopup.cpp
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/label.h"
 
-#include "gui/font.h"
+#include "gui/fonts/font.h"
 
 #include "debug.h"
 
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index f8f0c2ec0..d96b7c943 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -39,7 +39,8 @@
 #include "input/inputmanager.h"
 
 #include "gui/gui.h"
-#include "gui/font.h"
+
+#include "gui/fonts/font.h"
 
 #include "gui/popups/beingpopup.h"
 #include "gui/popups/popupmenu.h"
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index 19eb86f44..b5d3c3593 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -27,11 +27,12 @@
 
 #include "being/localplayer.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
 #include "gui/viewport.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/models/avatarlistmodel.h"
 
 #include "gui/windows/chatwindow.h"
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index dc5bf1700..f0a10c77c 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -25,10 +25,11 @@
 
 #include "input/inputmanager.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/widgets/linkhandler.h"
 
 #include "resources/image.h"
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 4c806b2b0..dbed0e4ac 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -75,11 +75,12 @@
 #include "resources/image.h"
 #include "resources/imageset.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
 #include "gui/rect.h"
 
+#include "gui/fonts/font.h"
+
 #include "utils/delete2.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp
index 253092539..71936ab41 100644
--- a/src/gui/widgets/checkbox.cpp
+++ b/src/gui/widgets/checkbox.cpp
@@ -71,10 +71,11 @@
 
 #include "resources/image.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
 
+#include "gui/fonts/font.h"
+
 #include "debug.h"
 
 int CheckBox::instances = 0;
diff --git a/src/gui/widgets/colorpage.cpp b/src/gui/widgets/colorpage.cpp
index 42d8f3016..0f71e87d7 100644
--- a/src/gui/widgets/colorpage.cpp
+++ b/src/gui/widgets/colorpage.cpp
@@ -22,9 +22,10 @@
 
 #include "gui/models/colormodel.h"
 
-#include "gui/font.h"
 #include "gui/skin.h"
 
+#include "gui/fonts/font.h"
+
 #include "debug.h"
 
 ColorPage::ColorPage(const Widget2 *const widget,
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 8de0cdc77..1cb7683e9 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -28,10 +28,11 @@
 
 #include "input/keydata.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/models/extendedlistmodel.h"
 
 #include "gui/widgets/popuplist.h"
diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp
index 67e027a96..59528421e 100644
--- a/src/gui/widgets/dropshortcutcontainer.cpp
+++ b/src/gui/widgets/dropshortcutcontainer.cpp
@@ -28,9 +28,10 @@
 
 #include "being/playerinfo.h"
 
-#include "gui/font.h"
 #include "gui/viewport.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/popups/itempopup.h"
 
 #include "gui/windows/inventorywindow.h"
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 5331eab42..ad7bf7358 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -27,9 +27,10 @@
 
 #include "input/inputmanager.h"
 
-#include "gui/font.h"
 #include "gui/viewport.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/popups/textpopup.h"
 
 #include "resources/image.h"
diff --git a/src/gui/widgets/extendedlistbox.cpp b/src/gui/widgets/extendedlistbox.cpp
index ca58bf95b..36bcc365a 100644
--- a/src/gui/widgets/extendedlistbox.cpp
+++ b/src/gui/widgets/extendedlistbox.cpp
@@ -22,9 +22,10 @@
 
 #include "gui/models/extendedlistmodel.h"
 
-#include "gui/font.h"
 #include "gui/skin.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/models/listmodel.h"
 
 #include "render/graphics.h"
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index e9d9e09bf..6f8519a3c 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -29,11 +29,12 @@
 
 #include "being/playerinfo.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
 #include "gui/viewport.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/popups/itempopup.h"
 
 #include "gui/windows/chatwindow.h"
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index 420eb5578..6a47b91ac 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -33,9 +33,10 @@
 
 #include "input/inputmanager.h"
 
-#include "gui/font.h"
 #include "gui/viewport.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/popups/itempopup.h"
 #include "gui/popups/spellpopup.h"
 
diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp
index bfdcc3ffd..ea183e8c3 100644
--- a/src/gui/widgets/label.cpp
+++ b/src/gui/widgets/label.cpp
@@ -64,10 +64,11 @@
 
 #include "gui/widgets/label.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
 
+#include "gui/fonts/font.h"
+
 #include "debug.h"
 
 Skin *Label::mSkin = nullptr;
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index 69d5d665f..b0e9f4236 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -72,10 +72,11 @@
 #include "listeners/selectionlistener.h"
 
 #include "gui/focushandler.h"
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/models/listmodel.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index f737f0153..6823ca050 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -25,10 +25,11 @@
 #include "client.h"
 #include "graphicsvertexes.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
 
+#include "gui/fonts/font.h"
+
 #include "utils/delete2.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp
index 8e122ece6..5f18d618f 100644
--- a/src/gui/widgets/radiobutton.cpp
+++ b/src/gui/widgets/radiobutton.cpp
@@ -71,10 +71,11 @@
 
 #include "resources/image.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
 
+#include "gui/fonts/font.h"
+
 #include "debug.h"
 
 int RadioButton::instances = 0;
diff --git a/src/gui/widgets/serverslistbox.h b/src/gui/widgets/serverslistbox.h
index 83fab9879..03333bdb0 100644
--- a/src/gui/widgets/serverslistbox.h
+++ b/src/gui/widgets/serverslistbox.h
@@ -23,7 +23,7 @@
 #ifndef GUI_WIDGETS_SERVERSLISTBOX_H
 #define GUI_WIDGETS_SERVERSLISTBOX_H
 
-#include "gui/font.h"
+#include "gui/fonts/font.h"
 
 #include "gui/models/serverslistmodel.h"
 
diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp
index 87bc2baa5..9ed8f8f08 100644
--- a/src/gui/widgets/setupitem.cpp
+++ b/src/gui/widgets/setupitem.cpp
@@ -24,9 +24,10 @@
 #include "main.h"
 #include "soundmanager.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/windows/editdialog.h"
 
 #include "gui/widgets/button.h"
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index ce2aa5aae..9b9a6bba8 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -27,9 +27,10 @@
 
 #include "being/playerinfo.h"
 
-#include "gui/font.h"
 #include "gui/viewport.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/popups/itempopup.h"
 
 #include "gui/models/shopitems.h"
diff --git a/src/gui/widgets/sliderlist.cpp b/src/gui/widgets/sliderlist.cpp
index 76e6b54c3..f925dcb10 100644
--- a/src/gui/widgets/sliderlist.cpp
+++ b/src/gui/widgets/sliderlist.cpp
@@ -20,9 +20,10 @@
 
 #include "gui/widgets/sliderlist.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/models/listmodel.h"
 
 #include "gui/widgets/button.h"
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index e86376812..3c57d1034 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -27,9 +27,10 @@
 #include "itemshortcut.h"
 #include "spellshortcut.h"
 
-#include "gui/font.h"
 #include "gui/viewport.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/popups/spellpopup.h"
 
 #include "gui/windows/shortcutwindow.h"
diff --git a/src/gui/widgets/tabs/setup_colors.cpp b/src/gui/widgets/tabs/setup_colors.cpp
index 83b4c6c2a..29f697ab4 100644
--- a/src/gui/widgets/tabs/setup_colors.cpp
+++ b/src/gui/widgets/tabs/setup_colors.cpp
@@ -21,10 +21,11 @@
 
 #include "gui/widgets/tabs/setup_colors.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/userpalette.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/containerplacer.h"
 #include "gui/widgets/label.h"
diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp
index c03835a0e..dcb78b40a 100644
--- a/src/gui/widgets/textbox.cpp
+++ b/src/gui/widgets/textbox.cpp
@@ -67,9 +67,10 @@
 
 #include "input/keydata.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 
+#include "gui/fonts/font.h"
+
 #include <sstream>
 
 #include "debug.h"
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 0080a8d22..2369f1c65 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -69,11 +69,12 @@
 
 #include "input/inputmanager.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
 #include "gui/viewport.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/popups/popupmenu.h"
 
 #include "resources/image.h"
diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp
index c567c5f06..e215d21b3 100644
--- a/src/gui/widgets/textpreview.cpp
+++ b/src/gui/widgets/textpreview.cpp
@@ -24,10 +24,11 @@
 
 #include "client.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
 
+#include "gui/fonts/font.h"
+
 #include "debug.h"
 
 int TextPreview::instances = 0;
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 1348b055c..923999437 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -73,11 +73,12 @@
 #include "soundmanager.h"
 
 #include "gui/focushandler.h"
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
 #include "gui/viewport.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/widgets/containerplacer.h"
 #include "gui/widgets/layout.h"
 
diff --git a/src/gui/windows/confirmdialog.cpp b/src/gui/windows/confirmdialog.cpp
index 6eb21622d..f71d4e551 100644
--- a/src/gui/windows/confirmdialog.cpp
+++ b/src/gui/windows/confirmdialog.cpp
@@ -24,13 +24,13 @@
 
 #include "soundmanager.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/widgets/button.h"
 #include "gui/widgets/textbox.h"
 
 #include "utils/gettext.h"
 
-#include "gui/font.h"
-
 #include "debug.h"
 
 ConfirmDialog::ConfirmDialog(const std::string &restrict title,
diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp
index ebe5a81b9..25cb5f629 100644
--- a/src/gui/windows/equipmentwindow.cpp
+++ b/src/gui/windows/equipmentwindow.cpp
@@ -32,9 +32,10 @@
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
 
-#include "gui/font.h"
 #include "gui/viewport.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/popups/itempopup.h"
 
 #include "gui/windows/setupwindow.h"
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index 90ce6eca4..14226ee38 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -33,10 +33,11 @@
 
 #include "input/inputmanager.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/viewport.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/models/sortlistmodelinv.h"
 
 #include "gui/popups/textpopup.h"
diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp
index 5de307963..a2ac10073 100644
--- a/src/gui/windows/npcdialog.cpp
+++ b/src/gui/windows/npcdialog.cpp
@@ -32,10 +32,11 @@
 
 #include "being/being.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/viewport.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/windows/inventorywindow.h"
 
 #include "gui/widgets/browserbox.h"
diff --git a/src/gui/windows/okdialog.cpp b/src/gui/windows/okdialog.cpp
index 5ab5356ca..bf8a64026 100644
--- a/src/gui/windows/okdialog.cpp
+++ b/src/gui/windows/okdialog.cpp
@@ -28,9 +28,9 @@
 #include "gui/widgets/button.h"
 #include "gui/widgets/textbox.h"
 
-#include "utils/gettext.h"
+#include "gui/fonts/font.h"
 
-#include "gui/font.h"
+#include "utils/gettext.h"
 
 #include "debug.h"
 
diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp
index f07d6f6b2..2e4ce2693 100644
--- a/src/gui/windows/questswindow.cpp
+++ b/src/gui/windows/questswindow.cpp
@@ -26,9 +26,10 @@
 
 #include "being/localplayer.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/models/questsmodel.h"
 
 #include "gui/widgets/browserbox.h"
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index f63a3d5ba..25dfff02e 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -31,9 +31,10 @@
 
 #include "input/keydata.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/models/serverslistmodel.h"
 
 #include "gui/widgets/checkbox.h"
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index 76296cfe4..f9351f29a 100644
--- a/src/gui/windows/skilldialog.cpp
+++ b/src/gui/windows/skilldialog.cpp
@@ -30,10 +30,11 @@
 #include "being/attributes.h"
 #include "being/localplayer.h"
 
-#include "gui/font.h"
 #include "gui/skin.h"
 #include "gui/viewport.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/popups/textpopup.h"
 
 #include "gui/models/skillmodel.h"
diff --git a/src/gui/windows/textdialog.cpp b/src/gui/windows/textdialog.cpp
index 9b7bb3eb1..3aa3211ad 100644
--- a/src/gui/windows/textdialog.cpp
+++ b/src/gui/windows/textdialog.cpp
@@ -30,7 +30,7 @@
 
 #include "utils/gettext.h"
 
-#include "gui/font.h"
+#include "gui/fonts/font.h"
 
 #include "debug.h"
 
diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp
index a6300d060..5827ca8a0 100644
--- a/src/gui/windows/tradewindow.cpp
+++ b/src/gui/windows/tradewindow.cpp
@@ -32,9 +32,10 @@
 #include "being/playerinfo.h"
 #include "being/playerrelations.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 
+#include "gui/fonts/font.h"
+
 #include "gui/windows/inventorywindow.h"
 #include "gui/windows/itemamountwindow.h"
 #include "gui/windows/setupwindow.h"
diff --git a/src/particle/textparticle.cpp b/src/particle/textparticle.cpp
index 9d37ca73d..12942fa4c 100644
--- a/src/particle/textparticle.cpp
+++ b/src/particle/textparticle.cpp
@@ -27,7 +27,8 @@
 #include "gui/theme.h"
 
 #include "gui/color.h"
-#include "gui/font.h"
+
+#include "gui/fonts/font.h"
 
 #include "debug.h"
 
diff --git a/src/resources/map/mapitem.cpp b/src/resources/map/mapitem.cpp
index eee82d253..967b851a5 100644
--- a/src/resources/map/mapitem.cpp
+++ b/src/resources/map/mapitem.cpp
@@ -20,10 +20,11 @@
 
 #include "resources/map/mapitem.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/userpalette.h"
 
+#include "gui/fonts/font.h"
+
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
 
diff --git a/src/text.cpp b/src/text.cpp
index 542dc60d9..bae0bd6dc 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -26,10 +26,11 @@
 #include "configuration.h"
 #include "textmanager.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/theme.h"
 
+#include "gui/fonts/font.h"
+
 #include "resources/image.h"
 
 #include "utils/delete2.h"
diff --git a/src/touchmanager.cpp b/src/touchmanager.cpp
index 177eb45be..6158d1254 100644
--- a/src/touchmanager.cpp
+++ b/src/touchmanager.cpp
@@ -26,10 +26,11 @@
 
 #include "input/mouseinput.h"
 
-#include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
 
+#include "gui/fonts/font.h"
+
 #include "input/inputmanager.h"
 
 #include "render/graphics.h"