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.

38 files changed, 32 insertions, 123 deletions

diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index b9686e39..8a7e61a1 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.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: beinghandler.cpp 4321 2008-06-02 11:42:26Z b_lindeijer $
  */
 
-#include "beinghandler.h"
-
 #include <iostream>
 #include <SDL_types.h>
 
+#include "beinghandler.h"
 #include "messagein.h"
 #include "protocol.h"
 
@@ -35,10 +32,10 @@
 #include "../localplayer.h"
 #include "../log.h"
 #include "../main.h"
+#include "../npc.h"
 #include "../particle.h"
-#include "../sound.h"
 #include "../player_relations.h"
-#include "../npc.h"
+#include "../sound.h"
 
 const int EMOTION_TIME = 150;    /**< Duration of emotion icon */
 
diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h
index 8f58a397..9e736751 100644
--- a/src/net/beinghandler.h
+++ b/src/net/beinghandler.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: beinghandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_BEINGHANDLER_H
diff --git a/src/net/buysellhandler.cpp b/src/net/buysellhandler.cpp
index b4e2cf30..b464e69f 100644
--- a/src/net/buysellhandler.cpp
+++ b/src/net/buysellhandler.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: buysellhandler.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
-#include "buysellhandler.h"
-
 #include <SDL_types.h>
 
+#include "buysellhandler.h"
 #include "messagein.h"
 #include "protocol.h"
 
@@ -39,8 +36,8 @@
 #include "../gui/sell.h"
 
 extern BuyDialog *buyDialog;
-extern SellDialog *sellDialog;
 extern Window *buySellDialog;
