From 94657284973f4037596bae468ebfbee5c217e02b Mon Sep 17 00:00:00 2001
From: panikon <panikon@zoho.com>
Date: Sat, 10 May 2014 06:08:56 -0300
Subject: Revert "Fixed order of includes in all source files"

This reverts commit b6b3f58795288701d0e162d43fa6f0a47af913b3.

Fixes issue 8184
http://hercules.ws/board/tracker/issue-8184-cart-related/
---
 src/map/mercenary.c | 54 ++++++++++++++++++++++++++---------------------------
 1 file changed, 26 insertions(+), 28 deletions(-)

(limited to 'src/map/mercenary.c')

diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 26bc8c188..495621014 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -2,44 +2,42 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "mercenary.h"
-
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#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"
 
-#include "atcommand.h"
-#include "battle.h"
-#include "chrif.h"
+#include "log.h"
 #include "clif.h"
-#include "guild.h"
+#include "chrif.h"
 #include "intif.h"
 #include "itemdb.h"
-#include "log.h"
 #include "map.h"
-#include "mob.h"
-#include "npc.h"
-#include "party.h"
 #include "pc.h"
+#include "status.h"
+#include "skill.h"
+#include "mob.h"
 #include "pet.h"
+#include "battle.h"
+#include "party.h"
+#include "guild.h"
+#include "atcommand.h"
 #include "script.h"
-#include "skill.h"
-#include "status.h"
+#include "npc.h"
 #include "trade.h"
 #include "unit.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"
+#include "mercenary.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
 
 struct mercenary_interface mercenary_s;
 
-- 
cgit v1.2.3-60-g2f50