24 files changed, 46 insertions, 1 deletions
diff --git a/src/graphics.h b/src/graphics.h
index 076633269..09fc48885 100644
--- a/src/graphics.h
+++ b/src/graphics.h
@@ -25,6 +25,8 @@
 
 #include <guichan/sdl/sdlgraphics.hpp>
 
+#include "localconsts.h"
+
 class GraphicsVertexes;
 class Image;
 class ImageVertexes;
diff --git a/src/gui/gui.h b/src/gui/gui.h
index c450e55a8..1633859fb 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -25,6 +25,8 @@
 
 #include <guichan/gui.hpp>
 
+#include "localconsts.h"
+
 class Graphics;
 class GuiConfigListener;
 class ImageSet;
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index 84aedb078..47ba4cb1f 100644
--- a/src/gui/widgets/button.h
+++ b/src/gui/widgets/button.h
@@ -27,6 +27,8 @@
 #include <guichan/mouseevent.hpp>
 #include <guichan/widgetlistener.hpp>
 
+#include "localconsts.h"
+
 class GraphicsVertexes;
 class Image;
 class ImageSet;
diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h
index 2e5eeea24..818a1f037 100644
--- a/src/gui/widgets/desktop.h
+++ b/src/gui/widgets/desktop.h
@@ -26,6 +26,8 @@
 
 #include <guichan/widgetlistener.hpp>
 
+#include "localconsts.h"
+
 class Image;
 class Label;
 
diff --git a/src/gui/widgets/flowcontainer.h b/src/gui/widgets/flowcontainer.h
index 240290327..526bec6ff 100644
--- a/src/gui/widgets/flowcontainer.h
+++ b/src/gui/widgets/flowcontainer.h
@@ -26,6 +26,8 @@
 
 #include <guichan/widgetlistener.hpp>
 
+#include "localconsts.h"
+
 /**
  * A container that arranges its contents like words on a page.
  *
diff --git a/src/gui/widgets/horizontcontainer.h b/src/gui/widgets/horizontcontainer.h
index 334c00969..48c1eaa84 100644
--- a/src/gui/widgets/horizontcontainer.h
+++ b/src/gui/widgets/horizontcontainer.h
@@ -26,6 +26,8 @@
 
 #include <guichan/widgetlistener.hpp>
 
+#include "localconsts.h"
+
 /**
  * A widget container.
  *
diff --git a/src/gui/widgets/icon.h b/src/gui/widgets/icon.h
index 004d77c23..97de87d25 100644
--- a/src/gui/widgets/icon.h
+++ b/src/gui/widgets/icon.h
@@ -25,6 +25,8 @@
 
 #include <guichan/widget.hpp>
 
+#include "localconsts.h"
+
 class Image;
 
 /**
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index 867d837c2..419f23632 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -31,6 +31,8 @@
 #include <list>
 #include <algorithm>
 
+#include "localconsts.h"
+
 class Image;
 class Inventory;
 class Item;
diff --git a/src/gui/widgets/itemlinkhandler.h b/src/gui/widgets/itemlinkhandler.h
index c50ea5dc2..329bdeb80 100644
--- a/src/gui/widgets/itemlinkhandler.h
+++ b/src/gui/widgets/itemlinkhandler.h
@@ -25,6 +25,8 @@
 
 #include "gui/widgets/linkhandler.h"
 
+#include "localconsts.h"
+
 class ItemPopup;
 
 class ItemLinkHandler final : public LinkHandler
diff --git a/src/gui/widgets/label.h b/src/gui/widgets/label.h
index 40632109d..51dcb632b 100644
--- a/src/gui/widgets/label.h
+++ b/src/gui/widgets/label.h
@@ -24,6 +24,8 @@
 
 #include <guichan/widgets/label.hpp>
 
+#include "localconsts.h"
+
 class Skin;
 
 /**
diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h
index 4a061bd73..5ba710987 100644
--- a/src/gui/widgets/listbox.h
+++ b/src/gui/widgets/listbox.h
@@ -25,6 +25,8 @@
 
 #include <guichan/widgets/listbox.hpp>
 
+#include "localconsts.h"
+
 class SelectionListener;
 
 /**
diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h
index bf57b6536..0039b245b 100644
--- a/src/gui/widgets/progressbar.h
+++ b/src/gui/widgets/progressbar.h
@@ -29,6 +29,8 @@
 
 #include <guichan/widgetlistener.hpp>
 
+#include "localconsts.h"
+
 class Graphics;
 class GraphicsVertexes;
 class ImageRect;
diff --git a/src/gui/widgets/progressindicator.h b/src/gui/widgets/progressindicator.h
index 7e79d0cca..1a9b91529 100644
--- a/src/gui/widgets/progressindicator.h
+++ b/src/gui/widgets/progressindicator.h
@@ -24,6 +24,8 @@
 
 #include <guichan/widget.hpp>
 
+#include "localconsts.h"
+
 class SimpleAnimation;
 
 /**
diff --git a/src/gui/widgets/radiobutton.h b/src/gui/widgets/radiobutton.h
index d53154ed9..af73e7e75 100644
--- a/src/gui/widgets/radiobutton.h
+++ b/src/gui/widgets/radiobutton.h
@@ -25,6 +25,8 @@
 
 #include <guichan/widgets/radiobutton.hpp>
 
+#include "localconsts.h"
+
 class Image;
 
 /**
diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h
index 26a41ee45..4ce1499b5 100644
--- a/src/gui/widgets/scrollarea.h
+++ b/src/gui/widgets/scrollarea.h
@@ -26,6 +26,8 @@
 #include <guichan/widgets/scrollarea.hpp>
 #include <guichan/widgetlistener.hpp>
 
+#include "localconsts.h"
+
 class GraphicsVertexes;
 class Image;
 class ImageRect;
diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h
index 0643890a6..4c843eebd 100644
--- a/src/gui/widgets/setupitem.h
+++ b/src/gui/widgets/setupitem.h
@@ -30,6 +30,7 @@
 #include <guichan/widget.hpp>
 
 #include <list>
+#include <vector>
 
 class CheckBox;
 class Configuration;
diff --git a/src/gui/widgets/setuptab.h b/src/gui/widgets/setuptab.h
index 8d8715559..08da2dd67 100644
--- a/src/gui/widgets/setuptab.h
+++ b/src/gui/widgets/setuptab.h
@@ -29,6 +29,8 @@
 
 #include <string>
 
+#include "localconsts.h"
+
 /**
  * A container for the contents of a tab in the setup window.
  */
