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.

41 files changed, 35 insertions, 128 deletions

diff --git a/src/resources/action.cpp b/src/resources/action.cpp
index 8ed099ea..f40d3109 100644
--- a/src/resources/action.cpp
+++ b/src/resources/action.cpp
@@ -17,17 +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: action.cpp 3676 2007-10-23 08:02:22Z b_lindeijer $
  */
 
 #include "action.h"
-
 #include "animation.h"
 
 #include "../utils/dtor.h"
 
-
 Action::Action()
 {
 }
diff --git a/src/resources/action.h b/src/resources/action.h
index 61307652..09eb066e 100644
--- a/src/resources/action.h
+++ b/src/resources/action.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: action.h 2905 2006-12-12 15:06:06Z b_lindeijer $
  */
 
 #ifndef _TMW_ACTION_H
diff --git a/src/resources/ambientoverlay.cpp b/src/resources/ambientoverlay.cpp
index 654cbb32..38d8fc46 100644
--- a/src/resources/ambientoverlay.cpp
+++ b/src/resources/ambientoverlay.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: ambientoverlay.cpp 2727 2006-10-07 20:01:34Z b_lindeijer $
  */
 
 #include "ambientoverlay.h"
-
 #include "image.h"
 
 #include "../graphics.h"
diff --git a/src/resources/ambientoverlay.h b/src/resources/ambientoverlay.h
index c0b18600..56c70066 100644
--- a/src/resources/ambientoverlay.h
+++ b/src/resources/ambientoverlay.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: ambientoverlay.h 2727 2006-10-07 20:01:34Z b_lindeijer $
  */
 
 #ifndef _TMW_RESOURCES_AMBIENTOVERLAY_H_
diff --git a/src/resources/animation.cpp b/src/resources/animation.cpp
index b740b9b5..596c5fac 100644
--- a/src/resources/animation.cpp
+++ b/src/resources/animation.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: animation.cpp 2905 2006-12-12 15:06:06Z b_lindeijer $
  */
 
-#include "animation.h"
-
 #include <algorithm>
 
+#include "animation.h"
+
 #include "../utils/dtor.h"
 
 Animation::Animation():
diff --git a/src/resources/animation.h b/src/resources/animation.h
index 53420ecd..8dfe8614 100644
--- a/src/resources/animation.h
+++ b/src/resources/animation.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: animation.h 3301 2007-05-23 21:35:01Z b_lindeijer $
  */
 
 #ifndef _TMW_ANIMATION_H
diff --git a/src/resources/buddylist.cpp b/src/resources/buddylist.cpp
index c917a45e..1bd98680 100644
--- a/src/resources/buddylist.cpp
+++ b/src/resources/buddylist.cpp
@@ -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: buddylist.cpp 4332 2008-06-05 07:33:12Z b_lindeijer $
  */
 
 #include <algorithm>
 #include <cstring>
-#include <iostream>
 #include <fstream>
+#include <iostream>
 
 #include "buddylist.h"
 
-#include "../main.h"
 #include "../configuration.h"
