Remove unnecessary header-header includes.

52 files changed, 53 insertions, 2 deletions

diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc
index bd76a3c3cb..279f559382 100644
--- a/crawl-ref/source/abyss.cc
+++ b/crawl-ref/source/abyss.cc
@@ -34,6 +34,7 @@
 #include "religion.h"
 #include "showsymb.h"
 #include "stuff.h"
+#include "env.h"
 #include "spells3.h"
 #include "terrain.h"
 #ifdef USE_TILE
diff --git a/crawl-ref/source/arena.cc b/crawl-ref/source/arena.cc
index 0f4b71c394..7da2a1288c 100644
--- a/crawl-ref/source/arena.cc
+++ b/crawl-ref/source/arena.cc
@@ -13,6 +13,7 @@
 #include "colour.h"
 #include "command.h"
 #include "dungeon.h"
+#include "env.h"
 #include "initfile.h"
 #include "items.h"
 #include "itemname.h" // for make_name()
diff --git a/crawl-ref/source/chardump.cc b/crawl-ref/source/chardump.cc
index 56d92419bf..0a5c163a9b 100644
--- a/crawl-ref/source/chardump.cc
+++ b/crawl-ref/source/chardump.cc
@@ -50,6 +50,7 @@
 #include "spl-util.h"
 #include "stash.h"
 #include "stuff.h"
+#include "env.h"
 #include "transfor.h"
 #include "view.h"
 #include "viewchar.h"
diff --git a/crawl-ref/source/cloud.cc b/crawl-ref/source/cloud.cc
index a6006c0b35..3567723166 100644
--- a/crawl-ref/source/cloud.cc
+++ b/crawl-ref/source/cloud.cc
@@ -25,6 +25,7 @@
 #include "random.h"
 #include "spells4.h"
 #include "stuff.h"
+#include "env.h"
 #include "terrain.h"
 #include "mutation.h"
 
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index 52ebddce29..a1d2128127 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -48,6 +48,7 @@
 #include "spl-util.h"
 #include "state.h"
 #include "stuff.h"
+#include "env.h"
 #include "terrain.h"
 #include "transfor.h"
 #include "tutorial.h"
diff --git a/crawl-ref/source/dbg-maps.cc b/crawl-ref/source/dbg-maps.cc
index 7766895590..fe4040406f 100644
--- a/crawl-ref/source/dbg-maps.cc
+++ b/crawl-ref/source/dbg-maps.cc
@@ -12,6 +12,7 @@
 #include "chardump.h"
 #include "coord.h"
 #include "dungeon.h"
+#include "env.h"
 #include "map_knowledge.h"
 #include "initfile.h"
 #include "maps.h"
diff --git a/crawl-ref/source/dbg-scan.cc b/crawl-ref/source/dbg-scan.cc
index 15981d2a5b..6f9191af5b 100644
--- a/crawl-ref/source/dbg-scan.cc
+++ b/crawl-ref/source/dbg-scan.cc
@@ -13,6 +13,7 @@
 #include "coordit.h"
 #include "dbg-util.h"
 #include "dungeon.h"
+#include "env.h"
 #include "itemname.h"
 #include "message.h"
 #include "mon-util.h"
diff --git a/crawl-ref/source/dbg-util.cc b/crawl-ref/source/dbg-util.cc
index d3950716ff..57bf3b1b37 100644
--- a/crawl-ref/source/dbg-util.cc
+++ b/crawl-ref/source/dbg-util.cc
@@ -12,6 +12,7 @@
 #include "cio.h"
 #include "coord.h"
 #include "dungeon.h"
+#include "env.h"
 #include "mon-stuff.h"
 #include "mon-util.h"
 #include "religion.h"
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index c6c323658c..cc11099929 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -47,6 +47,7 @@
 #include "stash.h"
 #include "state.h"
 #include "stuff.h"
+#include "env.h"
 #include "transfor.h"
 #include "travel.h"
 #include "tutorial.h"
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index da52bb3673..b51269d9e6 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -47,6 +47,7 @@
 #include "skills2.h"
 #include "spl-book.h"
 #include "stuff.h"
+#include "env.h"
 #include "spl-cast.h"
 #include "spl-util.h"
 #include "transfor.h"
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index 11e887c728..5a5d70b731 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -51,6 +51,7 @@
 #include "showsymb.h"
 #include "state.h"
 #include "stuff.h"
+#include "env.h"
 #include "areas.h"
 #include "stash.h"
 #ifdef USE_TILE
