Fix code style.

36 files changed, 99 insertions, 33 deletions

diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 8c43d1a20..2405743c5 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -31,9 +31,6 @@
 #include "being/playerinfo.h"
 #include "being/playerrelation.h"
 #include "being/playerrelations.h"
-#ifdef EATHENA_SUPPORT
-#include "being/homunculusinfo.h"
-#endif
 
 #include "const/spells.h"
 
diff --git a/src/gui/popups/textboxpopup.cpp b/src/gui/popups/textboxpopup.cpp
index 8fb07ef4e..a03fd9497 100644
--- a/src/gui/popups/textboxpopup.cpp
+++ b/src/gui/popups/textboxpopup.cpp
@@ -27,6 +27,8 @@
 
 #include "gui/fonts/font.h"
 
+#include "render/graphics.h"
+
 #include "debug.h"
 
 TextBoxPopup *textBoxPopup = nullptr;
diff --git a/src/gui/theme.h b/src/gui/theme.h
index 545700c20..9d7be649a 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -25,14 +25,17 @@
 #ifndef GUI_THEME_H
 #define GUI_THEME_H
 
+#include "logger.h"
+
 #include "enums/gui/progresscolorid.h"
 #include "enums/gui/themecolorid.h"
 
-#include "listeners/configlistener.h"
+#include "enums/render/rendertype.h"
 
-#include "render/graphics.h"
+#include "listeners/configlistener.h"
 
 #include "gui/palette.h"
+#include "gui/rect.h"
 
 #include "utils/stringvector.h"
 
@@ -40,6 +43,7 @@
 
 class DyePalette;
 class Image;
+class ImageRect;
 class ImageSet;
 class Skin;
 class Theme;
diff --git a/src/gui/themecolorsidoperators.h b/src/gui/themecolorsidoperators.h
index fae6d5018..ed7202ba7 100644
--- a/src/gui/themecolorsidoperators.h
+++ b/src/gui/themecolorsidoperators.h
@@ -18,11 +18,11 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_THEMECOLORIDOPERATORS_H
-#define GUI_THEMECOLORIDOPERATORS_H
+#ifndef GUI_THEMECOLORSIDOPERATORS_H
+#define GUI_THEMECOLORSIDOPERATORS_H
 
 #include "enums/gui/themecolorid.h"
 
 ThemeColorIdT operator+(const ThemeColorIdT &id, const int& i);
 
-#endif  // GUI_THEMECOLORIDOPERATORS_H
+#endif  // GUI_THEMECOLORSIDOPERATORS_H
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 7dddb4414..815aa82a8 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -49,6 +49,8 @@
 
 #include "input/inputmanager.h"
 
+#include "render/graphics.h"
+
 #include "resources/map/map.h"
 #include "resources/map/mapitem.h"
 #include "resources/map/speciallayer.h"
diff --git a/src/gui/widgets/basiccontainer.cpp b/src/gui/widgets/basiccontainer.cpp
index 8a4d3162a..c11d03b02 100644
--- a/src/gui/widgets/basiccontainer.cpp
+++ b/src/gui/widgets/basiccontainer.cpp
@@ -63,6 +63,8 @@
 
 #include "gui/widgets/basiccontainer.h"
 
+#include "render/graphics.h"
+
 #include <algorithm>
 
 #include "debug.h"
diff --git a/src/gui/widgets/basiccontainer2.cpp b/src/gui/widgets/basiccontainer2.cpp
index 862fa641c..8ce16487b 100644
--- a/src/gui/widgets/basiccontainer2.cpp
+++ b/src/gui/widgets/basiccontainer2.cpp
@@ -67,6 +67,8 @@
 
 #include "gui/widgets/basiccontainer2.h"
 
+#include "render/graphics.h"
+
 #include "debug.h"
 
 BasicContainer2::BasicContainer2(const Widget2 *const widget) :
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index 2c936ac96..d58953ab7 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -37,6 +37,8 @@
 
 #include "gui/widgets/linkhandler.h"
 
