6 files changed, 49 insertions, 16 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2af6b00b5..c43ecbae1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -888,6 +888,7 @@ SET(SRCS
     listeners/actionlistener.h
     gui/widgets/basiccontainer.h
     gui/buttoninfo.h
+    gui/buttontext.h
     gui/chatconsts.h
     gui/chatlog.h
     gui/cliprect.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 2beb3740f..c615c1dca 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -156,6 +156,7 @@ manaplus_SOURCES += events/actionevent.h \
 	      listeners/actionlistener.h \
 	      gui/widgets/basiccontainer.h \
 	      gui/buttoninfo.h \
+	      gui/buttontext.h \
 	      gui/chatconsts.h \
 	      gui/chatlog.h \
 	      gui/cliprect.h \
diff --git a/src/gui/buttontext.h b/src/gui/buttontext.h
new file mode 100644
index 000000000..68196d447
--- /dev/null
+++ b/src/gui/buttontext.h
@@ -0,0 +1,42 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2014  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GUI_BUTTONTEXT_H
+#define GUI_BUTTONTEXT_H
+
+#include "localconsts.h"
+
+#include <string>
+
+struct ButtonText final
+{
+    ButtonText(const std::string &text0, const int key0) :
+        text(text0),
+        key(key0)
+    {
+    }
+
+    A_DELETE_COPY(ButtonText)
+
+    std::string text;
+    int key;
+};
+
+#endif  // GUI_BUTTONTEXT_H
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 3ecd0f333..36970eaad 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -40,6 +40,9 @@
 
 #include "input/inputmanager.h"
 
+#include "gui/buttontext.h"
+#include "gui/viewport.h"
+
 #include "gui/windows/chatwindow.h"
 #include "gui/windows/equipmentwindow.h"
 #include "gui/windows/inventorywindow.h"
@@ -54,8 +57,6 @@
 #include "gui/windows/tradewindow.h"
 #include "gui/windowmenu.h"
 
-#include "gui/viewport.h"
-
 #include "gui/widgets/button.h"
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/tabs/chattab.h"
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp
index a45cfd7b8..3e1d3cb1d 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -27,6 +27,7 @@
 #include "input/inputmanager.h"
 
 #include "gui/buttoninfo.h"
+#include "gui/buttontext.h"
 #include "gui/skin.h"
 #include "gui/viewport.h"
 
diff --git a/src/gui/windowmenu.h b/src/gui/windowmenu.h
index 07067debd..cdcf77082 100644
--- a/src/gui/windowmenu.h
+++ b/src/gui/windowmenu.h
@@ -38,22 +38,9 @@
 
 class Button;
 class ButtonInfo;
+class ButtonText;
 class TextPopup;
 
-struct ButtonText final
-{
-    ButtonText(const std::string &text0, const int key0) :
-        text(text0),
-        key(key0)
-    {
-    }
-
-    A_DELETE_COPY(ButtonText)
-
-    std::string text;
-    int key;
-};
-
 /**
  * The window menu. Allows showing and hiding many of the different windows
  * used in the game.