19 files changed, 37 insertions, 21 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3d0eb0af0..9127ac46e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -217,7 +217,7 @@ SET(SRCS
     gui/widgets/layoutcell.h
     gui/widgets/layouthelper.cpp
     gui/widgets/layouthelper.h
-    gui/widgets/layouttype.h
+    enums/gui/layouttype.h
     gui/widgets/linepart.cpp
     gui/widgets/linepart.h
     gui/widgets/linkhandler.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 360b20e14..d7c0022ff 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -242,7 +242,7 @@ SRC += events/actionevent.h \
 	      gui/widgets/layoutcell.h \
 	      gui/widgets/layouthelper.cpp \
 	      gui/widgets/layouthelper.h \
-	      gui/widgets/layouttype.h \
+	      enums/gui/layouttype.h \
 	      gui/widgets/linepart.cpp \
 	      gui/widgets/linepart.h \
 	      gui/widgets/linkhandler.h \
diff --git a/src/gui/widgets/layouttype.h b/src/enums/gui/layouttype.h
index f614ce313..1f01466c7 100644
--- a/src/gui/widgets/layouttype.h
+++ b/src/enums/gui/layouttype.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_WIDGETS_LAYOUTTYPE_H
-#define GUI_WIDGETS_LAYOUTTYPE_H
+#ifndef ENUMS_GUI_WIDGETS_LAYOUTTYPE_H
+#define ENUMS_GUI_WIDGETS_LAYOUTTYPE_H
 
 #include "localconsts.h"
 
@@ -39,4 +39,4 @@ namespace LayoutType
     };
 }  // namespace LayoutType
 
-#endif  // GUI_WIDGETS_LAYOUTTYPE_H
+#endif  // ENUMS_GUI_WIDGETS_LAYOUTTYPE_H
diff --git a/src/gui/widgets/layoutarray.cpp b/src/gui/widgets/layoutarray.cpp
index 5b726b9cc..f1debc569 100644
--- a/src/gui/widgets/layoutarray.cpp
+++ b/src/gui/widgets/layoutarray.cpp
@@ -22,8 +22,9 @@
 
 #include "gui/widgets/layoutarray.h"
 
+#include "enums/gui/layouttype.h"
+
 #include "gui/widgets/layoutcell.h"
-#include "gui/widgets/layouttype.h"
 #include "gui/widgets/widget.h"
 
 #include <cassert>
diff --git a/src/gui/widgets/selldialog.cpp b/src/gui/widgets/selldialog.cpp
index e7513dd89..299407b99 100644
--- a/src/gui/widgets/selldialog.cpp
+++ b/src/gui/widgets/selldialog.cpp
@@ -24,6 +24,8 @@
 
 #include "units.h"
 
+#include "enums/gui/layouttype.h"
+
 #include "gui/windows/setupwindow.h"
 
 #include "gui/models/shopitems.h"
@@ -33,7 +35,6 @@
 #include "gui/widgets/createwidget.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
-#include "gui/widgets/layouttype.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/shoplistbox.h"
 #include "gui/widgets/slider.h"
diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp
index 8da750d34..288d65986 100644
--- a/src/gui/windows/buydialog.cpp
+++ b/src/gui/windows/buydialog.cpp
@@ -28,6 +28,8 @@
 
 #include "being/being.h"
 
+#include "enums/gui/layouttype.h"
+
 #include "gui/windows/setupwindow.h"
 #include "gui/windows/tradewindow.h"
 
@@ -41,7 +43,6 @@
 #include "gui/widgets/inttextfield.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
-#include "gui/widgets/layouttype.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/shoplistbox.h"
 #include "gui/widgets/slider.h"
diff --git a/src/gui/windows/didyouknowwindow.cpp b/src/gui/windows/didyouknowwindow.cpp
index d613b1c09..896b62567 100644
--- a/src/gui/windows/didyouknowwindow.cpp
+++ b/src/gui/windows/didyouknowwindow.cpp
@@ -24,6 +24,8 @@
 
 #include "configuration.h"
 
+#include "enums/gui/layouttype.h"
+
 #include "gui/gui.h"
 
 #include "gui/windows/setupwindow.h"