+#include "../main.h"
 
 BuddyList::BuddyList()
 {
diff --git a/src/resources/buddylist.h b/src/resources/buddylist.h
index 5a8f2324..6a3de8c4 100644
--- a/src/resources/buddylist.h
+++ b/src/resources/buddylist.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: buddylist.h 2239 2006-03-09 05:16:27Z der_doener $
  */
 
 #ifndef _TMW_BUDDYLIST_H
diff --git a/src/resources/colordb.h b/src/resources/colordb.h
index 1f8b191c..2b750fa3 100644
--- a/src/resources/colordb.h
+++ b/src/resources/colordb.h
@@ -22,8 +22,8 @@
 #ifndef _AETHYRA_COLOR_MANAGER_H
 #define _AETHYRA_COLOR_MANAGER_H
 
-#include <string>
 #include <map>
+#include <string>
 
 /**
  * The class that holds the color information.
diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp
index 195d5dd1..3be105d8 100644
--- a/src/resources/dye.cpp
+++ b/src/resources/dye.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: dye.cpp 3708 2007-11-04 11:52:44Z gmelquio $
  */
 
 #include <algorithm>
diff --git a/src/resources/dye.h b/src/resources/dye.h
index fe8669bb..4fb8fd40 100644
--- a/src/resources/dye.h
+++ b/src/resources/dye.h
@@ -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: dye.h 3706 2007-11-03 21:04:51Z gmelquio $
  */
 
 #ifndef _TMW_DYE_H
 #define _TMW_DYE_H
 
+#include <string>
 #include <vector>
 
 /**
@@ -38,7 +37,7 @@ class Palette
          * The string is either a file name or a sequence of hexadecimal RGB
          * values separated by ',' and starting with '#'.
          */
-        Palette(std::string const &);
+        Palette(std::string const &pallete);
 
         /**
          * Gets a pixel color depending on its intensity.
@@ -65,7 +64,7 @@ class Dye
          * The parts of string are separated by semi-colons. Each part starts
          * by an uppercase letter, followed by a colon and then a palette name.
          */
-        Dye(std::string const &);
+        Dye(std::string const &dye);
 
         /**
          * Destroys the associated palettes.
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index dc22a69b..35b9c254 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.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: image.cpp 3760 2007-11-21 19:43:11Z b_lindeijer $
  */
 
 #include <SDL_image.h>
 
-#include "image.h"
-
 #include "dye.h"
+#include "image.h"
 
 #include "../log.h"
 
diff --git a/src/resources/image.h b/src/resources/image.h
index 6f10f858..6eb33ed9 100644
--- a/src/resources/image.h
+++ b/src/resources/image.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: image.h 3760 2007-11-21 19:43:11Z b_lindeijer $
  */
 
 #ifndef _TMW_IMAGE_H
 #define _TMW_IMAGE_H
 
+#include <SDL.h>
+
 #include "../main.h"
 
-#include <SDL.h>
 #ifdef USE_OPENGL
 
 /* The definition of OpenGL extensions by SDL is giving problems with recent
diff --git a/src/resources/imageloader.cpp b/src/resources/imageloader.cpp
index d6539b05..a7e813d7 100644
--- a/src/resources/imageloader.cpp
+++ b/src/resources/imageloader.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: imageloader.cpp 3515 2007-08-25 16:56:52Z gmelquio $
  */
 
 #include <cassert>
 #include <string>
+
 #include <guichan/color.hpp>
 #include <guichan/sdl/sdlpixel.hpp>
 
-#include "imageloader.h"
-
 #include "image.h"
+#include "imageloader.h"
 #include "resourcemanager.h"
 
 ProxyImage::ProxyImage(SDL_Surface *s):
diff --git a/src/resources/imageloader.h b/src/resources/imageloader.h
index 89f38eda..7979fd2f 100644
--- a/src/resources/imageloader.h
+++ b/src/resources/imageloader.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: imageloader.h 3515 2007-08-25 16:56:52Z gmelquio $
  */
 
 #ifndef _TMW_IMAGELOADER_H
diff --git a/src/resources/imageset.cpp b/src/resources/imageset.cpp
index b7263ec3..b321439a 100644
--- a/src/resources/imageset.cpp
+++ b/src/resources/imageset.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: imageset.cpp 4209 2008-04-29 12:58:21Z b_lindeijer $
  */
 
+#include "image.h"
 #include "imageset.h"
 
 #include "../log.h"
 
-#include "image.h"
-
 #include "../utils/dtor.h"
 
 ImageSet::ImageSet(Image *img, int width, int height)
diff --git a/src/resources/imageset.h b/src/resources/imageset.h
index e276dd06..c7915212 100644
--- a/src/resources/imageset.h
+++ b/src/resources/imageset.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: imageset.h 3753 2007-11-20 12:27:56Z b_lindeijer $
  */
 
 #ifndef _TMW_IMAGESET_H
@@ -30,7 +28,6 @@
 
 class Image;
 
-
 /**
  * Stores a set of subimages originating from a single image.
  */
diff --git a/src/resources/imagewriter.cpp b/src/resources/imagewriter.cpp
index f11cad24..36805646 100644
--- a/src/resources/imagewriter.cpp
+++ b/src/resources/imagewriter.cpp
@@ -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: imagewriter.cpp 2417 2006-07-19 15:12:06Z umperio $
  */
 
-#include "imagewriter.h"
-
 #include <png.h>
-#include <string>
 #include <SDL.h>
+#include <string>
+
+#include "imagewriter.h"
 
 #include "../log.h"
 
diff --git a/src/resources/imagewriter.h b/src/resources/imagewriter.h
index c7968d30..632e2ae4 100644
--- a/src/resources/imagewriter.h
+++ b/src/resources/imagewriter.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: imagewriter.h 1766 2005-09-18 01:31:33Z bertram25 $
  */
 
 #include <iosfwd>
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 8b73f646..3f8dadce 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -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: itemdb.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include <cassert>
+
 #include <libxml/tree.h>
 
 #include "itemdb.h"
-
 #include "iteminfo.h"
 #include "resourcemanager.h"
 
diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index 1ee1b5f0..9b661a60 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.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: itemdb.h 3587 2007-09-20 13:24:20Z b_lindeijer $
  */
 
 #ifndef _TMW_ITEM_MANAGER_H
 #define _TMW_ITEM_MANAGER_H
 
-#include "iteminfo.h"
-
 #include <map>
 
+#include "iteminfo.h"
+
 /**
  * The namespace that holds the item information.
  */
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index 64f5c37e..5daeafe6 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.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: iteminfo.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
-#include "iteminfo.h"
-
 #include "itemdb.h"
+#include "iteminfo.h"
 
 const std::string&
 ItemInfo::getSprite(int gender) const
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 85f79263..4678bc08 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.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: iteminfo.h 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #ifndef _TMW_ITEMINFO_H_
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index f3d78ae9..d6154ee0 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.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: mapreader.cpp 4255 2008-05-21 21:44:27Z crush_tmw $
  */
 
-#include "mapreader.h"
-
 #include <cassert>
 #include <iostream>
 #include <zlib.h>
 
-#include "resourcemanager.h"
 #include "image.h"
+#include "mapreader.h"
+#include "resourcemanager.h"
 
 #include "../log.h"
 #include "../map.h"
diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h
index eb0d4873..ef52564e 100644
--- a/src/resources/mapreader.h
+++ b/src/resources/mapreader.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: mapreader.h 3587 2007-09-20 13:24:20Z b_lindeijer $
  */
 
 #ifndef _TMW_MAPREADER_H_
@@ -28,8 +26,8 @@
 
 #include <libxml/tree.h>
 
-class Properties;
 class Map;
+class Properties;
 class Tileset;
 
 /**
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index 8d8dd133..4d52b8ad 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.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: monsterdb.cpp 4255 2008-05-21 21:44:27Z crush_tmw $
  */
 
 #include "monsterdb.h"
-
 #include "resourcemanager.h"
 
 #include "../log.h"
diff --git a/src/resources/monsterdb.h b/src/resources/monsterdb.h
index 43865bb3..f1d69e72 100644
--- a/src/resources/monsterdb.h
+++ b/src/resources/monsterdb.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: monsterdb.h 3606 2007-09-27 14:54:09Z b_lindeijer $
  */
 
 #ifndef _TMW_MONSTER_DB_H
diff --git a/src/resources/monsterinfo.cpp b/src/resources/monsterinfo.cpp
index 19f2990b..4a71a122 100644
--- a/src/resources/monsterinfo.cpp
+++ b/src/resources/monsterinfo.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: monsterinfo.cpp 2650 2006-09-03 15:00:47Z b_lindeijer $
  */
 
 #include "monsterinfo.h"
diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h
index c5345bd8..05a78c5a 100644
--- a/src/resources/monsterinfo.h
+++ b/src/resources/monsterinfo.h
@@ -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: monsterinfo.h 2650 2006-09-03 15:00:47Z b_lindeijer $
  */
 
 #ifndef _TMW_MONSTERINFO_H_
 #define _TMW_MONSTERINFO_H_
 
+#include <list>
 #include <map>
 #include <string>
 #include <vector>
-#include <list>
 
 #include "../being.h"
 
-
 enum MonsterSoundEvent
 {
     MONSTER_EVENT_HIT,
diff --git a/src/resources/music.cpp b/src/resources/music.cpp
index 0e327218..2386aa43 100644
--- a/src/resources/music.cpp
+++ b/src/resources/music.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: music.cpp 3753 2007-11-20 12:27:56Z b_lindeijer $
  */
 
 #include "music.h"
diff --git a/src/resources/music.h b/src/resources/music.h
index a15d22c1..d50150b8 100644
--- a/src/resources/music.h
+++ b/src/resources/music.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: music.h 3753 2007-11-20 12:27:56Z b_lindeijer $
  */
 
 #ifndef _TMW_MUSIC_H
diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp
index c310d6e3..3ae58067 100644
--- a/src/resources/npcdb.cpp
+++ b/src/resources/npcdb.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: npcdb.cpp 4255 2008-05-21 21:44:27Z crush_tmw $
  */
 
 #include "npcdb.h"
-
 #include "resourcemanager.h"
 
 #include "../log.h"
diff --git a/src/resources/npcdb.h b/src/resources/npcdb.h
index e1240c5e..b4539866 100644
--- a/src/resources/npcdb.h
+++ b/src/resources/npcdb.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: npcdb.h 4255 2008-05-21 21:44:27Z crush_tmw $
  */
 
 #ifndef _TMW_NPC_DB_H
 #define _TMW_NPC_DB_H
 
-#include <map>
 #include <list>
+#include <map>
 #include <string>
 
 struct NPCsprite
diff --git a/src/resources/resource.cpp b/src/resources/resource.cpp
index 2bb60e56..e9310905 100644
--- a/src/resources/resource.cpp
+++ b/src/resources/resource.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: resource.cpp 3808 2007-12-22 21:33:47Z b_lindeijer $
  */
 
 #include <cassert>
 
 #include "resource.h"
-
 #include "resourcemanager.h"
 
 Resource::~Resource()
diff --git a/src/resources/resource.h b/src/resources/resource.h
index 9c70f6c0..e85e3147 100644
--- a/src/resources/resource.h
+++ b/src/resources/resource.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: resource.h 3808 2007-12-22 21:33:47Z b_lindeijer $
  */
 
 #ifndef _TMW_RESOURCE_H
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 16a2c470..310982af 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -17,29 +17,25 @@
  *  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: resourcemanager.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
 #include <cassert>
-#include <sstream>
-#include <sys/time.h>
-
 #include <physfs.h>
 #include <SDL_image.h>
+#include <sstream>
 
-#include "resourcemanager.h"
+#include <sys/time.h>
 
 #include "dye.h"
 #include "image.h"
+#include "imageset.h"
 #include "music.h"
+#include "resourcemanager.h"
 #include "soundeffect.h"
-#include "imageset.h"
 #include "spritedef.h"
 
 #include "../log.h"
 
-
 ResourceManager *ResourceManager::instance = NULL;
 
 ResourceManager::ResourceManager()
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index 3f0f1704..c814d752 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.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: resourcemanager.h 3839 2008-01-13 16:28:50Z the_enemy $
  */
 
 #ifndef _TMW_RESOURCE_MANAGER_H
@@ -29,11 +27,11 @@
 #include <string>
 #include <vector>
 
-class Resource;
 class Image;
+class ImageSet;
 class Music;
+class Resource;
 class SoundEffect;
-class ImageSet;
 class SpriteDef;
 struct SDL_Surface;
 
diff --git a/src/resources/soundeffect.cpp b/src/resources/soundeffect.cpp
index 03fa337e..e21fd2b0 100644
--- a/src/resources/soundeffect.cpp
+++ b/src/resources/soundeffect.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: soundeffect.cpp 3753 2007-11-20 12:27:56Z b_lindeijer $
  */
 
 #include "soundeffect.h"
diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h
index 0a574e7d..c3ff6668 100644
--- a/src/resources/soundeffect.h
+++ b/src/resources/soundeffect.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: soundeffect.h 3753 2007-11-20 12:27:56Z b_lindeijer $
  */
 
 #ifndef _TMW_SOUND_EFFECT_H
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index a6d8891e..b4193fd3 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.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$
  */
 
 #include <set>
 
-#include "spritedef.h"
-
 #include "action.h"
 #include "animation.h"
 #include "dye.h"
 #include "image.h"
 #include "imageset.h"
 #include "resourcemanager.h"
+#include "spritedef.h"
 
 #include "../log.h"
 #include "../utils/xml.h"
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 72c2566f..4b712340 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.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_SPRITEDEF_H
@@ -27,10 +25,10 @@
 #include <map>
 #include <string>
 
-#include "resource.h"
-
 #include <libxml/tree.h>
 
+#include "resource.h"
+
 class Action;
 class ImageSet;