9 files changed, 19 insertions, 19 deletions
diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp
index cd593bf92..ac8187fc3 100644
--- a/src/gui/windows/buydialog.cpp
+++ b/src/gui/windows/buydialog.cpp
@@ -69,7 +69,7 @@ static const char *const SORT_NAME_BUY[7] =
     N_("by type")
 };
 
-class SortListModelBuy final : public gcn::ListModel
+class SortListModelBuy final : public ListModel
 {
 public:
     ~SortListModelBuy()
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index acd4c50bd..eb4a0fb44 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -177,7 +177,7 @@ const char *COLOR_NAME[14] =
 };
 
 
-class ColorListModel final : public gcn::ListModel
+class ColorListModel final : public ListModel
 {
 public:
     ~ColorListModel()
diff --git a/src/gui/windows/editserverdialog.h b/src/gui/windows/editserverdialog.h
index 8907a2846..a3f649f0d 100644
--- a/src/gui/windows/editserverdialog.h
+++ b/src/gui/windows/editserverdialog.h
@@ -34,12 +34,12 @@ class ServerDialog;
 #include "listeners/actionlistener.h"
 #include "listeners/keylistener.h"
 
-#include "gui/base/listmodel.hpp"
+#include "gui/models/listmodel.h"
 
 /**
  * Server Type List Model
  */
-class TypeListModel : public gcn::ListModel
+class TypeListModel : public ListModel
 {
     public:
         TypeListModel()
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index 0b0e6c6de..be1487566 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -36,7 +36,7 @@
 #include "gui/gui.h"
 #include "gui/viewport.h"
 
-#include "gui/base/listmodel.hpp"
+#include "gui/models/listmodel.h"
 
 #include "gui/popups/textpopup.h"
 
@@ -81,7 +81,7 @@ static const char *const SORT_NAME_INVENTORY[6] =
     N_("by type")
 };
 
-class SortListModelInv final : public gcn::ListModel
+class SortListModelInv final : public ListModel
 {
 public:
     ~SortListModelInv()
diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp
index c63157e27..b65d5481f 100644
--- a/src/gui/windows/itemamountwindow.cpp
+++ b/src/gui/windows/itemamountwindow.cpp
@@ -33,7 +33,7 @@
 #include "net/net.h"
 #include "gui/viewport.h"
 
-#include "gui/base/listmodel.hpp"
+#include "gui/models/listmodel.h"
 
 #include "gui/popups/itempopup.h"
 
@@ -52,7 +52,7 @@
 
 #include "debug.h"
 
-class ItemsModal final : public gcn::ListModel
+class ItemsModal final : public ListModel
 {
 public:
     ItemsModal() :
diff --git a/src/gui/windows/logindialog.cpp b/src/gui/windows/logindialog.cpp
index bfa20af62..ac060817d 100644
--- a/src/gui/windows/logindialog.cpp
+++ b/src/gui/windows/logindialog.cpp
@@ -84,7 +84,7 @@ const char *UPDATE_TYPE_TEXT[3] =
     N_("Skip"),
 };
 
-class UpdateTypeModel final : public gcn::ListModel
+class UpdateTypeModel final : public ListModel
 {
     public:
         UpdateTypeModel()
@@ -108,11 +108,11 @@ class UpdateTypeModel final : public gcn::ListModel
         }
 };
 
-class UpdateListModel final : public gcn::ListModel
+class UpdateListModel final : public ListModel
 {
     public:
         explicit UpdateListModel(LoginData *const data) :
-            gcn::ListModel(),
+            ListModel(),
             mLoginData(data)
         {
         }
diff --git a/src/gui/windows/serverdialog.h b/src/gui/windows/serverdialog.h
index 3f63562f7..2d0ada344 100644
--- a/src/gui/windows/serverdialog.h
+++ b/src/gui/windows/serverdialog.h
@@ -34,7 +34,7 @@
 #include "listeners/keylistener.h"
 #include "listeners/selectionlistener.h"
 
-#include "gui/base/listmodel.hpp"
+#include "gui/models/listmodel.h"
 
 #include <string>
 #include <vector>
@@ -48,7 +48,7 @@ class ServerDialog;
 /**
  * Server and Port List Model
  */
-class ServersListModel final : public gcn::ListModel
+class ServersListModel final : public ListModel
 {
     public:
         typedef std::pair<int, std::string> VersionString;
diff --git a/src/gui/windows/textcommandeditor.cpp b/src/gui/windows/textcommandeditor.cpp
index 82d1c9ef6..358077021 100644
--- a/src/gui/windows/textcommandeditor.cpp
+++ b/src/gui/windows/textcommandeditor.cpp
@@ -27,7 +27,7 @@
 
 #include "input/keyboardconfig.h"
 
-#include "gui/base/listmodel.hpp"
+#include "gui/models/listmodel.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/dropdown.h"
@@ -44,7 +44,7 @@
 
 #include "debug.h"
 
-class IconsModal final : public gcn::ListModel
+class IconsModal final : public ListModel
 {
 public:
     IconsModal() :
@@ -121,7 +121,7 @@ const char *MAGIC_SCHOOL_TEXT[6] =
     N_("Astral Magic")
 };
 
-class TargetTypeModel final : public gcn::ListModel
+class TargetTypeModel final : public ListModel
 {
 public:
     ~TargetTypeModel()
@@ -140,7 +140,7 @@ public:
     }
 };
 
-class MagicSchoolModel final : public gcn::ListModel
+class MagicSchoolModel final : public ListModel
 {
 public:
     ~MagicSchoolModel()
diff --git a/src/gui/windows/worldselectdialog.cpp b/src/gui/windows/worldselectdialog.cpp
index 5acb11f93..e588e5eb0 100644
--- a/src/gui/windows/worldselectdialog.cpp
+++ b/src/gui/windows/worldselectdialog.cpp
@@ -33,7 +33,7 @@
 #include "gui/widgets/listbox.h"
 #include "gui/widgets/scrollarea.h"
 
-#include "gui/base/listmodel.hpp"
+#include "gui/models/listmodel.h"
 
 #include "net/loginhandler.h"
 #include "net/net.h"
@@ -47,7 +47,7 @@ extern WorldInfo **server_info;
 /**
  * The list model for the server list.
  */
-class WorldListModel final : public gcn::ListModel
+class WorldListModel final : public ListModel
 {
     public:
         explicit WorldListModel(Worlds worlds) :