Pedantic fixes to the client, where I alphabetized all of the include

statements, as well as removing the new skill dialog, which we do not, 
nor will we use (if we do, it'd be a new one that we'd make).

WARNING!!! This, and all other previous builds have a linker error for 
the Gnome libraries version 4.3.2 on my setup. It's assumed that this is 
also the case for other users of this library as well. I'm currently 
assuming that there's a bug in the compiler itself, and will look into 
reporting this, but in the mean time, it doesn't build for these users, 
unfortunately. Sorry about this.

146 files changed, 168 insertions, 722 deletions

diff --git a/src/gui/box.cpp b/src/gui/box.cpp
index f53bc18e..59d8c135 100644
--- a/src/gui/box.cpp
+++ b/src/gui/box.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: box.cpp 1456 2005-07-15 23:17:00Z b_lindeijer $
  */
 
 #include "box.h"
diff --git a/src/gui/box.h b/src/gui/box.h
index 280fd3e2..46654b48 100644
--- a/src/gui/box.h
+++ b/src/gui/box.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: box.h 2529 2006-08-13 10:20:19Z b_lindeijer $
  */
 
 
diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp
index b7d08cab..430a2aa2 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: browserbox.cpp 4348 2008-06-14 12:42:49Z the_enemy $
  */
 
 #include <algorithm>
@@ -28,8 +26,8 @@
 #include <guichan/mouseinput.hpp>
 
 #include "browserbox.h"
-#include "linkhandler.h"
 #include "colour.h"
+#include "linkhandler.h"
 
 #ifdef USE_OPENGL
 #include "../configuration.h"
diff --git a/src/gui/browserbox.h b/src/gui/browserbox.h
index c671d835..267e0fea 100644
--- a/src/gui/browserbox.h
+++ b/src/gui/browserbox.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: browserbox.h 3687 2007-10-26 00:22:12Z crush_tmw $
  */
 
 #ifndef __TMW_BROWSERBOX_H__
@@ -27,8 +25,8 @@
 #include <iosfwd>
 #include <vector>
 
-#include <guichan/widget.hpp>
 #include <guichan/mouselistener.hpp>
+#include <guichan/widget.hpp>
 
 #include "../guichanfwd.h"
 #include "../main.h"
diff --git a/src/gui/button.cpp b/src/gui/button.cpp
index 1243d798..40ecd1b7 100644
--- a/src/gui/button.cpp
+++ b/src/gui/button.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: button.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #include <algorithm>
diff --git a/src/gui/button.h b/src/gui/button.h
index bbd26010..eecd0dc0 100644
--- a/src/gui/button.h
+++ b/src/gui/button.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: button.h 3606 2007-09-27 14:54:09Z b_lindeijer $
  */
 
 #ifndef _TMW_BUTTON_H
diff --git a/src/gui/buttonbox.cpp b/src/gui/buttonbox.cpp
index 592cb92a..903d971d 100644
--- a/src/gui/buttonbox.cpp
+++ b/src/gui/buttonbox.cpp
@@ -17,13 +17,10 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: buttonbox.cpp
  */
 
-#include "buttonbox.h"
-
 #include "button.h"
+#include "buttonbox.h"
 
 ButtonBox::ButtonBox(const std::string &title, const std::string &buttonTxt,
 		     ButtonBoxListener *listener) :
diff --git a/src/gui/buttonbox.h b/src/gui/buttonbox.h
index 5fc9f88d..edde4aa4 100644
--- a/src/gui/buttonbox.h
+++ b/src/gui/buttonbox.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: buttonbox.h
  */
 
 #ifndef _TMW_BUTTONBOX_H
@@ -28,10 +26,10 @@
 
 #include <guichan/actionlistener.hpp>
 
-#include "../guichanfwd.h"
-
 #include "window.h"
 
