8 files changed, 13 insertions, 10 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d2d7effde..72bff6ee1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -138,7 +138,7 @@ SET(SRCS
     gui/widgets/emoteshortcutcontainer.h
     gui/widgets/extendedlistbox.cpp
     gui/widgets/extendedlistbox.h
-    gui/widgets/extendedlistmodel.h
+    gui/models/extendedlistmodel.h
     gui/widgets/extendednamesmodel.cpp
     gui/widgets/extendednamesmodel.h
     gui/widgets/flowcontainer.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index b06506604..2179818d7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -234,7 +234,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/widgets/emoteshortcutcontainer.h \
 	      gui/widgets/extendedlistbox.cpp \
 	      gui/widgets/extendedlistbox.h \
-	      gui/widgets/extendedlistmodel.h \
+	      gui/models/extendedlistmodel.h \
 	      gui/widgets/extendednamesmodel.cpp \
 	      gui/widgets/extendednamesmodel.h \
 	      gui/widgets/flowcontainer.cpp \
diff --git a/src/gui/widgets/extendedlistmodel.h b/src/gui/models/extendedlistmodel.h
index c3cd26b90..5d859e781 100644
--- a/src/gui/widgets/extendedlistmodel.h
+++ b/src/gui/models/extendedlistmodel.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_WIDGETS_EXTENDEDLISTMODEL_H
-#define GUI_WIDGETS_EXTENDEDLISTMODEL_H
+#ifndef GUI_MODELS_EXTENDEDLISTMODEL_H
+#define GUI_MODELS_EXTENDEDLISTMODEL_H
 
 #include "resources/image.h"
 
@@ -31,4 +31,4 @@ class ExtendedListModel : public ListModel
         virtual const Image *getImageAt(int i) A_WARN_UNUSED = 0;
 };
 
-#endif  // GUI_WIDGETS_EXTENDEDLISTMODEL_H
+#endif  // GUI_MODELS_EXTENDEDLISTMODEL_H
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index ec9a2e22f..763cf47a5 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -28,7 +28,8 @@
 
 #include "input/keydata.h"
 
-#include "gui/widgets/extendedlistmodel.h"
+#include "gui/models/extendedlistmodel.h"
+
 #include "gui/widgets/popuplist.h"
 
 #include "resources/image.h"
diff --git a/src/gui/widgets/extendedlistbox.cpp b/src/gui/widgets/extendedlistbox.cpp
index c507f986c..13fb70f28 100644
--- a/src/gui/widgets/extendedlistbox.cpp
+++ b/src/gui/widgets/extendedlistbox.cpp
@@ -20,7 +20,7 @@
 
 #include "gui/widgets/extendedlistbox.h"
 
-#include "gui/widgets/extendedlistmodel.h"
+#include "gui/models/extendedlistmodel.h"
 
 #include "gui/font.h"
 
diff --git a/src/gui/widgets/extendednamesmodel.h b/src/gui/widgets/extendednamesmodel.h
index 93e87cfa0..3c38c48ed 100644
--- a/src/gui/widgets/extendednamesmodel.h
+++ b/src/gui/widgets/extendednamesmodel.h
@@ -23,7 +23,7 @@
 
 #include "utils/stringvector.h"
 
-#include "gui/widgets/extendedlistmodel.h"
+#include "gui/models/extendedlistmodel.h"
 
 class ExtendedNamesModel : public ExtendedListModel
 {
diff --git a/src/gui/widgets/tabs/setup_theme.cpp b/src/gui/widgets/tabs/setup_theme.cpp
index 1d5f0f910..8d5b234e1 100644
--- a/src/gui/widgets/tabs/setup_theme.cpp
+++ b/src/gui/widgets/tabs/setup_theme.cpp
@@ -26,9 +26,10 @@
 
 #include "gui/windows/okdialog.h"
 
+#include "gui/models/extendedlistmodel.h"
+
 #include "gui/widgets/button.h"
 #include "gui/widgets/dropdown.h"
-#include "gui/widgets/extendedlistmodel.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/namesmodel.h"
diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h
index b9fa1aab8..5188c2fe2 100644
--- a/src/gui/windows/npcdialog.h
+++ b/src/gui/windows/npcdialog.h
@@ -25,7 +25,8 @@
 
 #include "listeners/configlistener.h"
 
-#include "gui/widgets/extendedlistmodel.h"
+#include "gui/models/extendedlistmodel.h"
+
 #include "gui/widgets/window.h"
 
 #include "utils/stringvector.h"