Remove further header-include. env.h now always directly included.

31 files changed, 31 insertions, 3 deletions

diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index 4bda429d91..fe6ba4577b 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -26,6 +26,7 @@
 #include "describe.h"
 #include "directn.h"
 #include "effects.h"
+#include "env.h"
 #include "food.h"
 #include "godabil.h"
 #include "it_use2.h"
diff --git a/crawl-ref/source/art-func.h b/crawl-ref/source/art-func.h
index 1fc84ad220..442004a220 100644
--- a/crawl-ref/source/art-func.h
+++ b/crawl-ref/source/art-func.h
@@ -23,6 +23,7 @@
 
 #include "cloud.h"    // For storm's bow rain
 #include "effects.h"  // For Sceptre of Torment tormenting
+#include "env.h"      // For storm bow env.cgrid
 #include "food.h"     // For evokes
 #include "mon-place.h" // For Sceptre of Asmodeus evoke
 #include "mon-stuff.h" // For Scythe of Curses cursing items
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 5ca97ddc8c..9ed9b32c3d 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -29,6 +29,7 @@
 #include "delay.h"
 #include "dgnevent.h"
 #include "effects.h"
+#include "env.h"
 #include "enum.h"
 #include "map_knowledge.h"
 #include "fprop.h"
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index 7444df5068..5b09bae904 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -18,6 +18,7 @@
 #include "database.h"
 #include "dungeon.h"
 #include "effects.h"
+#include "env.h"
 #include "files.h"
 #include "food.h"
 #include "ghost.h"
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index dbba93e9a6..e4ed388ab1 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -23,6 +23,7 @@
 #include "coordit.h"
 #include "defines.h"
 #include "effects.h"
+#include "env.h"
 #include "enum.h"
 #include "map_knowledge.h"
 #include "fprop.h"
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index fd10393667..3d4a11103a 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -29,6 +29,7 @@
 #include "delay.h"
 #include "directn.h"
 #include "dgnevent.h"
+#include "env.h"
 #include "map_knowledge.h"
 #include "fprop.h"
 #include "food.h"
diff --git a/crawl-ref/source/effects.h b/crawl-ref/source/effects.h
index fd1886dd36..0b71717f3c 100644
--- a/crawl-ref/source/effects.h
+++ b/crawl-ref/source/effects.h
@@ -8,9 +8,6 @@
 #ifndef EFFECTS_H
 #define EFFECTS_H
 
-#include "env.h"
-#include "externs.h"
-
 struct bolt;
 
 class monsters;
@@ -49,6 +46,7 @@ int place_ring(std::vector<coord_def>& ring_points,
                int arc_occupancy,
                int& seen_count);
 