diff --git a/crawl-ref/source/exclude.cc b/crawl-ref/source/exclude.cc
index 824affc669..ba19f710ac 100644
--- a/crawl-ref/source/exclude.cc
+++ b/crawl-ref/source/exclude.cc
@@ -14,6 +14,7 @@
 #include "options.h"
 #include "overmap.h"
 #include "stuff.h"
+#include "env.h"
 #include "tags.h"
 #include "terrain.h"
 #include "travel.h"
diff --git a/crawl-ref/source/hiscores.cc b/crawl-ref/source/hiscores.cc
index a99a9b4a95..24ca1a90cb 100644
--- a/crawl-ref/source/hiscores.cc
+++ b/crawl-ref/source/hiscores.cc
@@ -54,6 +54,7 @@
 #include "species.h"
 #include "state.h"
 #include "stuff.h"
+#include "env.h"
 #include "tags.h"
 
 #include "skills2.h"
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index 1c33d271ab..d477d1b767 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -40,6 +40,7 @@
 #include "spl-book.h"
 #include "state.h"
 #include "stuff.h"
+#include "env.h"
 #include "transfor.h"
 
 
diff --git a/crawl-ref/source/l_debug.cc b/crawl-ref/source/l_debug.cc
index 2a93d8f857..82ee06d688 100644
--- a/crawl-ref/source/l_debug.cc
+++ b/crawl-ref/source/l_debug.cc
@@ -12,6 +12,7 @@
 #include "chardump.h"
 #include "coordit.h"
 #include "dungeon.h"
+#include "env.h"
 #include "message.h"
 #include "mon-iter.h"
 #include "mon-stuff.h"
diff --git a/crawl-ref/source/l_dgn.cc b/crawl-ref/source/l_dgn.cc
index a1b42e30cd..e87089a32a 100644
--- a/crawl-ref/source/l_dgn.cc
+++ b/crawl-ref/source/l_dgn.cc
@@ -10,6 +10,7 @@
 #include "colour.h"
 #include "coord.h"
 #include "directn.h"
+#include "env.h"
 #include "l_defs.h"
 #include "mapmark.h"
 #include "maps.h"
diff --git a/crawl-ref/source/l_dgnit.cc b/crawl-ref/source/l_dgnit.cc
index 6512c3233e..9c176c1d8e 100644
--- a/crawl-ref/source/l_dgnit.cc
+++ b/crawl-ref/source/l_dgnit.cc
@@ -10,6 +10,7 @@
 
 #include "coord.h"
 #include "dungeon.h"
+#include "env.h"
 #include "items.h"
 #include "mapdef.h"
 #include "stash.h"
diff --git a/crawl-ref/source/l_dgnmon.cc b/crawl-ref/source/l_dgnmon.cc
index df4e83cc46..772c600409 100644
--- a/crawl-ref/source/l_dgnmon.cc
+++ b/crawl-ref/source/l_dgnmon.cc
@@ -9,6 +9,7 @@
 #include "l_libs.h"
 
 #include "dungeon.h"
+#include "env.h"
 #include "mapdef.h"
 #include "mon-util.h"
 #include "mon-place.h"
diff --git a/crawl-ref/source/l_feat.cc b/crawl-ref/source/l_feat.cc
index ce5cebce83..302a5d1f76 100644
--- a/crawl-ref/source/l_feat.cc
+++ b/crawl-ref/source/l_feat.cc
@@ -11,6 +11,7 @@
 
 #include "coord.h"
 #include "dungeon.h"
+#include "env.h"
 #include "terrain.h"
 
 #define FEATF(name, val) \
diff --git a/crawl-ref/source/l_item.cc b/crawl-ref/source/l_item.cc
index 57e8eb9ca8..c2248e1682 100644
--- a/crawl-ref/source/l_item.cc
+++ b/crawl-ref/source/l_item.cc
@@ -13,8 +13,10 @@
 #include "itemprop.h"
 #include "items.h"
 #include "output.h"
+#include "player.h"
 #include "skills2.h"
 #include "stuff.h"
+#include "env.h"
 
 /////////////////////////////////////////////////////////////////////
 // User bindings to get information on items. We must be careful
diff --git a/crawl-ref/source/lev-pand.cc b/crawl-ref/source/lev-pand.cc
index a772d6e3d6..ef8491f500 100644
--- a/crawl-ref/source/lev-pand.cc
+++ b/crawl-ref/source/lev-pand.cc
@@ -12,6 +12,7 @@
 
 #include "externs.h"
 #include "dungeon.h"
