move exguichan files into gui/base/

79 files changed, 128 insertions, 128 deletions

diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index b676a7e94..4a477b802 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -36,7 +36,7 @@
 
 #include "resources/image.h"
 
-#include <guichan/font.hpp>
+#include "gui/base/font.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index b91c095b7..d7ce9ab12 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -37,9 +37,9 @@
 #include "utils/stringutils.h"
 #include "utils/timer.h"
 
-#include <guichan/graphics.hpp>
-#include <guichan/font.hpp>
-#include <guichan/cliprectangle.hpp>
+#include "gui/base/graphics.hpp"
+#include "gui/base/font.hpp"
+#include "gui/base/cliprectangle.hpp"
 
 #include <algorithm>
 
diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h
index 09f06bc39..deefd886a 100644
--- a/src/gui/widgets/browserbox.h
+++ b/src/gui/widgets/browserbox.h
@@ -26,8 +26,8 @@
 
 #include "gui/widgets/widget2.h"
 
-#include <guichan/mouselistener.hpp>
-#include <guichan/widget.hpp>
+#include "gui/base/mouselistener.hpp"
+#include "gui/base/widget.hpp"
 
 #include <list>
 #include <vector>
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 0042b07e3..faefd6f6c 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -30,7 +30,7 @@
 
 #include "resources/imageset.h"
 
-#include <guichan/font.hpp>
+#include "gui/base/font.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index 3dd783e52..aeec63b82 100644
--- a/src/gui/widgets/button.h
+++ b/src/gui/widgets/button.h
@@ -25,8 +25,8 @@
 
 #include "gui/widgets/widget2.h"
 
-#include <guichan/widgets/button.hpp>
-#include <guichan/widgetlistener.hpp>
+#include "gui/base/widgets/button.hpp"
+#include "gui/base/widgetlistener.hpp"
 
 #include "localconsts.h"
 
diff --git a/src/gui/widgets/characterdisplay.h b/src/gui/widgets/characterdisplay.h
index eb5ec6dfc..ebb0d46da 100644
--- a/src/gui/widgets/characterdisplay.h
+++ b/src/gui/widgets/characterdisplay.h
@@ -29,7 +29,7 @@
 #include "net/charserverhandler.h"
 #include "net/net.h"
 
-#include <guichan/widgetlistener.hpp>
+#include "gui/base/widgetlistener.hpp"
 
 #include "localconsts.h"
 
diff --git a/src/gui/widgets/characterviewbase.h b/src/gui/widgets/characterviewbase.h
index a7c9d2240..af3722e4b 100644
--- a/src/gui/widgets/characterviewbase.h
+++ b/src/gui/widgets/characterviewbase.h
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/container.h"
 
-#include <guichan/actionlistener.hpp>
+#include "gui/base/actionlistener.hpp"
 
 #include "localconsts.h"
 
diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp
index 47d9f2b57..fa227f5ca 100644
--- a/src/gui/widgets/checkbox.cpp
+++ b/src/gui/widgets/checkbox.cpp
@@ -29,7 +29,7 @@
 
 #include "resources/image.h"
 
-#include <guichan/font.hpp>
+#include "gui/base/font.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h
index 2d4581327..d0864d0d5 100644
--- a/src/gui/widgets/checkbox.h
+++ b/src/gui/widgets/checkbox.h
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/widget2.h"
 
-#include <guichan/widgets/checkbox.hpp>
+#include "gui/base/widgets/checkbox.hpp"
 
 #include "localconsts.h"
 
diff --git a/src/gui/widgets/colormodel.h b/src/gui/widgets/colormodel.h
index 8b9226159..4d29e24d3 100644
--- a/src/gui/widgets/colormodel.h
+++ b/src/gui/widgets/colormodel.h
@@ -23,8 +23,8 @@
 
 #include "utils/stringvector.h"
 
-#include <guichan/color.hpp>
-#include <guichan/listmodel.hpp>
+#include "gui/base/color.hpp"
+#include "gui/base/listmodel.hpp"
 
 #include "localconsts.h"
 
diff --git a/src/gui/widgets/colorpage.cpp b/src/gui/widgets/colorpage.cpp
index 11dd1f07e..9730f7006 100644
--- a/src/gui/widgets/colorpage.cpp
+++ b/src/gui/widgets/colorpage.cpp
@@ -22,7 +22,7 @@
 
 #include "gui/widgets/colormodel.h"
 
