diff --git a/zone/cli/tests/zone_state.cpp b/zone/cli/tests/zone_state.cpp
index b527f5a4f..bacfcb180 100644
--- a/zone/cli/tests/zone_state.cpp
+++ b/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()
 {
diff --git a/zone/zone_cli.h b/zone/zone_cli.h
index 7e5e6e81c..c3adafba0 100644
--- a/zone/zone_cli.h
+++ b/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 {
diff --git a/zone/zone_event_scheduler.h b/zone/zone_event_scheduler.h
index a2e6c67ad..d28cc27e3 100644
--- a/zone/zone_event_scheduler.h
+++ b/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);
diff --git a/zone/zone_reload.h b/zone/zone_reload.h
index 1e4f95826..d9b9c39a6 100644
--- a/zone/zone_reload.h
+++ b/zone/zone_reload.h
@@ -21,7 +21,6 @@
 #ifndef EQEMU_ZONE_RELOAD_H
 #define EQEMU_ZONE_RELOAD_H
 
-
 class ZoneReload {
 public:
 	static void HotReloadQuests();
diff --git a/zone/zone_save_state.h b/zone/zone_save_state.h
index 8d124240b..8d8c3f9ce 100644
--- a/zone/zone_save_state.h
+++ b/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;
diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp
index d85d9cf63..f44be3e51 100644
--- a/zone/zonedb.cpp
+++ b/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"
diff --git a/zone/zonedump.h b/zone/zonedump.h
index 5d29a252b..5aea0a583 100644
--- a/zone/zonedump.h
+++ b/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)