Flatten header dependencies a bit.

This removes a couple of unnecessary includes from header files.

I may have missed adding some tiles includes.

64 files changed, 71 insertions, 37 deletions

diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index c867cc4a36..140c36deff 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -24,6 +24,7 @@
 #include "decks.h"
 #include "delay.h"
 #include "describe.h"
+#include "directn.h"
 #include "effects.h"
 #include "food.h"
 #include "godabil.h"
diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc
index 90431bb9be..d125f0b61a 100644
--- a/crawl-ref/source/abyss.cc
+++ b/crawl-ref/source/abyss.cc
@@ -14,6 +14,7 @@
 #include "artefact.h"
 #include "cloud.h"
 #include "colour.h"
+#include "coordit.h"
 #include "makeitem.h"
 #include "mapmark.h"
 #include "message.h"
diff --git a/crawl-ref/source/artefact.cc b/crawl-ref/source/artefact.cc
index ef9f992fc0..f6698604ef 100644
--- a/crawl-ref/source/artefact.cc
+++ b/crawl-ref/source/artefact.cc
@@ -18,6 +18,7 @@
 #include "options.h"
 
 #include "colour.h"
+#include "coordit.h"
 #include "database.h"
 #include "describe.h"
 #include "itemname.h"
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index e35894dea9..af3a9108e8 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -24,6 +24,7 @@
 #include "cio.h"
 #include "cloud.h"
 #include "colour.h"
+#include "coordit.h"
 #include "delay.h"
 #include "dgnevent.h"
 #include "effects.h"
diff --git a/crawl-ref/source/chardump.cc b/crawl-ref/source/chardump.cc
index 20100ace55..a1effb544a 100644
--- a/crawl-ref/source/chardump.cc
+++ b/crawl-ref/source/chardump.cc
@@ -29,6 +29,7 @@
 #include "hiscores.h"
 #include "initfile.h"
 #include "itemprop.h"
+#include "itemname.h"
 #include "items.h"
 #include "kills.h"
 #include "macro.h"
diff --git a/crawl-ref/source/cloud.cc b/crawl-ref/source/cloud.cc
index 6e233b2410..1c6af41739 100644
--- a/crawl-ref/source/cloud.cc
+++ b/crawl-ref/source/cloud.cc
@@ -16,6 +16,8 @@
 #include "cloud.h"
 #include "colour.h"
 #include "coord.h"
+#include "coordit.h"
+#include "dungeon.h"
 #include "fprop.h"
 #include "mapmark.h"
 #include "ouch.h"
diff --git a/crawl-ref/source/cloud.h b/crawl-ref/source/cloud.h
index c94bd4af8d..9cd1ef249c 100644
--- a/crawl-ref/source/cloud.h
+++ b/crawl-ref/source/cloud.h
@@ -9,7 +9,6 @@
 #define CLOUD_H
 
 #include "externs.h"