+#include "render/graphics.h"
+
 #include "resources/image.h"
 #include "resources/imageset.h"
 #include "resources/iteminfo.h"
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index f994f413b..2e20be616 100644
--- a/src/gui/widgets/button.h
+++ b/src/gui/widgets/button.h
@@ -75,6 +75,8 @@
 #include "listeners/mouselistener.h"
 #include "listeners/widgetlistener.h"
 
+#include "render/graphics.h"
+
 #include "localconsts.h"
 
 class Image;
diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp
index fd0ca8fb3..b0679e1d8 100644
--- a/src/gui/widgets/checkbox.cpp
+++ b/src/gui/widgets/checkbox.cpp
@@ -67,14 +67,16 @@
 
 #include "settings.h"
 
-#include "resources/image.h"
-#include "resources/imagerect.h"
-
 #include "gui/gui.h"
 #include "gui/skin.h"
 
 #include "gui/fonts/font.h"
 
+#include "render/graphics.h"
+
+#include "resources/image.h"
+#include "resources/imagerect.h"
+
 #include "debug.h"
 
 int CheckBox::instances = 0;
diff --git a/src/gui/widgets/colorpage.cpp b/src/gui/widgets/colorpage.cpp
index 82ed92b69..4ef560d61 100644
--- a/src/gui/widgets/colorpage.cpp
+++ b/src/gui/widgets/colorpage.cpp
@@ -20,12 +20,14 @@
 
 #include "gui/widgets/colorpage.h"
 
-#include "gui/models/colormodel.h"
-
 #include "gui/skin.h"
 
 #include "gui/fonts/font.h"
 
