12 files changed, 24 insertions, 14 deletions
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index 7caf28d7d..18e8c8a49 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -23,7 +23,6 @@
 
 #include "actormanager.h"
 #include "configuration.h"
-#include "graphicsvertexes.h"
 
 #include "being/localplayer.h"
 
@@ -42,6 +41,8 @@
 
 #include "gui/windows/chatwindow.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "resources/image.h"
 
 #include "resources/map/map.h"
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 246e08a8e..563d6aa0c 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -65,7 +65,6 @@
 
 #include "gui/widgets/button.h"
 
-#include "graphicsvertexes.h"
 #include "settings.h"
 
 #include "resources/image.h"
@@ -79,6 +78,8 @@
 
 #include "render/renderers.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "utils/delete2.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/emotepage.cpp b/src/gui/widgets/emotepage.cpp
index a14bfe96a..e1f25a19c 100644
--- a/src/gui/widgets/emotepage.cpp
+++ b/src/gui/widgets/emotepage.cpp
@@ -20,10 +20,10 @@
 
 #include "gui/widgets/emotepage.h"
 
-#include "graphicsvertexes.h"
-
 #include "render/graphics.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "resources/imageset.h"
 #include "resources/resourcemanager.h"
 
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index afdf91e79..fbe213964 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -23,7 +23,6 @@
 #include "gui/widgets/itemcontainer.h"
 
 #include "dragdrop.h"
-#include "graphicsvertexes.h"
 
 #include "being/playerinfo.h"
 
@@ -60,6 +59,8 @@
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "resources/iteminfo.h"
 
 #include <algorithm>
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp
index 3de1bbed9..d48921056 100644
--- a/src/gui/widgets/popup.cpp
+++ b/src/gui/widgets/popup.cpp
@@ -23,8 +23,6 @@
 
 #include "gui/widgets/popup.h"
 
-#include "graphicsvertexes.h"
-
 #include "gui/popupmanager.h"
 #include "gui/skin.h"
 
@@ -34,6 +32,8 @@
 
 #include "render/graphics.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "debug.h"
 
 Popup::Popup(const std::string &name,
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index 15a3996ed..9456b835a 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -22,7 +22,6 @@
 
 #include "gui/widgets/progressbar.h"
 
-#include "graphicsvertexes.h"
 #include "settings.h"
 
 #include "gui/gui.h"
@@ -34,6 +33,8 @@
 
 #include "render/graphics.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "debug.h"
 
 int ProgressBar::mInstances = 0;
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index ff198fa65..8d003e9f3 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -65,7 +65,6 @@
 
 #include "gui/widgets/scrollarea.h"
 
-#include "graphicsvertexes.h"
 #include "settings.h"
 
 #include "gui/gui.h"
@@ -76,6 +75,8 @@
 
 #include "render/graphics.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "resources/image.h"
 #include "resources/imagerect.h"
 
diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp
index 7ff7da55a..392895f65 100644
--- a/src/gui/widgets/shortcutcontainer.cpp
+++ b/src/gui/widgets/shortcutcontainer.cpp
@@ -22,7 +22,6 @@
 
 #include "gui/widgets/shortcutcontainer.h"
 
-#include "graphicsvertexes.h"
 #include "settings.h"
 
 #include "gui/gui.h"
@@ -33,6 +32,8 @@
 
 #include "render/graphics.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "debug.h"
 
 float ShortcutContainer::mAlpha = 1.0;
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index 88b385be9..e7d14ac59 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -65,7 +65,6 @@
 
 #include "gui/widgets/slider.h"
 
-#include "graphicsvertexes.h"
 #include "settings.h"
 
 #include "gui/gui.h"
@@ -77,6 +76,8 @@
 
 #include "render/graphics.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "debug.h"
 
 ImageRect Slider::buttons[2];
diff --git a/src/gui/widgets/tabs/tab.cpp b/src/gui/widgets/tabs/tab.cpp
index 7f5c26c8f..707e0dffe 100644
--- a/src/gui/widgets/tabs/tab.cpp
+++ b/src/gui/widgets/tabs/tab.cpp
@@ -65,7 +65,6 @@
 
 #include "gui/widgets/tabs/tab.h"
 
-#include "graphicsvertexes.h"
 #include "settings.h"
 
 #include "gui/gui.h"
@@ -74,6 +73,8 @@
 #include "gui/widgets/label.h"
 #include "gui/widgets/tabbedarea.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "resources/image.h"
 #include "resources/imagerect.h"
 
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 1c63bba31..c8535b197 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -72,7 +72,6 @@
 #else
 #include "resources/image.h"
 #endif
-#include "graphicsvertexes.h"
 #include "soundmanager.h"
 
 #include "const/sound.h"
@@ -94,6 +93,8 @@
 
 #include "render/renderers.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "utils/delete2.h"
 
 #include "debug.h"
diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp
index 62feb6e7d..79095b301 100644
--- a/src/gui/windows/equipmentwindow.cpp
+++ b/src/gui/windows/equipmentwindow.cpp
@@ -24,7 +24,6 @@
 
 #include "configuration.h"
 #include "dragdrop.h"
-#include "graphicsvertexes.h"
 
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
@@ -42,6 +41,8 @@
 #include "gui/widgets/playerbox.h"
 #include "gui/widgets/tabstrip.h"
 
+#include "render/vertexes/graphicsvertexes.h"
+
 #include "resources/equipmentslots.h"
 #include "resources/imageset.h"