diff --git a/src/game/ScriptedPch.h b/src/game/ScriptedPch.h
index bd725ded2..8a5e4bff4 100644
--- a/src/game/ScriptedPch.h
+++ b/src/game/ScriptedPch.h
@@ -21,6 +21,7 @@
 #include "Chat.h"
 #include "DBCStructure.h"
 #include "DBCStores.h"
+#include "SpellId.h"
 
 #ifdef WIN32
 #include <windows.h>
diff --git a/src/game/SpellId.h b/src/game/SpellId.h
index 84ec56d26..70eda7c85 100644
--- a/src/game/SpellId.h
+++ b/src/game/SpellId.h
@@ -1,5 +1,8 @@
 /* This file is auto-generated. */
 
+#ifndef _SPELLID_H
+#define _SPELLID_H
+
 enum SpellId
 {
     // 1: Word of Recall (OLD)
@@ -140134,3 +140137,4 @@ enum SpellId
 
 };
 
+#endif
\ No newline at end of file
diff --git a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp b/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
index 52cb2dbe0..a92866d0f 100644
--- a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
+++ b/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
@@ -20,7 +20,6 @@
 #include "Vehicle.h"
 #include "ObjectMgr.h"
 #include "ScriptedEscortAI.h"
-#include "SpellId.h"
 
 /*######
 ##Quest 12848
diff --git a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp
index 627ef3954..633c91dbc 100644
--- a/src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp
+++ b/src/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp
@@ -23,7 +23,6 @@ EndScriptData */
 
 #include "ScriptedPch.h"
 #include "temple_of_ahnqiraj.h"
-#include "SpellId.h"
 
 /*
  * This is a 2 phases events. Here follows an explanation of the main events and transition between phases and sub-phases.
diff --git a/src/scripts/northrend/draktharon_keep/boss_trollgore.cpp b/src/scripts/northrend/draktharon_keep/boss_trollgore.cpp
index a82070396..c5ebd62d7 100644
--- a/src/scripts/northrend/draktharon_keep/boss_trollgore.cpp
+++ b/src/scripts/northrend/draktharon_keep/boss_trollgore.cpp
@@ -29,7 +29,6 @@ update creature_template set scriptname = 'boss_trollgore' where entry = '';
 *** SQL END ***/
 #include "ScriptedPch.h"
 #include "drak_tharon_keep.h"
-#include "SpellId.h"
 
 enum Spells
 {
diff --git a/src/scripts/northrend/naxxramas/boss_anubrekhan.cpp b/src/scripts/northrend/naxxramas/boss_anubrekhan.cpp
index 3b731bc27..19913ce30 100644
--- a/src/scripts/northrend/naxxramas/boss_anubrekhan.cpp
+++ b/src/scripts/northrend/naxxramas/boss_anubrekhan.cpp
@@ -16,7 +16,6 @@
 
 #include "ScriptedPch.h"
 #include "naxxramas.h"
-#include "SpellId.h"
 
 #define SAY_GREET           RAND(-1533000,-1533004,-1533005,-1533006,-1533007)
 #define SAY_AGGRO           RAND(-1533001,-1533002,-1533003)
diff --git a/src/scripts/northrend/naxxramas/boss_faerlina.cpp b/src/scripts/northrend/naxxramas/boss_faerlina.cpp
index 905ed0034..1405fd09c 100644
--- a/src/scripts/northrend/naxxramas/boss_faerlina.cpp
+++ b/src/scripts/northrend/naxxramas/boss_faerlina.cpp
@@ -18,7 +18,6 @@
 
 #include "ScriptedPch.h"
 #include "naxxramas.h"
-#include "SpellId.h"
 
 enum Yells
 {
diff --git a/src/scripts/northrend/naxxramas/boss_gothik.cpp b/src/scripts/northrend/naxxramas/boss_gothik.cpp
index 191a5e8e9..0109fcaa5 100644
--- a/src/scripts/northrend/naxxramas/boss_gothik.cpp
+++ b/src/scripts/northrend/naxxramas/boss_gothik.cpp
@@ -16,7 +16,6 @@
 
 #include "ScriptedPch.h"
 #include "naxxramas.h"
-#include "SpellId.h"
 
 enum Yells
 {
diff --git a/src/scripts/northrend/naxxramas/boss_loatheb.cpp b/src/scripts/northrend/naxxramas/boss_loatheb.cpp
index c1a637cc7..9bafbeda2 100644
--- a/src/scripts/northrend/naxxramas/boss_loatheb.cpp
+++ b/src/scripts/northrend/naxxramas/boss_loatheb.cpp
@@ -18,7 +18,6 @@
 
 #include "ScriptedPch.h"
 #include "naxxramas.h"
-#include "SpellId.h"
 
 enum Spells
 {
diff --git a/src/scripts/northrend/naxxramas/boss_maexxna.cpp b/src/scripts/northrend/naxxramas/boss_maexxna.cpp
index 8f874e4fc..7b647b1d4 100644
--- a/src/scripts/northrend/naxxramas/boss_maexxna.cpp
+++ b/src/scripts/northrend/naxxramas/boss_maexxna.cpp
@@ -18,7 +18,6 @@
 
 #include "ScriptedPch.h"
 #include "naxxramas.h"
-#include "SpellId.h"
 
 enum Spells 
 {
diff --git a/src/scripts/northrend/naxxramas/boss_thaddius.cpp b/src/scripts/northrend/naxxramas/boss_thaddius.cpp
index b2a4b16b2..5e023e19c 100644
--- a/src/scripts/northrend/naxxramas/boss_thaddius.cpp
+++ b/src/scripts/northrend/naxxramas/boss_thaddius.cpp
@@ -18,7 +18,6 @@
 
 #include "ScriptedPch.h"
 #include "naxxramas.h"
-#include "SpellId.h"
 
 //Stalagg
 enum StalaggYells
diff --git a/src/scripts/northrend/violet_hold/boss_erekem.cpp b/src/scripts/northrend/violet_hold/boss_erekem.cpp
index f88622ddf..302425966 100644
--- a/src/scripts/northrend/violet_hold/boss_erekem.cpp
+++ b/src/scripts/northrend/violet_hold/boss_erekem.cpp
@@ -11,7 +11,6 @@ update creature_template set scriptname = '' where entry = '';
 *** SQL END ***/
 #include "ScriptedPch.h"
 #include "violet_hold.h"
-#include "SpellId.h"
 
 enum Spells
 {
diff --git a/src/scripts/northrend/violet_hold/boss_ichoron.cpp b/src/scripts/northrend/violet_hold/boss_ichoron.cpp
index 8c51340ac..fb916fd02 100644
--- a/src/scripts/northrend/violet_hold/boss_ichoron.cpp
+++ b/src/scripts/northrend/violet_hold/boss_ichoron.cpp
@@ -24,7 +24,6 @@ Script Data End */
 
 #include "ScriptedPch.h"
 #include "violet_hold.h"
-#include "SpellId.h"
 
 enum Spells
 {
diff --git a/src/scripts/world/go_scripts.cpp b/src/scripts/world/go_scripts.cpp
index 6235c6b31..b771e3cbc 100644
--- a/src/scripts/world/go_scripts.cpp
+++ b/src/scripts/world/go_scripts.cpp
@@ -43,10 +43,10 @@ go_rusty_cage
 go_scourge_cage
 go_jotunheim_cage
 go_table_theka
+go_soulwell
 EndContentData */
 
 #include "ScriptedPch.h"
-#include "SpellId.h"
 
 /*######
 ## go_cat_figurine