Standardize header order

Also remove some extra new lines and fix eAthena's PartyTab define guards.

17 files changed, 38 insertions, 29 deletions

diff --git a/src/resources/action.h b/src/resources/action.h
index 387f1b14..12340628 100644
--- a/src/resources/action.h
+++ b/src/resources/action.h
@@ -22,10 +22,10 @@
 #ifndef ACTION_H
 #define ACTION_H
 
-#include <map>
-
 #include <libxml/tree.h>
 
+#include <map>
+
 class Animation;
 
 /**
diff --git a/src/resources/ambientlayer.cpp b/src/resources/ambientlayer.cpp
index 92895bc2..34678736 100644
--- a/src/resources/ambientlayer.cpp
+++ b/src/resources/ambientlayer.cpp
@@ -21,9 +21,10 @@
 
 #include "resources/ambientlayer.h"
 
+#include "graphics.h"
+
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
-#include "graphics.h"
 
 AmbientLayer::AmbientLayer(Image *img, float parallax,
                                float speedX, float speedY, bool keepRatio):
diff --git a/src/resources/ambientoverlay.cpp b/src/resources/ambientoverlay.cpp
index 8c851e2e..c68336ab 100644
--- a/src/resources/ambientoverlay.cpp
+++ b/src/resources/ambientoverlay.cpp
@@ -21,9 +21,10 @@
 
 #include "resources/ambientoverlay.h"
 
+#include "graphics.h"
+
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
-#include "graphics.h"
 
 AmbientOverlay::AmbientOverlay(Image *img, float parallax,
                                float speedX, float speedY, bool keepRatio):
diff --git a/src/resources/animation.h b/src/resources/animation.h
index 80e0781a..8de57f01 100644
--- a/src/resources/animation.h
+++ b/src/resources/animation.h
@@ -22,10 +22,10 @@
 #ifndef ANIMATION_H
 #define ANIMATION_H
 
-#include <vector>
-
 #include <libxml/tree.h>
 
+#include <vector>
+
 class Image;
 
 /**
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index 41c3a194..f1ee3280 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -22,11 +22,11 @@
 #include "resources/image.h"
 
 #include "resources/dye.h"
+#include "resources/sdlrescalefacility.h"
 
 #include "log.h"
 
 #include <SDL_image.h>
-#include "resources/sdlrescalefacility.h"
 
 #ifdef USE_OPENGL
 bool Image::mUseOpenGL = false;
diff --git a/src/resources/imageloader.cpp b/src/resources/imageloader.cpp
index 694c57af..24c99df1 100644
--- a/src/resources/imageloader.cpp
+++ b/src/resources/imageloader.cpp
@@ -25,6 +25,7 @@
 #include "resources/resourcemanager.h"
 
 #include <guichan/color.hpp>
+
 #include <guichan/sdl/sdlpixel.hpp>
 
 #include <cassert>
diff --git a/src/resources/imageset.cpp b/src/resources/imageset.cpp
index 0c836134..e7183062 100644
--- a/src/resources/imageset.cpp
+++ b/src/resources/imageset.cpp
@@ -21,10 +21,10 @@
 
 #include "resources/imageset.h"
 
-#include "resources/image.h"
-
 #include "log.h"
 
+#include "resources/image.h"
+
 #include "utils/dtor.h"
 
 ImageSet::ImageSet(Image *img, int width, int height)
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 900e3547..ef7954c9 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -21,11 +21,11 @@
 
 #include "resources/itemdb.h"
 
+#include "log.h"
+
 #include "resources/iteminfo.h"
 #include "resources/resourcemanager.h"
 
-#include "log.h"
-
 #include "utils/dtor.h"
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 6c033490..2af4069c 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -22,10 +22,10 @@
 #ifndef ITEMINFO_H
 #define ITEMINFO_H
 
-#include "resources/spritedef.h"
-
 #include "player.h"
 
+#include "resources/spritedef.h"
+
 #include <map>
 #include <string>
 #include <vector>
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 28bc91c3..b149ca76 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -19,15 +19,16 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "resources/animation.h"
-#include "resources/image.h"
 #include "resources/mapreader.h"
-#include "resources/resourcemanager.h"
 
 #include "log.h"
 #include "map.h"
 #include "tileset.h"
 
+#include "resources/animation.h"
+#include "resources/image.h"
+#include "resources/resourcemanager.h"
+
 #include "utils/base64.h"
 #include "utils/stringutils.h"
 #include "utils/xml.h"
diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h
index 0ed553c3..9ee79579 100644
--- a/src/resources/mapreader.h
+++ b/src/resources/mapreader.h
@@ -24,6 +24,8 @@
 
 #include <libxml/tree.h>
 
+#include <string>
+
 class Map;
 class Properties;
 class Tileset;
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index 0c28586a..823001a2 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -21,10 +21,10 @@
 
 #include "resources/monsterdb.h"
 
-#include "resources/monsterinfo.h"
-
 #include "log.h"
 
+#include "resources/monsterinfo.h"
+
 #include "utils/dtor.h"
 #include "utils/gettext.h"
 #include "utils/xml.h"
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index fe594a3f..eee76d55 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -21,6 +21,8 @@
 
 #include "resources/resourcemanager.h"
 
+#include "log.h"
+
 #include "resources/dye.h"
 #include "resources/image.h"
 #include "resources/imageset.h"
@@ -28,11 +30,11 @@
 #include "resources/soundeffect.h"
 #include "resources/spritedef.h"
 
-#include "log.h"
-
-#include <cassert>
 #include <physfs.h>
+
 #include <SDL_image.h>
+
+#include <cassert>
 #include <sstream>
 
 #include <sys/time.h>
diff --git a/src/resources/sdlrescalefacility.h b/src/resources/sdlrescalefacility.h
index 971f5d73..bffd583d 100644
--- a/src/resources/sdlrescalefacility.h
+++ b/src/resources/sdlrescalefacility.h
@@ -29,9 +29,10 @@
 #ifndef SDLRESCALEFACILITY_H
 #define SDLRESCALEFACILITY_H
 
-#include <SDL.h>
 #include "image.h"
 
+#include <SDL.h>
+
 /**
  * _SDLzoomSurface is internally used by Image::getScaledImage() to provide
  * a rescaled copy of its internal mImage member.
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index 62db7b66..2d051f57 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -21,6 +21,8 @@
 
 #include "resources/spritedef.h"
 
+#include "log.h"
+
 #include "resources/action.h"
 #include "resources/animation.h"
 #include "resources/dye.h"
@@ -28,8 +30,6 @@
 #include "resources/imageset.h"
 #include "resources/resourcemanager.h"
 
-#include "log.h"
-
 #include "utils/xml.h"
 
 #include <set>
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 45b5b043..dc555baa 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -24,11 +24,11 @@
 
 #include "resources/resource.h"
 
+#include <libxml/tree.h>
+
 #include <map>
 #include <string>
 
-#include <libxml/tree.h>
-
 class Action;
 class ImageSet;
 
diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp
index 2c7395f0..c907352c 100644
--- a/src/resources/wallpaper.cpp
+++ b/src/resources/wallpaper.cpp
@@ -25,12 +25,12 @@
 
 #include "utils/stringutils.h"
 
+#include <physfs.h>
+
 #include <algorithm>
 #include <cstring>
-#include <vector>
-
-#include <physfs.h>
 #include <time.h>
+#include <vector>
 
 #define WALLPAPER_FOLDER "graphics/images/"
 #define WALLPAPER_BASE   "login_wallpaper.png"