+#include "env.h"
 #include "mon-place.h"
 #include "mon-pick.h"
 #include "random.h"
diff --git a/crawl-ref/source/los.cc b/crawl-ref/source/los.cc
index 2984718518..47916487c4 100644
--- a/crawl-ref/source/los.cc
+++ b/crawl-ref/source/los.cc
@@ -59,6 +59,7 @@
 #include "ray.h"
 #include "state.h"
 #include "stuff.h"
+#include "env.h"
 #include "terrain.h"
 #include "viewgeom.h"
 
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index 3ad8f77048..32e7454bc8 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -19,6 +19,7 @@
 #include "decks.h"
 #include "describe.h"
 #include "dungeon.h"
+#include "env.h"
 #include "food.h"
 #include "itemprop.h"
 #include "items.h"
diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc
index 407eaf9a6f..88d1f9381e 100644
--- a/crawl-ref/source/mapdef.cc
+++ b/crawl-ref/source/mapdef.cc
@@ -39,6 +39,7 @@
 #include "religion.h"
 #include "spl-util.h"
 #include "stuff.h"
+#include "env.h"
 #include "tags.h"
 
 static const char *map_section_names[] = {
diff --git a/crawl-ref/source/mapmark.cc b/crawl-ref/source/mapmark.cc
index 612c0fc8df..1e27ac1a14 100644
--- a/crawl-ref/source/mapmark.cc
+++ b/crawl-ref/source/mapmark.cc
@@ -19,6 +19,7 @@
 #include "l_defs.h"
 #include "l_libs.h"
 #include "stuff.h"
+#include "env.h"
 #include "tags.h"
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/crawl-ref/source/maps.cc b/crawl-ref/source/maps.cc
index 3f5565cc06..c90c99552d 100644
--- a/crawl-ref/source/maps.cc
+++ b/crawl-ref/source/maps.cc
@@ -19,6 +19,7 @@
 #include "coordit.h"
 #include "dbg-maps.h"
 #include "dungeon.h"
+#include "env.h"
 #include "enum.h"
 #include "files.h"
 #include "message.h"
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index a4e977553e..9b3ee6eb03 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -72,6 +72,7 @@
 #include "stash.h"
 #include "state.h"
 #include "stuff.h"
+#include "env.h"
 #include "areas.h"
 #include "tiles.h"
 #include "terrain.h"
diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc
index 23c873e10f..1a1f8b8b44 100644
--- a/crawl-ref/source/mon-abil.cc
+++ b/crawl-ref/source/mon-abil.cc
@@ -30,6 +30,7 @@
 #include "spl-util.h"
 #include "state.h"
 #include "stuff.h"
+#include "env.h"
 #include "areas.h"
 #include "view.h"
 #include "shout.h"
diff --git a/crawl-ref/source/mon-act.cc b/crawl-ref/source/mon-act.cc
index c1d45b9eab..c580992fc0 100644
--- a/crawl-ref/source/mon-act.cc
+++ b/crawl-ref/source/mon-act.cc
@@ -16,6 +16,7 @@
 #include "dbg-scan.h"
 #include "delay.h"
 #include "directn.h"
+#include "env.h"
 #include "map_knowledge.h"
 #include "food.h"
 #include "fprop.h"
diff --git a/crawl-ref/source/mon-behv.cc b/crawl-ref/source/mon-behv.cc
index e098c3efd0..aea54df3e6 100644
--- a/crawl-ref/source/mon-behv.cc
+++ b/crawl-ref/source/mon-behv.cc
@@ -12,6 +12,7 @@
 
 #include "coord.h"
 #include "coordit.h"
+#include "env.h"
 #include "fprop.h"
 #include "exclude.h"
 #include "los.h"
diff --git a/crawl-ref/source/mon-gear.cc b/crawl-ref/source/mon-gear.cc
index ba2e2b68ab..816d5709be 100644
--- a/crawl-ref/source/mon-gear.cc
+++ b/crawl-ref/source/mon-gear.cc
@@ -13,6 +13,7 @@
 
 #include "artefact.h"
 #include "dungeon.h"
+#include "env.h"
 #include "itemprop.h"
 #include "items.h"
 #include "makeitem.h"
diff --git a/crawl-ref/source/mon-place.cc b/crawl-ref/source/mon-place.cc
index 718223fa6c..a76f864080 100644
--- a/crawl-ref/source/mon-place.cc
+++ b/crawl-ref/source/mon-place.cc
@@ -32,6 +32,7 @@
 #include "religion.h"
 #include "state.h"
 #include "stuff.h"
+#include "env.h"
 #include "terrain.h"
 #include "traps.h"
 #include "view.h"
diff --git a/crawl-ref/source/mon-place.h b/crawl-ref/source/mon-place.h
index 24d4765ac4..709a88045b 100644
--- a/crawl-ref/source/mon-place.h
+++ b/crawl-ref/source/mon-place.h
@@ -11,6 +11,7 @@
 #include "coord.h"
 #include "enum.h"
 #include "dungeon.h"
+#include "player.h"
 
 enum band_type
 {
diff --git a/crawl-ref/source/mon-stuff.cc b/crawl-ref/source/mon-stuff.cc
index 7c46d42e29..06a88530f4 100644
--- a/crawl-ref/source/mon-stuff.cc
+++ b/crawl-ref/source/mon-stuff.cc
@@ -42,6 +42,7 @@
 #include "spl-util.h"
 #include "state.h"
 #include "stuff.h"
+#include "env.h"
 #include "areas.h"
 #include "terrain.h"
 #include "transfor.h"
diff --git a/crawl-ref/source/mon-transit.cc b/crawl-ref/source/mon-transit.cc
index 0ed945f1b4..685a4c0d09 100644
--- a/crawl-ref/source/mon-transit.cc
+++ b/crawl-ref/source/mon-transit.cc
@@ -12,6 +12,7 @@
 
 #include "artefact.h"
 #include "dungeon.h"
+#include "env.h"
 #include "items.h"
 #include "mon-place.h"
 #include "mon-util.h"
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 2a2c2e5280..bd0820f4bb 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -30,6 +30,7 @@
 #include "spl-util.h"
 #include "state.h"
 #include "stuff.h"
+#include "env.h"
 #include "terrain.h"
 
 //jmf: moved from inside function
diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc
index ede1fd4807..9fec154f91 100644
--- a/crawl-ref/source/monster.cc
+++ b/crawl-ref/source/monster.cc
@@ -13,6 +13,7 @@
 #include "delay.h"
 #include "dgnevent.h"
 #include "directn.h"
+#include "env.h"
 #include "fight.h"
 #include "ghost.h"
 #include "goditem.h"
diff --git a/crawl-ref/source/overmap.cc b/crawl-ref/source/overmap.cc
index af6283d96d..975f9db76a 100644
--- a/crawl-ref/source/overmap.cc
+++ b/crawl-ref/source/overmap.cc
@@ -33,6 +33,7 @@
 #include "shopping.h"
 #include "state.h"
 #include "stuff.h"
+#include "env.h"
 #include "terrain.h"
 #include "view.h"
 
diff --git a/crawl-ref/source/quiver.cc b/crawl-ref/source/quiver.cc
index 9791173a8e..f31b7b76dd 100644
--- a/crawl-ref/source/quiver.cc
+++ b/crawl-ref/source/quiver.cc
@@ -11,11 +11,13 @@
 
 #include "quiver.h"
 
+#include "env.h"
 #include "invent.h"
 #include "item_use.h"
 #include "itemprop.h"
 #include "items.h"
 #include "options.h"
+#include "player.h"
 #include "stuff.h"
 #include "tags.h"
 
diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc
index 56974b78fe..4c6f007595 100644
--- a/crawl-ref/source/shopping.cc
+++ b/crawl-ref/source/shopping.cc
@@ -34,6 +34,7 @@
 #include "spl-book.h"
 #include "stash.h"
 #include "stuff.h"
+#include "env.h"
 
 #define SHOPPING_LIST_COST_KEY "shopping_list_cost_key"
 
diff --git a/crawl-ref/source/spl-util.cc b/crawl-ref/source/spl-util.cc
index df4c49bbd8..a374f18771 100644
--- a/crawl-ref/source/spl-util.cc
+++ b/crawl-ref/source/spl-util.cc
@@ -24,6 +24,7 @@
 #include "debug.h"
 #include "godabil.h"
 #include "stuff.h"
+#include "env.h"
 #include "macro.h"
 #include "mon-behv.h"
 #include "mon-util.h"
diff --git a/crawl-ref/source/stash.cc b/crawl-ref/source/stash.cc
index 1c4bddfbc9..44f68d4251 100644
--- a/crawl-ref/source/stash.cc
+++ b/crawl-ref/source/stash.cc
@@ -34,6 +34,7 @@
 #include "spl-book.h"
 #include "stash.h"
 #include "stuff.h"
+#include "env.h"
 #include "tags.h"
 #include "terrain.h"
 #include "traps.h"
diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc
index f3d24c6f25..2dc5c220b1 100644
--- a/crawl-ref/source/stuff.cc
+++ b/crawl-ref/source/stuff.cc
@@ -17,6 +17,7 @@
 #include "mon-place.h"
 #include "state.h"
 #include "stuff.h"
+#include "env.h"
 #include "areas.h"
 #include "view.h"
 #include "viewchar.h"
diff --git a/crawl-ref/source/stuff.h b/crawl-ref/source/stuff.h
index 5bfcebdcd2..89757eb99d 100644
--- a/crawl-ref/source/stuff.h
+++ b/crawl-ref/source/stuff.h
@@ -8,8 +8,6 @@
 #ifndef STUFF_H
 #define STUFF_H
 
-#include "env.h"
-#include "player.h"
 #include <map>
 
 std::string make_time_string(time_t abs_time, bool terse = false);
diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc
index 25f19dc6cb..5b04041c53 100644
--- a/crawl-ref/source/tags.cc
+++ b/crawl-ref/source/tags.cc
@@ -77,6 +77,7 @@
 #include "skills.h"
 #include "skills2.h"
 #include "stuff.h"
+#include "env.h"
 #include "tags.h"
 #include "tiles.h"
 #include "tilemcache.h"
diff --git a/crawl-ref/source/terrain.cc b/crawl-ref/source/terrain.cc
index 5278fd6b12..5e60478a3f 100644
--- a/crawl-ref/source/terrain.cc
+++ b/crawl-ref/source/terrain.cc
@@ -33,6 +33,7 @@
 #include "religion.h"
 #include "spells3.h"
 #include "stuff.h"
+#include "env.h"
 #include "transfor.h"
 #include "traps.h"
 #include "view.h"
diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc
index 6ec12832cd..0babbfa79c 100644
--- a/crawl-ref/source/traps.cc
+++ b/crawl-ref/source/traps.cc
@@ -35,6 +35,7 @@
 #include "spl-util.h"
 #include "state.h"
 #include "stuff.h"
+#include "env.h"
 #include "areas.h"
 #include "terrain.h"
 #include "transfor.h"
diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc
index a3f19fa946..b3d9b38c0f 100644
--- a/crawl-ref/source/travel.cc
+++ b/crawl-ref/source/travel.cc
@@ -42,6 +42,7 @@
 #include "player.h"
 #include "stash.h"
 #include "stuff.h"
+#include "env.h"
 #include "tags.h"
 #include "terrain.h"
 #ifdef USE_TILE
diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc
index 9d42708f00..65acaed376 100644
--- a/crawl-ref/source/tutorial.cc
+++ b/crawl-ref/source/tutorial.cc
@@ -50,6 +50,7 @@
 #include "species.h"
 #include "spl-book.h"
 #include "stuff.h"
+#include "env.h"
 #include "tags.h"
 #include "terrain.h"
 #ifdef USE_TILE
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index c8d154f888..f22623bc4c 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -57,6 +57,7 @@
 #include "player.h"
 #include "random.h"
 #include "stuff.h"
+#include "env.h"
 #include "spells3.h"
 #include "stash.h"
 #include "tiles.h"
diff --git a/crawl-ref/source/wiz-fsim.cc b/crawl-ref/source/wiz-fsim.cc
index e998abb7d4..24bf25117c 100644
--- a/crawl-ref/source/wiz-fsim.cc
+++ b/crawl-ref/source/wiz-fsim.cc
@@ -12,6 +12,7 @@
 
 #include "beam.h"
 #include "dbg-util.h"
+#include "env.h"
 #include "fight.h"
 #include "itemprop.h"
 #include "items.h"
diff --git a/crawl-ref/source/wiz-mon.cc b/crawl-ref/source/wiz-mon.cc
index 4990bcd74a..a7ba5fa190 100644
--- a/crawl-ref/source/wiz-mon.cc
+++ b/crawl-ref/source/wiz-mon.cc
@@ -33,6 +33,7 @@
 #include "spl-mis.h"
 #include "spl-util.h"
 #include "stuff.h"
+#include "env.h"
 #include "areas.h"
 #include "view.h"