+class los_def;
 // Collect lists of points that are within LOS (under the given losgrid),
 // unoccupied, and not solid (walls/statues).
 void collect_radius_points(std::vector<std::vector<coord_def> > &radius_points,
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 3429f71570..eb09539c01 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -27,6 +27,7 @@
 #include "delay.h"
 #include "directn.h"
 #include "effects.h"
+#include "env.h"
 #include "map_knowledge.h"
 #include "fprop.h"
 #include "food.h"
diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc
index 97f00a56f0..37755a4623 100644
--- a/crawl-ref/source/files.cc
+++ b/crawl-ref/source/files.cc
@@ -47,6 +47,7 @@
 #include "directn.h"
 #include "dungeon.h"
 #include "effects.h"
+#include "env.h"
 #include "ghost.h"
 #include "initfile.h"
 #include "itemprop.h"
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc
index 41e398165c..112f9e1739 100644
--- a/crawl-ref/source/food.cc
+++ b/crawl-ref/source/food.cc
@@ -24,6 +24,7 @@
 #include "debug.h"
 #include "delay.h"
 #include "effects.h"
+#include "env.h"
 #include "invent.h"
 #include "items.h"
 #include "itemname.h"
diff --git a/crawl-ref/source/godabil.cc b/crawl-ref/source/godabil.cc
index fc65c7b4b5..ce2aab0002 100644
--- a/crawl-ref/source/godabil.cc
+++ b/crawl-ref/source/godabil.cc
@@ -15,6 +15,7 @@
 #include "database.h"
 #include "directn.h"
 #include "effects.h"
+#include "env.h"
 #include "files.h"
 #include "godabil.h"
 #include "invent.h"
diff --git a/crawl-ref/source/godwrath.cc b/crawl-ref/source/godwrath.cc
index a712ce0fea..c828ae59ec 100644
--- a/crawl-ref/source/godwrath.cc
+++ b/crawl-ref/source/godwrath.cc
@@ -14,6 +14,7 @@
 #include "database.h"
 #include "decks.h"
 #include "effects.h"
+#include "env.h"
 #include "enum.h"
 #include "food.h"
 #include "ghost.h"
diff --git a/crawl-ref/source/it_use2.cc b/crawl-ref/source/it_use2.cc
index df4051580b..bc916fe007 100644
--- a/crawl-ref/source/it_use2.cc
+++ b/crawl-ref/source/it_use2.cc
@@ -16,6 +16,7 @@
 #include "artefact.h"
 #include "beam.h"
 #include "effects.h"
+#include "env.h"
 #include "food.h"
 #include "item_use.h"
 #include "itemname.h"
diff --git a/crawl-ref/source/it_use3.cc b/crawl-ref/source/it_use3.cc
index ebeb80a435..94c4f541d5 100644
--- a/crawl-ref/source/it_use3.cc
+++ b/crawl-ref/source/it_use3.cc
@@ -22,6 +22,7 @@
 #include "decks.h"
 #include "directn.h"
 #include "effects.h"
+#include "env.h"
 #include "fight.h"
 #include "food.h"
 #include "invent.h"
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 9a0b2c0504..897836e718 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -29,6 +29,7 @@
 #include "describe.h"
 #include "directn.h"
 #include "effects.h"
+#include "env.h"
 #include "map_knowledge.h"
 #include "fight.h"
 #include "food.h"
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index c794c01c0e..279717663a 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -29,6 +29,7 @@
 #include "dgnevent.h"
 #include "directn.h"
 #include "effects.h"
+#include "env.h"
 #include "food.h"
 #include "hiscores.h"
 #include "invent.h"
diff --git a/crawl-ref/source/main.cc b/crawl-ref/source/main.cc
index 65a609ec3a..3298e96ea7 100644
--- a/crawl-ref/source/main.cc
+++ b/crawl-ref/source/main.cc
@@ -60,6 +60,7 @@
 #include "directn.h"
 #include "dungeon.h"
 #include "effects.h"
+#include "env.h"
 #include "map_knowledge.h"
 #include "fprop.h"
 #include "fight.h"
diff --git a/crawl-ref/source/mon-cast.cc b/crawl-ref/source/mon-cast.cc
index 17d4faa140..a2a1cb2e6d 100644
--- a/crawl-ref/source/mon-cast.cc
+++ b/crawl-ref/source/mon-cast.cc
@@ -12,6 +12,7 @@
 #include "coordit.h"
 #include "database.h"
 #include "effects.h"
+#include "env.h"
 #include "fprop.h"
 #include "fight.h"
 #include "ghost.h"
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index 945259aaba..a8de02db3f 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -25,6 +25,7 @@
 #include "delay.h"
 #include "defines.h"
 #include "effects.h"
+#include "env.h"
 #include "files.h"
 #include "format.h"
 #include "godabil.h"
diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc
index 2565f85d13..8a1cd211a4 100644
--- a/crawl-ref/source/ouch.cc
+++ b/crawl-ref/source/ouch.cc
@@ -37,6 +37,7 @@
 #include "chardump.h"
 #include "delay.h"
 #include "effects.h"
+#include "env.h"
 #include "files.h"
 #include "fight.h"
 #include "godabil.h"
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index dbc36d491c..7ca84864c4 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -26,6 +26,7 @@
 #include "dgnevent.h"
 #include "directn.h"
 #include "effects.h"
+#include "env.h"
 #include "map_knowledge.h"
 #include "fight.h"
 #include "food.h"
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index f82625126e..366cada82e 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -36,6 +36,7 @@
 #include "describe.h"
 #include "dgnevent.h"
 #include "effects.h"
+#include "env.h"
 #include "enum.h"
 #include "fprop.h"
 #include "fight.h"
diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc
index 07e730aa1d..c1d4b40057 100644
--- a/crawl-ref/source/spells1.cc
+++ b/crawl-ref/source/spells1.cc
@@ -26,6 +26,7 @@
 #include "describe.h"
 #include "directn.h"
 #include "effects.h"
+#include "env.h"
 #include "invent.h"
 #include "it_use2.h"
 #include "itemname.h"
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc
index 3d5e378171..468f8f4151 100644
--- a/crawl-ref/source/spells2.cc
+++ b/crawl-ref/source/spells2.cc
@@ -23,6 +23,7 @@
 #include "delay.h"
 #include "directn.h"
 #include "effects.h"
+#include "env.h"
 #include "map_knowledge.h"
 #include "fprop.h"
 #include "ghost.h"
diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc
index a8ac9055d2..f7b60e1ab9 100644
--- a/crawl-ref/source/spells3.cc
+++ b/crawl-ref/source/spells3.cc
@@ -26,6 +26,7 @@
 #include "debug.h"
 #include "delay.h"
 #include "effects.h"
+#include "env.h"
 #include "fprop.h"
 #include "food.h"
 #include "goditem.h"
diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc
index dbde499551..f1b2e6228b 100644
--- a/crawl-ref/source/spells4.cc
+++ b/crawl-ref/source/spells4.cc
@@ -24,6 +24,7 @@
 #include "directn.h"
 #include "dungeon.h"
 #include "effects.h"
+#include "env.h"
 #include "invent.h"
 #include "it_use2.h"
 #include "item_use.h"
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 356ca36636..9f73adf013 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -20,6 +20,7 @@
 #include "describe.h"
 #include "directn.h"
 #include "effects.h"
+#include "env.h"
 #include "map_knowledge.h"
 #include "food.h"
 #include "format.h"
diff --git a/crawl-ref/source/spl-mis.cc b/crawl-ref/source/spl-mis.cc
index b67dea7d86..ebc876cf8c 100644
--- a/crawl-ref/source/spl-mis.cc
+++ b/crawl-ref/source/spl-mis.cc
@@ -16,6 +16,7 @@
 #include "cloud.h"
 #include "directn.h"
 #include "effects.h"
+#include "env.h"
 #include "it_use2.h"
 #include "kills.h"
 #include "misc.h"
diff --git a/crawl-ref/source/wiz-dgn.cc b/crawl-ref/source/wiz-dgn.cc
index cbecfbdfd5..a976c93c12 100644
--- a/crawl-ref/source/wiz-dgn.cc
+++ b/crawl-ref/source/wiz-dgn.cc
@@ -15,6 +15,7 @@
 #include "delay.h"
 #include "dungeon.h"
 #include "effects.h"
+#include "env.h"
 #include "files.h"
 #include "items.h"
 #include "l_defs.h"
diff --git a/crawl-ref/source/wiz-item.cc b/crawl-ref/source/wiz-item.cc
index f7e5d81e11..903dd91292 100644
--- a/crawl-ref/source/wiz-item.cc
+++ b/crawl-ref/source/wiz-item.cc
@@ -17,6 +17,7 @@
 #include "dbg-util.h"
 #include "decks.h"
 #include "effects.h"
+#include "env.h"
 #include "itemprop.h"
 #include "items.h"
 #include "item_use.h"
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index fe2fd7f6e4..ad5133df4d 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -16,6 +16,7 @@
 #include "delay.h"
 #include "directn.h"
 #include "effects.h"
+#include "env.h"
 #include "map_knowledge.h"
 #include "feature.h"
 #include "goditem.h"