9 files changed, 17 insertions, 13 deletions
diff --git a/src/gui/changeemaildialog.cpp b/src/gui/changeemaildialog.cpp
index b6473612..d36ab487 100644
--- a/src/gui/changeemaildialog.cpp
+++ b/src/gui/changeemaildialog.cpp
@@ -23,7 +23,6 @@
 
 #include "main.h"
 #include "log.h"
-#include "logindata.h"
 
 #include "gui/register.h"
 #include "gui/okdialog.h"
@@ -32,6 +31,8 @@
 #include "gui/widgets/label.h"
 #include "gui/widgets/textfield.h"
 
+#include "net/logindata.h"
+
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
diff --git a/src/gui/changepassworddialog.cpp b/src/gui/changepassworddialog.cpp
index 39d992b2..35f57ef4 100644
--- a/src/gui/changepassworddialog.cpp
+++ b/src/gui/changepassworddialog.cpp
@@ -23,7 +23,6 @@
 
 #include "main.h"
 #include "log.h"
-#include "logindata.h"
 
 #include "gui/register.h"
 #include "gui/okdialog.h"
@@ -33,6 +32,8 @@
 #include "gui/widgets/textfield.h"
 #include "gui/widgets/label.h"
 
+#include "net/logindata.h"
+
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index ba69a9b3..f88fa733 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -34,7 +34,7 @@
 #include "gui/changepassworddialog.h"
 #include "gui/changeemaildialog.h"
 
-#include "logindata.h"
+#include "net/logindata.h"
 
 #include "net/tmwserv/accountserver/account.h"
 #endif
diff --git a/src/gui/charselectdialog.h b/src/gui/charselectdialog.h
index 75a98465..adbf3de1 100644
--- a/src/gui/charselectdialog.h
+++ b/src/gui/charselectdialog.h
@@ -30,11 +30,8 @@
 
 #include <guichan/actionlistener.hpp>
 
-#ifdef TMWSERV_SUPPORT
-#include "../logindata.h"
-#endif
-
 class LocalPlayer;
+class LoginData;
 class Player;
 class PlayerBox;
 
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index 8391a5c4..77f2e137 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -31,8 +31,9 @@
 #include "gui/widgets/passwordfield.h"
 #include "gui/widgets/textfield.h"
 
+#include "net/logindata.h"
+
 #include "main.h"
-#include "logindata.h"
 #include "configuration.h"
 
 #include "utils/gettext.h"
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index 6dfc761d..2b897641 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -23,7 +23,6 @@
 
 #include "configuration.h"
 #include "log.h"
-#include "logindata.h"
 #include "main.h"
 
 #include "gui/login.h"
@@ -37,6 +36,8 @@
 #include "gui/widgets/radiobutton.h"
 #include "gui/widgets/textfield.h"
 
+#include "net/logindata.h"
+
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index f3b0739a..a3dfdeae 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -29,9 +29,10 @@
 #include "gui/widgets/layout.h"
 #include "gui/widgets/textfield.h"
 
+#include "net/logindata.h"
+
 #include "configuration.h"
 #include "log.h"
-#include "logindata.h"
 #include "main.h"
 
 #include "utils/gettext.h"
diff --git a/src/gui/serverselectdialog.cpp b/src/gui/serverselectdialog.cpp
index be4baead..ccdf2bb6 100644
--- a/src/gui/serverselectdialog.cpp
+++ b/src/gui/serverselectdialog.cpp
@@ -25,9 +25,10 @@
 #include "gui/widgets/listbox.h"
 #include "gui/widgets/scrollarea.h"
 
-#include "logindata.h"
+#include "net/logindata.h"
+#include "net/serverinfo.h"
+
 #include "main.h"
-#include "serverinfo.h"
 
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
diff --git a/src/gui/unregisterdialog.cpp b/src/gui/unregisterdialog.cpp
index 6775051e..048239c5 100644
--- a/src/gui/unregisterdialog.cpp
+++ b/src/gui/unregisterdialog.cpp
@@ -23,7 +23,6 @@
 
 #include "main.h"
 #include "log.h"
-#include "logindata.h"
 
 #include "gui/okdialog.h"
 #include "gui/register.h"
@@ -34,6 +33,8 @@
 #include "gui/widgets/passwordfield.h"
 #include "gui/widgets/textfield.h"
 
+#include "net/logindata.h"
+
 #include "utils/gettext.h"
 #include "utils/stringutils.h"