.

zone/cli/tests/zone_state.cpp

@@ -2,9 +2,10 @@ extern Zone *zone;
 
 #include <cereal/archives/json.hpp>
 #include <cereal/types/map.hpp>
-#include "../../common/repositories/npc_types_repository.h"
 #include "../../corpse.h"
+#include "../../../common/repositories/npc_types_repository.h"
 #include "../../../common/repositories/respawn_times_repository.h"
+#include "../../../common/repositories/zone_state_spawns_repository.h"
 
 inline void ClearState()
 {

zone/zone.h

@@ -25,7 +25,6 @@
 #include "../common/random.h"
 #include "../common/strings.h"
 #include "zonedb.h"
-#include "../common/zone_store.h"
 #include "../common/repositories/grid_repository.h"
 #include "../common/repositories/grid_entries_repository.h"
 #include "../common/repositories/zone_points_repository.h"
@@ -46,10 +45,7 @@
 #include "../common/repositories/lootdrop_repository.h"
 #include "../common/repositories/lootdrop_entries_repository.h"
 #include "../common/repositories/base_data_repository.h"
-#include "../common/repositories/skill_caps_repository.h"
-#include "../common/repositories/zone_state_spawns_repository.h"
 #include "../common/repositories/spawn2_disabled_repository.h"
-#include "../common/repositories/player_titlesets_repository.h"
 
 struct EXPModifier
 {

zone/zone_cli.h

@@ -1,7 +1,6 @@
 #ifndef EQEMU_ZONE_CLI_H
 #define EQEMU_ZONE_CLI_H
 
-#include <iostream>
 #include "../common/cli/argh.h"
 
 class ZoneCLI {

zone/zone_event_scheduler.h

@@ -2,9 +2,10 @@
 #define EQEMU_ZONE_EVENT_SCHEDULER_H
 
 #include "../common/server_event_scheduler.h"
-#include "zone.h"
 #include "../common/content/world_content_service.h"
 
+class Zone;
+
 class ZoneEventScheduler : public ServerEventScheduler {
 public:
 	void Process(Zone *zone, WorldContentService *content_service);

zone/zone_reload.h

@@ -21,7 +21,6 @@
 #ifndef EQEMU_ZONE_RELOAD_H
 #define EQEMU_ZONE_RELOAD_H
 
-
 class ZoneReload {
 public:
 	static void HotReloadQuests();

zone/zone_save_state.h

@@ -2,12 +2,8 @@
 
 #include <string>
 #include <cereal/archives/json.hpp>
-#include <cereal/types/map.hpp>
 #include "npc.h"
-#include "corpse.h"
-#include "zone.h"
 #include "../common/repositories/zone_state_spawns_repository.h"
-#include "../common/repositories/spawn2_disabled_repository.h"
 
 struct LootEntryStateData {
 	uint32   item_id     = 0;

zone/zonedb.cpp

@@ -46,7 +46,6 @@
 #include "../common/repositories/npc_types_tint_repository.h"
 #include "../common/repositories/merchantlist_temp_repository.h"
 #include "../common/repositories/character_exp_modifiers_repository.h"
-#include "../common/repositories/character_data_repository.h"
 #include "../common/repositories/character_corpses_repository.h"
 #include "../common/repositories/character_corpse_items_repository.h"
 #include "../common/repositories/zone_repository.h"

zone/zonedump.h

@@ -28,7 +28,6 @@ spawn2 mediumblob, npcs mediumblob, npc_loot mediumblob, gmspawntype mediumblob,
 #define ZONEDUMP_H
 #include "../common/faction.h"
 #include "../common/eq_packet_structs.h"
-#include "../common/inventory_profile.h"
 
 #pragma pack(1)