@@ -33,7 +35,6 @@
 #include "gui/widgets/checkbox.h"
 #include "gui/widgets/itemlinkhandler.h"
 #include "gui/widgets/layout.h"
-#include "gui/widgets/layouttype.h"
 #include "gui/widgets/scrollarea.h"
 
 #include "utils/delete2.h"
diff --git a/src/gui/windows/helpwindow.cpp b/src/gui/windows/helpwindow.cpp
index 8629c878e..fbbef3af9 100644
--- a/src/gui/windows/helpwindow.cpp
+++ b/src/gui/windows/helpwindow.cpp
@@ -24,6 +24,8 @@
 
 #include "configuration.h"
 
+#include "enums/gui/layouttype.h"
+
 #include "input/inputmanager.h"
 
 #include "gui/gui.h"
@@ -33,7 +35,6 @@
 #include "gui/widgets/button.h"
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/layout.h"
-#include "gui/widgets/layouttype.h"
 #include "gui/widgets/scrollarea.h"
 
 #include "utils/gettext.h"
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index 8ab12f6a8..40f276c89 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -27,6 +27,8 @@
 
 #include "being/playerinfo.h"
 
+#include "enums/gui/layouttype.h"
+
 #include "input/inputmanager.h"
 
 #include "gui/gui.h"
@@ -51,7 +53,6 @@
 #include "gui/widgets/dropdown.h"
 #include "gui/widgets/itemcontainer.h"
 #include "gui/widgets/layout.h"
-#include "gui/widgets/layouttype.h"
 #include "gui/widgets/progressbar.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/tabstrip.h"
diff --git a/src/gui/windows/mailwindow.cpp b/src/gui/windows/mailwindow.cpp
index 7345f8266..2b9bcb40a 100644
--- a/src/gui/windows/mailwindow.cpp
+++ b/src/gui/windows/mailwindow.cpp
@@ -20,6 +20,8 @@
 
 #include "gui/windows/mailwindow.h"
 
+#include "enums/gui/layouttype.h"
+
 #include "net/mailhandler.h"
 
 #include "gui/models/extendednamesmodel.h"
@@ -35,7 +37,6 @@
 #include "gui/widgets/createwidget.h"
 #include "gui/widgets/extendedlistbox.h"
 #include "gui/widgets/layout.h"
-#include "gui/widgets/layouttype.h"
 #include "gui/widgets/scrollarea.h"
 
 #include "utils/delete2.h"
diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp
index 00ba8061d..3ba705152 100644
--- a/src/gui/windows/npcdialog.cpp
+++ b/src/gui/windows/npcdialog.cpp
@@ -32,6 +32,8 @@
 #include "being/being.h"
 #include "being/playerinfo.h"
 
+#include "enums/gui/layouttype.h"
+
 #include "gui/gui.h"
 #include "gui/viewport.h"
 
@@ -50,7 +52,6 @@
 #include "gui/widgets/itemcontainer.h"
 #include "gui/widgets/itemlinkhandler.h"
 #include "gui/widgets/layout.h"
-#include "gui/widgets/layouttype.h"
 #include "gui/widgets/extendedlistbox.h"
 #include "gui/widgets/playerbox.h"
 #include "gui/widgets/scrollarea.h"
diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp
index 2a6ba3d6e..8eddeeb2c 100644
--- a/src/gui/windows/outfitwindow.cpp
+++ b/src/gui/windows/outfitwindow.cpp
@@ -30,6 +30,8 @@
 
 #include "const/emoteshortcut.h"
 
+#include "enums/gui/layouttype.h"
+
 #include "input/inputactionoperators.h"
 #include "input/inputmanager.h"
 
@@ -43,7 +45,6 @@
 #include "gui/widgets/checkbox.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
-#include "gui/widgets/layouttype.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp
index ac7b52364..c35bb80b1 100644
--- a/src/gui/windows/questswindow.cpp
+++ b/src/gui/windows/questswindow.cpp
@@ -26,6 +26,8 @@
 
 #include "being/localplayer.h"
 
+#include "enums/gui/layouttype.h"
+
 #include "gui/gui.h"
 
 #include "gui/fonts/font.h"
@@ -39,7 +41,6 @@
 #include "gui/widgets/containerplacer.h"
 #include "gui/widgets/createwidget.h"
 #include "gui/widgets/layout.h"
