From 55620305949a515c4427594d3c33319f1b9bcce3 Mon Sep 17 00:00:00 2001
From: akkadius <akkadius1@gmail.com>
Date: Sat, 29 Nov 2014 16:43:19 -0600
Subject: [PATCH] guild.cpp #include cleanup spell_effects.cpp #include cleanup

---
 zone/guild.cpp         | 16 +++-------------
 zone/spell_effects.cpp | 20 +++++++++-----------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/zone/guild.cpp b/zone/guild.cpp
index 5f8378d2b..58b0f006e 100644
--- a/zone/guild.cpp
+++ b/zone/guild.cpp
@@ -15,23 +15,13 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#include "../common/debug.h"
-#include "masterentity.h"
-#include "worldserver.h"
-#include "net.h"
+
 #include "../common/database.h"
-#include "../common/spdat.h"
-#include "../common/packet_dump.h"
-#include "../common/packet_functions.h"
-#include "petitions.h"
-#include "../common/serverinfo.h"
-#include "../common/zone_numbers.h"
-#include "../common/moremath.h"
 #include "../common/guilds.h"
 #include "../common/string_util.h"
+
 #include "guild_mgr.h"
-#include "string_ids.h"
-#include "npc_ai.h"
+#include "worldserver.h"
 
 extern WorldServer worldserver;
 
diff --git a/zone/spell_effects.cpp b/zone/spell_effects.cpp
index b55102072..620d2669c 100644
--- a/zone/spell_effects.cpp
+++ b/zone/spell_effects.cpp
@@ -15,26 +15,24 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#include "../common/debug.h"
-#include "../common/spdat.h"
-#include "masterentity.h"
-#include "../common/packet_dump.h"
-#include "../common/moremath.h"
-#include "../common/item.h"
-#include "worldserver.h"
-#include "../common/skills.h"
+
 #include "../common/bodytypes.h"
 #include "../common/classes.h"
+#include "../common/debug.h"
+#include "../common/item.h"
 #include "../common/rulesys.h"
+#include "../common/skills.h"
+#include "../common/spdat.h"
+#include "quest_parser_collection.h"
+#include "string_ids.h"
+#include "worldserver.h"
 #include <math.h>
-#include <assert.h>
+
 #ifndef WIN32
 #include <stdlib.h>
 #include "../common/unix.h"
 #endif
 
-#include "string_ids.h"
-#include "quest_parser_collection.h"
 
 extern Zone* zone;
 extern volatile bool ZoneLoaded;