Fix some include files paths.

19 files changed, 22 insertions, 19 deletions

diff --git a/src/gui/botcheckerwindow.cpp b/src/gui/botcheckerwindow.cpp
index c110e880e..5d2fe2781 100644
--- a/src/gui/botcheckerwindow.cpp
+++ b/src/gui/botcheckerwindow.cpp
@@ -27,6 +27,8 @@
 #include <vector>
 #include <algorithm>
 
+#include "gui/chatwindow.h"
+
 #include "gui/widgets/button.h"
 #include "gui/widgets/chattab.h"
 #include "gui/widgets/scrollarea.h"
@@ -36,7 +38,6 @@
 #include "gui/widgets/table.h"
 
 #include "actorspritemanager.h"
-#include "chatwindow.h"
 #include "configuration.h"
 #include "localplayer.h"
 #include "main.h"
diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index 09c37d952..b2048eb0a 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "chatwindow.h"
+#include "gui/chatwindow.h"
 
 #include "actorspritemanager.h"
 #include "client.h"
diff --git a/src/gui/focushandler.cpp b/src/gui/focushandler.cpp
index c4e851bd1..2a3ed9f4a 100644
--- a/src/gui/focushandler.cpp
+++ b/src/gui/focushandler.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "focushandler.h"
+#include "gui/focushandler.h"
 
 #include "gui/widgets/window.h"
 
diff --git a/src/gui/killstats.cpp b/src/gui/killstats.cpp
index 1486fdd64..4b20d5270 100644
--- a/src/gui/killstats.cpp
+++ b/src/gui/killstats.cpp
@@ -20,7 +20,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "killstats.h"
+#include "gui/killstats.h"
 
 #include <math.h>
 #include <guichan/widgets/label.hpp>
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index e0d0a1e41..3f4e2650f 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -25,10 +25,10 @@
 #include "chatlog.h"
 #include "client.h"
 #include "configuration.h"
-#include "gui.h"
 #include "log.h"
 #include "main.h"
 
+#include "gui/gui.h"
 #include "gui/login.h"
 #include "gui/okdialog.h"
 #include "gui/sdlinput.h"
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index d15302267..5db19b97d 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "setup.h"
+#include "gui/setup.h"
 
 #include "configuration.h"
 #include "main.h"
diff --git a/src/gui/statuspopup.cpp b/src/gui/statuspopup.cpp
index fa0e3e437..f098ff9eb 100644
--- a/src/gui/statuspopup.cpp
+++ b/src/gui/statuspopup.cpp
@@ -25,6 +25,7 @@
 
 #include "gui/gui.h"
 #include "gui/palette.h"
+#include "gui/viewport.h"
 
 #include "gui/widgets/layout.h"
 #include "gui/widgets/textbox.h"
@@ -32,7 +33,6 @@
 #include "graphics.h"
 #include "localplayer.h"
 #include "units.h"
-#include "viewport.h"
 #include "keyboardconfig.h"
 
 #include "utils/gettext.h"
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index d2fe19792..ef2ce78ed 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -30,11 +30,11 @@
 #include "localplayer.h"
 #include "playerinfo.h"
 #include "units.h"
-#include "viewport.h"
 
 #include "gui/equipmentwindow.h"
 #include "gui/setup.h"
 #include "gui/theme.h"
+#include "gui/viewport.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
diff --git a/src/gui/textcommandeditor.cpp b/src/gui/textcommandeditor.cpp
index 45bff6b03..e169e9303 100644
--- a/src/gui/textcommandeditor.cpp
+++ b/src/gui/textcommandeditor.cpp
@@ -27,6 +27,8 @@
 #include <vector>
 #include <algorithm>
 
+#include "gui/chatwindow.h"
+
 #include "gui/widgets/button.h"
 #include "gui/widgets/chattab.h"
 #include "gui/widgets/dropdown.h"
@@ -38,7 +40,6 @@
 #include "gui/widgets/table.h"
 #include "gui/widgets/textfield.h"
 
-#include "chatwindow.h"
 #include "configuration.h"
 #include "item.h"
 #include "localplayer.h"
diff --git a/src/gui/widgets/channeltab.cpp b/src/gui/widgets/channeltab.cpp
index 625a9b589..df2df2790 100644
--- a/src/gui/widgets/channeltab.cpp
+++ b/src/gui/widgets/channeltab.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "channeltab.h"
+#include "gui/widgets/channeltab.h"
 
 #include "channel.h"
 
