13 files changed, 19 insertions, 19 deletions
diff --git a/src/gui/buydialog.cpp b/src/gui/buydialog.cpp
index fe504413c..00602e6f2 100644
--- a/src/gui/buydialog.cpp
+++ b/src/gui/buydialog.cpp
@@ -26,7 +26,7 @@
 #include "units.h"
 
 #include "gui/setup.h"
-#include "gui/trade.h"
+#include "gui/tradewindow.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index 0e12f024a..bf4225df9 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -32,7 +32,7 @@
 #include "gui/changepassworddialog.h"
 #include "gui/charcreatedialog.h"
 #include "gui/confirmdialog.h"
-#include "gui/login.h"
+#include "gui/logindialog.h"
 #include "gui/okdialog.h"
 #include "gui/sdlinput.h"
 #include "gui/textdialog.h"
diff --git a/src/gui/itemamountwindow.cpp b/src/gui/itemamountwindow.cpp
index 751578d9b..5506f1690 100644
--- a/src/gui/itemamountwindow.cpp
+++ b/src/gui/itemamountwindow.cpp
@@ -25,7 +25,7 @@
 #include "item.h"
 #include "keyboardconfig.h"
 
-#include "gui/trade.h"
+#include "gui/tradewindow.h"
 #include "net/inventoryhandler.h"
 #include "gui/itempopup.h"
 #include "net/net.h"
diff --git a/src/gui/login.cpp b/src/gui/logindialog.cpp
index d910d37bc..e32caeb13 100644
--- a/src/gui/login.cpp
+++ b/src/gui/logindialog.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/login.h"
+#include "gui/logindialog.h"
 
 #include "client.h"
 #include "configuration.h"
diff --git a/src/gui/login.h b/src/gui/logindialog.h
index 9a65e9718..ade45c211 100644
--- a/src/gui/login.h
+++ b/src/gui/logindialog.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LOGIN_H
-#define LOGIN_H
+#ifndef LOGINDIALOG_H
+#define LOGINDIALOG_H
 
 #include "gui/widgets/window.h"
 
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 73fd360fa..9048c53b2 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -44,11 +44,11 @@
 #include "gui/itemamountwindow.h"
 #include "gui/ministatus.h"
 #include "gui/outfitwindow.h"
-#include "gui/sell.h"
+#include "gui/selldialog.h"
 #include "gui/socialwindow.h"
 #include "gui/textcommandeditor.h"
 #include "gui/textdialog.h"
-#include "gui/trade.h"
+#include "gui/tradewindow.h"
 #include "gui/viewport.h"
 #include "gui/windowmenu.h"
 
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index 9ebc82fb7..4bce1b8b8 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -26,7 +26,7 @@
 #include "configuration.h"
 #include "log.h"
 
-#include "gui/login.h"
+#include "gui/logindialog.h"
 #include "gui/okdialog.h"
 
 #include "gui/widgets/button.h"
diff --git a/src/gui/sell.cpp b/src/gui/selldialog.cpp
index 1a1fa60e0..e1ed7c1b0 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/selldialog.cpp
@@ -20,13 +20,13 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/sell.h"
+#include "gui/selldialog.h"
 
 #include "shopitem.h"
 #include "units.h"
 
 #include "gui/setup.h"
-#include "gui/trade.h"
+#include "gui/tradewindow.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
diff --git a/src/gui/sell.h b/src/gui/selldialog.h
index 86343a953..e40dd50c2 100644
--- a/src/gui/sell.h
+++ b/src/gui/selldialog.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SELL_H
-#define SELL_H
+#ifndef SELLDIALOG_H
+#define SELLDIALOG_H
 
 #include "gui/widgets/window.h"
 
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index 3f4e2650f..48b364264 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -29,7 +29,7 @@
 #include "main.h"
 
 #include "gui/gui.h"
-#include "gui/login.h"
+#include "gui/logindialog.h"
 #include "gui/okdialog.h"
 #include "gui/sdlinput.h"
 #include "gui/theme.h"
diff --git a/src/gui/shopwindow.cpp b/src/gui/shopwindow.cpp
index 60d48a4c7..72553ea01 100644
--- a/src/gui/shopwindow.cpp
+++ b/src/gui/shopwindow.cpp
@@ -24,9 +24,9 @@
 
 #include "gui/buydialog.h"
 #include "gui/itemamountwindow.h"
-#include "gui/sell.h"
+#include "gui/selldialog.h"
 #include "gui/setup.h"
-#include "gui/trade.h"
+#include "gui/tradewindow.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/chattab.h"
diff --git a/src/gui/trade.cpp b/src/gui/tradewindow.cpp
index 38aaecb83..279f6c178 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/tradewindow.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/trade.h"
+#include "gui/tradewindow.h"
 
 #include "inventory.h"
 #include "item.h"
diff --git a/src/gui/trade.h b/src/gui/tradewindow.h
index 67515c013..6865434b6 100644
--- a/src/gui/trade.h
+++ b/src/gui/tradewindow.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TRADE_H
-#define TRADE_H
+#ifndef TRADEWINDOW_H
+#define TRADEWINDOW_H
 
 #include "guichanfwd.h"