Standardize header order

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

13 files changed, 24 insertions, 25 deletions

diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h
index 2823d308..2cd571c9 100644
--- a/src/gui/widgets/browserbox.h
+++ b/src/gui/widgets/browserbox.h
@@ -22,12 +22,12 @@
 #ifndef BROWSERBOX_H
 #define BROWSERBOX_H
 
-#include <list>
-#include <vector>
-
 #include <guichan/mouselistener.hpp>
 #include <guichan/widget.hpp>
 
+#include <list>
+#include <vector>
+
 class LinkHandler;
 
 struct BROWSER_LINK {
diff --git a/src/gui/widgets/chattab.h b/src/gui/widgets/chattab.h
index 5d8b594a..2caf2b73 100644
--- a/src/gui/widgets/chattab.h
+++ b/src/gui/widgets/chattab.h
@@ -22,9 +22,10 @@
 #ifndef CHATTAB_H
 #define CHATTAB_H
 
-#include "gui/widgets/tab.h"
 #include "gui/chat.h"
 
+#include "gui/widgets/tab.h"
+
 class BrowserBox;
 class Recorder;
 class ScrollArea;
diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h
index a65a5196..d971fd66 100644
--- a/src/gui/widgets/checkbox.h
+++ b/src/gui/widgets/checkbox.h
@@ -24,7 +24,6 @@
 
 #include <guichan/widgets/checkbox.hpp>
 
-
 class Image;
 
 /**
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index fb807f38..249d083a 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -21,6 +21,10 @@
 
 #include "gui/widgets/desktop.h"
 
+#include "graphics.h"
+#include "log.h"
+#include "main.h"
+
 #include "gui/palette.h"
 
 #include "gui/widgets/label.h"
@@ -29,10 +33,6 @@
 #include "resources/resourcemanager.h"
 #include "resources/wallpaper.h"
 
-#include "graphics.h"
-#include "log.h"
-#include "main.h"
-
 Desktop::Desktop()
     : mWallpaper(0)
 {
diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h
index da623bbd..bd69019f 100644
--- a/src/gui/widgets/desktop.h
+++ b/src/gui/widgets/desktop.h
@@ -22,10 +22,10 @@
 #ifndef DESKTOP_H
 #define DESKTOP_H
 
-#include "gui/widgets/container.h"
-
 #include "guichanfwd.h"
 
+#include "gui/widgets/container.h"
+
 #include <guichan/widgetlistener.hpp>
 
 class Image;
diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h
index 8860927e..a75fe968 100644
--- a/src/gui/widgets/emoteshortcutcontainer.h
+++ b/src/gui/widgets/emoteshortcutcontainer.h
@@ -22,10 +22,10 @@
 #ifndef EMOTESHORTCUTCONTAINER_H
 #define EMOTESHORTCUTCONTAINER_H
 
-#include <vector>
-
 #include "gui/widgets/shortcutcontainer.h"
 
+#include <vector>
+
 class AnimatedSprite;
 class Image;
 
diff --git a/src/gui/widgets/guildlistbox.h b/src/gui/widgets/guildlistbox.h
index d266fe46..959e3bd0 100644
--- a/src/gui/widgets/guildlistbox.h
+++ b/src/gui/widgets/guildlistbox.h
@@ -22,12 +22,12 @@
 #ifndef GUI_GUILDLISTBOX_H
 #define GUI_GUILDLISTBOX_H
 
+#include "gui/widgets/listbox.h"
+
 #include <map>
 #include <string>
 #include <vector>
 
-#include "gui/widgets/listbox.h"
-
 class Image;
 
 class GuildListBox : public ListBox
diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp
index 1a7011ab..d284658d 100644
--- a/src/gui/widgets/itemlinkhandler.cpp
+++ b/src/gui/widgets/itemlinkhandler.cpp
@@ -22,10 +22,11 @@
 #include <sstream>
 #include <string>
 
-#include "gui/widgets/itemlinkhandler.h"
 #include "gui/itempopup.h"
 #include "gui/viewport.h"
 
+#include "gui/widgets/itemlinkhandler.h"
+
 #include "resources/iteminfo.h"
 #include "resources/itemdb.h"
 
diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h
index 03d57b8d..411ad2d1 100644
--- a/src/gui/widgets/itemshortcutcontainer.h
+++ b/src/gui/widgets/itemshortcutcontainer.h
@@ -22,10 +22,10 @@
 #ifndef ITEMSHORTCUTCONTAINER_H
 #define ITEMSHORTCUTCONTAINER_H
 
-#include <guichan/mouselistener.hpp>
-
 #include "gui/widgets/shortcutcontainer.h"
 
+#include <guichan/mouselistener.hpp>
+
 class Image;
 class Item;
 class ItemPopup;
diff --git a/src/gui/widgets/linkhandler.h b/src/gui/widgets/linkhandler.h
index 30267f87..03fcc491 100644
--- a/src/gui/widgets/linkhandler.h
+++ b/src/gui/widgets/linkhandler.h
@@ -24,8 +24,6 @@
 
 #include <string>
 
-#include <string>
-
 /**
  * A simple interface to windows that need to handle links from BrowserBox
  * widget.
diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h
index 119ed841..7d45841b 100644
--- a/src/gui/widgets/popup.h
+++ b/src/gui/widgets/popup.h
@@ -23,11 +23,11 @@
 #ifndef POPUP_H
 #define POPUP_H
 
-#include "gui/widgets/container.h"
-
 #include "configuration.h"
 #include "guichanfwd.h"
 
+#include "gui/widgets/container.h"
+
 class Skin;
 class WindowContainer;
 
diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h
index a0a8f951..20e0d169 100644
--- a/src/gui/widgets/progressbar.h
+++ b/src/gui/widgets/progressbar.h
@@ -22,10 +22,10 @@
 #ifndef PROGRESSBAR_H
 #define PROGRESSBAR_H
 
-#include <string>
-
 #include <guichan/widget.hpp>
 
+#include <string>
+
 class ImageRect;
 
 /**
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp
index 9abe1f58..6ad25125 100644
--- a/src/gui/widgets/tab.cpp
+++ b/src/gui/widgets/tab.cpp
@@ -25,12 +25,12 @@
 #include "graphics.h"
 
 #include "gui/palette.h"
+#include "gui/skin.h"
 
 #include "gui/widgets/tabbedarea.h"
 
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
-#include "gui/skin.h"
 
 #include "utils/dtor.h"