diff --git a/src/gui/widgets/slider.h b/src/gui/widgets/slider.h
index 6fdce1f94..9dfd53a1b 100644
--- a/src/gui/widgets/slider.h
+++ b/src/gui/widgets/slider.h
@@ -25,6 +25,8 @@
 
 #include <guichan/widgets/slider.hpp>
 
+#include "localconsts.h"
+
 class Image;
 class ImageRect;
 
diff --git a/src/gui/widgets/tab.h b/src/gui/widgets/tab.h
index 199eefbb3..c41864e6c 100644
--- a/src/gui/widgets/tab.h
+++ b/src/gui/widgets/tab.h
@@ -30,6 +30,8 @@
 
 #include <guichan/widgetlistener.hpp>
 
+#include "localconsts.h"
+
 class GraphicsVertexes;
 class ImageRect;
 class Label;
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index bb354b7f8..6fe8066a2 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -30,7 +30,7 @@
 
 #include "gui/widgets/button.h"
 
-#include <string>
+#include "utils/stringvector.h"
 
 class Tab;
 
diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h
index eea1a400c..e854fac1a 100644
--- a/src/gui/widgets/textbox.h
+++ b/src/gui/widgets/textbox.h
@@ -25,6 +25,8 @@
 
 #include <guichan/widgets/textbox.hpp>
 
+#include "localconsts.h"
+
 /**
  * A text box, meant to be used inside a scroll area. Same as the Guichan text
  * box except this one doesn't have a background or border, instead completely
diff --git a/src/gui/widgets/textpreview.h b/src/gui/widgets/textpreview.h
index 3b4d6dd65..401cdbb8b 100644
--- a/src/gui/widgets/textpreview.h
+++ b/src/gui/widgets/textpreview.h
@@ -27,6 +27,8 @@
 #include <guichan/font.hpp>
 #include <guichan/widget.hpp>
 
+#include "localconsts.h"
+
 /**
  * Preview widget for particle colors, etc.
  */
diff --git a/src/gui/widgets/vertcontainer.h b/src/gui/widgets/vertcontainer.h
index 8d758288a..50eb54ffd 100644
--- a/src/gui/widgets/vertcontainer.h
+++ b/src/gui/widgets/vertcontainer.h
@@ -28,6 +28,8 @@
 
 #include <vector>
 
+#include "localconsts.h"
+
 /**
  * A widget container.
  *
diff --git a/src/gui/widgets/widgetgroup.h b/src/gui/widgets/widgetgroup.h
index 10b145435..6c53c3fda 100644
--- a/src/gui/widgets/widgetgroup.h
+++ b/src/gui/widgets/widgetgroup.h
@@ -26,6 +26,8 @@
 #include <guichan/actionlistener.hpp>
 #include <guichan/widgetlistener.hpp>
 
+#include "localconsts.h"
+
 class WidgetGroup : public Container,
                     public gcn::WidgetListener,
                     public gcn::ActionListener