diff --git a/modules/AZTH/src/AZTH_SC.cpp b/modules/AZTH/src/AZTH_SC.cpp
index 461b52e7..f6fbd1d1 100644
--- a/modules/AZTH/src/AZTH_SC.cpp
+++ b/modules/AZTH/src/AZTH_SC.cpp
@@ -824,7 +824,7 @@ public:
 
     bool CanSellItem(Player* player, Item* item, Creature* creature) override
     {
-        if (item->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_UNK1))
+        if (item->HasFlag(ITEM_FIELD_FLAGS, ITEM_FIELD_FLAG_UNK1))
         {
             player->SendSellError(SELL_ERR_CANT_SELL_ITEM, creature, item->GetGUID(), 0);
             return false;
@@ -1126,7 +1126,7 @@ public:
             return false;
 
         // [AZTH] force soulbound using an unknown flag as workaround
-        if (item->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_UNK1))
+        if (item->HasFlag(ITEM_FIELD_FLAGS, ITEM_FIELD_FLAG_UNK1))
             return false;
 
         return true;        
diff --git a/modules/BGItemLevel/src/scripts/ArenaSeason.h b/modules/BGItemLevel/src/scripts/ArenaSeason.h
index c2e0cba5..d56b802d 100644
--- a/modules/BGItemLevel/src/scripts/ArenaSeason.h
+++ b/modules/BGItemLevel/src/scripts/ArenaSeason.h
@@ -1,7 +1,7 @@
 #include "Common.h"
 #include "Define.h"
 #include "Config.h"
-#include "ItemPrototype.h"
+#include "ItemTemplate.h"
 #include "Player.h"
 
 class Season
diff --git a/modules/BGItemLevel/src/scripts/BGItemLevel.cpp b/modules/BGItemLevel/src/scripts/BGItemLevel.cpp
index 24340ac7..24a8f9a5 100644
--- a/modules/BGItemLevel/src/scripts/BGItemLevel.cpp
+++ b/modules/BGItemLevel/src/scripts/BGItemLevel.cpp
@@ -1,7 +1,7 @@
 #include "ScriptMgr.h"
 #include "Player.h"
 #include "Item.h"
-#include "ItemPrototype.h"
+#include "ItemTemplate.h"
 #include "Battleground.h"
 #include "BattlegroundMgr.h"
 #include "QueryResult.h"
diff --git a/modules/ExtraItems/src/scripts/ExtraItems.cpp b/modules/ExtraItems/src/scripts/ExtraItems.cpp
index 6abe4e1b..07703525 100644
--- a/modules/ExtraItems/src/scripts/ExtraItems.cpp
+++ b/modules/ExtraItems/src/scripts/ExtraItems.cpp
@@ -10,7 +10,7 @@
 #include "GossipDef.h"
 #include "Item.h"
 #include "Group.h"
-#include "ItemPrototype.h"
+#include "ItemTemplate.h"
 #include "Log.h"
 #include "ObjectMgr.h"
 #include "Opcodes.h"
diff --git a/modules/Jukebox/src/scripts/Jukebox.cpp b/modules/Jukebox/src/scripts/Jukebox.cpp
index a81e1509..ab5bd7ad 100644
--- a/modules/Jukebox/src/scripts/Jukebox.cpp
+++ b/modules/Jukebox/src/scripts/Jukebox.cpp
@@ -1,7 +1,7 @@
 #include "ScriptMgr.h"
 #include "Player.h"
 #include "Item.h"
-#include "ItemPrototype.h"
+#include "ItemTemplate.h"
 #include "Common.h"
 #include "music.h"
 #include "ScriptedCreature.h"
@@ -170,4 +170,4 @@ void AddSC_Jukebox()
     new loadMusic();
     new Jukebox();
     new JukeboxSummon();
-}
\ No newline at end of file
+}
diff --git a/modules/PvPMode/src/scripts/PvPMode.cpp b/modules/PvPMode/src/scripts/PvPMode.cpp
index bfb690b2..125e62b4 100644
--- a/modules/PvPMode/src/scripts/PvPMode.cpp
+++ b/modules/PvPMode/src/scripts/PvPMode.cpp
@@ -205,7 +205,7 @@ public:
          */
                 // all items stored in pvp account should be soulbound
                 item->SetBinding(true);
-                item->ApplyModFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_UNK1, true);
+                item->ApplyModFlag(ITEM_FIELD_FLAGS, ITEM_FIELD_FLAG_UNK1, true);
                 /* try to avoid for performances
                 SQLTransaction trans = CharacterDatabase.BeginTransaction();
                 item->SaveToDB(trans);
diff --git a/modules/TournamentSet/src/scripts/TournamentSet.cpp b/modules/TournamentSet/src/scripts/TournamentSet.cpp
index 3e4f139e..7edd1029 100644
--- a/modules/TournamentSet/src/scripts/TournamentSet.cpp
+++ b/modules/TournamentSet/src/scripts/TournamentSet.cpp
@@ -247,7 +247,7 @@ public:
 
         //soulbound with our special flag
         item->SetBinding(true);
-        item->ApplyModFlag(ITEM_FIELD_FLAGS, ITEM_FLAG_UNK1, true);
+        item->ApplyModFlag(ITEM_FIELD_FLAGS, ITEM_FIELD_FLAG_UNK1, true);
 
         setEnchantAndSocket(player, item, originalEntry, spec);
     }
diff --git a/modules/azerothshard/src/game/AzthUtils.h b/modules/azerothshard/src/game/AzthUtils.h
index a73c1244..ab0ab348 100644
--- a/modules/azerothshard/src/game/AzthUtils.h
+++ b/modules/azerothshard/src/game/AzthUtils.h
@@ -5,7 +5,7 @@
 #include "Define.h"
 #include "Config.h"
 #include "Item.h"
-#include "ItemPrototype.h"
+#include "ItemTemplate.h"
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "Group.h"
diff --git a/modules/smartstone-app-loot-mod/src/scripts/smartstoneLootModifier.cpp b/modules/smartstone-app-loot-mod/src/scripts/smartstoneLootModifier.cpp
index e2c88ed4..63ea4d0e 100644
--- a/modules/smartstone-app-loot-mod/src/scripts/smartstoneLootModifier.cpp
+++ b/modules/smartstone-app-loot-mod/src/scripts/smartstoneLootModifier.cpp
@@ -1,7 +1,7 @@
 #include "ScriptMgr.h"
 #include "Player.h"
 #include "Item.h"
-#include "ItemPrototype.h"
+#include "ItemTemplate.h"
 #include "Common.h"
 #include "AZTH.h"
 
diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp
index 43bf4947..82ea3280 100644
--- a/src/server/game/Entities/Vehicle/Vehicle.cpp
+++ b/src/server/game/Entities/Vehicle/Vehicle.cpp
@@ -498,10 +498,6 @@ void Vehicle::RelocatePassengers()
 {
     ASSERT(_me->GetMap());
     
-    // [AZTH]
-    std::vector<std::pair<Unit*, Position>> seatRelocation;
-    seatRelocation.reserve(Seats.size());
-
     std::vector<std::pair<Unit*, Position>> seatRelocation;
     seatRelocation.reserve(Seats.size());