-#include "gui/widgets/layouttype.h"
 #include "gui/widgets/extendedlistbox.h"
 #include "gui/widgets/itemlinkhandler.h"
 #include "gui/widgets/scrollarea.h"
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index 5121d531b..83d54730f 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -32,6 +32,8 @@
 #include "const/gui/chat.h"
 #endif  // TMWA_SUPPORT
 
+#include "enums/gui/layouttype.h"
+
 #include "gui/windows/editdialog.h"
 
 #include "gui/windows/itemamountwindow.h"
@@ -44,7 +46,6 @@
 #include "gui/widgets/containerplacer.h"
 #include "gui/widgets/createwidget.h"
 #include "gui/widgets/layout.h"
-#include "gui/widgets/layouttype.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/shoplistbox.h"
 #include "gui/widgets/tabstrip.h"
diff --git a/src/gui/windows/shortcutwindow.cpp b/src/gui/windows/shortcutwindow.cpp
index 5184b3e1d..cf93e23a8 100644
--- a/src/gui/windows/shortcutwindow.cpp
+++ b/src/gui/windows/shortcutwindow.cpp
@@ -22,13 +22,14 @@
 
 #include "gui/windows/shortcutwindow.h"
 
+#include "enums/gui/layouttype.h"
+
 #include "gui/windows/setupwindow.h"
 #include "gui/widgets/tabbedarea.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/createwidget.h"
 #include "gui/widgets/layout.h"
-#include "gui/widgets/layouttype.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/shortcutcontainer.h"
 
diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp
index 00e061400..ecd777a3c 100644
--- a/src/gui/windows/statuswindow.cpp
+++ b/src/gui/windows/statuswindow.cpp
@@ -30,6 +30,8 @@
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
 
+#include "enums/gui/layouttype.h"
+
 #include "gui/windows/chatwindow.h"
 
 #include "gui/windows/equipmentwindow.h"
@@ -38,7 +40,6 @@
 #include "gui/widgets/button.h"
 #include "gui/widgets/createwidget.h"
 #include "gui/widgets/layout.h"
-#include "gui/widgets/layouttype.h"
 #include "gui/widgets/progressbar.h"
 #include "gui/widgets/statspage.h"
 #include "gui/widgets/statspagebasic.h"
diff --git a/src/gui/windows/textselectdialog.cpp b/src/gui/windows/textselectdialog.cpp
index d533f3838..25bc7db84 100644
--- a/src/gui/windows/textselectdialog.cpp
+++ b/src/gui/windows/textselectdialog.cpp
@@ -22,6 +22,8 @@
 
 #include "gui/windows/textselectdialog.h"
 
+#include "enums/gui/layouttype.h"
+
 #include "gui/windows/setupwindow.h"
 
 #include "gui/models/namesmodel.h"
@@ -30,7 +32,6 @@
 #include "gui/widgets/containerplacer.h"
 #include "gui/widgets/createwidget.h"
 #include "gui/widgets/layout.h"
-#include "gui/widgets/layouttype.h"
 #include "gui/widgets/listbox.h"
 #include "gui/widgets/scrollarea.h"
 
diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp
index 6a2f27b44..d7d397a1e 100644
--- a/src/gui/windows/tradewindow.cpp
+++ b/src/gui/windows/tradewindow.cpp
@@ -30,6 +30,8 @@
 #include "being/playerinfo.h"
 #include "being/playerrelations.h"
 
+#include "enums/gui/layouttype.h"
+
 #include "gui/gui.h"
 
 #include "gui/fonts/font.h"
@@ -43,7 +45,6 @@
 #include "gui/widgets/itemcontainer.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
-#include "gui/widgets/layouttype.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/textfield.h"
 
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 4736f43da..98ae83fe5 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -27,13 +27,14 @@
 #include "main.h"
 #include "settings.h"
 
+#include "enums/gui/layouttype.h"
+
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/button.h"
 #include "gui/widgets/containerplacer.h"
 #include "gui/widgets/itemlinkhandler.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
-#include "gui/widgets/layouttype.h"
 #include "gui/widgets/progressbar.h"
 #include "gui/widgets/scrollarea.h"