+#include "gui/models/colormodel.h"
+
+#include "render/graphics.h"
+
 #include "debug.h"
 
 ColorPage::ColorPage(const Widget2 *const widget,
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index aab966f9c..134889ee2 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -36,6 +36,8 @@
 #include "resources/resourcemanager.h"
 #include "resources/wallpaper.h"
 
+#include "render/graphics.h"
+
 #include "debug.h"
 
 Desktop *desktop = nullptr;
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index c4c15a303..05ca7124f 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -34,6 +34,8 @@
 #include "gui/widgets/createwidget.h"
 #include "gui/widgets/popuplist.h"
 
+#include "render/graphics.h"
+
 #include "resources/imagerect.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/emotepage.cpp b/src/gui/widgets/emotepage.cpp
index d6903d49d..a14bfe96a 100644
--- a/src/gui/widgets/emotepage.cpp
+++ b/src/gui/widgets/emotepage.cpp
@@ -22,6 +22,8 @@
 
 #include "graphicsvertexes.h"
 
+#include "render/graphics.h"
+
 #include "resources/imageset.h"
 #include "resources/resourcemanager.h"
 
diff --git a/src/gui/widgets/emotepage.h b/src/gui/widgets/emotepage.h
index a12bc5f1a..7caa19b44 100644
--- a/src/gui/widgets/emotepage.h
+++ b/src/gui/widgets/emotepage.h
@@ -28,6 +28,8 @@
 
 #include "localconsts.h"
 
+class ImageCollection;
+
 class EmotePage final : public Widget,
                         public MouseListener,
                         public WidgetListener
diff --git a/src/gui/widgets/extendedlistbox.cpp b/src/gui/widgets/extendedlistbox.cpp
index 927b2132b..dd8c511f4 100644
--- a/src/gui/widgets/extendedlistbox.cpp
+++ b/src/gui/widgets/extendedlistbox.cpp
@@ -26,6 +26,8 @@
 
 #include "gui/fonts/font.h"
 
+#include "render/graphics.h"
+
 #include "debug.h"
 
 ExtendedListBox::ExtendedListBox(const Widget2 *const widget,
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index c6acc33da..7ab9674c5 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -30,6 +30,8 @@
 
 #include "listeners/guitableactionlistener.h"
 
+#include "render/graphics.h"
+
 #include "utils/delete2.h"
 #include "utils/dtor.h"
 
diff --git a/src/gui/widgets/icon.cpp b/src/gui/widgets/icon.cpp
index 855ea7a20..9df53b1d1 100644
--- a/src/gui/widgets/icon.cpp
+++ b/src/gui/widgets/icon.cpp
@@ -24,6 +24,8 @@
 
 #include "gui/gui.h"
 
+#include "render/graphics.h"
+
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
 
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index b4fa698d7..006644425 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -35,6 +35,7 @@
 #include "localconsts.h"
 
 class Image;
+class ImageCollection;
 class Inventory;
 class Item;
 class SelectionListener;
diff --git a/src/gui/widgets/label.h b/src/gui/widgets/label.h
index 3d9e5f941..98c7cc6ac 100644
--- a/src/gui/widgets/label.h
+++ b/src/gui/widgets/label.h
@@ -72,6 +72,8 @@
 #include "listeners/tooltiplistener.h"
 #include "listeners/widgetlistener.h"
 
+#include "render/graphics.h"
+
 #include "localconsts.h"
 
 class Skin;
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index 180a0e877..9ad3787f9 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -67,8 +67,6 @@
 
 #include "settings.h"
 
-#include "listeners/selectionlistener.h"
-
 #include "gui/focushandler.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
@@ -77,6 +75,10 @@
 
 #include "gui/models/listmodel.h"
 
+#include "listeners/selectionlistener.h"
+
+#include "render/graphics.h"
+
 #include "debug.h"
 
 float ListBox::mAlpha = 1.0;
diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp
index d796458da..62d4b6bf9 100644
--- a/src/gui/widgets/playerbox.cpp
+++ b/src/gui/widgets/playerbox.cpp
@@ -29,6 +29,8 @@
 #include "gui/gui.h"
 #include "gui/skin.h"
 
+#include "render/graphics.h"
+
 #include "resources/image.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp
index 9a15bd6de..3de1bbed9 100644
--- a/src/gui/widgets/popup.cpp
+++ b/src/gui/widgets/popup.cpp
@@ -32,6 +32,8 @@
 
 #include "utils/delete2.h"
 
+#include "render/graphics.h"
+
 #include "debug.h"
 
 Popup::Popup(const std::string &name,
diff --git a/src/gui/widgets/popuplist.cpp b/src/gui/widgets/popuplist.cpp
index 3d876b4cf..3477ef653 100644
--- a/src/gui/widgets/popuplist.cpp
+++ b/src/gui/widgets/popuplist.cpp
@@ -27,6 +27,8 @@
 #include "gui/widgets/extendedlistbox.h"
 #include "gui/widgets/scrollarea.h"
 
+#include "render/graphics.h"
+
 #include "debug.h"
 
 PopupList::PopupList(DropDown *const widget,
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index bb0824aaa..15a3996ed 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -32,6 +32,8 @@
 
 #include "utils/delete2.h"
 
+#include "render/graphics.h"
+
 #include "debug.h"
 
 int ProgressBar::mInstances = 0;
diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp
index d0583a7c8..6cd6b75e0 100644
--- a/src/gui/widgets/radiobutton.cpp
+++ b/src/gui/widgets/radiobutton.cpp
@@ -67,14 +67,16 @@
 
 #include "settings.h"
 
-#include "resources/image.h"
-#include "resources/imagerect.h"
-
 #include "gui/gui.h"
 #include "gui/skin.h"
 
 #include "gui/fonts/font.h"
 
+#include "render/graphics.h"
+
+#include "resources/image.h"
+#include "resources/imagerect.h"
+
 #include "debug.h"
 
 int RadioButton::instances = 0;
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index 11a9905d4..ff198fa65 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -71,12 +71,14 @@
 #include "gui/gui.h"
 #include "gui/skin.h"
 
-#include "resources/image.h"
-#include "resources/imagerect.h"
-
 #include "utils/delete2.h"
 #include "utils/stringutils.h"
 
+#include "render/graphics.h"
+
+#include "resources/image.h"
+#include "resources/imagerect.h"
+
 #include "debug.h"
 
 int ScrollArea::instances = 0;
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index 2a515b2e9..fe720e387 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -35,6 +35,8 @@
 
 #include "gui/models/shopitems.h"
 
+#include "render/graphics.h"
+
 #include "resources/image.h"
 
 #include "resources/item/shopitem.h"
diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp
index c173dc97e..7ff7da55a 100644
--- a/src/gui/widgets/shortcutcontainer.cpp
+++ b/src/gui/widgets/shortcutcontainer.cpp
@@ -27,9 +27,11 @@
 
 #include "gui/gui.h"
 
+#include "utils/delete2.h"
+
 #include "resources/image.h"
 
-#include "utils/delete2.h"
+#include "render/graphics.h"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index f885b5e7d..88b385be9 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -70,10 +70,12 @@
 
 #include "gui/gui.h"
 
+#include "utils/delete2.h"
+
 #include "resources/image.h"
 #include "resources/imagerect.h"
 
-#include "utils/delete2.h"
+#include "render/graphics.h"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp
index 13cb07da9..91218d41a 100644
--- a/src/gui/widgets/textbox.cpp
+++ b/src/gui/widgets/textbox.cpp
@@ -69,6 +69,8 @@
 
 #include "gui/fonts/font.h"
 
+#include "render/graphics.h"
+
 #include <sstream>
 
 #include "debug.h"
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 4060f8d1a..d02cd2541 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -67,7 +67,9 @@
 
 #include "settings.h"
 
-#include "input/inputmanager.h"
+#ifdef USE_SDL2
+#include "enums/input/keyvalue.h"
+#endif
 
 #include "gui/gui.h"
 #include "gui/skin.h"
@@ -79,17 +81,17 @@
 
 #include "gui/popups/popupmenu.h"
 
-#ifdef USE_SDL2
-#include "enums/input/keyvalue.h"
-#endif
-
-#include "resources/image.h"
-#include "resources/imagerect.h"
+#include "input/inputmanager.h"
 
 #include "utils/copynpaste.h"
 #include "utils/stringutils.h"
 #include "utils/timer.h"
 
+#include "render/graphics.h"
+
+#include "resources/image.h"
+#include "resources/imagerect.h"
+
 #undef DELETE  // Win32 compatibility hack
 
 #include "debug.h"
diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp
index 63b26e444..12992fab5 100644
--- a/src/gui/widgets/textpreview.cpp
+++ b/src/gui/widgets/textpreview.cpp
@@ -29,6 +29,8 @@
 
 #include "gui/fonts/font.h"
 
+#include "render/graphics.h"
+
 #include "debug.h"
 
 int TextPreview::instances = 0;
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index c5bcb2215..75f4b81fb 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -70,13 +70,15 @@
 
 #include "enums/resources/imageposition.h"
 
-#include "listeners/mouselistener.h"
-#include "listeners/widgetlistener.h"
-
 #include "gui/fonts/textchunk.h"
 
 #include "gui/widgets/basiccontainer2.h"
 
+#include "listeners/mouselistener.h"
+#include "listeners/widgetlistener.h"
+
+#include "render/graphics.h"
+
 #include "localconsts.h"
 
 class ContainerPlacer;
diff --git a/src/gui/windowmanager.cpp b/src/gui/windowmanager.cpp
index 4748fd713..e8c7f2425 100644
--- a/src/gui/windowmanager.cpp
+++ b/src/gui/windowmanager.cpp
@@ -61,6 +61,8 @@
 #include "utils/naclmessages.h"
 #endif  // __native_client__
 
+#include "render/graphics.h"
+
 #ifdef ANDROID
 #ifndef USE_SDL2
 #include <SDL_screenkeyboard.h>
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index 91e1c16cc..028e8cbab 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -26,6 +26,8 @@
 
 #include "enums/being/beingdirection.h"
 
+#include "being/being.h"
+
 #include "gui/windows/okdialog.h"
 
 #include "gui/widgets/button.h"