+extern SellDialog *sellDialog;
 
 BuySellHandler::BuySellHandler()
 {
diff --git a/src/net/buysellhandler.h b/src/net/buysellhandler.h
index 4da52c95..49984840 100644
--- a/src/net/buysellhandler.h
+++ b/src/net/buysellhandler.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: buysellhandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_BUYSELLHANDLER_H
diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp
index 2af3fe07..833732db 100644
--- a/src/net/charserverhandler.cpp
+++ b/src/net/charserverhandler.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: charserverhandler.cpp 4330 2008-06-04 08:53:01Z b_lindeijer $
  */
 
 #include "charserverhandler.h"
-
 #include "messagein.h"
 #include "network.h"
 #include "protocol.h"
 
+#include "../extensions.h"
 #include "../game.h"
 #include "../localplayer.h"
 #include "../log.h"
 #include "../logindata.h"
 #include "../main.h"
-#include "../extensions.h"
 
-#include "../gui/ok_dialog.h"
 #include "../gui/char_select.h"
+#include "../gui/ok_dialog.h"
 
 /*
  * Yeah, this is a global.  Get over it.
diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h
index 663de94d..05f547d0 100644
--- a/src/net/charserverhandler.h
+++ b/src/net/charserverhandler.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: charserverhandler.h 3228 2007-03-22 23:53:13Z b_lindeijer $
  */
 
 #ifndef _TMW_NET_CHARSERVERHANDLER_H
diff --git a/src/net/chathandler.cpp b/src/net/chathandler.cpp
index bee19112..b73b86b4 100644
--- a/src/net/chathandler.cpp
+++ b/src/net/chathandler.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: chathandler.cpp 4237 2008-05-14 18:57:32Z b_lindeijer $
  */
 
-#include "chathandler.h"
-
 #include <SDL_types.h>
 #include <string>
 
+#include "chathandler.h"
 #include "messagein.h"
 #include "protocol.h"
 
diff --git a/src/net/chathandler.h b/src/net/chathandler.h
index 08a560f3..53ea61d8 100644
--- a/src/net/chathandler.h
+++ b/src/net/chathandler.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: chathandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_CHATHANDLER_H
diff --git a/src/net/equipmenthandler.cpp b/src/net/equipmenthandler.cpp
index 5464fa55..4775371a 100644
--- a/src/net/equipmenthandler.cpp
+++ b/src/net/equipmenthandler.cpp
@@ -17,12 +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: equipmenthandler.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include "equipmenthandler.h"
-
 #include "messagein.h"
 #include "protocol.h"
 
diff --git a/src/net/equipmenthandler.h b/src/net/equipmenthandler.h
index 0121e6ad..31a747c3 100644
--- a/src/net/equipmenthandler.h
+++ b/src/net/equipmenthandler.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: equipmenthandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_EQUIPMENTHANDLER_H
diff --git a/src/net/inventoryhandler.cpp b/src/net/inventoryhandler.cpp
index 44a3256e..12b7d5ef 100644
--- a/src/net/inventoryhandler.cpp
+++ b/src/net/inventoryhandler.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: inventoryhandler.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
-#include "inventoryhandler.h"
-
 #include <SDL_types.h>
 
+#include "inventoryhandler.h"
 #include "messagein.h"
 #include "protocol.h"
 
-#include "../resources/iteminfo.h"
+#include "../inventory.h"
 #include "../item.h"
 #include "../itemshortcut.h"
 #include "../localplayer.h"
 #include "../log.h"
-#include "../inventory.h"
 
 #include "../gui/chat.h"
 
+#include "../resources/iteminfo.h"
+
 #include "../utils/tostring.h"
 
 InventoryHandler::InventoryHandler()
diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h
index 64ef8464..002fa938 100644
--- a/src/net/inventoryhandler.h
+++ b/src/net/inventoryhandler.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: inventoryhandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_INVENTORYHANDLER_H
diff --git a/src/net/itemhandler.cpp b/src/net/itemhandler.cpp
index 9af2be10..9cf85ce7 100644
--- a/src/net/itemhandler.cpp
+++ b/src/net/itemhandler.cpp
@@ -17,12 +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: itemhandler.cpp 2150 2006-02-06 02:56:48Z der_doener $
  */
 
 #include "itemhandler.h"
-
 #include "messagein.h"
 #include "protocol.h"
 
diff --git a/src/net/itemhandler.h b/src/net/itemhandler.h
index 702e193a..99fc6b62 100644
--- a/src/net/itemhandler.h
+++ b/src/net/itemhandler.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: itemhandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_ITEMHANDLER_H
diff --git a/src/net/loginhandler.cpp b/src/net/loginhandler.cpp
index 946f4a21..9a7aaabd 100644
--- a/src/net/loginhandler.cpp
+++ b/src/net/loginhandler.cpp
@@ -17,12 +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: loginhandler.cpp 3233 2007-03-24 01:57:39Z b_lindeijer $
  */
 
 #include "loginhandler.h"
-
 #include "messagein.h"
 #include "network.h"
 #include "protocol.h"
diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h
index 797655c3..1e087619 100644
--- a/src/net/loginhandler.h
+++ b/src/net/loginhandler.h
@@ -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: loginhandler.h 2137 2006-02-04 16:54:35Z der_doener $
  */
 
 #ifndef _TMW_NET_LOGINHANDLER_H
 #define _TMW_NET_LOGINHANDLER_H
 
-#include "messagehandler.h"
 #include <string>
 
+#include "messagehandler.h"
+
 struct LoginData;
 
 class LoginHandler : public MessageHandler
diff --git a/src/net/maploginhandler.cpp b/src/net/maploginhandler.cpp
index 15f70baf..bc08d5d6 100644
--- a/src/net/maploginhandler.cpp
+++ b/src/net/maploginhandler.cpp
@@ -17,12 +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: maploginhandler.cpp 2239 2006-03-09 05:16:27Z der_doener $
  */
 
 #include "maploginhandler.h"
-
 #include "messagein.h"
 #include "protocol.h"
 
diff --git a/src/net/maploginhandler.h b/src/net/maploginhandler.h
index 6ff6bc00..4d9fa75b 100644
--- a/src/net/maploginhandler.h
+++ b/src/net/maploginhandler.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: maploginhandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_MAPLOGINHANDLER_H
diff --git a/src/net/messagehandler.cpp b/src/net/messagehandler.cpp
index 370a01ab..7a41e1ad 100644
--- a/src/net/messagehandler.cpp
+++ b/src/net/messagehandler.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: messagehandler.cpp 2112 2006-01-22 13:31:13Z der_doener $
  */
 
-#include "messagehandler.h"
-
 #include <cassert>
 
+#include "messagehandler.h"
 #include "network.h"
 
 MessageHandler::MessageHandler():
diff --git a/src/net/messagehandler.h b/src/net/messagehandler.h
index 90ffa489..952e76a9 100644
--- a/src/net/messagehandler.h
+++ b/src/net/messagehandler.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: messagehandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_MESSAGEHANDLER_H
diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp
index bec47a5a..345e02fc 100644
--- a/src/net/messagein.cpp
+++ b/src/net/messagein.cpp
@@ -17,21 +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: messagein.cpp 2369 2006-06-26 21:32:52Z b_lindeijer $
  */
 
-#include "messagein.h"
-
 #include <cassert>
 #include <SDL.h>
 #include <SDL_endian.h>
 
+#include "messagein.h"
+
 #define MAKEWORD(low,high) \
     ((unsigned short)(((unsigned char)(low)) | \
     ((unsigned short)((unsigned char)(high))) << 8))
 
-
 MessageIn::MessageIn(const char *data, unsigned int length):
     mData(data),
     mLength(length),
diff --git a/src/net/messagein.h b/src/net/messagein.h
index 0a6b8b8b..81db6cdc 100644
--- a/src/net/messagein.h
+++ b/src/net/messagein.h
@@ -17,15 +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: messagein.h 1879 2005-10-16 21:18:11Z der_doener $
  */
 
 #ifndef _TMW_MESSAGEIN_
 #define _TMW_MESSAGEIN_
 
-#include <string>
 #include <SDL_types.h>
+#include <string>
 
 /**
  * Used for parsing an incoming message.
diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp
index f5f3dad9..6aa25411 100644
--- a/src/net/messageout.cpp
+++ b/src/net/messageout.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: messageout.cpp 3754 2007-11-20 15:19:50Z b_lindeijer $
  */
 
 #include <cstring>
-#include <string>
 #include <SDL.h>
 #include <SDL_endian.h>
-
-#include "network.h"
+#include <string>
 
 #include "messageout.h"
+#include "network.h"
 
 MessageOut::MessageOut(Network *network):
     mNetwork(network),
diff --git a/src/net/messageout.h b/src/net/messageout.h
index 33deb1bb..3c4cc241 100644
--- a/src/net/messageout.h
+++ b/src/net/messageout.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: messageout.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_MESSAGEOUT_
diff --git a/src/net/network.cpp b/src/net/network.cpp
index efb11708..c9f8d1bd 100644
--- a/src/net/network.cpp
+++ b/src/net/network.cpp
@@ -17,19 +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: network.cpp 3550 2007-08-30 16:46:21Z b_lindeijer $
  */
 
-#include "network.h"
+#include <sstream>
 
 #include "messagehandler.h"
 #include "messagein.h"
+#include "network.h"
 
 #include "../log.h"
 
-#include <sstream>
-
 /** Warning: buffers and other variables are shared,
     so there can be only one connection active at a time */
 
diff --git a/src/net/network.h b/src/net/network.h
index 826e6776..856808a2 100644
--- a/src/net/network.h
+++ b/src/net/network.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: network.h 3234 2007-03-24 13:05:27Z b_lindeijer $
  */
 
 #ifndef _TMW_NETWORK_
diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp
index 70f04271..65259959 100644
--- a/src/net/npchandler.cpp
+++ b/src/net/npchandler.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: npchandler.cpp 2883 2006-12-03 17:00:07Z b_lindeijer $
  */
 
-#include "npchandler.h"
-
 #include "messagein.h"
+#include "npchandler.h"
 #include "protocol.h"
 
 #include "../beingmanager.h"
 #include "../npc.h"
 
-#include "../gui/npclistdialog.h"
 #include "../gui/npc_text.h"
+#include "../gui/npclistdialog.h"
 
 extern NpcListDialog *npcListDialog;
 extern NpcTextDialog *npcTextDialog;
diff --git a/src/net/npchandler.h b/src/net/npchandler.h
index 7abd7495..abb16b7a 100644
--- a/src/net/npchandler.h
+++ b/src/net/npchandler.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: npchandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_NPCHANDLER_H
diff --git a/src/net/partyhandler.cpp b/src/net/partyhandler.cpp
index c1f2ba2e..9b5f3080 100644
--- a/src/net/partyhandler.cpp
+++ b/src/net/partyhandler.cpp
@@ -17,23 +17,20 @@
  *  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: partyhandler.cpp
  */
 
-#include "partyhandler.h"
+#include <guichan/actionlistener.hpp>
 
+#include "partyhandler.h"
 #include "protocol.h"
 #include "messagein.h"
 
 #include "../gui/chat.h"
 #include "../gui/confirm_dialog.h"
 
+#include "../beingmanager.h"
 #include "../game.h"
 #include "../party.h"
-#include "../beingmanager.h"
-
-#include <guichan/actionlistener.hpp>
 
 PartyHandler::PartyHandler(Party *party) : mParty(party)
 {
diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h
index de97d084..daabc52f 100644
--- a/src/net/partyhandler.h
+++ b/src/net/partyhandler.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: partyhandler.h
  */
 
 #ifndef _TMW_NET_PARTYHANDLER_H
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index ea561a81..c8442a89 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -17,20 +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: playerhandler.cpp 4190 2008-04-26 17:37:03Z peaveydk $
  */
 
-#include "playerhandler.h"
-
 #include "messagein.h"
+#include "playerhandler.h"
 #include "protocol.h"
 
 #include "../engine.h"
 #include "../localplayer.h"
 #include "../log.h"
 #include "../npc.h"
-#include "../utils/tostring.h"
 
 #include "../gui/buy.h"
 #include "../gui/chat.h"
@@ -42,6 +38,8 @@
 #include "../gui/skill.h"
 #include "../gui/viewport.h"
 
+#include "../utils/tostring.h"
+
 // TODO Move somewhere else
 OkDialog *weightNotice = NULL;
 OkDialog *deathNotice = NULL;
diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h
index f7c0672d..ec22e704 100644
--- a/src/net/playerhandler.h
+++ b/src/net/playerhandler.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: playerhandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_PLAYERHANDLER_H
diff --git a/src/net/protocol.cpp b/src/net/protocol.cpp
index 791b7fe5..a0e21d2e 100644
--- a/src/net/protocol.cpp
+++ b/src/net/protocol.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: protocol.cpp 2158 2006-02-07 10:37:54Z der_doener $
  */
 
 #include "protocol.h"
diff --git a/src/net/protocol.h b/src/net/protocol.h
index 5e1d3c62..fabe6911 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.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: protocol.h 4321 2008-06-02 11:42:26Z b_lindeijer $
  */
 
 #ifndef _TMW_PROTOCOL_
diff --git a/src/net/skillhandler.cpp b/src/net/skillhandler.cpp
index 3685d04b..b9a232fb 100644
--- a/src/net/skillhandler.cpp
+++ b/src/net/skillhandler.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: skillhandler.cpp 2832 2006-11-05 20:57:59Z b_lindeijer $
  */
 
-#include "skillhandler.h"
-
 #include "messagein.h"
 #include "protocol.h"
+#include "skillhandler.h"
 
 #include "../log.h"
 
diff --git a/src/net/skillhandler.h b/src/net/skillhandler.h
index 734772b4..80095bd3 100644
--- a/src/net/skillhandler.h
+++ b/src/net/skillhandler.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: skillhandler.h 2112 2006-01-22 13:31:13Z der_doener $
  */
 
 #ifndef _TMW_NET_SKILLHANDLER_H
diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp
index 9174d846..11fe2c19 100644
--- a/src/net/tradehandler.cpp
+++ b/src/net/tradehandler.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: tradehandler.cpp 4354 2008-06-17 16:52:44Z the_enemy $
  */
 
-#include "tradehandler.h"
-
 #include "messagein.h"
 #include "protocol.h"
+#include "tradehandler.h"
 
 #include "../inventory.h"
 #include "../item.h"
diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h
index 22e01f48..37ec5024 100644
--- a/src/net/tradehandler.h
+++ b/src/net/tradehandler.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: tradehandler.h 4237 2008-05-14 18:57:32Z b_lindeijer $
  */
 
 #ifndef _TMW_NET_TRADEHANDLER_H