diff --git a/src/gui/widgets/inttextfield.h b/src/gui/widgets/inttextfield.h
index 651c3659e..b36b088a6 100644
--- a/src/gui/widgets/inttextfield.h
+++ b/src/gui/widgets/inttextfield.h
@@ -23,7 +23,7 @@
 #ifndef INTTEXTFIELD_H
 #define INTTEXTFIELD_H
 
-#include "textfield.h"
+#include "gui/widgets/textfield.h"
 
 /**
  * TextBox which only accepts numbers as input.
diff --git a/src/gui/widgets/passwordfield.h b/src/gui/widgets/passwordfield.h
index b1ff39777..5ba08094d 100644
--- a/src/gui/widgets/passwordfield.h
+++ b/src/gui/widgets/passwordfield.h
@@ -23,7 +23,7 @@
 #ifndef PASSWORDFIELD_H
 #define PASSWORDFIELD_H
 
-#include "textfield.h"
+#include "gui/widgets/textfield.h"
 
 /**
  * A password field.
diff --git a/src/gui/widgets/progressindicator.cpp b/src/gui/widgets/progressindicator.cpp
index af48d0649..9ca6fe3b8 100644
--- a/src/gui/widgets/progressindicator.cpp
+++ b/src/gui/widgets/progressindicator.cpp
@@ -19,7 +19,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "progressindicator.h"
+#include "gui/widgets/progressindicator.h"
 
 #include "graphics.h"
 #include "simpleanimation.h"
diff --git a/src/gui/widgets/table.h b/src/gui/widgets/table.h
index f7473c535..48075d53a 100644
--- a/src/gui/widgets/table.h
+++ b/src/gui/widgets/table.h
@@ -23,7 +23,7 @@
 #ifndef TABLE_H
 #define TABLE_H
 
-#include "tablemodel.h"
+#include "gui/widgets/tablemodel.h"
 
 #include <guichan/keylistener.hpp>
 #include <guichan/mouselistener.hpp>
diff --git a/src/gui/widgets/whispertab.cpp b/src/gui/widgets/whispertab.cpp
index 1a7a73b1a..0cfd41bcb 100644
--- a/src/gui/widgets/whispertab.cpp
+++ b/src/gui/widgets/whispertab.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "whispertab.h"
+#include "gui/widgets/whispertab.h"
 
 #include "chatlog.h"
 #include "commandhandler.h"
diff --git a/src/net/charhandler.h b/src/net/charhandler.h
index 0cddc62d0..b362a623c 100644
--- a/src/net/charhandler.h
+++ b/src/net/charhandler.h
@@ -24,9 +24,10 @@
 #define CHARHANDLER_H
 
 #include "localplayer.h"
-#include "logindata.h"
 #include "playerinfo.h"
 
+#include "net/logindata.h"
+
 #include <iosfwd>
 #include <vector>
 
diff --git a/src/net/gamehandler.h b/src/net/gamehandler.h
index e56e82db0..14203fb20 100644
--- a/src/net/gamehandler.h
+++ b/src/net/gamehandler.h
@@ -23,7 +23,7 @@
 #ifndef MAPHANDLER_H
 #define MAPHANDLER_H
 
-#include "logindata.h"
+#include "net/logindata.h"
 
 #include <iosfwd>
 
diff --git a/src/utils/mkdir.cpp b/src/utils/mkdir.cpp
index bc20cb196..d8962f0cd 100644
--- a/src/utils/mkdir.cpp
+++ b/src/utils/mkdir.cpp
@@ -35,7 +35,7 @@
 #include <cstdlib>
 #endif
 
-#include "mkdir.h"
+#include "utils/mkdir.h"
 
 #if defined WIN32
 int mkdir_r(const char *pathname)
diff --git a/src/utils/specialfolder.cpp b/src/utils/specialfolder.cpp
index fda498bf7..864615181 100644
--- a/src/utils/specialfolder.cpp
+++ b/src/utils/specialfolder.cpp
@@ -20,7 +20,7 @@
  */
 
 #ifdef WIN32
-#include "specialfolder.h"
+#include "utils/specialfolder.h"
 #include <windows.h>
 
 #ifdef _SPECIALFOLDERLOCATION_TEST_