+#include "../guichanfwd.h"
+
 class ButtonBoxListener
 {
     public:
diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 8e2a7a7a..a4574eb7 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -17,15 +17,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: buy.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
-#include "buy.h"
-
 #include <guichan/widgets/label.hpp>
 
 #include "button.h"
+#include "buy.h"
 #include "scrollarea.h"
 #include "shop.h"
 #include "shoplistbox.h"
diff --git a/src/gui/buy.h b/src/gui/buy.h
index 6f75cab5..0915385a 100644
--- a/src/gui/buy.h
+++ b/src/gui/buy.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: buy.h 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #ifndef _TMW_BUY_H
diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp
index 9cc3b297..57c95841 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buysell.cpp
@@ -17,13 +17,10 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: buysell.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
-#include "buysell.h"
-
 #include "button.h"
+#include "buysell.h"
 
 #include "../npc.h"
 
diff --git a/src/gui/buysell.h b/src/gui/buysell.h
index 0966ec03..d73205b6 100644
--- a/src/gui/buysell.h
+++ b/src/gui/buysell.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: buysell.h 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #ifndef _TMW_BUYSELL_H
@@ -26,10 +24,10 @@
 
 #include <guichan/actionlistener.hpp>
 
-#include "../guichanfwd.h"
-
 #include "window.h"
 
+#include "../guichanfwd.h"
+
 /**
  * A dialog to choose between buying or selling at a shop.
  *
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index ca4d8608..93783ded 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -17,17 +17,14 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: char_select.cpp 3760 2007-11-21 19:43:11Z b_lindeijer $
  */
 
-#include "char_select.h"
-
 #include <string>
 
 #include <guichan/widgets/label.hpp>
 
 #include "button.h"
+#include "char_select.h"
 #include "confirm_dialog.h"
 #include "ok_dialog.h"
 #include "playerbox.h"
diff --git a/src/gui/char_select.h b/src/gui/char_select.h
index 182600d1..63630736 100644
--- a/src/gui/char_select.h
+++ b/src/gui/char_select.h
@@ -17,23 +17,21 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: char_select.h 3752 2007-11-20 10:50:00Z b_lindeijer $
  */
 
 #ifndef _CHAR_SELECT_H
 #define _CHAR_SELECT_H
 
+#include <guichan/actionlistener.hpp>
+
 #include "window.h"
 
 #include "../guichanfwd.h"
 #include "../lockedarray.h"
 
-#include <guichan/actionlistener.hpp>
-
-class Player;
 class LocalPlayer;
 class Network;
+class Player;
 class PlayerBox;
 
 /**
diff --git a/src/gui/char_server.cpp b/src/gui/char_server.cpp
index 3465fb69..8f68e6e1 100644
--- a/src/gui/char_server.cpp
+++ b/src/gui/char_server.cpp
@@ -17,13 +17,10 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: char_server.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
-#include "char_server.h"
-
 #include "button.h"
+#include "char_server.h"
 #include "listbox.h"
 #include "scrollarea.h"
 
diff --git a/src/gui/char_server.h b/src/gui/char_server.h
index 32a0645f..bb81d3a5 100644
--- a/src/gui/char_server.h
+++ b/src/gui/char_server.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: char_server.h 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #ifndef _CHAR_SEL_SERVER_H
diff --git a/src/gui/chargedialog.cpp b/src/gui/chargedialog.cpp
index 862378ae..1733c7eb 100644
--- a/src/gui/chargedialog.cpp
+++ b/src/gui/chargedialog.cpp
@@ -17,7 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  */
 
  /* The window supported by this class shows player stats and keeps a charging
@@ -25,7 +24,6 @@
   */
 
 #include "chargedialog.h"
-
 #include "progressbar.h"
 
 #include "../localplayer.h"
diff --git a/src/gui/chargedialog.h b/src/gui/chargedialog.h
index 222fb3b5..53998ab8 100644
--- a/src/gui/chargedialog.h
+++ b/src/gui/chargedialog.h
@@ -17,7 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  */
 
 #ifndef _TMW_CHARGE_H
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 6a74d19e..dd11cebb 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -17,29 +17,27 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: chat.cpp 4227 2008-05-08 00:39:29Z peaveydk $
  */
 
 #include <algorithm>
 #include <fstream>
+
 #include <guichan/focushandler.hpp>
 #include <guichan/key.hpp>
 
-#include "chat.h"
-
 #include "browserbox.h"
+#include "chat.h"
 #include "chatinput.h"
 #include "scrollarea.h"
 #include "windowcontainer.h"
 
+#include "../beingmanager.h"
 #include "../configuration.h"
+#include "../extensions.h"
 #include "../game.h"
 #include "../localplayer.h"
-#include "../beingmanager.h"
-#include "../recorder.h"
 #include "../party.h"
-#include "../extensions.h"
+#include "../recorder.h"
 
 #include "../net/messageout.h"
 #include "../net/protocol.h"
diff --git a/src/gui/chat.h b/src/gui/chat.h
index 5e5ca110..437dc115 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -17,16 +17,14 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: chat.h 4227 2008-05-08 00:39:29Z peaveydk $
  */
 
 #ifndef _TMW_CHAT_H
 #define _TMW_CHAT_H
 
+#include <fstream>
 #include <list>
 #include <string>
-#include <fstream>
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/keylistener.hpp>
@@ -37,9 +35,9 @@
 
 class BrowserBox;
 class Network;
-class ScrollArea;
 class Recorder;
 class Party;
+class ScrollArea;
 
 #define BY_GM         0   // those should be self-explanatory =)
 #define BY_PLAYER     1
diff --git a/src/gui/chatinput.cpp b/src/gui/chatinput.cpp
index b403a03e..afe7f037 100644
--- a/src/gui/chatinput.cpp
+++ b/src/gui/chatinput.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: chatinput.cpp 3361 2007-07-07 20:12:58Z b_lindeijer $
  */
 
 #include "chatinput.h"
diff --git a/src/gui/chatinput.h b/src/gui/chatinput.h
index 043244b9..44e22956 100644
--- a/src/gui/chatinput.h
+++ b/src/gui/chatinput.h
@@ -17,19 +17,17 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: chatinput.h 3361 2007-07-07 20:12:58Z b_lindeijer $
  */
 
 #ifndef _TMW_CHATINPUT_H
 #define _TMW_CHATINPUT_H
 
+#include <guichan/focuslistener.hpp>
+
 #include "textfield.h"
 
 #include "../guichanfwd.h"
 
-#include <guichan/focuslistener.hpp>
-
 /**
  * The chat input hides when it loses focus. It is also invisible by default.
  */
diff --git a/src/gui/checkbox.cpp b/src/gui/checkbox.cpp
index b530bbea..20e24dee 100644
--- a/src/gui/checkbox.cpp
+++ b/src/gui/checkbox.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: checkbox.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #include "checkbox.h"
diff --git a/src/gui/checkbox.h b/src/gui/checkbox.h
index 160a2bf4..f6d8f2e5 100644
--- a/src/gui/checkbox.h
+++ b/src/gui/checkbox.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: checkbox.h 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #ifndef _TMW_CHECKBOX_H
diff --git a/src/gui/colour.cpp b/src/gui/colour.cpp
index d1782e1c..4c3782a4 100644
--- a/src/gui/colour.cpp
+++ b/src/gui/colour.cpp
@@ -19,10 +19,10 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "colour.h"
-
 #include <cstdio>
 
+#include "colour.h"
+
 #include "../configuration.h"
 
 Colour::Colour()
diff --git a/src/gui/colour.h b/src/gui/colour.h
index ac75f08b..1e8ba3db 100644
--- a/src/gui/colour.h
+++ b/src/gui/colour.h
@@ -21,9 +21,10 @@
 
 #ifndef _COLOUR_H
 #define _COLOUR_H
+
 #include <cstdio>
-#include <vector>
 #include <string>
+#include <vector>
 
 #include <guichan/listmodel.hpp>
 
diff --git a/src/gui/confirm_dialog.cpp b/src/gui/confirm_dialog.cpp
index 848c4767..732f5769 100644
--- a/src/gui/confirm_dialog.cpp
+++ b/src/gui/confirm_dialog.cpp
@@ -17,14 +17,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: confirm_dialog.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
-#include "confirm_dialog.h"
-
 #include <guichan/font.hpp>
 
+#include "confirm_dialog.h"
+
 ConfirmDialog::ConfirmDialog(const std::string &title, const std::string &msg,
         Window *parent):
     Window(title, true, parent)
diff --git a/src/gui/confirm_dialog.h b/src/gui/confirm_dialog.h
index 65f33cac..109dcea0 100644
--- a/src/gui/confirm_dialog.h
+++ b/src/gui/confirm_dialog.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: confirm_dialog.h 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #ifndef _TMW_OPTION_DIALOG_H
diff --git a/src/gui/connection.cpp b/src/gui/connection.cpp
index 0b62ca3c..1204b203 100644
--- a/src/gui/connection.cpp
+++ b/src/gui/connection.cpp
@@ -17,17 +17,14 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: connection.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
-#include "connection.h"
-
 #include <guichan/actionlistener.hpp>
 
 #include <guichan/widgets/label.hpp>
 
 #include "button.h"
+#include "connection.h"
 #include "progressbar.h"
 
 #include "../main.h"
diff --git a/src/gui/connection.h b/src/gui/connection.h
index 86b688a3..c3a6208f 100644
--- a/src/gui/connection.h
+++ b/src/gui/connection.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: connection.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_CONNECTION_H
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index 1e7d5b35..7fc63096 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -17,22 +17,19 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: debugwindow.cpp 3509 2007-08-23 13:43:17Z b_lindeijer $
  */
 
-#include "debugwindow.h"
-
 #include <SDL_mouse.h>
 
 #include <guichan/widgets/label.hpp>
 
 #include "button.h"
+#include "debugwindow.h"
 #include "gui.h"
 #include "viewport.h"
 
-#include "../game.h"
 #include "../engine.h"
+#include "../game.h"
 #include "../particle.h"
 #include "../map.h"
 
diff --git a/src/gui/debugwindow.h b/src/gui/debugwindow.h
index 59ae765c..ae1d8b14 100644
--- a/src/gui/debugwindow.h
+++ b/src/gui/debugwindow.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: debugwindow.h 3509 2007-08-23 13:43:17Z b_lindeijer $
  */
 
 #ifndef _TMW_DEBUGWINDOW_H
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 727ac732..bf85f033 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: equipmentwindow.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include "equipmentwindow.h"
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index 6a7a4944..7aacfc1e 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: equipmentwindow.h 2545 2006-08-17 19:11:28Z crush_tmw $
  */
 
 #ifndef _TMW_EQUIPMENT_H
diff --git a/src/gui/focushandler.cpp b/src/gui/focushandler.cpp
index 966d2013..f9ea8b7d 100644
--- a/src/gui/focushandler.cpp
+++ b/src/gui/focushandler.cpp
@@ -17,13 +17,10 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: focushandler.cpp 2239 2006-03-09 05:16:27Z der_doener $
  */
 
 #include "focushandler.h"
 
-
 void FocusHandler::requestModalFocus(gcn::Widget *widget)
 {
     /* If there is another widget with modal focus, remove its modal focus
diff --git a/src/gui/focushandler.h b/src/gui/focushandler.h
index 5fde09f1..a5218485 100644
--- a/src/gui/focushandler.h
+++ b/src/gui/focushandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: focushandler.h 2239 2006-03-09 05:16:27Z der_doener $
  */
 
 #ifndef _TMW_FOCUSHANDLER_H
diff --git a/src/gui/gccontainer.cpp b/src/gui/gccontainer.cpp
index 8095be61..ec3c8a5c 100644
--- a/src/gui/gccontainer.cpp
+++ b/src/gui/gccontainer.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: gccontainer.cpp 4208 2008-04-29 11:25:26Z b_lindeijer $
  */
 
 #include "gccontainer.h"
diff --git a/src/gui/gccontainer.h b/src/gui/gccontainer.h
index 660111fc..2af7f6ad 100644
--- a/src/gui/gccontainer.h
+++ b/src/gui/gccontainer.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: gccontainer.h 4208 2008-04-29 11:25:26Z b_lindeijer $
  */
 
 #ifndef _TMW_GUI_GCCONTAINER_H
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index f72f544c..fcc7ed77 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -17,12 +17,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: gui.cpp 3628 2007-10-18 18:39:48Z b_lindeijer $
  */
 
-#include "gui.h"
-
 #include <guichan/exception.hpp>
 #include <guichan/image.hpp>
 #include <guichan/imagefont.hpp>
@@ -31,6 +27,7 @@
 #include <guichan/sdl/sdlinput.hpp>
 
 #include "focushandler.h"
+#include "gui.h"
 #include "viewport.h"
 #include "window.h"
 #include "windowcontainer.h"
@@ -41,8 +38,8 @@
 #include "../log.h"
 
 #include "../resources/imageset.h"
-#include "../resources/resourcemanager.h"
 #include "../resources/imageloader.h"
+#include "../resources/resourcemanager.h"
 
 // Guichan stuff
 Gui *gui;
diff --git a/src/gui/gui.h b/src/gui/gui.h
index f250a8e3..8cf91915 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: gui.h 3628 2007-10-18 18:39:48Z b_lindeijer $
  */
 
 #ifndef _TMW_GUI
@@ -28,8 +26,8 @@
 
 #include "../guichanfwd.h"
 
-class GuiConfigListener;
 class Graphics;
+class GuiConfigListener;
 class ImageSet;
 class Viewport;
 
diff --git a/src/gui/hbox.cpp b/src/gui/hbox.cpp
index dc909195..020e85c6 100644
--- a/src/gui/hbox.cpp
+++ b/src/gui/hbox.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: hbox.cpp 1881 2005-10-18 21:40:25Z der_doener $
  */
 
 #include "hbox.h"
diff --git a/src/gui/hbox.h b/src/gui/hbox.h
index 93ac270d..da70a53c 100644
--- a/src/gui/hbox.h
+++ b/src/gui/hbox.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: hbox.h 1881 2005-10-18 21:40:25Z der_doener $
  */
 
 #ifndef HBOX_H
diff --git a/src/gui/help.cpp b/src/gui/help.cpp
index 56a5e70e..19413a08 100644
--- a/src/gui/help.cpp
+++ b/src/gui/help.cpp
@@ -17,14 +17,11 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: help.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
-#include "help.h"
-
 #include "button.h"
 #include "browserbox.h"
+#include "help.h"
 #include "scrollarea.h"
 
 #include "../resources/resourcemanager.h"
diff --git a/src/gui/help.h b/src/gui/help.h
index 3b45283c..bd200ccf 100644
--- a/src/gui/help.h
+++ b/src/gui/help.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: help.h 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #ifndef _TMW_HELP_H
@@ -26,8 +24,8 @@
 
 #include <guichan/actionlistener.hpp>
 
-#include "window.h"
 #include "linkhandler.h"
+#include "window.h"
 
 #include "../guichanfwd.h"
 
diff --git a/src/gui/inttextbox.cpp b/src/gui/inttextbox.cpp
index 7a39c2df..858a3fcb 100644
--- a/src/gui/inttextbox.cpp
+++ b/src/gui/inttextbox.cpp
@@ -17,14 +17,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: inttextbox.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
-#include "inttextbox.h"
-
 #include <guichan/key.hpp>
 
+#include "inttextbox.h"
+
 #include "../utils/tostring.h"
 
 IntTextBox::IntTextBox(int i):
diff --git a/src/gui/inttextbox.h b/src/gui/inttextbox.h
index 6ade7e71..922ef4c5 100644
--- a/src/gui/inttextbox.h
+++ b/src/gui/inttextbox.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: inttextbox.h 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #ifndef INTTEXTBOX_H
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 1b2e5c63..cbce0ee3 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -17,18 +17,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: inventorywindow.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
-#include "inventorywindow.h"
-
 #include <string>
 
 #include <guichan/mouseinput.hpp>
 
 #include "button.h"
 #include "gui.h"
+#include "inventorywindow.h"
 #include "item_amount.h"
 #include "itemcontainer.h"
 #include "scrollarea.h"
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 055bfad9..2e589471 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: inventorywindow.h 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #ifndef _TMW_INVENTORYWINDOW_H
diff --git a/src/gui/item_amount.cpp b/src/gui/item_amount.cpp
index 40e2e121..4ce8ac6c 100644
--- a/src/gui/item_amount.cpp
+++ b/src/gui/item_amount.cpp
@@ -17,14 +17,11 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: item_amount.cpp 3718 2007-11-11 14:46:33Z b_lindeijer $
  */
 
-#include "item_amount.h"
-
 #include "button.h"
 #include "inttextbox.h"
+#include "item_amount.h"
 #include "slider.h"
 #include "trade.h"
 
diff --git a/src/gui/item_amount.h b/src/gui/item_amount.h
index 668dfe3b..2005094d 100644
--- a/src/gui/item_amount.h
+++ b/src/gui/item_amount.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: item_amount.h 3718 2007-11-11 14:46:33Z b_lindeijer $
  */
 
 #ifndef _TMW_ITEM_AMOUNT_WINDOW_H
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index 186a2da6..30cb1d6d 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: itemcontainer.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include "itemcontainer.h"
@@ -30,8 +28,8 @@
 #include "../inventory.h"
 #include "../item.h"
 #include "../itemshortcut.h"
-#include "../log.h"
 #include "../localplayer.h"
+#include "../log.h"
 
 #include "../resources/image.h"
 #include "../resources/iteminfo.h"
diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h
index 5562023f..54e0c1ca 100644
--- a/src/gui/itemcontainer.h
+++ b/src/gui/itemcontainer.h
@@ -17,19 +17,17 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: itemcontainer.h 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #ifndef _TMW_ITEMCONTAINER_H__
 #define _TMW_ITEMCONTAINER_H__
 
+#include <list>
+
 #include <guichan/mouselistener.hpp>
 #include <guichan/widget.hpp>
 #include <guichan/widgetlistener.hpp>
 
-#include <list>
-
 #include "../guichanfwd.h"
 
 class Image;
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index aab9fd9d..055cbe44 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -18,23 +18,21 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Legend of Mazzeroth; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
-#include "itempopup.h"
 #include <guichan/widgets/label.hpp>
-#include "widgets/layout.h"
 
 #include "gui.h"
+#include "itempopup.h"
+
+#include "widgets/layout.h"
 
 #include "../resources/image.h"
-#include "../resources/resourcemanager.h"
 #include "../resources/iteminfo.h"
+#include "../resources/resourcemanager.h"
 #include "../utils/gettext.h"
 #include "../utils/strprintf.h"
 
-
 ItemPopup::ItemPopup()
 {
 
diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h
index 499b2e0a..0082ec2c 100644
--- a/src/gui/itempopup.h
+++ b/src/gui/itempopup.h
@@ -19,15 +19,13 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Legend of Mazzeroth; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _LOM_ITEMPOPUP_H__
 #define _LOM_ITEMPOPUP_H__
 
-#include "textbox.h"
 #include "scrollarea.h"
+#include "textbox.h"
 #include "window.h"
 
 #include "../item.h"
diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp
index 5899abd1..86a53aca 100644
--- a/src/gui/itemshortcutcontainer.cpp
+++ b/src/gui/itemshortcutcontainer.cpp
@@ -17,18 +17,16 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: itemshortcutcontainer.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include "itemshortcutcontainer.h"
 
-#include "../localplayer.h"
 #include "../graphics.h"
 #include "../inventory.h"
 #include "../item.h"
 #include "../itemshortcut.h"
 #include "../keyboardconfig.h"
+#include "../localplayer.h"
 
 #include "../resources/image.h"
 #include "../resources/resourcemanager.h"
diff --git a/src/gui/itemshortcutcontainer.h b/src/gui/itemshortcutcontainer.h
index cc4e830a..a8daca0b 100644
--- a/src/gui/itemshortcutcontainer.h
+++ b/src/gui/itemshortcutcontainer.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: itemshortcutcontainer.h 4076 2008-04-12 18:36:15Z b_lindeijer $
  */
 
 #ifndef _TMW_ITEMSHORTCUTCONTAINER_H__
diff --git a/src/gui/itemshortcutwindow.cpp b/src/gui/itemshortcutwindow.cpp
index 394fcbb7..5a4dfacd 100644
--- a/src/gui/itemshortcutwindow.cpp
+++ b/src/gui/itemshortcutwindow.cpp
@@ -17,13 +17,10 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: itemshortcutwindow.cpp 4076 2008-04-12 18:36:15Z b_lindeijer $
  */
 
-#include "itemshortcutwindow.h"
-
 #include "itemshortcutcontainer.h"
+#include "itemshortcutwindow.h"
 #include "scrollarea.h"
 
 static const int SCROLL_PADDING = 0;
diff --git a/src/gui/itemshortcutwindow.h b/src/gui/itemshortcutwindow.h
index 112c39d9..587f15c8 100644
--- a/src/gui/itemshortcutwindow.h
+++ b/src/gui/itemshortcutwindow.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: itemshortcutwindow.h 4076 2008-04-12 18:36:15Z b_lindeijer $
  */
 
 #ifndef _TMW_ITEMSHORTCUTWINDOW_H
diff --git a/src/gui/linkhandler.h b/src/gui/linkhandler.h
index 93a8c000..44f906db 100644
--- a/src/gui/linkhandler.h
+++ b/src/gui/linkhandler.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: linkhandler.h 3606 2007-09-27 14:54:09Z b_lindeijer $
  */
 
 #ifndef _TMW_LINK_HANDLER_H_
diff --git a/src/gui/listbox.cpp b/src/gui/listbox.cpp
index cf941be1..4dca66a0 100644
--- a/src/gui/listbox.cpp
+++ b/src/gui/listbox.cpp
@@ -17,17 +17,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: listbox.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
-#include "listbox.h"
-
 #include <guichan/font.hpp>
 #include <guichan/graphics.hpp>
 #include <guichan/listmodel.hpp>
 #include <guichan/mouseinput.hpp>
 
+#include "listbox.h"
+
 ListBox::ListBox(gcn::ListModel *listModel):
     gcn::ListBox(listModel)
 {
diff --git a/src/gui/listbox.h b/src/gui/listbox.h
index 2f501a6c..30eb4c79 100644
--- a/src/gui/listbox.h
+++ b/src/gui/listbox.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: listbox.h 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #ifndef _TMW_LISTBOX_H
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index 0cdb4656..fa47af32 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -17,26 +17,24 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: login.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
-#include "login.h"
-
 #include <string>
 #include <vector>
 
 #include <guichan/widgets/label.hpp>
 
-#include "../main.h"
-#include "../logindata.h"
-#include "../configuration.h"
-
 #include "button.h"
 #include "checkbox.h"
+#include "login.h"
 #include "ok_dialog.h"
 #include "passwordfield.h"
 #include "textfield.h"
+
+#include "../main.h"
+#include "../logindata.h"
+#include "../configuration.h"
+
 #include "../utils/tostring.h"
 
 static const int MAX_SERVER_LIST_SIZE = 5;
diff --git a/src/gui/login.h b/src/gui/login.h
index 3550d82b..3b911424 100644
--- a/src/gui/login.h
+++ b/src/gui/login.h
@@ -17,24 +17,24 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: login.h 3234 2007-03-24 13:05:27Z b_lindeijer $
  */
 
 #ifndef _TMW_LOGIN_H
 #define _TMW_LOGIN_H
 
 #include <iosfwd>
-#include <vector>
 #include <string>
+#include <vector>
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/keylistener.hpp>
 
+#include "scrollarea.h"
 #include "window.h"
-#include "../guichanfwd.h"
+
 #include "widgets/dropdown.h"
-#include "scrollarea.h"
+
+#include "../guichanfwd.h"
 
 class LoginData;
 
diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index 2d07e632..79281631 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.cpp
@@ -17,26 +17,23 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: menuwindow.cpp 4060 2008-04-09 14:49:07Z b_lindeijer $
  */
 
-#include "menuwindow.h"
-
 #include <string>
 
 #include <guichan/actionlistener.hpp>
 
 #include "button.h"
+#include "menuwindow.h"
 #include "windowcontainer.h"
 
-extern Window *setupWindow;
-extern Window *inventoryWindow;
+extern Window *chatWindow;
 extern Window *equipmentWindow;
+extern Window *inventoryWindow;
+extern Window *itemShortcutWindow;
+extern Window *setupWindow;
 extern Window *skillDialog;
 extern Window *statusWindow;
-extern Window *itemShortcutWindow;
-extern Window *chatWindow;
 
 namespace {
     struct MenuWindowListener : public gcn::ActionListener
diff --git a/src/gui/menuwindow.h b/src/gui/menuwindow.h
index add04095..03ec3380 100644
--- a/src/gui/menuwindow.h
+++ b/src/gui/menuwindow.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: menuwindow.h 2417 2006-07-19 15:12:06Z umperio $
  */
 
 #ifndef _TMW_MENU_H
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 8404e52a..728f61e4 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: minimap.cpp 4116 2008-04-17 12:48:43Z peaveydk $
  */
 
 #include "minimap.h"
diff --git a/src/gui/minimap.h b/src/gui/minimap.h
index a3b14729..7897ebdb 100644
--- a/src/gui/minimap.h
+++ b/src/gui/minimap.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: minimap.h 2417 2006-07-19 15:12:06Z umperio $
  */
 
 #ifndef _TMW_MINIMAP_H
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index 1bdabbfe..59dca0e1 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.cpp
@@ -17,20 +17,17 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: ministatus.cpp 3753 2007-11-20 12:27:56Z b_lindeijer $
  */
 
-#include "ministatus.h"
-
 #include <guichan/widgets/label.hpp>
 
 #include "gui.h"
+#include "ministatus.h"
 #include "progressbar.h"
 
-#include "../localplayer.h"
 #include "../configuration.h"
 #include "../graphics.h"
+#include "../localplayer.h"
 
 #include "../utils/tostring.h"
 
diff --git a/src/gui/ministatus.h b/src/gui/ministatus.h
index d4002d93..d7f6f68c 100644
--- a/src/gui/ministatus.h
+++ b/src/gui/ministatus.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: ministatus.h 2581 2006-08-25 22:04:17Z b_lindeijer $
  */
 
 #ifndef _TMW_MINISTATUS_H
diff --git a/src/gui/newskill.cpp b/src/gui/newskill.cpp
deleted file mode 100644
index c2088e75..00000000
--- a/src/gui/newskill.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World 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.
- *
- *  The Mana World 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 The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: newskill.cpp 3587 2007-09-20 13:24:20Z b_lindeijer $
- */
-
- /* This file implements the new skill dialog for use under the latest
-  * version of the skill system as of 2005/02/20
-  */
-
-#include "newskill.h"
-
-#include <guichan/widgets/label.hpp>
-
-#include "button.h"
-#include "progressbar.h"
-
-#include "../graphics.h"
-
-const char *skill_name[] = {
-    // 0-99
-    // weapon skills 0-9
-    "Short Blades", "Long Blades", "Hammers", "Archery", "Whip",
-    "Staves", "Throwing", "Piercing", "Hand to Hand", NULL,
-    // magic skills 10-19
-    "Epyri (Fire)", "Merene (Water)", "Geon (Earth)", "Izurial (Air)",
-    "Lumine (Light)", "Tenebrae (Dark)", "Chronos (Time)", "Teless (Space)",
-    "Gen (Mana)", NULL,
-    // craft skills 20-29
-    "Metalworking", "Woodworking", "Jeweler", "Cook", "Tailor",
-    "Alchemist", "Artisan", "Synthesis", NULL, NULL,
-    // general skills 30-39
-    "Running", "Searching", "Sneak", "Trading", "Intimidate",
-    "Athletics", NULL, NULL, NULL,NULL,
-    // combat skills 40-49
-    "Dodge", "Accuracy", "Critical", "Block", "Parry", "Diehard", "Magic Aura",
-    "Counter", NULL, NULL,
-    // resistance skills 50-59
-    "Poison", "Silence", "Petrify", "Paralyze", "Blind", "Slow", "Zombie",
-    "Critical", NULL, NULL,
-    // element reistance 60-69
-    "Heat (Fire)", "Chill (Water)", "Stone (Earth)", "Wind (Air)",
-    "Shine (Light)", "Shadow (Dark)", "Decay (Time)", "Chaos (Space)", NULL,
-    NULL,
-    // hunting skills 70-79
-    "Insects", "Birds", "Lizards", "Amorphs", "Undead", "Machines", "Arcana",
-    "Humanoids", "Plantoids", NULL,
-    // stats 80-89
-    "Strength", "Fortitude", "Vitality", "Menality", "Awareness", "Mana",
-    "Dexterity", NULL, NULL, NULL,
-    // unused (reserved) 90-99
-    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
-};
-
-
-NewSkillDialog::NewSkillDialog():
-    Window("Skills")
-{
-    startPoint = 0;
-    for (int i = 0; i < N_SKILL_CAT_SIZE; i++)
-    {
-        mSkillLabel[i] = new gcn::Label("Empty               ");
-        mSkillLevel[i] = new gcn::Label("00000");
-        mSkillbar[i] = new ProgressBar(0.0f,100,15,0,0,255);
-        mSkillLevel[i]->setAlignment(Graphics::RIGHT);
-        add(mSkillLabel[i],40,5+i*25);
-        add(mSkillLevel[i],150,5+i*25);
-        add(mSkillbar[i],180,5+i*25);
-    }
-    // initialize the skills
-    for (int i = 0; i < N_SKILL; i++)
-    {
-        mPlayerSkill[i].level = 0;
-        mPlayerSkill[i].exp = 0;
-    }
-    resetNSD();
-
-    // create controls
-    Button *catButton[N_SKILL_CAT];
-    catButton[0] = new Button("Weapons", "g1", this);
-    catButton[1] = new Button("Magic", "g2", this);
-    catButton[2] = new Button("Craft", "g3", this);
-    catButton[3] = new Button("General", "g4", this);
-    catButton[4] = new Button("Combat", "g5", this);
-    catButton[5] = new Button("E. Resist", "g6", this);
-    catButton[6] = new Button("S. Resist", "g7", this);
-    catButton[7] = new Button("Hunting", "g8", this);
-    catButton[8] = new Button("Stat", "g9", this);
-
-    setContentSize(350, 250);
-
-    for (int i = 0; i < 9; ++i) {
-        catButton[i]->setDimension(gcn::Rectangle(0, 0, 60, 20));
-        catButton[i]->setPosition(290, 20 * i);
-        add(catButton[i]);
-    }
-
-    Button *closeButton = new Button("Close", "close", this);
-    closeButton->setDimension(gcn::Rectangle(0,0,60,20));
-    closeButton->setPosition(290, 230);
-    add(closeButton);
-
-    // finsihing touches
-    setLocationRelativeTo(getParent());
-}
-
-void NewSkillDialog::action(const gcn::ActionEvent &event)
-{
-    int osp = startPoint;
-    if (event.getId() == "close")
-    {
-        setVisible(false);
-    }
-    else if (event.getId() == "g1") // weapons group 0-9
-    {
-        startPoint =0;
-    }
-    else if (event.getId() == "g2") // magic group 10-19
-    {
-        startPoint =10;
-    }
-    else if (event.getId() == "g3") // craft group 20-29
-    {
-        startPoint =20;
-    }
-    else if (event.getId() == "g4") // general group 30-39
-    {
-        startPoint =30;
-    }
-    else if (event.getId() == "g5") // combat group 40-49
-    {
-        startPoint =40;
-    }
-    else if (event.getId() == "g6") // e. resist group 50-59
-    {
-        startPoint =50;
-    }
-    else if (event.getId() == "g7") // s resist group 60-69
-    {
-        startPoint =60;
-    }
-    else if (event.getId() == "g8") // hunting group 70-79
-    {
-        startPoint =70;
-    }
-    else if (event.getId() == "g9") // stats group 80-89
-    {
-        startPoint =80;
-    }
-    if (osp != startPoint)
-    {
-        resetNSD();
-    }
-}
-
-void NewSkillDialog::resetNSD()
-{
-     for (int a = 0; a < N_SKILL_CAT_SIZE; a++)
-     {
-         if (skill_name[a + startPoint])
-         {
-             mSkillLabel[a]->setCaption(skill_name[a + startPoint]);
-             mSkillLabel[a]->setVisible(true);
-             char tmp[5];
-             sprintf(tmp, "%d", mPlayerSkill[a+startPoint].level);
-             mSkillLevel[a]->setCaption(tmp);
-             mSkillLevel[a]->setVisible(true);
-             mSkillbar[a]->setProgress(0.0f);
-             mSkillbar[a]->setVisible(true);
-         }
-         else
-         {
-             mSkillLevel[a]->setVisible(false);
-             mSkillLabel[a]->setVisible(false);
-             mSkillbar[a]->setVisible(false);
-         }
-     }
-}
diff --git a/src/gui/newskill.h b/src/gui/newskill.h
deleted file mode 100644
index c553ab1d..00000000
--- a/src/gui/newskill.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World 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.
- *
- *  The Mana World 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 The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: newskill.h 3035 2007-01-14 14:54:39Z b_lindeijer $
- */
-
-#ifndef _TMW_NSKILL_H
-#define _TMW_NSKILL_H
-
-#include <guichan/actionlistener.hpp>
-
-#include "window.h"
-
-#include "../guichanfwd.h"
-
-class ProgressBar;
-
-#define N_SKILL 100 // skill count constant
-#define N_SKILL_CAT 9 // skill category count
-#define N_SKILL_CAT_SIZE 10 // skill category maximum size
-
-struct nSkill {
-    short level;
-    short exp;
-};
-
-/**
- * Dialog showing the skills in the planned skill model.
- *
- * \ingroup Interface
- */
-class NewSkillDialog : public Window, public gcn::ActionListener
-{
-    public:
-        /**
-         * Constructor.
-         */
-        NewSkillDialog();
-
-        // action listener
-        void action(const gcn::ActionEvent &event);
-
-    private:
-        void resetNSD(); // updates the values in the dialog box
-
-        // members
-        int startPoint; // starting point of skill listing
-        ProgressBar *mSkillbar[N_SKILL_CAT_SIZE];
-        gcn::Label *mSkillLabel[N_SKILL_CAT_SIZE];
-        gcn::Label *mSkillLevel[N_SKILL_CAT_SIZE];
-        nSkill mPlayerSkill[N_SKILL]; // pointer to an array of skill values
-};
-
-#endif
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index d74b3ddd..052b5f33 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -17,14 +17,11 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: npc_text.cpp 4096 2008-04-16 08:39:59Z b_lindeijer $
  */
 
-#include "npc_text.h"
-
 #include <string>
 
+#include "npc_text.h"
 #include "textbox.h"
 
 #include "../npc.h"
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index 3773950a..e26dd870 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -17,18 +17,17 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: npc_text.h 4096 2008-04-16 08:39:59Z b_lindeijer $
  */
 
 #ifndef _TMW_NPC_TEXT_H
 #define _TMW_NPC_TEXT_H
 
 #include <iosfwd>
+
 #include <guichan/actionlistener.hpp>
 
-#include "scrollarea.h"
 #include "button.h"
+#include "scrollarea.h"
 #include "window.h"
 
 #include "../guichanfwd.h"
diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index 3203ba84..ba9e3d58 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -17,15 +17,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: npclistdialog.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
-#include "npclistdialog.h"
-
 #include <sstream>
 
 #include "listbox.h"
+#include "npclistdialog.h"
 
 #include "../npc.h"
 
diff --git a/src/gui/npclistdialog.h b/src/gui/npclistdialog.h
index 4e9d4b3b..77f0c177 100644
--- a/src/gui/npclistdialog.h
+++ b/src/gui/npclistdialog.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: npclistdialog.h 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #ifndef _TMW_GUI_NPCLISTDIALOG_H
diff --git a/src/gui/ok_dialog.cpp b/src/gui/ok_dialog.cpp
index b8d3c7ba..421c873e 100644
--- a/src/gui/ok_dialog.cpp
+++ b/src/gui/ok_dialog.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: ok_dialog.cpp 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #include "ok_dialog.h"
diff --git a/src/gui/ok_dialog.h b/src/gui/ok_dialog.h
index 426da538..a06ddd7c 100644
--- a/src/gui/ok_dialog.h
+++ b/src/gui/ok_dialog.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: ok_dialog.h 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #ifndef _OK_DIALOG_H
diff --git a/src/gui/passwordfield.cpp b/src/gui/passwordfield.cpp
index 710eb767..01c7e15d 100644
--- a/src/gui/passwordfield.cpp
+++ b/src/gui/passwordfield.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: passwordfield.cpp 2132 2006-02-01 14:53:10Z der_doener $
  */
 
 #include "passwordfield.h"
diff --git a/src/gui/passwordfield.h b/src/gui/passwordfield.h
index 8228bfe2..9aa6ab49 100644
--- a/src/gui/passwordfield.h
+++ b/src/gui/passwordfield.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: passwordfield.h 2895 2006-12-09 01:44:18Z b_lindeijer $
  */
 
 #ifndef _TMW_PASSWORDFIELD_H_
diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp
index 6d39ce05..79c5676f 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/playerbox.cpp
@@ -17,16 +17,14 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: playerbox.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #include <algorithm>
 
 #include "playerbox.h"
 
-#include "../player.h"
 #include "../graphics.h"
+#include "../player.h"
 
 #include "../resources/image.h"
 #include "../resources/resourcemanager.h"
diff --git a/src/gui/playerbox.h b/src/gui/playerbox.h
index 86cdf064..7aec87bf 100644
--- a/src/gui/playerbox.h
+++ b/src/gui/playerbox.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: playerbox.h 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #ifndef __TMW_PLAYERBOX_H__
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 7e40abed..c0feb68d 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -17,12 +17,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: popupmenu.cpp 4243 2008-05-16 15:48:52Z the_enemy $
  */
 
-#include "popupmenu.h"
-
 #include <cassert>
 #include <iostream>
 
@@ -31,6 +27,7 @@
 #include "browserbox.h"
 #include "inventorywindow.h"
 #include "item_amount.h"
+#include "popupmenu.h"
 #include "windowcontainer.h"
 
 #include "../being.h"
@@ -43,8 +40,8 @@
 #include "../net/messageout.h"
 #include "../net/protocol.h"
 
-#include "../resources/iteminfo.h"
 #include "../resources/itemdb.h"
+#include "../resources/iteminfo.h"
 
 extern std::string tradePartnerName;
 
diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h
index 601fa2ae..3cf949b3 100644
--- a/src/gui/popupmenu.h
+++ b/src/gui/popupmenu.h
@@ -17,22 +17,19 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: popupmenu.h 2239 2006-03-09 05:16:27Z der_doener $
  */
 
 #ifndef _TMW_POPUP_MENU_H
 #define _TMW_POPUP_MENU_H
 
-#include "window.h"
 #include "linkhandler.h"
+#include "window.h"
 
 class Being;
 class BrowserBox;
 class FloorItem;
 class Item;
 
-
 /**
  * Window showing popup menu.
  */
diff --git a/src/gui/progressbar.cpp b/src/gui/progressbar.cpp
index 6dbc3b85..708a2991 100644
--- a/src/gui/progressbar.cpp
+++ b/src/gui/progressbar.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: progressbar.cpp 4008 2008-03-27 14:51:10Z b_lindeijer $
  */
 
 #include "progressbar.h"
diff --git a/src/gui/progressbar.h b/src/gui/progressbar.h
index df825a5d..a20c901f 100644
--- a/src/gui/progressbar.h
+++ b/src/gui/progressbar.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: progressbar.h 2240 2006-03-09 12:24:36Z der_doener $
  */
 
 #ifndef _TMW_PROGRESSBAR_H
@@ -32,7 +30,6 @@
 
 class ImageRect;
 
-
 /**
  * A progress bar.
  *
diff --git a/src/gui/radiobutton.cpp b/src/gui/radiobutton.cpp
index cbab4d2d..5f929e62 100644
--- a/src/gui/radiobutton.cpp
+++ b/src/gui/radiobutton.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: radiobutton.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #include "radiobutton.h"
diff --git a/src/gui/radiobutton.h b/src/gui/radiobutton.h
index ef87dccd..8fb6d832 100644
--- a/src/gui/radiobutton.h
+++ b/src/gui/radiobutton.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: radiobutton.h 1584 2005-08-13 12:49:52Z der_doener $
  */
 
 #ifndef _TMW_RADIOBUTTON_H
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index e0b663b8..ec6a9756 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -17,12 +17,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: register.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
-#include "register.h"
-
 #include <string>
 #include <sstream>
 
@@ -36,10 +32,11 @@
 #include "button.h"
 #include "checkbox.h"
 #include "login.h"
+#include "ok_dialog.h"
 #include "passwordfield.h"
 #include "radiobutton.h"
+#include "register.h"
 #include "textfield.h"
-#include "ok_dialog.h"
 
 #include "../utils/tostring.h"
 
diff --git a/src/gui/register.h b/src/gui/register.h
index 6f997b75..87a11bb9 100644
--- a/src/gui/register.h
+++ b/src/gui/register.h
@@ -17,18 +17,18 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: register.h 3234 2007-03-24 13:05:27Z b_lindeijer $
  */
 
 #ifndef _TMW_REGISTER_H
 #define _TMW_REGISTER_H
 
 #include <iosfwd>
+
 #include <guichan/actionlistener.hpp>
 #include <guichan/keylistener.hpp>
 
 #include "window.h"
+
 #include "../guichanfwd.h"
 
 class LoginData;
diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index a3aef702..032e3f78 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/scrollarea.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: scrollarea.cpp 4204 2008-04-28 18:29:04Z b_lindeijer $
  */
 
 #include <algorithm>
diff --git a/src/gui/scrollarea.h b/src/gui/scrollarea.h
index 32a192fc..ebe2c77b 100644
--- a/src/gui/scrollarea.h
+++ b/src/gui/scrollarea.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: scrollarea.h 4204 2008-04-28 18:29:04Z b_lindeijer $
  */
 
 #ifndef __TMW_SCROLLAREA_H__
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 9fed52f3..63af1aaa 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -17,12 +17,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: sell.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
-#include "sell.h"
-
 #include <cassert>
 
 #include <guichan/widgets/label.hpp>
@@ -30,17 +26,18 @@
 #include "button.h"
 #include "shoplistbox.h"
 #include "scrollarea.h"
+#include "sell.h"
 #include "shop.h"
 #include "slider.h"
 
 #include "../item.h"
 #include "../npc.h"
 
-#include "../resources/iteminfo.h"
-
 #include "../net/messageout.h"
 #include "../net/protocol.h"
 
+#include "../resources/iteminfo.h"
+
 #include "../utils/tostring.h"
 
 SellDialog::SellDialog(Network *network):
diff --git a/src/gui/sell.h b/src/gui/sell.h
index 11528f89..48961efc 100644
--- a/src/gui/sell.h
+++ b/src/gui/sell.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: sell.h 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #ifndef _TMW_SELL_H
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 4faa8a86..b8fdb7de 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -17,33 +17,30 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: setup.cpp 4306 2008-05-28 20:22:37Z crush_tmw $
  */
 
 #include <algorithm>
-
-#include "setup.h"
+#include <iostream>
 
 #include "button.h"
+#include "setup.h"
 #include "setup_audio.h"
+#include "setup_colours.h"
 #include "setup_joystick.h"
-#include "setup_video.h"
 #include "setup_keyboard.h"
 #include "setup_players.h"
-#include "setup_colours.h"
+#include "setup_video.h"
 #include "tabbedcontainer.h"
 
 #include "../utils/dtor.h"
-#include <iostream>
 
-extern Window *statusWindow;
-extern Window *minimap;
 extern Window *chatWindow;
-extern Window *inventoryWindow;
 extern Window *equipmentWindow;
 extern Window *helpWindow;
+extern Window *inventoryWindow;
+extern Window *minimap;
 extern Window *skillDialog;
+extern Window *statusWindow;
 
 Setup::Setup():
     Window("Setup")
diff --git a/src/gui/setup.h b/src/gui/setup.h
index c24b8cb9..fd200f4c 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: setup.h 4237 2008-05-14 18:57:32Z b_lindeijer $
  */
 
 #ifndef _TMW_SETUP_H
diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index 09357cce..70b34a31 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.cpp
@@ -17,16 +17,13 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: setup_audio.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
-#include "setup_audio.h"
-
 #include <guichan/widgets/label.hpp>
 
 #include "checkbox.h"
 #include "ok_dialog.h"
+#include "setup_audio.h"
 #include "slider.h"
 
 #include "../configuration.h"
diff --git a/src/gui/setup_audio.h b/src/gui/setup_audio.h
index 76420101..9835a8fb 100644
--- a/src/gui/setup_audio.h
+++ b/src/gui/setup_audio.h
@@ -17,17 +17,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: setup_audio.h 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #ifndef _TMW_GUI_SETUP_AUDIO_H
 #define _TMW_GUI_SETUP_AUDIO_H
 
-#include "setuptab.h"
-
 #include <guichan/actionlistener.hpp>
 
+#include "setuptab.h"
+
 #include "../guichanfwd.h"
 
 class Setup_Audio : public SetupTab, public gcn::ActionListener
diff --git a/src/gui/setup_colours.cpp b/src/gui/setup_colours.cpp
index 2c6d7aa9..0becd48f 100644
--- a/src/gui/setup_colours.cpp
+++ b/src/gui/setup_colours.cpp
@@ -19,8 +19,6 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "setup_colours.h"
-
 #include <vector>
 
 #include <guichan/listmodel.hpp>
@@ -29,6 +27,7 @@
 
 #include "colour.h"
 #include "scrollarea.h"
+#include "setup_colours.h"
 #include "slider.h"
 
 #include "../configuration.h"
diff --git a/src/gui/setup_colours.h b/src/gui/setup_colours.h
index 566bed37..3bd87848 100644
--- a/src/gui/setup_colours.h
+++ b/src/gui/setup_colours.h
@@ -22,17 +22,17 @@
 #ifndef _SETUP_COLOURS_H
 #define _SETUP_COLOURS_H
 
-#include <vector>
 #include <string>
+#include <vector>
 
 #include <guichan/actionlistener.hpp>
-#include <guichan/widgets/listbox.hpp>
 #include <guichan/widgets/label.hpp>
+#include <guichan/widgets/listbox.hpp>
 
+#include "scrollarea.h"
 #include "setuptab.h"
 #include "slider.h"
 #include "textfield.h"
-#include "scrollarea.h"
 
 #include "../guichanfwd.h"
 
diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp
index 41e91595..723d0597 100644
--- a/src/gui/setup_joystick.cpp
+++ b/src/gui/setup_joystick.cpp
@@ -17,16 +17,14 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: setup_joystick.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
-#include "setup_joystick.h"
-
 #include <guichan/widgets/label.hpp>
 
 #include "button.h"
 #include "checkbox.h"
+#include "setup_joystick.h"
+
 #include "../configuration.h"
 #include "../joystick.h"
 
diff --git a/src/gui/setup_joystick.h b/src/gui/setup_joystick.h
index 399156d8..d2973a89 100644
--- a/src/gui/setup_joystick.h
+++ b/src/gui/setup_joystick.h
@@ -17,17 +17,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: setup_joystick.h 3035 2007-01-14 14:54:39Z b_lindeijer $
  */
 
 #ifndef _TMW_GUI_SETUP_JOYSTICK_H
 #define _TMW_GUI_SETUP_JOYSTICK_H
 
-#include "setuptab.h"
-
 #include <guichan/actionlistener.hpp>
 
+#include "setuptab.h"
+
 #include "../guichanfwd.h"
 
 class Setup_Joystick : public SetupTab, public gcn::ActionListener
diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp
index 704fc691..007fcb52 100644
--- a/src/gui/setup_keyboard.cpp
+++ b/src/gui/setup_keyboard.cpp
@@ -17,11 +17,9 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: setup_keyboard.cpp 4255 2008-05-21 21:44:27Z crush_tmw $
  */
 
-#include "setup_keyboard.h"
+#include <SDL_keyboard.h>
 
 #include <guichan/widgets/label.hpp>
 #include <guichan/listmodel.hpp>
@@ -30,14 +28,13 @@
 #include "listbox.h"
 #include "ok_dialog.h"
 #include "scrollarea.h"
+#include "setup_keyboard.h"
 
 #include "../configuration.h"
 #include "../keyboardconfig.h"
 
 #include "../utils/tostring.h"
 
-#include <SDL_keyboard.h>
-
 /**
  * The list model for key function list.
  *
diff --git a/src/gui/setup_keyboard.h b/src/gui/setup_keyboard.h
index 7f945181..937790af 100644
--- a/src/gui/setup_keyboard.h
+++ b/src/gui/setup_keyboard.h
@@ -17,21 +17,19 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: setup_keyboard.h 4255 2008-05-21 21:44:27Z crush_tmw $
  */
 
 #ifndef _TMW_GUI_SETUP_KEYBOARD_H
 #define _TMW_GUI_SETUP_KEYBOARD_H
 
-#include "setuptab.h"
-#include "button.h"
-#include "../guichanfwd.h"
+#include <string>
 
 #include <guichan/actionlistener.hpp>
 
+#include "button.h"
+#include "setuptab.h"
 
-#include <string>
+#include "../guichanfwd.h"
 
 class Setup_Keyboard : public SetupTab, public gcn::ActionListener
 {
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index ed1facc7..d07a9685 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -17,23 +17,21 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: setup_players.cpp 4353 2008-06-16 07:04:46Z b_lindeijer $
  */
 
-#include "setup_players.h"
-
 #include <vector>
+
 #include <guichan/widgets/dropdown.hpp>
 #include <guichan/widgets/label.hpp>
 
 #include "button.h"
 #include "checkbox.h"
 #include "ok_dialog.h"
+#include "setup_players.h"
 
-#include "../player_relations.h"
 #include "../configuration.h"
 #include "../log.h"
+#include "../player_relations.h"
 #include "../sound.h"
 
 #define COLUMNS_NR 2 // name plus listbox
diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h
index b04023ab..b693a952 100644
--- a/src/gui/setup_players.h
+++ b/src/gui/setup_players.h
@@ -22,15 +22,14 @@
 #ifndef _TMW_GUI_SETUP_PLAYERS_H
 #define _TMW_GUI_SETUP_PLAYERS_H
 
-#include "setuptab.h"
+#include <guichan/actionlistener.hpp>
 
-#include "scrollarea.h"
 #include "button.h"
+#include "scrollarea.h"
+#include "setuptab.h"
 #include "table.h"
-#include <guichan/actionlistener.hpp>
 
 #include "../guichanfwd.h"
-
 #include "../player_relations.h"
 
 class PlayerTableModel;
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 879a3066..ec5b1d0a 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -17,15 +17,11 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: setup_video.cpp 4338 2008-06-05 18:41:39Z crush_tmw $
  */
 
-#include "setup_video.h"
-
+#include <SDL.h>
 #include <string>
 #include <vector>
-#include <SDL.h>
 
 #include <guichan/key.hpp>
 #include <guichan/listmodel.hpp>
@@ -36,6 +32,7 @@
 #include "listbox.h"
 #include "ok_dialog.h"
 #include "scrollarea.h"
+#include "setup_video.h"
 #include "slider.h"
 #include "textfield.h"
 
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index d0a19cb6..4103c5ef 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -17,18 +17,16 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: setup_video.h 4306 2008-05-28 20:22:37Z crush_tmw $
  */
 
 #ifndef _TMW_GUI_SETUP_VIDEO_H
 #define _TMW_GUI_SETUP_VIDEO_H
 
-#include "setuptab.h"
-
 #include <guichan/actionlistener.hpp>
 #include <guichan/keylistener.hpp>
 
+#include "setuptab.h"
+
 #include "../guichanfwd.h"
 
 class Setup_Video : public SetupTab, public gcn::ActionListener,
diff --git a/src/gui/setuptab.h b/src/gui/setuptab.h
index bbfe4fac..6c276c35 100644
--- a/src/gui/setuptab.h
+++ b/src/gui/setuptab.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: setuptab.h 2273 2006-03-19 00:48:10Z der_doener $
  */
 
 #ifndef _TMW_GUI_SETUPTAB_H
diff --git a/src/gui/shop.cpp b/src/gui/shop.cpp
index e7619547..a4478a62 100644
--- a/src/gui/shop.cpp
+++ b/src/gui/shop.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: shop.cpp 4348 2008-06-14 12:42:49Z the_enemy $
  */
 
 #include "shop.h"
diff --git a/src/gui/shop.h b/src/gui/shop.h
index 8dfda67e..97b8d173 100644
--- a/src/gui/shop.h
+++ b/src/gui/shop.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: shop.h 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #ifndef _SHOP_H
@@ -29,10 +27,10 @@
 
 #include <guichan/listmodel.hpp>
 
-#include "../resources/image.h"
-
-#include "../shopitem.h"
 #include "../guichanfwd.h"
+#include "../shopitem.h"
+
+#include "../resources/image.h"
 
 class ShopItems : public gcn::ListModel
 {
diff --git a/src/gui/shoplistbox.cpp b/src/gui/shoplistbox.cpp
index 7a8b52ed..e31eee58 100644
--- a/src/gui/shoplistbox.cpp
+++ b/src/gui/shoplistbox.cpp
@@ -17,18 +17,16 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: listbox.cpp 2655 2006-09-03 21:25:02Z b_lindeijer $
  */
 
-#include "shoplistbox.h"
-
+#include <guichan/basiccontainer.hpp>
 #include <guichan/font.hpp>
 #include <guichan/graphics.hpp>
+#include <guichan/imagefont.hpp>
 #include <guichan/listmodel.hpp>
 #include <guichan/mouseinput.hpp>
-#include <guichan/imagefont.hpp>
-#include <guichan/basiccontainer.hpp>
+
+#include "shoplistbox.h"
 
 #include "../graphics.h"
 
diff --git a/src/gui/shoplistbox.h b/src/gui/shoplistbox.h
index 5840e47f..e856c076 100644
--- a/src/gui/shoplistbox.h
+++ b/src/gui/shoplistbox.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: listbox.h 2655 2006-09-03 21:25:02Z b_lindeijer $
  */
 
 #ifndef _TMW_SHOPLISTBOX_H
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 5a23e2a8..36c3a305 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -17,25 +17,22 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <algorithm>
 
 #include <guichan/widgets/label.hpp>
 
-#include "skill.h"
-
 #include "button.h"
 #include "listbox.h"
+#include "skill.h"
 #include "windowcontainer.h"
 
 #include "../localplayer.h"
+#include "../log.h"
 
 #include "../utils/dtor.h"
 #include "../utils/xml.h"
-#include "../log.h"
 
 #define SKILLS_FILE "skills.xml"
 
diff --git a/src/gui/skill.h b/src/gui/skill.h
index 92badc8a..ee579dd5 100644
--- a/src/gui/skill.h
+++ b/src/gui/skill.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_SKILL_H
diff --git a/src/gui/slider.cpp b/src/gui/slider.cpp
index a1ae6acc..afeecf17 100644
--- a/src/gui/slider.cpp
+++ b/src/gui/slider.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: slider.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #include "slider.h"
diff --git a/src/gui/slider.h b/src/gui/slider.h
index 5700d64d..36bfe698 100644
--- a/src/gui/slider.h
+++ b/src/gui/slider.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: slider.h 1584 2005-08-13 12:49:52Z der_doener $
  */
 
 #ifndef _TMW_SLIDER_H
@@ -30,7 +28,6 @@
 
 class Image;
 
-
 /**
  * Slider widget. Same as the Guichan slider but with custom look.
  *
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index 0ccbebc0..2ab80bd9 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -18,8 +18,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Legend of Mazzeroth; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <guichan/font.hpp>
diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h
index 7a2a73b8..9b8eab70 100644
--- a/src/gui/speechbubble.h
+++ b/src/gui/speechbubble.h
@@ -18,15 +18,13 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Legend of Mazzeroth; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _LOM_SPEECHBUBBLE_H__
 #define _LOM_SPEECHBUBBLE_H__
 
-#include "textbox.h"
 #include "scrollarea.h"
+#include "textbox.h"
 #include "window.h"
 
 class SpeechBubble : public Window
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index 79b3aec7..9d6760d0 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -17,16 +17,13 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: status.cpp 3510 2007-08-23 14:14:51Z b_lindeijer $
  */
 
-#include "status.h"
-
 #include <guichan/widgets/label.hpp>
 
 #include "button.h"
 #include "progressbar.h"
+#include "status.h"
 #include "windowcontainer.h"
 
 #include "../localplayer.h"
diff --git a/src/gui/status.h b/src/gui/status.h
index 4d082148..55ed393e 100644
--- a/src/gui/status.h
+++ b/src/gui/status.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: status.h 3538 2007-08-28 00:01:38Z b_lindeijer $
  */
 
 #ifndef _TMW_STATUS_H
diff --git a/src/gui/tabbedcontainer.cpp b/src/gui/tabbedcontainer.cpp
index fc3efbd5..8e95aa7c 100644
--- a/src/gui/tabbedcontainer.cpp
+++ b/src/gui/tabbedcontainer.cpp
@@ -17,18 +17,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: tabbedcontainer.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #include <algorithm>
 
-#include "tabbedcontainer.h"
-
 #include "button.h"
+#include "tabbedcontainer.h"
 
-#include "../utils/tostring.h"
 #include "../utils/dtor.h"
+#include "../utils/tostring.h"
 
 TabbedContainer::TabbedContainer(int width, int padX, int buttonHeight,
                                  int height, int padY, int buttonsPerRow):
diff --git a/src/gui/tabbedcontainer.h b/src/gui/tabbedcontainer.h
index b004edc2..2fc41247 100644
--- a/src/gui/tabbedcontainer.h
+++ b/src/gui/tabbedcontainer.h
@@ -17,16 +17,14 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: tabbedcontainer.h 3152 2007-02-27 16:31:34Z crush_tmw $
  */
 
 #ifndef _TMW_TABPANE_H
 #define _TMW_TABPANE_H
 
 #include <iosfwd>
-#include <vector>
 #include <map>
+#include <vector>
 
 #include <guichan/actionlistener.hpp>
 
diff --git a/src/gui/table.cpp b/src/gui/table.cpp
index 8d2ab86a..e4d7812e 100644
--- a/src/gui/table.cpp
+++ b/src/gui/table.cpp
@@ -19,12 +19,12 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <guichan/graphics.hpp>
-#include <guichan/actionlistener.hpp>
-#include "table.h"
 #include <cassert>
 
+#include <guichan/graphics.hpp>
+#include <guichan/actionlistener.hpp>
 
+#include "table.h"
 
 class GuiTableActionListener : public gcn::ActionListener
 {
diff --git a/src/gui/table.h b/src/gui/table.h
index cef82d5d..b4c607ae 100644
--- a/src/gui/table.h
+++ b/src/gui/table.h
@@ -31,6 +31,7 @@
 #include <guichan/widget.hpp>
 
 #include "table_model.h"
+
 #include "../guichanfwd.h"
 
 class GuiTableActionListener;
diff --git a/src/gui/table_model.cpp b/src/gui/table_model.cpp
index 57da29d9..e1afef96 100644
--- a/src/gui/table_model.cpp
+++ b/src/gui/table_model.cpp
@@ -19,8 +19,10 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <guichan/widget.hpp>
 #include <cstdlib>
+
+#include <guichan/widget.hpp>
+
 #include "table_model.h"
 
 void
diff --git a/src/gui/table_model.h b/src/gui/table_model.h
index 69e41cd3..4022e369 100644
--- a/src/gui/table_model.h
+++ b/src/gui/table_model.h
@@ -22,9 +22,11 @@
 #ifndef TMW_TABLE_MODEL_H_
 #define TMW_TABLE_MODEL_H_
 
-#include <guichan/gui.hpp>
 #include <set>
 #include <vector>
+
+#include <guichan/gui.hpp>
+
 #include "../guichanfwd.h"
 
 class TableModelListener
diff --git a/src/gui/textbox.cpp b/src/gui/textbox.cpp
index 2a496a1f..d7b589fa 100644
--- a/src/gui/textbox.cpp
+++ b/src/gui/textbox.cpp
@@ -17,17 +17,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: textbox.cpp 4096 2008-04-16 08:39:59Z b_lindeijer $
  */
 
-#include "textbox.h"
-
 #include <sstream>
 
 #include <guichan/basiccontainer.hpp>
 #include <guichan/font.hpp>
 
+#include "textbox.h"
+
 TextBox::TextBox():
     gcn::TextBox()
 {
diff --git a/src/gui/textbox.h b/src/gui/textbox.h
index 6f4db7dd..a0f0f947 100644
--- a/src/gui/textbox.h
+++ b/src/gui/textbox.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: textbox.h 4096 2008-04-16 08:39:59Z b_lindeijer $
  */
 
 #ifndef __TMW_TEXTBOX_H__
diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp
index b128701b..bd016a8d 100644
--- a/src/gui/textfield.cpp
+++ b/src/gui/textfield.cpp
@@ -17,13 +17,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: textfield.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #include <algorithm>
 
 #include <guichan/font.hpp>
+
 #include <guichan/sdl/sdlinput.hpp>
 
 #include "textfield.h"
diff --git a/src/gui/textfield.h b/src/gui/textfield.h
index 60766676..6def784d 100644
--- a/src/gui/textfield.h
+++ b/src/gui/textfield.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: textfield.h 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #ifndef __TMW_TEXTFIELD_H__
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index 2831fc46..8c02ab01 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -17,12 +17,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id $
  */
 
-#include "trade.h"
-
 #include <sstream>
 
 #include <guichan/widgets/label.hpp>
@@ -34,6 +30,7 @@
 #include "itemcontainer.h"
 #include "scrollarea.h"
 #include "textfield.h"
+#include "trade.h"
 
 #include "../inventory.h"
 #include "../item.h"
diff --git a/src/gui/trade.h b/src/gui/trade.h
index 7adf9575..5d587991 100644
--- a/src/gui/trade.h
+++ b/src/gui/trade.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id $
  */
 
 #ifndef _TMW_TRADE_H
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 5e9baa32..64f02f54 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -17,12 +17,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: updatewindow.cpp 4332 2008-06-05 07:33:12Z b_lindeijer $
  */
 
-#include "updatewindow.h"
-
 #include <iostream>
 #include <SDL.h>
 #include <SDL_thread.h>
@@ -34,6 +30,7 @@
 #include "button.h"
 #include "progressbar.h"
 #include "scrollarea.h"
+#include "updatewindow.h"
 
 // Curl should be included after Guichan to avoid Windows redefinitions
 #include <curl/curl.h>
@@ -42,10 +39,10 @@
 #include "../log.h"
 #include "../main.h"
 
-#include "../utils/tostring.h"
-
 #include "../resources/resourcemanager.h"
 
+#include "../utils/tostring.h"
+
 /**
  * Calculates the Alder-32 checksum for the given file.
  */
diff --git a/src/gui/updatewindow.h b/src/gui/updatewindow.h
index b669f829..4c302e85 100644
--- a/src/gui/updatewindow.h
+++ b/src/gui/updatewindow.h
@@ -17,14 +17,13 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: updatewindow.h 4332 2008-06-05 07:33:12Z b_lindeijer $
  */
 
 #ifndef _UPDATERWINDOW_H
 #define _UPDATERWINDOW_H
 
 #include <guichan/actionlistener.hpp>
+
 #include <string>
 #include <vector>
 
diff --git a/src/gui/vbox.cpp b/src/gui/vbox.cpp
index 6f36dc9c..2ec1112d 100644
--- a/src/gui/vbox.cpp
+++ b/src/gui/vbox.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: vbox.cpp 3587 2007-09-20 13:24:20Z b_lindeijer $
  */
 
 #include "vbox.h"
diff --git a/src/gui/vbox.h b/src/gui/vbox.h
index fd029143..4538338f 100644
--- a/src/gui/vbox.h
+++ b/src/gui/vbox.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: vbox.h 1881 2005-10-18 21:40:25Z der_doener $
  */
 
 #ifndef VBOX_H
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 6f89f639..3f0f546e 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -17,16 +17,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: viewport.cpp 4098 2008-04-16 11:36:41Z b_lindeijer $
  */
 
-#include "viewport.h"
+#include <cassert>
 
 #include <guichan/sdl/sdlinput.hpp>
 
 #include "gui.h"
 #include "popupmenu.h"
+#include "viewport.h"
 
 #include "../beingmanager.h"
 #include "../configuration.h"
@@ -40,15 +39,13 @@
 #include "../textmanager.h"
 
 #include "../resources/animation.h"
-#include "../resources/monsterinfo.h"
-#include "../resources/resourcemanager.h"
 #include "../resources/image.h"
 #include "../resources/imageset.h"
+#include "../resources/monsterinfo.h"
+#include "../resources/resourcemanager.h"
 
 #include "../utils/tostring.h"
 
-#include <cassert>
-
 extern volatile int tick_time;
 
 Viewport::Viewport():
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index c7b3c0e7..3120de91 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_VIEWPORT_H_
@@ -28,8 +26,8 @@
 
 #include "windowcontainer.h"
 
-#include "../configlistener.h"
 #include "../being.h"
+#include "../configlistener.h"
 #include "../guichanfwd.h"
 
 class Map;
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 9bf7452d..88a12d68 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <algorithm>
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index 9f6491b7..25ae05f8 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef DROPDOWN_H
@@ -27,8 +25,10 @@
 #include <iosfwd>
 
 #include <guichan/widgets/dropdown.hpp>
-#include "../scrollarea.h"
+
 #include "../listbox.h"
+#include "../scrollarea.h"
+
 #include "../../guichanfwd.h"
 
 class Image;
diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp
index e13493bb..e8b50dc9 100644
--- a/src/gui/widgets/resizegrip.cpp
+++ b/src/gui/widgets/resizegrip.cpp
@@ -17,14 +17,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: resizegrip.cpp 3587 2007-09-20 13:24:20Z b_lindeijer $
  */
 
-#include "resizegrip.h"
-
 #include <guichan/graphics.hpp>
 
+#include "resizegrip.h"
+
 #include "../../graphics.h"
 
 #include "../../resources/image.h"
diff --git a/src/gui/widgets/resizegrip.h b/src/gui/widgets/resizegrip.h
index 03a9228f..5f3a09a4 100644
--- a/src/gui/widgets/resizegrip.h
+++ b/src/gui/widgets/resizegrip.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: resizegrip.h 3270 2007-04-15 01:22:17Z b_lindeijer $
  */
 
 #ifndef _TMW_RESIZEGRIP_H
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 1a6f1ac6..4ace032b 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -17,21 +17,19 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include <algorithm>
-#include <climits>
 #include <cassert>
+#include <climits>
 
 #include <guichan/exception.hpp>
-#include <guichan/widgets/icon.hpp>
 
-#include "window.h"
+#include <guichan/widgets/icon.hpp>
 
 #include "gui.h"
 #include "gccontainer.h"
+#include "window.h"
 #include "windowcontainer.h"
 
 #include "widgets/resizegrip.h"
diff --git a/src/gui/window.h b/src/gui/window.h
index 228cc37b..3bb41a95 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -17,24 +17,23 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_WINDOW_H__
 #define _TMW_WINDOW_H__
 
-#include <guichan/widgets/window.hpp>
 #include <guichan/widgetlistener.hpp>
 
+#include <guichan/widgets/window.hpp>
+
 #include "../guichanfwd.h"
 
 class ConfigListener;
 class GCContainer;
+class Image;
 class ImageRect;
 class ResizeGrip;
 class WindowContainer;
-class Image;
 
 /**
  * A window. This window can be dragged around and has a title bar. Windows are
diff --git a/src/gui/windowcontainer.cpp b/src/gui/windowcontainer.cpp
index 05c2b5e9..d8535f73 100644
--- a/src/gui/windowcontainer.cpp
+++ b/src/gui/windowcontainer.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: windowcontainer.cpp 3754 2007-11-20 15:19:50Z b_lindeijer $
  */
 
 #include "windowcontainer.h"
diff --git a/src/gui/windowcontainer.h b/src/gui/windowcontainer.h
index c9728230..d783fefd 100644
--- a/src/gui/windowcontainer.h
+++ b/src/gui/windowcontainer.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id: windowcontainer.h 2884 2006-12-04 11:20:54Z b_lindeijer $
  */
 
 #ifndef _TMW_WINDOWCONTAINER_H_