-#include "travel.h"
 
 enum fog_machine_type
 {
diff --git a/crawl-ref/source/dbg-asrt.cc b/crawl-ref/source/dbg-asrt.cc
index 53338f52c8..50ebea9af5 100644
--- a/crawl-ref/source/dbg-asrt.cc
+++ b/crawl-ref/source/dbg-asrt.cc
@@ -12,12 +12,15 @@
 
 #include "clua.h"
 #include "coord.h"
+#include "coordit.h"
 #include "crash.h"
 #include "dbg-crsh.h"
 #include "dbg-scan.h"
 #include "dbg-util.h"
 #include "directn.h"
 #include "dlua.h"
+#include "dungeon.h"
+#include "env.h"
 #include "initfile.h"
 #include "jobs.h"
 #include "mapmark.h"
@@ -29,6 +32,7 @@
 #include "spl-cast.h"
 #include "spl-util.h"
 #include "state.h"
+#include "travel.h"
 
 #ifdef DEBUG
 static std::string _assert_msg;
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index 03e812faac..3394e782f9 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -11,10 +11,10 @@
 #include <algorithm>
 
 #include "externs.h"
-#include "options.h"
 
 #include "beam.h"
 #include "cio.h"
+#include "coordit.h"
 #include "database.h"
 #include "dungeon.h"
 #include "effects.h"
@@ -35,6 +35,7 @@
 #include "mon-place.h"
 #include "mon-stuff.h"
 #include "mutation.h"
+#include "options.h"
 #include "ouch.h"
 #include "player.h"
 #include "religion.h"
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index a609856b88..790c83bd00 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -24,6 +24,7 @@
 #include "colour.h"
 #include "command.h"
 #include "coord.h"
+#include "coordit.h"
 #include "dbg-util.h"
 #include "debug.h"
 #include "describe.h"
diff --git a/crawl-ref/source/directn.h b/crawl-ref/source/directn.h
index 65322b34e7..13b2dd7c60 100644
--- a/crawl-ref/source/directn.h
+++ b/crawl-ref/source/directn.h
@@ -11,7 +11,6 @@
 #include "describe.h"
 #include "externs.h"
 #include "enum.h"
-#include "libgui.h"
 #include "ray.h"
 #include "state.h"
 
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index b0ce733591..52fb457886 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -20,6 +20,7 @@
 #include "chardump.h"
 #include "cloud.h"
 #include "colour.h"
+#include "coordit.h"
 #include "defines.h"
 #include "effects.h"
 #include "enum.h"
diff --git a/crawl-ref/source/dungeon.h b/crawl-ref/source/dungeon.h
index b8cace2155..c84695dd74 100644
--- a/crawl-ref/source/dungeon.h
+++ b/crawl-ref/source/dungeon.h
@@ -8,7 +8,6 @@
 #ifndef DUNGEON_H
 #define DUNGEON_H
 
-#include "fixedvector.h"
 #include "fixedarray.h"
 #include "externs.h"
 #include "terrain.h"
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index f79a6a95d9..08b62e4e00 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -23,6 +23,7 @@
 #include "beam.h"
 #include "cloud.h"
 #include "colour.h"
+#include "coordit.h"
 #include "decks.h"
 #include "delay.h"
 #include "directn.h"
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index a6b428fe07..8fac63cb08 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -20,9 +20,11 @@
 #include "attitude-change.h"
 #include "beam.h"
 #include "cloud.h"
+#include "coordit.h"
 #include "database.h"
 #include "debug.h"
 #include "delay.h"
+#include "directn.h"
 #include "effects.h"
 #include "map_knowledge.h"
 #include "fprop.h"
diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc
index 2c01dbdc75..1673b27aa5 100644
--- a/crawl-ref/source/files.cc
+++ b/crawl-ref/source/files.cc
@@ -42,6 +42,7 @@
 #include "chardump.h"
 #include "cloud.h"
 #include "clua.h"
+#include "coordit.h"
 #include "debug.h"
 #include "directn.h"
 #include "dungeon.h"
diff --git a/crawl-ref/source/files.h b/crawl-ref/source/files.h
index 2854bfac74..9cc125d74d 100644
--- a/crawl-ref/source/files.h
+++ b/crawl-ref/source/files.h
@@ -9,7 +9,6 @@
 #define FILES_H
 
 #include "externs.h"
-#include "fixedarray.h"
 #include "player.h"
 #include <stdio.h>
 #include <string>
diff --git a/crawl-ref/source/godabil.cc b/crawl-ref/source/godabil.cc
index 27439a3890..aef7df3fc5 100644
--- a/crawl-ref/source/godabil.cc
+++ b/crawl-ref/source/godabil.cc
@@ -13,6 +13,7 @@
 #include "coord.h"
 #include "coordit.h"
 #include "database.h"
+#include "directn.h"
 #include "effects.h"
 #include "files.h"
 #include "godabil.h"
@@ -37,6 +38,7 @@
 #include "spells4.h"
 #include "spl-book.h"
 #include "spl-util.h"
+#include "state.h"
 #include "stuff.h"
 #include "terrain.h"
 #include "view.h"
diff --git a/crawl-ref/source/goditem.cc b/crawl-ref/source/goditem.cc
index 7711153cfe..65ddba4de7 100644
--- a/crawl-ref/source/goditem.cc
+++ b/crawl-ref/source/goditem.cc
@@ -5,7 +5,6 @@
 
 #include "AppHdr.h"
 
-#include "religion.h"
 #include "goditem.h"
 
 #include <algorithm>
@@ -15,7 +14,11 @@
 #include <stdio.h>
 #include <cmath>
 
-#include "externs.h"
+#include "itemname.h"
+#include "religion.h"
+#include "spl-book.h"
+#include "spl-cast.h"
+#include "spl-util.h"
 
 bool is_holy_item(const item_def& item)
 {
diff --git a/crawl-ref/source/goditem.h b/crawl-ref/source/goditem.h
index f6e9e3caf0..9f0e32cdec 100644
--- a/crawl-ref/source/goditem.h
+++ b/crawl-ref/source/goditem.h
@@ -5,11 +5,7 @@
 #include "externs.h"
 
 #include "artefact.h"
-#include "itemname.h"
 #include "player.h"
-#include "spl-book.h"
-#include "spl-cast.h"
-#include "spl-util.h"
 
 bool is_holy_item(const item_def& item);
 bool is_unholy_item(const item_def& item);
diff --git a/crawl-ref/source/godwrath.cc b/crawl-ref/source/godwrath.cc
index 0e0b68bb13..42a5e63a0a 100644
--- a/crawl-ref/source/godwrath.cc
+++ b/crawl-ref/source/godwrath.cc
@@ -34,10 +34,12 @@
 #include "spells4.h"
 #include "spl-mis.h"
 #include "stash.h"
+#include "state.h"
 #include "transfor.h"
 #include "shout.h"
 #include "xom.h"
 
+#include <sstream>
 
 static void _god_smites_you(god_type god, const char *message = NULL,
                             kill_method_type death_type = NUM_KILLBY);
diff --git a/crawl-ref/source/it_use3.cc b/crawl-ref/source/it_use3.cc
index 4eef45bc74..b759932301 100644
--- a/crawl-ref/source/it_use3.cc
+++ b/crawl-ref/source/it_use3.cc
@@ -17,6 +17,7 @@
 #include "artefact.h"
 #include "beam.h"
 #include "cloud.h"
+#include "coordit.h"
 #include "database.h"
 #include "decks.h"
 #include "directn.h"
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 12c02afeb9..f430e1ade7 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -22,6 +22,7 @@
 #include "cloud.h"
 #include "colour.h"
 #include "command.h"
+#include "coordit.h"
 #include "debug.h"
 #include "decks.h"
 #include "delay.h"
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index 969b472cdd..ceb16affb6 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -16,12 +16,12 @@
 #include <ctype.h>
 
 #include "externs.h"
-#include "options.h"
 
 #include "arena.h"
 #include "artefact.h"
 #include "beam.h"
 #include "branch.h"
+#include "coordit.h"
 #include "dbg-util.h"
 #include "debug.h"
 #include "decks.h"
@@ -44,6 +44,7 @@
 #include "mon-util.h"
 #include "mutation.h"
 #include "notes.h"
+#include "options.h"
 #include "place.h"
 #include "player.h"
 #include "quiver.h"
diff --git a/crawl-ref/source/l_dgnbld.cc b/crawl-ref/source/l_dgnbld.cc
index e3eae9c0ef..aeaa026d32 100644
--- a/crawl-ref/source/l_dgnbld.cc
+++ b/crawl-ref/source/l_dgnbld.cc
@@ -9,6 +9,7 @@
 
 #include "cluautil.h"
 #include "coord.h"
+#include "coordit.h"
 #include "dungeon.h"
 #include "l_libs.h"
 #include "mapdef.h"
diff --git a/crawl-ref/source/l_mapmrk.cc b/crawl-ref/source/l_mapmrk.cc
index 8165babe85..c297eacd57 100644
--- a/crawl-ref/source/l_mapmrk.cc
+++ b/crawl-ref/source/l_mapmrk.cc
@@ -3,6 +3,7 @@
 #include "cluautil.h"
 #include "l_libs.h"
 
+#include "env.h"
 #include "mapmark.h"
 
 static int mapmarker_pos(lua_State *ls)
diff --git a/crawl-ref/source/main.cc b/crawl-ref/source/main.cc
index ca4c848c95..75e7d3cb1f 100644
--- a/crawl-ref/source/main.cc
+++ b/crawl-ref/source/main.cc
@@ -46,6 +46,7 @@
 #include "cloud.h"
 #include "clua.h"
 #include "command.h"
+#include "coordit.h"
 #include "ctest.h"
 #include "crash.h"
 #include "database.h"
diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc
index 1482387fed..d6d348f0b5 100644
--- a/crawl-ref/source/mapdef.cc
+++ b/crawl-ref/source/mapdef.cc
@@ -17,6 +17,7 @@
 #include "branch.h"
 #include "colour.h"
 #include "coord.h"
+#include "coordit.h"
 #include "describe.h"
 #include "directn.h"
 #include "dungeon.h"
diff --git a/crawl-ref/source/mapdef.h b/crawl-ref/source/mapdef.h
index e8ceafabda..aa407a669f 100644
--- a/crawl-ref/source/mapdef.h
+++ b/crawl-ref/source/mapdef.h
@@ -15,14 +15,12 @@
 #include <cstdio>
 #include <memory>
 
-#include "coordit.h"
 #include "dlua.h"
 #include "enum.h"
 #include "externs.h"
 #include "matrix.h"
 #include "fprop.h"
 #include "makeitem.h"
-#include "stuff.h"
 #include "travel.h"
 
 // [dshaligram] Maps can be mirrored; for every orientation, there must be
@@ -231,6 +229,7 @@ private:
 };
 
 class map_def;
+class rectangle_iterator;
 class map_lines
 {
 public:
diff --git a/crawl-ref/source/mapmark.cc b/crawl-ref/source/mapmark.cc
index b0f27d40b6..cf8b378d30 100644
--- a/crawl-ref/source/mapmark.cc
+++ b/crawl-ref/source/mapmark.cc
@@ -12,6 +12,7 @@
 
 #include "clua.h"
 #include "cluautil.h"
+#include "coordit.h"
 #include "directn.h"
 #include "dlua.h"
 #include "libutil.h"
diff --git a/crawl-ref/source/mapmark.h b/crawl-ref/source/mapmark.h
index 67e64a2804..62cd8fe722 100644
--- a/crawl-ref/source/mapmark.h
+++ b/crawl-ref/source/mapmark.h
@@ -7,7 +7,6 @@
 #ifndef __MAPMARK_H__
 #define __MAPMARK_H__
 
-#include "dungeon.h"
 #include "dgnevent.h"
 #include "clua.h"
 #include "dlua.h"
diff --git a/crawl-ref/source/maps.cc b/crawl-ref/source/maps.cc
index cbe4922382..3f5565cc06 100644
--- a/crawl-ref/source/maps.cc
+++ b/crawl-ref/source/maps.cc
@@ -7,7 +7,6 @@
 #include "AppHdr.h"
 
 #include "maps.h"
-#include "tags.h"
 
 #include <cstring>
 #include <cstdlib>
@@ -17,6 +16,7 @@
 #include <unistd.h>
 #endif
 
+#include "coordit.h"
 #include "dbg-maps.h"
 #include "dungeon.h"
 #include "enum.h"
@@ -27,6 +27,7 @@
 #include "mon-place.h"
 #include "random.h"
 #include "state.h"
+#include "tags.h"
 #include "terrain.h"
 
 static bool _safe_vault_place(const map_def &md,
diff --git a/crawl-ref/source/maps.h b/crawl-ref/source/maps.h
index 77a86b941a..382dee0c5f 100644
--- a/crawl-ref/source/maps.h
+++ b/crawl-ref/source/maps.h
@@ -9,7 +9,6 @@
 #define MAPS_H
 
 #include "dlua.h"
-#include "fixedvector.h"
 #include "dungeon.h"
 
 #include <vector>
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index ea245fbff3..54456fc8a5 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -33,6 +33,7 @@
 #include "chardump.h"
 #include "clua.h"
 #include "cloud.h"
+#include "coordit.h"
 #include "database.h"
 #include "delay.h"
 #include "directn.h"
@@ -43,6 +44,7 @@
 #include "files.h"
 #include "food.h"
 #include "hiscores.h"
+#include "itemname.h"
 #include "itemprop.h"
 #include "items.h"
 #include "lev-pand.h"
diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc
index e9c5c15051..6904c0c25f 100644
--- a/crawl-ref/source/mon-abil.cc
+++ b/crawl-ref/source/mon-abil.cc
@@ -13,6 +13,7 @@
 #include "arena.h"
 #include "beam.h"
 #include "colour.h"
+#include "coordit.h"
 #include "directn.h"
 #include "fprop.h"
 #include "ghost.h"
diff --git a/crawl-ref/source/mon-act.cc b/crawl-ref/source/mon-act.cc
index 6e41ed98d9..587fafdff8 100644
--- a/crawl-ref/source/mon-act.cc
+++ b/crawl-ref/source/mon-act.cc
@@ -11,6 +11,7 @@
 #include "attitude-change.h"
 #include "beam.h"
 #include "cloud.h"
+#include "coordit.h"
 #include "dbg-scan.h"
 #include "delay.h"
 #include "directn.h"
diff --git a/crawl-ref/source/mon-cast.cc b/crawl-ref/source/mon-cast.cc
index b1ae67a26e..a476da9e73 100644
--- a/crawl-ref/source/mon-cast.cc
+++ b/crawl-ref/source/mon-cast.cc
@@ -9,6 +9,7 @@
 #include "beam.h"
 #include "cloud.h"
 #include "colour.h"
+#include "coordit.h"
 #include "database.h"
 #include "effects.h"
 #include "fprop.h"
@@ -28,6 +29,7 @@
 #include "spl-cast.h"
 #include "spells1.h"
 #include "spells3.h"
+#include "state.h"
 #include "stuff.h"
 #include "teleport.h"
 #include "view.h"
diff --git a/crawl-ref/source/mon-gear.h b/crawl-ref/source/mon-gear.h
index 4e03286402..c07825f15e 100644
--- a/crawl-ref/source/mon-gear.h
+++ b/crawl-ref/source/mon-gear.h
@@ -6,7 +6,6 @@
 #ifndef MON_GEAR_H
 #define MON_GEAR_H
 
-#include "itemprop.h"
 
 void give_item(int mid, int level_number, bool mons_summoned);
 #endif
diff --git a/crawl-ref/source/mon-place.cc b/crawl-ref/source/mon-place.cc
index e03177d26d..6070ea0ee7 100644
--- a/crawl-ref/source/mon-place.cc
+++ b/crawl-ref/source/mon-place.cc
@@ -12,7 +12,8 @@
 
 #include "arena.h"
 #include "branch.h"
-#include "directn.h" // for the Compass
+#include "coordit.h"
+#include "directn.h"
 #include "fprop.h"
 #include "externs.h"
 #include "options.h"
diff --git a/crawl-ref/source/mon-place.h b/crawl-ref/source/mon-place.h
index dd3523acdc..bea1c0f988 100644
--- a/crawl-ref/source/mon-place.h
+++ b/crawl-ref/source/mon-place.h
@@ -11,7 +11,6 @@
 #include "coord.h"
 #include "enum.h"
 #include "dungeon.h"
-#include "fixedvector.h"
 
 enum band_type
 {
diff --git a/crawl-ref/source/mon-stuff.cc b/crawl-ref/source/mon-stuff.cc
index 150f58ec55..07890d5236 100644
--- a/crawl-ref/source/mon-stuff.cc
+++ b/crawl-ref/source/mon-stuff.cc
@@ -12,6 +12,7 @@
 #include "attitude-change.h"
 #include "cloud.h"
 #include "cluautil.h"
+#include "coordit.h"
 #include "database.h"
 #include "delay.h"
 #include "dgnevent.h"
@@ -21,6 +22,7 @@
 #include "food.h"
 #include "godabil.h"
 #include "hiscores.h"
+#include "itemname.h"
 #include "items.h"
 #include "kills.h"
 #include "message.h"
diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc
index 304a019dd0..ad1d1b499c 100644
--- a/crawl-ref/source/monster.cc
+++ b/crawl-ref/source/monster.cc
@@ -8,12 +8,14 @@
 
 #include "beam.h"
 #include "cloud.h"
+#include "coordit.h"
 #include "delay.h"
 #include "dgnevent.h"
 #include "directn.h"
 #include "fight.h"
 #include "ghost.h"
 #include "goditem.h"
+#include "itemname.h"
 #include "items.h"
 #include "kills.h"
 #include "misc.h"
@@ -24,7 +26,8 @@
 #include "mon-transit.h"
 #include "random.h"
 #include "religion.h"
-#include "shopping.h" // for item values
+#include "shopping.h"
+#include "spl-util.h"
 #include "state.h"
 #include "traps.h"
 #include "tutorial.h"
diff --git a/crawl-ref/source/output.h b/crawl-ref/source/output.h
index 7c443c9ff8..d06e6fe18c 100644
--- a/crawl-ref/source/output.h
+++ b/crawl-ref/source/output.h
@@ -8,7 +8,6 @@
 #ifndef OUTPUT_H
 #define OUTPUT_H
 
-#include "format.h"
 
 enum status_redraw_flag_type
 {
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 8c09a7d2ba..e36fd474e6 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -24,6 +24,7 @@
 #include "coordit.h"
 #include "delay.h"
 #include "dgnevent.h"
+#include "directn.h"
 #include "effects.h"
 #include "map_knowledge.h"
 #include "fight.h"
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 875a43eaac..fbfd5ada54 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -27,6 +27,7 @@
 #include "attitude-change.h"
 #include "beam.h"
 #include "chardump.h"
+#include "coordit.h"
 #include "database.h"
 #include "debug.h"
 #include "decks.h"
@@ -69,6 +70,7 @@
 #include "spells1.h"
 #include "spells3.h"
 #include "spells4.h"
+#include "spl-book.h"
 #include "spl-mis.h"
 #include "stash.h"
 #include "state.h"
diff --git a/crawl-ref/source/shopping.h b/crawl-ref/source/shopping.h
index e61bf0e16e..cc38e1f8be 100644
--- a/crawl-ref/source/shopping.h
+++ b/crawl-ref/source/shopping.h
@@ -9,7 +9,6 @@
 #define SHOPPING_H
 
 #include "externs.h"
-#include "itemname.h"
 
 int artefact_value(const item_def &item);
 
diff --git a/crawl-ref/source/spells1.h b/crawl-ref/source/spells1.h
index ceac072671..8368947f03 100644
--- a/crawl-ref/source/spells1.h
+++ b/crawl-ref/source/spells1.h
@@ -8,10 +8,6 @@
 #ifndef SPELLS1_H
 #define SPELLS1_H
 
-
-#include "externs.h"
-#include "directn.h"
-
 struct bolt;
 
 bool cast_sure_blade(int power);
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc
index 06311a9c0e..58f66d2bae 100644
--- a/crawl-ref/source/spells2.cc
+++ b/crawl-ref/source/spells2.cc
@@ -19,6 +19,7 @@
 #include "artefact.h"
 #include "beam.h"
 #include "cloud.h"
+#include "coordit.h"
 #include "delay.h"
 #include "directn.h"
 #include "effects.h"
@@ -28,6 +29,7 @@
 #include "goditem.h"
 #include "invent.h"
 #include "itemprop.h"
+#include "itemname.h"
 #include "items.h"
 #include "it_use2.h"
 #include "message.h"
diff --git a/crawl-ref/source/spells2.h b/crawl-ref/source/spells2.h
index 03cd40eaa5..74111a2434 100644
--- a/crawl-ref/source/spells2.h
+++ b/crawl-ref/source/spells2.h
@@ -8,7 +8,7 @@
 #define SPELLS2_H
 
 #include "enum.h"
-#include "itemprop.h"  // from brand_type()
+#include "itemprop.h"
 
 struct dist;
 
diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc
index 9a598aa9c7..973add3d88 100644
--- a/crawl-ref/source/spells3.cc
+++ b/crawl-ref/source/spells3.cc
@@ -21,6 +21,7 @@
 #include "beam.h"
 #include "branch.h"
 #include "cloud.h"
+#include "coordit.h"
 #include "directn.h"
 #include "debug.h"
 #include "delay.h"
diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc
index f3086187c3..f2f0af6053 100644
--- a/crawl-ref/source/spells4.cc
+++ b/crawl-ref/source/spells4.cc
@@ -18,6 +18,7 @@
 #include "artefact.h"
 #include "beam.h"
 #include "cloud.h"
+#include "coordit.h"
 #include "debug.h"
 #include "delay.h"
 #include "directn.h"
diff --git a/crawl-ref/source/spl-book.h b/crawl-ref/source/spl-book.h
index 908f42df31..fbec92b89a 100644
--- a/crawl-ref/source/spl-book.h
+++ b/crawl-ref/source/spl-book.h
@@ -9,7 +9,6 @@
 #define SPL_BOOK_H
 
 #include "externs.h"
-#include "fixedvector.h"
 
 #define SPELLBOOK_SIZE 8
 
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 812cfdbfe9..fe2f423c2d 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -18,6 +18,7 @@
 #include "coord.h"
 #include "coordit.h"
 #include "describe.h"
+#include "directn.h"
 #include "effects.h"
 #include "map_knowledge.h"
 #include "food.h"
diff --git a/crawl-ref/source/spl-mis.cc b/crawl-ref/source/spl-mis.cc
index dcc7c1764d..bfe11d25b6 100644
--- a/crawl-ref/source/spl-mis.cc
+++ b/crawl-ref/source/spl-mis.cc
@@ -14,6 +14,7 @@
 
 #include "colour.h"
 #include "cloud.h"
+#include "directn.h"
 #include "effects.h"
 #include "it_use2.h"
 #include "kills.h"
diff --git a/crawl-ref/source/state.h b/crawl-ref/source/state.h
index a1bf485298..93ae40675d 100644
--- a/crawl-ref/source/state.h
+++ b/crawl-ref/source/state.h
@@ -7,7 +7,6 @@
 #ifndef STATE_H
 #define STATE_H
 
-#include "enum.h"
 #include "player.h"
 #include <vector>
 
diff --git a/crawl-ref/source/tags.h b/crawl-ref/source/tags.h
index 101be56949..820740ef33 100644
--- a/crawl-ref/source/tags.h
+++ b/crawl-ref/source/tags.h
@@ -9,7 +9,6 @@
 
 #include <cstdio>
 #include <stdint.h>
-#include "externs.h"
 
 struct show_type;
 
diff --git a/crawl-ref/source/terrain.cc b/crawl-ref/source/terrain.cc
index c86014197d..a85f8276e1 100644
--- a/crawl-ref/source/terrain.cc
+++ b/crawl-ref/source/terrain.cc
@@ -13,6 +13,7 @@
 #include <sstream>
 
 #include "cloud.h"
+#include "coordit.h"
 #include "dgnevent.h"
 #include "directn.h"
 #include "map_knowledge.h"
diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc
index b3450cbddf..26d5b8e868 100644
--- a/crawl-ref/source/tilereg.cc
+++ b/crawl-ref/source/tilereg.cc
@@ -11,9 +11,9 @@
 
 #include "cio.h"
 #include "coord.h"
-#include "map_knowledge.h"
 #include "debug.h"
 #include "describe.h"
+#include "directn.h"
 #include "files.h"
 #include "food.h"
 #include "itemname.h"
@@ -25,6 +25,7 @@
 #include "misc.h"
 #include "menu.h"
 #include "newgame.h"
+#include "map_knowledge.h"
 #include "mon-util.h"
 #include "options.h"
 #include "player.h"
diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc
index d63b336ae6..6a92f492d9 100644
--- a/crawl-ref/source/tilesdl.cc
+++ b/crawl-ref/source/tilesdl.cc
@@ -5,11 +5,12 @@
 #include "artefact.h"
 #include "cio.h"
 #include "coord.h"
-#include "map_knowledge.h"
+#include "directn.h"
 #include "itemname.h"
 #include "itemprop.h"
 #include "files.h"
 #include "macro.h"
+#include "map_knowledge.h"
 #include "message.h"
 #include "mon-util.h"
 #include "options.h"
diff --git a/crawl-ref/source/tilesdl.h b/crawl-ref/source/tilesdl.h
index f20ca14813..63e476c99d 100644
--- a/crawl-ref/source/tilesdl.h
+++ b/crawl-ref/source/tilesdl.h
@@ -8,9 +8,7 @@
 #ifndef TILESDL_H
 #define TILESDL_H
 
-#include "debug.h"
 #include "externs.h"
-#include "fixedvector.h"
 #include "tilereg.h"
 
 // This struct defines all of the state that any particular rendering needs.
diff --git a/crawl-ref/source/transfor.h b/crawl-ref/source/transfor.h
index 52cc7e9391..36e7d1fe5c 100644
--- a/crawl-ref/source/transfor.h
+++ b/crawl-ref/source/transfor.h
@@ -10,7 +10,6 @@
 
 #include <set>
 
-#include "fixedvector.h"
 #include "enum.h"
 
 enum transformation_type
diff --git a/crawl-ref/source/travel.h b/crawl-ref/source/travel.h
index 87216aa6e1..5a79e6b046 100644
--- a/crawl-ref/source/travel.h
+++ b/crawl-ref/source/travel.h
@@ -9,7 +9,6 @@
 #include "externs.h"
 
 #include "exclude.h"
-#include "los.h"
 
 #include <stdio.h>
 #include <string>
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index 040d938cca..c11a309c6d 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -31,6 +31,7 @@
 #include "clua.h"
 #include "colour.h"
 #include "coord.h"
+#include "coordit.h"
 #include "database.h"
 #include "debug.h"
 #include "delay.h"
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index f16e188872..f9725dcc31 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -11,6 +11,7 @@
 #include "artefact.h"
 #include "beam.h"
 #include "branch.h"
+#include "coordit.h"
 #include "database.h"
 #include "delay.h"
 #include "directn.h"