-#include <guichan/font.hpp>
+#include "gui/base/font.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/container.h b/src/gui/widgets/container.h
index 8f3933357..a83ec8d48 100644
--- a/src/gui/widgets/container.h
+++ b/src/gui/widgets/container.h
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/widget2.h"
 
-#include <guichan/widgets/container.hpp>
+#include "gui/base/widgets/container.hpp"
 
 /**
  * A widget container.
diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h
index b62ae96ef..88034fbbc 100644
--- a/src/gui/widgets/desktop.h
+++ b/src/gui/widgets/desktop.h
@@ -24,7 +24,7 @@
 
 #include "gui/widgets/container.h"
 
-#include <guichan/widgetlistener.hpp>
+#include "gui/base/widgetlistener.hpp"
 
 #include "localconsts.h"
 
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 59cdec6fb..3669d3eab 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -32,7 +32,7 @@
 
 #include "resources/image.h"
 
-#include <guichan/font.hpp>
+#include "gui/base/font.hpp"
 
 #include <algorithm>
 
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index ed93dc358..da2eb64f9 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -25,13 +25,13 @@
 
 #include "gui/widgets/widget2.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/basiccontainer.hpp>
-#include <guichan/focuslistener.hpp>
-#include <guichan/keylistener.hpp>
-#include <guichan/listmodel.hpp>
-#include <guichan/mouselistener.hpp>
-#include <guichan/selectionlistener.hpp>
+#include "gui/base/actionlistener.hpp"
+#include "gui/base/basiccontainer.hpp"
+#include "gui/base/focuslistener.hpp"
+#include "gui/base/keylistener.hpp"
+#include "gui/base/listmodel.hpp"
+#include "gui/base/mouselistener.hpp"
+#include "gui/base/selectionlistener.hpp"
 
 #include "localconsts.h"
 
diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp
index 73547b770..857eed024 100644
--- a/src/gui/widgets/dropshortcutcontainer.cpp
+++ b/src/gui/widgets/dropshortcutcontainer.cpp
@@ -36,7 +36,7 @@
 
 #include "resources/image.h"
 
-#include <guichan/font.hpp>
+#include "gui/base/font.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/emotepage.h b/src/gui/widgets/emotepage.h
index 132cfb8e9..1603bab5e 100644
--- a/src/gui/widgets/emotepage.h
+++ b/src/gui/widgets/emotepage.h
@@ -23,9 +23,9 @@
 
 #include "gui/widgets/widget2.h"
 
-#include <guichan/mouselistener.hpp>
-#include <guichan/widget.hpp>
-#include <guichan/widgetlistener.hpp>
+#include "gui/base/mouselistener.hpp"
+#include "gui/base/widget.hpp"
+#include "gui/base/widgetlistener.hpp"
 
 #include "localconsts.h"
 
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index d080a6072..8d83ffeae 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -33,7 +33,7 @@
 
 #include "resources/image.h"
 
-#include <guichan/font.hpp>
+#include "gui/base/font.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/extendedlistbox.cpp b/src/gui/widgets/extendedlistbox.cpp
index bd3a35964..6aaf85bbe 100644
--- a/src/gui/widgets/extendedlistbox.cpp
+++ b/src/gui/widgets/extendedlistbox.cpp
@@ -22,9 +22,9 @@
 
 #include "gui/widgets/extendedlistmodel.h"
 
-#include <guichan/font.hpp>
-#include <guichan/graphics.hpp>
-#include <guichan/listmodel.hpp>
+#include "gui/base/font.hpp"
+#include "gui/base/graphics.hpp"
+#include "gui/base/listmodel.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/extendedlistmodel.h b/src/gui/widgets/extendedlistmodel.h
index 0299ef7ed..0b9c4d819 100644
--- a/src/gui/widgets/extendedlistmodel.h
+++ b/src/gui/widgets/extendedlistmodel.h
@@ -23,7 +23,7 @@
 
 #include "resources/image.h"
 
-#include <guichan/listmodel.hpp>
+#include "gui/base/listmodel.hpp"
 
 class ExtendedListModel : public gcn::ListModel
 {
diff --git a/src/gui/widgets/flowcontainer.h b/src/gui/widgets/flowcontainer.h
index 81043b450..1967258dd 100644
--- a/src/gui/widgets/flowcontainer.h
+++ b/src/gui/widgets/flowcontainer.h
@@ -24,7 +24,7 @@
 
 #include "gui/widgets/container.h"
 
-#include <guichan/widgetlistener.hpp>
+#include "gui/base/widgetlistener.hpp"
 
 #include "localconsts.h"
 
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index ae0dd14c5..9630f5c17 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -29,9 +29,9 @@
 
 #include "utils/dtor.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/graphics.hpp>
-#include <guichan/key.hpp>
+#include "gui/base/actionlistener.hpp"
+#include "gui/base/graphics.hpp"
+#include "gui/base/key.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h
index 5529ce842..e91482078 100644
--- a/src/gui/widgets/guitable.h
+++ b/src/gui/widgets/guitable.h
@@ -28,9 +28,9 @@
 #include "gui/widgets/tablemodel.h"
 #include "gui/widgets/widget2.h"
 
-#include <guichan/keylistener.hpp>
-#include <guichan/mouselistener.hpp>
-#include <guichan/widget.hpp>
+#include "gui/base/keylistener.hpp"
+#include "gui/base/mouselistener.hpp"
+#include "gui/base/widget.hpp"
 
 #include <vector>
 
diff --git a/src/gui/widgets/horizontcontainer.h b/src/gui/widgets/horizontcontainer.h
index be30220e8..517cb6fd9 100644
--- a/src/gui/widgets/horizontcontainer.h
+++ b/src/gui/widgets/horizontcontainer.h
@@ -24,7 +24,7 @@
 
 #include "gui/widgets/container.h"
 
-#include <guichan/widgetlistener.hpp>
+#include "gui/base/widgetlistener.hpp"
 
 #include "localconsts.h"
 
diff --git a/src/gui/widgets/icon.h b/src/gui/widgets/icon.h
index 1cbd3158c..98cb83b61 100644
--- a/src/gui/widgets/icon.h
+++ b/src/gui/widgets/icon.h
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/widget2.h"
 
-#include <guichan/widget.hpp>
+#include "gui/base/widget.hpp"
 
 #include "localconsts.h"
 
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 2014d3ffe..0361c54e7 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -46,8 +46,8 @@
 
 #include "resources/image.h"
 
-#include <guichan/font.hpp>
-#include <guichan/selectionlistener.hpp>
+#include "gui/base/font.hpp"
+#include "gui/base/selectionlistener.hpp"
 
 #include <algorithm>
 
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index f4a73af9f..c7ca851d9 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -25,10 +25,10 @@
 
 #include "gui/widgets/widget2.h"
 
-#include <guichan/keylistener.hpp>
-#include <guichan/mouselistener.hpp>
-#include <guichan/widget.hpp>
-#include <guichan/widgetlistener.hpp>
+#include "gui/base/keylistener.hpp"
+#include "gui/base/mouselistener.hpp"
+#include "gui/base/widget.hpp"
+#include "gui/base/widgetlistener.hpp"
 
 #include <list>
 
diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp
index cb74a658b..c10979bef 100644
--- a/src/gui/widgets/itemlinkhandler.cpp
+++ b/src/gui/widgets/itemlinkhandler.cpp
@@ -37,8 +37,8 @@
 
 #include <string>
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/mouseinput.hpp>
+#include "gui/base/actionlistener.hpp"
+#include "gui/base/mouseinput.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index cdeb83af7..1334afae7 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -45,7 +45,7 @@
 
 #include "resources/image.h"
 
-#include <guichan/font.hpp>
+#include "gui/base/font.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp
index 7a16b800c..767830f5d 100644
--- a/src/gui/widgets/label.cpp
+++ b/src/gui/widgets/label.cpp
@@ -21,7 +21,7 @@
 
 #include "gui/widgets/label.h"
 
-#include <guichan/font.hpp>
+#include "gui/base/font.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/label.h b/src/gui/widgets/label.h
index 3546f17b4..2fc2393fb 100644
--- a/src/gui/widgets/label.h
+++ b/src/gui/widgets/label.h
@@ -24,7 +24,7 @@
 
 #include "gui/widgets/widget2.h"
 
-#include <guichan/widgets/label.hpp>
+#include "gui/base/widgets/label.hpp"
 
 #include "localconsts.h"
 
diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h
index b03c10c1f..013963bfa 100644
--- a/src/gui/widgets/layout.h
+++ b/src/gui/widgets/layout.h
@@ -25,7 +25,7 @@
 
 #include "localconsts.h"
 
-#include <guichan/widgets/container.hpp>
+#include "gui/base/widgets/container.hpp"
 
 #include <vector>
 
diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h
index 4f8ed8708..1a3a3a69f 100644
--- a/src/gui/widgets/layouthelper.h
+++ b/src/gui/widgets/layouthelper.h
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/layout.h"
 
-#include <guichan/widgetlistener.hpp>
+#include "gui/base/widgetlistener.hpp"
 
 /**
  * A helper class for adding a layout to a Guichan container widget. The layout
diff --git a/src/gui/widgets/linkhandler.h b/src/gui/widgets/linkhandler.h
index 744ff0b29..f79f1bf50 100644
--- a/src/gui/widgets/linkhandler.h
+++ b/src/gui/widgets/linkhandler.h
@@ -25,7 +25,7 @@
 
 #include <string>
 
-#include <guichan/mouselistener.hpp>
+#include "gui/base/mouselistener.hpp"
 
 /**
  * A simple interface to windows that need to handle links from BrowserBox
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index 9a1a074b3..767067801 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -29,10 +29,10 @@
 
 #include "gui/gui.h"
 
-#include <guichan/focushandler.hpp>
-#include <guichan/font.hpp>
-#include <guichan/graphics.hpp>
-#include <guichan/listmodel.hpp>
+#include "gui/base/focushandler.hpp"
+#include "gui/base/font.hpp"
+#include "gui/base/graphics.hpp"
+#include "gui/base/listmodel.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h
index b1a2f0da5..784193fdf 100644
--- a/src/gui/widgets/listbox.h
+++ b/src/gui/widgets/listbox.h
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/widget2.h"
 
-#include <guichan/widgets/listbox.hpp>
+#include "gui/base/widgets/listbox.hpp"
 
 #include "localconsts.h"
 
diff --git a/src/gui/widgets/mouseevent.h b/src/gui/widgets/mouseevent.h
index b7c0cc94c..d98a70130 100644
--- a/src/gui/widgets/mouseevent.h
+++ b/src/gui/widgets/mouseevent.h
@@ -22,8 +22,8 @@
 #ifndef GUI_WIDGETS_MOUSEEVENT_H
 #define GUI_WIDGETS_MOUSEEVENT_H
 
-#include <guichan/mouseevent.hpp>
-#include <guichan/widget.hpp>
+#include "gui/base/mouseevent.hpp"
+#include "gui/base/widget.hpp"
 
 class MouseEvent final : public gcn::MouseEvent
 {
diff --git a/src/gui/widgets/namesmodel.h b/src/gui/widgets/namesmodel.h
index f70dd2571..5e8b47d23 100644
--- a/src/gui/widgets/namesmodel.h
+++ b/src/gui/widgets/namesmodel.h
@@ -23,7 +23,7 @@
 
 #include "utils/stringvector.h"
 
-#include <guichan/listmodel.hpp>
+#include "gui/base/listmodel.hpp"
 
 #include "localconsts.h"
 
diff --git a/src/gui/widgets/playerbox.h b/src/gui/widgets/playerbox.h
index 3ebae9be4..b78c8c3f1 100644
--- a/src/gui/widgets/playerbox.h
+++ b/src/gui/widgets/playerbox.h
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/widget2.h"
 
-#include <guichan/widgets/scrollarea.hpp>
+#include "gui/base/widgets/scrollarea.hpp"
 
 #include "localconsts.h"
 
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp
index 1ba4083cd..c0de328e7 100644
--- a/src/gui/widgets/popup.cpp
+++ b/src/gui/widgets/popup.cpp
@@ -27,7 +27,7 @@
 
 #include "gui/viewport.h"
 
-#include <guichan/exception.hpp>
+#include "gui/base/exception.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h
index 711ac97b7..7e7001891 100644
--- a/src/gui/widgets/popup.h
+++ b/src/gui/widgets/popup.h
@@ -26,8 +26,8 @@
 
 #include "gui/widgets/container.h"
 
-#include <guichan/mouselistener.hpp>
-#include <guichan/widgetlistener.hpp>
+#include "gui/base/mouselistener.hpp"
+#include "gui/base/widgetlistener.hpp"
 
 class ImageCollection;
 class Skin;
diff --git a/src/gui/widgets/popuplist.h b/src/gui/widgets/popuplist.h
index f41b9f631..dfe93c0ae 100644
--- a/src/gui/widgets/popuplist.h
+++ b/src/gui/widgets/popuplist.h
@@ -23,8 +23,8 @@
 
 #include "gui/widgets/popup.h"
 
-#include <guichan/focuslistener.hpp>
-#include <guichan/listmodel.hpp>
+#include "gui/base/focuslistener.hpp"
+#include "gui/base/listmodel.hpp"
 
 #include "localconsts.h"
 
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index 38257e0a8..61ecc9080 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -28,7 +28,7 @@
 #include "gui/gui.h"
 #include "gui/sdlfont.h"
 
-#include <guichan/font.hpp>
+#include "gui/base/font.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h
index eefabe83a..ca32fc165 100644
--- a/src/gui/widgets/progressbar.h
+++ b/src/gui/widgets/progressbar.h
@@ -25,8 +25,8 @@
 
 #include "gui/widgets/widget2.h"
 
-#include <guichan/widget.hpp>
-#include <guichan/widgetlistener.hpp>
+#include "gui/base/widget.hpp"
+#include "gui/base/widgetlistener.hpp"
 
 #include <string>
 
diff --git a/src/gui/widgets/progressindicator.h b/src/gui/widgets/progressindicator.h
index 61a72dd67..fc9ab5b5f 100644
--- a/src/gui/widgets/progressindicator.h
+++ b/src/gui/widgets/progressindicator.h
@@ -24,7 +24,7 @@
 
 #include "gui/widgets/widget2.h"
 
-#include <guichan/widget.hpp>
+#include "gui/base/widget.hpp"
 
 #include "localconsts.h"
 
diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp
index e0643a8ac..a81afa037 100644
--- a/src/gui/widgets/radiobutton.cpp
+++ b/src/gui/widgets/radiobutton.cpp
@@ -29,7 +29,7 @@
 
 #include "resources/image.h"
 
-#include <guichan/font.hpp>
+#include "gui/base/font.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/radiobutton.h b/src/gui/widgets/radiobutton.h
index f5ff43f4c..dca2d1167 100644
--- a/src/gui/widgets/radiobutton.h
+++ b/src/gui/widgets/radiobutton.h
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/widget2.h"
 
-#include <guichan/widgets/radiobutton.hpp>
+#include "gui/base/widgets/radiobutton.hpp"
 
 #include "localconsts.h"
 
diff --git a/src/gui/widgets/radiogroup.h b/src/gui/widgets/radiogroup.h
index 1863a348c..0fd1f2605 100644
--- a/src/gui/widgets/radiogroup.h
+++ b/src/gui/widgets/radiogroup.h
@@ -23,7 +23,7 @@
 
 #include "gui/widgets/widgetgroup.h"
 
-#include <guichan/widget.hpp>
+#include "gui/base/widget.hpp"
 
 class RadioGroup final : public WidgetGroup
 {
diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h
index 13e5e3665..58bd73107 100644
--- a/src/gui/widgets/scrollarea.h
+++ b/src/gui/widgets/scrollarea.h
@@ -25,8 +25,8 @@
 
 #include "gui/widgets/widget2.h"
 
-#include <guichan/widgets/scrollarea.hpp>
-#include <guichan/widgetlistener.hpp>
+#include "gui/base/widgets/scrollarea.hpp"
+#include "gui/base/widgetlistener.hpp"
 
 #include "localconsts.h"
 
diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp
index 2cb7f60d1..4f0ea025d 100644
--- a/src/gui/widgets/setupitem.cpp
+++ b/src/gui/widgets/setupitem.cpp
@@ -41,7 +41,7 @@
 #include "utils/gettext.h"
 #include "utils/mathutils.h"
 
-#include <guichan/font.hpp>
+#include "gui/base/font.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h
index c72bb39ef..027f91824 100644
--- a/src/gui/widgets/setupitem.h
+++ b/src/gui/widgets/setupitem.h
@@ -24,7 +24,7 @@
 #include "gui/widgets/button.h"
 #include "gui/widgets/tabs/setuptabscroll.h"
 
-#include <guichan/actionlistener.hpp>
+#include "gui/base/actionlistener.hpp"
 
 #include <list>
 #include <vector>
diff --git a/src/gui/widgets/shopitems.h b/src/gui/widgets/shopitems.h
index 4803d6fed..54de95cc0 100644
--- a/src/gui/widgets/shopitems.h
+++ b/src/gui/widgets/shopitems.h
@@ -23,7 +23,7 @@
 #ifndef GUI_WIDGETS_SHOPITEMS_H
 #define GUI_WIDGETS_SHOPITEMS_H
 
-#include <guichan/listmodel.hpp>
+#include "gui/base/listmodel.hpp"
 
 #include <string>
 #include <vector>
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index 58f9ec8eb..4a7fda039 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -35,8 +35,8 @@
 
 #include "resources/image.h"
 
-#include <guichan/font.hpp>
-#include <guichan/listmodel.hpp>
+#include "gui/base/font.hpp"
+#include "gui/base/listmodel.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h
index 8bd84758d..88e27320a 100644
--- a/src/gui/widgets/shortcutcontainer.h
+++ b/src/gui/widgets/shortcutcontainer.h
@@ -25,9 +25,9 @@
 
 #include "gui/widgets/widget2.h"
 
-#include <guichan/mouselistener.hpp>
-#include <guichan/widget.hpp>
-#include <guichan/widgetlistener.hpp>
+#include "gui/base/mouselistener.hpp"
+#include "gui/base/widget.hpp"
+#include "gui/base/widgetlistener.hpp"
 
 class Image;
 class ImageCollection;
diff --git a/src/gui/widgets/skillinfo.h b/src/gui/widgets/skillinfo.h
index d268b3438..a201f3274 100644
--- a/src/gui/widgets/skillinfo.h
+++ b/src/gui/widgets/skillinfo.h
@@ -23,7 +23,7 @@
 #ifndef GUI_WIDGETS_SKILLINFO_H
 #define GUI_WIDGETS_SKILLINFO_H
 
-#include <guichan/color.hpp>
+#include "gui/base/color.hpp"
 
 #include <vector>
 #include <map>
diff --git a/src/gui/widgets/skillmodel.h b/src/gui/widgets/skillmodel.h
index 0f77dccfe..b1a682fd9 100644
--- a/src/gui/widgets/skillmodel.h
+++ b/src/gui/widgets/skillmodel.h
@@ -24,7 +24,7 @@
 #define GUI_WIDGETS_SKILLMODEL_H
 
 #include "gui/widgets/skillinfo.h"
-#include <guichan/listmodel.hpp>
+#include "gui/base/listmodel.hpp"
 
 #include <string>
 
diff --git a/src/gui/widgets/slider.h b/src/gui/widgets/slider.h
index a0f7829ac..d5d4a30fe 100644
--- a/src/gui/widgets/slider.h
+++ b/src/gui/widgets/slider.h
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/widget2.h"
 
-#include <guichan/widgets/slider.hpp>
+#include "gui/base/widgets/slider.hpp"
 
 #include "localconsts.h"
 
diff --git a/src/gui/widgets/sliderlist.cpp b/src/gui/widgets/sliderlist.cpp
index 60d7926d1..4416a00b7 100644
--- a/src/gui/widgets/sliderlist.cpp
+++ b/src/gui/widgets/sliderlist.cpp
@@ -25,7 +25,7 @@
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
 
-#include <guichan/font.hpp>
+#include "gui/base/font.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/sliderlist.h b/src/gui/widgets/sliderlist.h
index 73f8c6f5c..016a60290 100644
--- a/src/gui/widgets/sliderlist.h
+++ b/src/gui/widgets/sliderlist.h
@@ -21,9 +21,9 @@
 #ifndef GUI_WIDGETS_SLIDERLIST_H
 #define GUI_WIDGETS_SLIDERLIST_H
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/listmodel.hpp>
-#include <guichan/mouselistener.hpp>
+#include "gui/base/actionlistener.hpp"
+#include "gui/base/listmodel.hpp"
+#include "gui/base/mouselistener.hpp"
 
 #include "gui/widgets/container.h"
 
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index bf14f21fe..e59b9fbdb 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -36,7 +36,7 @@
 
 #include "resources/image.h"
 
-#include <guichan/font.hpp>
+#include "gui/base/font.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index 3b0cf1db5..8cb8fd78a 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -29,7 +29,7 @@
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/tabs/tab.h"
 
-#include <guichan/widgets/container.hpp>
+#include "gui/base/widgets/container.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index d0f97b688..7a023903f 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -25,11 +25,11 @@
 
 #include "gui/widgets/widget2.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/keylistener.hpp>
-#include <guichan/mouselistener.hpp>
-#include <guichan/widgetlistener.hpp>
-#include <guichan/widgets/container.hpp>
+#include "gui/base/actionlistener.hpp"
+#include "gui/base/keylistener.hpp"
+#include "gui/base/mouselistener.hpp"
+#include "gui/base/widgetlistener.hpp"
+#include "gui/base/widgets/container.hpp"
 
 class Button;
 class Image;
diff --git a/src/gui/widgets/tablemodel.cpp b/src/gui/widgets/tablemodel.cpp
index f244f51f4..7b6b8048e 100644
--- a/src/gui/widgets/tablemodel.cpp
+++ b/src/gui/widgets/tablemodel.cpp
@@ -24,7 +24,7 @@
 
 #include "utils/dtor.h"
 
-#include <guichan/widget.hpp>
+#include "gui/base/widget.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/tabs/setup_colors.h b/src/gui/widgets/tabs/setup_colors.h
index b2f860415..38f0f2687 100644
--- a/src/gui/widgets/tabs/setup_colors.h
+++ b/src/gui/widgets/tabs/setup_colors.h
@@ -24,7 +24,7 @@
 
 #include "gui/widgets/tabs/setuptab.h"
 
-#include <guichan/selectionlistener.hpp>
+#include "gui/base/selectionlistener.hpp"
 
 #include <string>
 
diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp
index 9ce6fd616..b079974d5 100644
--- a/src/gui/widgets/tabs/setup_input.cpp
+++ b/src/gui/widgets/tabs/setup_input.cpp
@@ -38,7 +38,7 @@
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/tabstrip.h"
 
-#include <guichan/listmodel.hpp>
+#include "gui/base/listmodel.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp
index 45ada01df..f35f75413 100644
--- a/src/gui/widgets/tabs/setup_video.cpp
+++ b/src/gui/widgets/tabs/setup_video.cpp
@@ -46,7 +46,7 @@
 
 #include "test/testmain.h"
 
-#include <guichan/listmodel.hpp>
+#include "gui/base/listmodel.hpp"
 
 #include <algorithm>
 
diff --git a/src/gui/widgets/tabs/setup_video.h b/src/gui/widgets/tabs/setup_video.h
index 22d55c121..25ecfabd6 100644
--- a/src/gui/widgets/tabs/setup_video.h
+++ b/src/gui/widgets/tabs/setup_video.h
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/tabs/setuptab.h"
 
-#include <guichan/keylistener.hpp>
+#include "gui/base/keylistener.hpp"
 
 class Button;
 class CheckBox;
diff --git a/src/gui/widgets/tabs/setuptab.h b/src/gui/widgets/tabs/setuptab.h
index 388b0a988..d8e76f812 100644
--- a/src/gui/widgets/tabs/setuptab.h
+++ b/src/gui/widgets/tabs/setuptab.h
@@ -25,8 +25,8 @@
 
 #include "gui/widgets/container.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/widgetlistener.hpp>
+#include "gui/base/actionlistener.hpp"
+#include "gui/base/widgetlistener.hpp"
 
 #include <string>
 
diff --git a/src/gui/widgets/tabs/tab.h b/src/gui/widgets/tabs/tab.h
index 118b1f0e2..fa9846ab4 100644
--- a/src/gui/widgets/tabs/tab.h
+++ b/src/gui/widgets/tabs/tab.h
@@ -25,9 +25,9 @@
 
 #include "gui/widgets/widget2.h"
 
-#include <guichan/basiccontainer.hpp>
-#include <guichan/mouselistener.hpp>
-#include <guichan/widgetlistener.hpp>
+#include "gui/base/basiccontainer.hpp"
+#include "gui/base/mouselistener.hpp"
+#include "gui/base/widgetlistener.hpp"
 
 #include "localconsts.h"
 
diff --git a/src/gui/widgets/tabstrip.h b/src/gui/widgets/tabstrip.h
index 622ccba81..3e954aec5 100644
--- a/src/gui/widgets/tabstrip.h
+++ b/src/gui/widgets/tabstrip.h
@@ -23,7 +23,7 @@
 
 #include "gui/widgets/widgetgroup.h"
 
-#include <guichan/widget.hpp>
+#include "gui/base/widget.hpp"
 
 class TabStrip final : public WidgetGroup
 {
diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp
index f59bc0ceb..3f56ecfcf 100644
--- a/src/gui/widgets/textbox.cpp
+++ b/src/gui/widgets/textbox.cpp
@@ -25,7 +25,7 @@
 #include "input/keydata.h"
 #include "input/keyevent.h"
 
-#include <guichan/font.hpp>
+#include "gui/base/font.hpp"
 
 #include <sstream>
 
diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h
index 501744515..797707716 100644
--- a/src/gui/widgets/textbox.h
+++ b/src/gui/widgets/textbox.h
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/widget2.h"
 
-#include <guichan/widgets/textbox.hpp>
+#include "gui/base/widgets/textbox.hpp"
 
 #include "localconsts.h"
 
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 269ace775..b655de830 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -39,7 +39,7 @@
 #include "utils/copynpaste.h"
 #include "utils/timer.h"
 
-#include <guichan/font.hpp>
+#include "gui/base/font.hpp"
 
 #undef DELETE  // Win32 compatibility hack
 
diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h
index abff9cf2a..d8ab2c830 100644
--- a/src/gui/widgets/textfield.h
+++ b/src/gui/widgets/textfield.h
@@ -25,8 +25,8 @@
 
 #include "gui/widgets/widget2.h"
 
-#include <guichan/focuslistener.hpp>
-#include <guichan/widgets/textfield.hpp>
+#include "gui/base/focuslistener.hpp"
+#include "gui/base/widgets/textfield.hpp"
 
 #include "localconsts.h"
 
diff --git a/src/gui/widgets/textpreview.h b/src/gui/widgets/textpreview.h
index eeb6805fb..bfb361a9b 100644
--- a/src/gui/widgets/textpreview.h
+++ b/src/gui/widgets/textpreview.h
@@ -25,7 +25,7 @@
 
 #include "gui/widgets/widget2.h"
 
-#include <guichan/widget.hpp>
+#include "gui/base/widget.hpp"
 
 #include "localconsts.h"
 
diff --git a/src/gui/widgets/vertcontainer.h b/src/gui/widgets/vertcontainer.h
index 76f6354dd..d194a00c3 100644
--- a/src/gui/widgets/vertcontainer.h
+++ b/src/gui/widgets/vertcontainer.h
@@ -24,7 +24,7 @@
 
 #include "gui/widgets/container.h"
 
-#include <guichan/widgetlistener.hpp>
+#include "gui/base/widgetlistener.hpp"
 
 #include <vector>
 
diff --git a/src/gui/widgets/widgetgroup.h b/src/gui/widgets/widgetgroup.h
index 3d63b02f8..897183839 100644
--- a/src/gui/widgets/widgetgroup.h
+++ b/src/gui/widgets/widgetgroup.h
@@ -23,8 +23,8 @@
 
 #include "gui/widgets/container.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/widgetlistener.hpp>
+#include "gui/base/actionlistener.hpp"
+#include "gui/base/widgetlistener.hpp"
 
 #include "localconsts.h"
 
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index c716445f3..c78582a91 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -37,9 +37,9 @@
 #include "resources/cursor.h"
 #include "resources/image.h"
 
-#include <guichan/exception.hpp>
-#include <guichan/focushandler.hpp>
-#include <guichan/font.hpp>
+#include "gui/base/exception.hpp"
+#include "gui/base/focushandler.hpp"
+#include "gui/base/font.hpp"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index bb0f19bb3..29fd589a5 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -27,9 +27,9 @@
 
 #include "gui/widgets/widget2.h"
 
-#include <guichan/widgetlistener.hpp>
+#include "gui/base/widgetlistener.hpp"
 
-#include <guichan/widgets/window.hpp>
+#include "gui/base/widgets/window.hpp"
 
 #include "localconsts.h"