6 files changed, 13 insertions, 10 deletions
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 070afdbb5..0e9241f21 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -60,7 +60,7 @@ DropDown::DropDown(const Widget2 *const widget,
     gcn::BasicContainer(),
     gcn::KeyListener(),
     gcn::MouseListener(),
-    gcn::FocusListener(),
+    FocusListener(),
     gcn::SelectionListener(),
     Widget2(widget),
     mPopup(new PopupList(this, listModel, extended, modal)),
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index 0b6ada6dd..ca0743ae7 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -26,9 +26,10 @@
 #include "gui/widgets/widget2.h"
 
 #include "gui/base/basiccontainer.hpp"
-#include "gui/base/focuslistener.hpp"
-#include "gui/base/keylistener.hpp"
 #include "gui/base/listmodel.hpp"
+
+#include "listeners/focuslistener.h"
+#include "gui/base/keylistener.hpp"
 #include "gui/base/mouselistener.hpp"
 #include "gui/base/selectionlistener.hpp"
 
@@ -54,7 +55,7 @@ class DropDown final : public ActionListener,
                        public gcn::BasicContainer,
                        public gcn::KeyListener,
                        public gcn::MouseListener,
-                       public gcn::FocusListener,
+                       public FocusListener,
                        public gcn::SelectionListener,
                        public Widget2
 {
diff --git a/src/gui/widgets/popuplist.cpp b/src/gui/widgets/popuplist.cpp
index f7f8afc66..b8e4dabb4 100644
--- a/src/gui/widgets/popuplist.cpp
+++ b/src/gui/widgets/popuplist.cpp
@@ -32,7 +32,7 @@ PopupList::PopupList(DropDown *const widget,
                      gcn::ListModel *const listModel,
                      bool extended, bool modal):
     Popup("PopupList", "popuplist.xml"),
-    gcn::FocusListener(),
+    FocusListener(),
     mListModel(listModel),
     mListBox(extended ? new ExtendedListBox(
         widget, listModel, "extendedlistbox.xml", 0) :
diff --git a/src/gui/widgets/popuplist.h b/src/gui/widgets/popuplist.h
index dfe93c0ae..454b5617c 100644
--- a/src/gui/widgets/popuplist.h
+++ b/src/gui/widgets/popuplist.h
@@ -23,7 +23,8 @@
 
 #include "gui/widgets/popup.h"
 
-#include "gui/base/focuslistener.hpp"
+#include "listeners/focuslistener.h"
+
 #include "gui/base/listmodel.hpp"
 
 #include "localconsts.h"
@@ -33,7 +34,7 @@ class ListBox;
 class ScrollArea;
 
 class PopupList final : public Popup,
-                        public gcn::FocusListener
+                        public FocusListener
 {
     public:
         PopupList(DropDown *const widget,
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 692a5608e..22e9d42dd 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -57,7 +57,7 @@ TextField::TextField(const Widget2 *restrict const widget,
                      const std::string &restrict eventId,
                      const bool sendAlwaysEvents):
     gcn::TextField(text),
-    gcn::FocusListener(),
+    FocusListener(),
     Widget2(widget),
     mSendAlwaysEvents(sendAlwaysEvents),
     mCaretColor(&getThemeColor(Theme::CARET)),
diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h
index 80d022bb1..4545e9ff9 100644
--- a/src/gui/widgets/textfield.h
+++ b/src/gui/widgets/textfield.h
@@ -25,7 +25,8 @@
 
 #include "gui/widgets/widget2.h"
 
-#include "gui/base/focuslistener.hpp"
+#include "listeners/focuslistener.h"
+
 #include "gui/base/widgets/textfield.hpp"
 
 #include "localconsts.h"
@@ -38,7 +39,7 @@ class PopupMenu;
  * \ingroup GUI
  */
 class TextField : public gcn::TextField,
-                  public gcn::FocusListener,
+                  public FocusListener,
                   public Widget2
 {
     public: