Re-commit of "Fixed order of includes in all source files"

This reverts commit 94657284973f4037596bae468ebfbee5c217e02b.

1 files changed, 28 insertions, 26 deletions

diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 495621014..26bc8c188 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -2,42 +2,44 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#include "../common/cbasetypes.h"
-#include "../common/malloc.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/nullpo.h"
-#include "../common/mmo.h"
-#include "../common/random.h"
-#include "../common/showmsg.h"
-#include "../common/strlib.h"
-#include "../common/utils.h"
+#define HERCULES_CORE
 
-#include "log.h"
-#include "clif.h"
+#include "mercenary.h"
+
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "atcommand.h"
+#include "battle.h"
 #include "chrif.h"
+#include "clif.h"
+#include "guild.h"
 #include "intif.h"
 #include "itemdb.h"
+#include "log.h"
 #include "map.h"
-#include "pc.h"
-#include "status.h"
-#include "skill.h"
 #include "mob.h"
-#include "pet.h"
-#include "battle.h"
+#include "npc.h"
 #include "party.h"
-#include "guild.h"
-#include "atcommand.h"
+#include "pc.h"
+#include "pet.h"
 #include "script.h"
-#include "npc.h"
+#include "skill.h"
+#include "status.h"
 #include "trade.h"
 #include "unit.h"
-#include "mercenary.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/mmo.h"
+#include "../common/nullpo.h"
+#include "../common/random.h"
+#include "../common/showmsg.h"
+#include "../common/socket.h"
+#include "../common/strlib.h"
+#include "../common/timer.h"
+#include "../common/utils.h"
 
 struct mercenary_interface mercenary_s;