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/chrif.c | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

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

diff --git a/src/map/chrif.c b/src/map/chrif.c
index 81e2d387c..99a1935fd 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -2,16 +2,15 @@
 // See the LICENSE file
 // Portions Copyright (c) Athena Dev Teams
 
-#define HERCULES_CORE
-
-#include "../config/core.h" // AUTOTRADE_PERSISTENCY, STATS_OPT_OUT
-#include "chrif.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <time.h>
+#include "../common/cbasetypes.h"
+#include "../common/malloc.h"
+#include "../common/socket.h"
+#include "../common/timer.h"
+#include "../common/nullpo.h"
+#include "../common/showmsg.h"
+#include "../common/strlib.h"
+#include "../common/ers.h"
+#include "../common/HPM.h"
 
 #include "map.h"
 #include "battle.h"
@@ -26,17 +25,15 @@
 #include "instance.h"
 #include "mercenary.h"
 #include "elemental.h"
+#include "chrif.h"
 #include "quest.h"
 #include "storage.h"
-#include "../common/HPM.h"
-#include "../common/cbasetypes.h"
-#include "../common/ers.h"
-#include "../common/malloc.h"
-#include "../common/nullpo.h"
-#include "../common/showmsg.h"
-#include "../common/socket.h"
-#include "../common/strlib.h"
-#include "../common/timer.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <time.h>
 
 struct chrif_interface chrif_s;
 
-- 
cgit v1.2.3-60-g2f50