2 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/base/widgets/button.cpp b/src/gui/base/widgets/button.cpp
index 3e699670a..82ff878a0 100644
--- a/src/gui/base/widgets/button.cpp
+++ b/src/gui/base/widgets/button.cpp
@@ -83,7 +83,7 @@ namespace gcn
         gcn::Widget(),
         gcn::MouseListener(),
         gcn::KeyListener(),
-        gcn::FocusListener(),
+        FocusListener(),
         mCaption(),
         mHasMouse(false),
         mKeyPressed(false),
@@ -104,7 +104,7 @@ namespace gcn
         gcn::Widget(),
         gcn::MouseListener(),
         gcn::KeyListener(),
-        gcn::FocusListener(),
+        FocusListener(),
         mCaption(caption),
         mHasMouse(false),
         mKeyPressed(false),
diff --git a/src/gui/base/widgets/button.hpp b/src/gui/base/widgets/button.hpp
index cd41a1b02..e2d6c0c8e 100644
--- a/src/gui/base/widgets/button.hpp
+++ b/src/gui/base/widgets/button.hpp
@@ -66,10 +66,11 @@
 
 #include <string>
 
-#include "gui/base/focuslistener.hpp"
+#include "listeners/focuslistener.h"
 #include "gui/base/keylistener.hpp"
-#include "gui/base/mouseevent.hpp"
 #include "gui/base/mouselistener.hpp"
+
+#include "gui/base/mouseevent.hpp"
 #include "gui/base/widget.hpp"
 
 #include "render/graphics.h"