Axe a buttload of useless #includes.

Can't test Android, MSVC or Mac, but a very brief glance at the diff suggests
it's unlikely they're affected.

85 files changed, 11 insertions, 123 deletions

diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc
index 3b1d07a1e2..89b776313f 100644
--- a/crawl-ref/source/abyss.cc
+++ b/crawl-ref/source/abyss.cc
@@ -25,7 +25,6 @@
 #include "files.h"
 #include "itemprop.h"
 #include "items.h"
-#include "l_defs.h"
 #include "libutil.h"
 #include "los.h"
 #include "makeitem.h"
diff --git a/crawl-ref/source/actor.cc b/crawl-ref/source/actor.cc
index ad992ea27b..1b84595e45 100644
--- a/crawl-ref/source/actor.cc
+++ b/crawl-ref/source/actor.cc
@@ -1,11 +1,11 @@
 #include "AppHdr.h"
+#include <sstream>
 
 #include "actor.h"
 #include "areas.h"
 #include "artefact.h"
 #include "attack.h"
 #include "coord.h"
-#include "describe.h"
 #include "env.h"
 #include "fprop.h"
 #include "itemprop.h"
diff --git a/crawl-ref/source/artefact.cc b/crawl-ref/source/artefact.cc
index 03c1e7d723..00487d70ee 100644
--- a/crawl-ref/source/artefact.cc
+++ b/crawl-ref/source/artefact.cc
@@ -21,7 +21,6 @@
 #include "colour.h"
 #include "coordit.h"
 #include "database.h"
-#include "describe.h"
 #include "itemname.h"
 #include "itemprop.h"
 #include "items.h"
diff --git a/crawl-ref/source/attack.cc b/crawl-ref/source/attack.cc
index 088b7cd718..b9c39af770 100644
--- a/crawl-ref/source/attack.cc
+++ b/crawl-ref/source/attack.cc
@@ -14,8 +14,6 @@
 #include <stdio.h>
 #include <algorithm>
 
-#include "art-enum.h"
-// #include "artefact.h"
 #include "externs.h"
 #include "enum.h"
 #include "fight.h"
diff --git a/crawl-ref/source/attitude-change.cc b/crawl-ref/source/attitude-change.cc
index 20ee16ec42..120366d289 100644
--- a/crawl-ref/source/attitude-change.cc
+++ b/crawl-ref/source/attitude-change.cc
@@ -15,7 +15,6 @@
 #include "env.h"
 #include "godcompanions.h"
 #include "goditem.h"
-#include "itemprop.h"
 #include "libutil.h"
 #include "message.h"
 #include "mon-behv.h"
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index b90a5055e5..8441247904 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -29,7 +29,6 @@
 #include "coordit.h"
 #include "delay.h"
 #include "dungeon.h"
-#include "dgnevent.h"
 #include "effects.h"
 #include "env.h"
 #include "enum.h"
diff --git a/crawl-ref/source/branch.cc b/crawl-ref/source/branch.cc
index b34b753051..17b179ecfa 100644
--- a/crawl-ref/source/branch.cc
+++ b/crawl-ref/source/branch.cc
@@ -2,9 +2,7 @@
 
 #include "branch.h"
 #include "externs.h"
-#include "files.h"
 #include "player.h"
-#include "traps.h"
 #include "travel.h"
 #include "branch-data.h"
 
diff --git a/crawl-ref/source/cloud.cc b/crawl-ref/source/cloud.cc
index 8717849975..4e3e9fed6f 100644
--- a/crawl-ref/source/cloud.cc
+++ b/crawl-ref/source/cloud.cc
@@ -20,7 +20,6 @@
 #include "env.h"
 #include "fprop.h"
 #include "godconduct.h"
-#include "los.h"
 #include "losglobal.h"
 #include "mapmark.h"
 #include "melee_attack.h"
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index d4308a4576..b54c2a7bee 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -8,6 +8,7 @@
 #include "decks.h"
 
 #include <iostream>
+#include <sstream>
 #include <algorithm>
 
 #include "externs.h"
@@ -18,7 +19,6 @@
 #include "coordit.h"
 #include "database.h"
 #include "dactions.h"
-#include "describe.h"
 #include "dungeon.h"
 #include "effects.h"
 #include "env.h"
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index 1e164e51c1..6d8e249f2e 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -25,12 +25,10 @@
 #include "fprop.h"
 #include "exclude.h"
 #include "food.h"
-#include "godabil.h"
 #include "godpassive.h"
 #include "godprayer.h"
 #include "invent.h"
 #include "items.h"
-#include "itemname.h"
 #include "itemprop.h"
 #include "item_use.h"
 #include "libutil.h"
@@ -48,7 +46,6 @@
 #include "random.h"
 #include "religion.h"
 #include "godconduct.h"
-#include "shout.h"
 #include "spl-other.h"
 #include "spl-util.h"
 #include "spl-selfench.h"
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index a69ac58ca9..1abaf09599 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -29,7 +29,6 @@
 #include "directn.h"
 #include "food.h"
 #include "ghost.h"
-#include "godabil.h"
 #include "goditem.h"
 #include "godpassive.h"
 #include "invent.h"
@@ -49,11 +48,9 @@
 #include "output.h"
 #include "player.h"
 #include "quiver.h"
-#include "random.h"
 #include "religion.h"
 #include "skills2.h"
 #include "spl-book.h"
-#include "spl-clouds.h"
 #include "spl-summoning.h"
 #include "state.h"
 #include "stuff.h"
diff --git a/crawl-ref/source/dgn-irregular-box.cc b/crawl-ref/source/dgn-irregular-box.cc
index 1d5d753e4a..e5bd40e6c0 100644
--- a/crawl-ref/source/dgn-irregular-box.cc
+++ b/crawl-ref/source/dgn-irregular-box.cc
@@ -6,7 +6,6 @@
 #include "AppHdr.h"
 #include <vector>
 
-#include "coord.h"
 #include "mapdef.h"
 #include "random.h"
 #include "dgn-irregular-box.h"
diff --git a/crawl-ref/source/dgn-shoals.cc b/crawl-ref/source/dgn-shoals.cc
index a83514f39a..bf11b3f63c 100644
--- a/crawl-ref/source/dgn-shoals.cc
+++ b/crawl-ref/source/dgn-shoals.cc
@@ -1,7 +1,6 @@
 #include "AppHdr.h"
 
 #include "act-iter.h"
-#include "branch.h"
 #include "cio.h"
 #include "colour.h"
 #include "coordit.h"
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index 8752d0bb16..98ce4eee35 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -18,7 +18,6 @@
 #include "externs.h"
 #include "options.h"
 
-#include "branch.h"
 #include "cio.h"
 #include "cloud.h"
 #include "colour.h"
@@ -34,7 +33,6 @@
 #include "itemname.h"
 #include "itemprop.h"
 #include "items.h"
-#include "l_defs.h"
 #include "libutil.h"
 #include "los.h"
 #include "losglobal.h"
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index fed0cacc71..0dbd901f9b 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -22,13 +22,10 @@
 #include "chardump.h"
 #include "coordit.h"
 #include "defines.h"
-#include "describe.h"
 #include "dgn-delve.h"
 #include "dgn-height.h"
 #include "dgn-shoals.h"
-#include "dgn-swamp.h"
 #include "dgn-labyrinth.h"
-#include "dgn-layouts.h"
 #include "effects.h"
 #include "env.h"
 #include "enum.h"
@@ -45,7 +42,6 @@
 #include "itemname.h"
 #include "itemprop.h"
 #include "items.h"
-#include "l_defs.h"
 #include "lev-pand.h"
 #include "libutil.h"
 #include "makeitem.h"
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index b1fb9ee5f7..041fb35912 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -47,7 +47,6 @@
 #include "items.h"
 #include "libutil.h"
 #include "makeitem.h"
-#include "map_knowledge.h"
 #include "message.h"
 #include "mgen_data.h"
 #include "misc.h"
diff --git a/crawl-ref/source/evoke.cc b/crawl-ref/source/evoke.cc
index 844ded2945..d84f74acab 100644
--- a/crawl-ref/source/evoke.cc
+++ b/crawl-ref/source/evoke.cc
@@ -49,7 +49,6 @@
 #include "spl-book.h"
 #include "spl-cast.h"
 #include "spl-clouds.h"
-#include "spl-summoning.h"
 #include "spl-util.h"
 #include "state.h"
 #include "stuff.h"
diff --git a/crawl-ref/source/format.cc b/crawl-ref/source/format.cc
index 1745e6fe9f..b14bff4f97 100644
--- a/crawl-ref/source/format.cc
+++ b/crawl-ref/source/format.cc
@@ -5,7 +5,6 @@
 #include "colour.h"
 #include "format.h"
 #include "libutil.h"
-#include "showsymb.h"
 #include "lang-fake.h"
 #include "unicode.h"
 #include "viewchar.h"
diff --git a/crawl-ref/source/ghost.cc b/crawl-ref/source/ghost.cc
index e8eef08f19..db7e41fbe6 100644
--- a/crawl-ref/source/ghost.cc
+++ b/crawl-ref/source/ghost.cc
@@ -23,7 +23,6 @@
 #include "mon-util.h"
 #include "mon-transit.h"
 #include "player.h"
-#include "religion.h"
 
 #include <vector>
 
diff --git a/crawl-ref/source/godabil.cc b/crawl-ref/source/godabil.cc
index 65107f8e52..ebdcefe639 100644
--- a/crawl-ref/source/godabil.cc
+++ b/crawl-ref/source/godabil.cc
@@ -6,8 +6,8 @@
 #include "AppHdr.h"
 
 #include <queue>
+#include <sstream>
 
-#include "act-iter.h"
 #include "areas.h"
 #include "artefact.h"
 #include "beam.h"
@@ -17,7 +17,6 @@
 #include "database.h"
 #include "delay.h"
 #include "dactions.h"
-#include "describe.h"
 #include "effects.h"
 #include "env.h"
 #include "files.h"
diff --git a/crawl-ref/source/godcompanions.cc b/crawl-ref/source/godcompanions.cc
index 83b6b83a25..2f4568566d 100644
--- a/crawl-ref/source/godcompanions.cc
+++ b/crawl-ref/source/godcompanions.cc
@@ -9,8 +9,6 @@
 
 #include "godcompanions.h"
 
-#include "coord.h"
-#include "coordit.h"
 #include "actor.h"
 #include "mon-stuff.h"
 #include "mon-util.h"
diff --git a/crawl-ref/source/goditem.cc b/crawl-ref/source/goditem.cc
index 437183d0d3..978ad9f386 100644
--- a/crawl-ref/source/goditem.cc
+++ b/crawl-ref/source/goditem.cc
@@ -14,7 +14,6 @@
 #include <stdio.h>
 #include <cmath>
 
-#include "art-enum.h"
 #include "artefact.h"
 #include "itemname.h"
 #include "itemprop.h"
diff --git a/crawl-ref/source/godpassive.cc b/crawl-ref/source/godpassive.cc
index 9c6780e931..143b2c07de 100644
--- a/crawl-ref/source/godpassive.cc
+++ b/crawl-ref/source/godpassive.cc
@@ -9,7 +9,6 @@
 #include "coord.h"
 #include "coordit.h"
 #include "defines.h"
-#include "describe.h"
 #include "env.h"
 #include "files.h"
 #include "food.h"
diff --git a/crawl-ref/source/godprayer.cc b/crawl-ref/source/godprayer.cc
index b5a186e651..1bb8429c03 100644
--- a/crawl-ref/source/godprayer.cc
+++ b/crawl-ref/source/godprayer.cc
@@ -4,7 +4,6 @@
 
 #include <cmath>
 
-#include "areas.h"
 #include "artefact.h"
 #include "coordit.h"
 #include "database.h"
@@ -25,11 +24,10 @@
 #include "misc.h"
 #include "monster.h"
 #include "notes.h"
-#include "options.h"
 #include "random.h"
 #include "religion.h"
+#include "shopping.h"
 #include "skills2.h"
-#include "stash.h"
 #include "state.h"
 #include "stuff.h"
 #include "terrain.h"
diff --git a/crawl-ref/source/hints.cc b/crawl-ref/source/hints.cc
index aa112319d8..f192b43b64 100644
--- a/crawl-ref/source/hints.cc
+++ b/crawl-ref/source/hints.cc
@@ -16,7 +16,6 @@
 #include "artefact.h"
 #include "cloud.h"
 #include "colour.h"
-#include "coordit.h"
 #include "command.h"
 #include "database.h"
 #include "decks.h"
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 9453c87833..c22eac4a5e 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -59,6 +59,7 @@
 #include "state.h"
 #include "stuff.h"
 #include "target.h"
+#include "terrain.h"
 #include "throw.h"
 #include "transform.h"
 #include "uncancel.h"
diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc
index 42a5be769a..f01d00e84a 100644
--- a/crawl-ref/source/itemprop.cc
+++ b/crawl-ref/source/itemprop.cc
@@ -32,7 +32,6 @@
 #include "player.h"
 #include "religion.h"
 #include "skills.h"
-#include "spl-book.h"
 #include "quiver.h"
 #include "random.h"
 #include "shopping.h"
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index 39fd9d58b2..353431ea38 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -33,7 +33,6 @@
 #include "dungeon.h"
 #include "effects.h"
 #include "env.h"
-#include "evoke.h"
 #include "food.h"
 #include "godpassive.h"
 #include "godprayer.h"
diff --git a/crawl-ref/source/l_dgnmon.cc b/crawl-ref/source/l_dgnmon.cc
index d6296ad70d..c1d624e276 100644
--- a/crawl-ref/source/l_dgnmon.cc
+++ b/crawl-ref/source/l_dgnmon.cc
@@ -5,7 +5,6 @@
 
 #include "AppHdr.h"
 
-#include "branch.h"
 #include "cluautil.h"
 #include "coord.h"
 #include "l_libs.h"
diff --git a/crawl-ref/source/l_file.cc b/crawl-ref/source/l_file.cc
index c14f709b4d..3a0a6a4d47 100644
--- a/crawl-ref/source/l_file.cc
+++ b/crawl-ref/source/l_file.cc
@@ -8,7 +8,6 @@
 #include "files.h"
 
 #include "tags.h"
-// #include "version.h"
 
 ///////////////////////////////////////////////////////////
 // User-accessible file operations
diff --git a/crawl-ref/source/l_mapgrd.cc b/crawl-ref/source/l_mapgrd.cc
index 7d27e750d1..e730254c7c 100644
--- a/crawl-ref/source/l_mapgrd.cc
+++ b/crawl-ref/source/l_mapgrd.cc
@@ -4,7 +4,6 @@
 #include "l_libs.h"
 
 #include "mapdef.h"
-#include "mon-ench.h"
 
 /////////////////////////////////////////////////////////////////////
 // mapgrd and mapgrd_col handling (i.e. map_lines in a metatable)
diff --git a/crawl-ref/source/l_subvault.cc b/crawl-ref/source/l_subvault.cc
index 6102f94a9d..ea6c012c06 100644
--- a/crawl-ref/source/l_subvault.cc
+++ b/crawl-ref/source/l_subvault.cc
@@ -6,9 +6,9 @@
 #include "AppHdr.h"
 
 #include "cluautil.h"
+#include "libutil.h"
 #include "l_libs.h"
 #include "mapdef.h"
-#include "mon-ench.h"
 
 static int dgn_is_subvault(lua_State *ls)
 {
diff --git a/crawl-ref/source/lev-pand.cc b/crawl-ref/source/lev-pand.cc
index b45f0c1de3..d4320a3065 100644
--- a/crawl-ref/source/lev-pand.cc
+++ b/crawl-ref/source/lev-pand.cc
@@ -11,7 +11,6 @@
 
 #include "externs.h"
 #include "colour.h"
-#include "dungeon.h"
 #include "env.h"
 #include "mon-place.h"
 #include "mgen_data.h"
diff --git a/crawl-ref/source/main.cc b/crawl-ref/source/main.cc
index f4d187c7e0..a85d8395c3 100644
--- a/crawl-ref/source/main.cc
+++ b/crawl-ref/source/main.cc
@@ -119,7 +119,6 @@
 #include "spl-goditem.h"
 #include "spl-other.h"
 #include "spl-selfench.h"
-#include "spl-summoning.h"
 #include "spl-transloc.h"
 #include "spl-util.h"
 #include "stairs.h"
diff --git a/crawl-ref/source/map_knowledge.cc b/crawl-ref/source/map_knowledge.cc
index fb332bb3a4..c2ff341660 100644
--- a/crawl-ref/source/map_knowledge.cc
+++ b/crawl-ref/source/map_knowledge.cc
@@ -2,14 +2,11 @@
 
 #include "map_knowledge.h"
 
-#include "cloud.h"
 #include "coordit.h"
 #include "dgn-overview.h"
-#include "dgnevent.h"
 #include "directn.h"
 #include "env.h"
 #include "feature.h"
-#include "los.h"
 #include "mon-util.h"
 #include "notes.h"
 #include "options.h"
diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc
index ca23e102d5..358c6fce23 100644
--- a/crawl-ref/source/mapdef.cc
+++ b/crawl-ref/source/mapdef.cc
@@ -26,7 +26,6 @@
 #include "dgn-height.h"
 #include "exclude.h"
 #include "files.h"
-#include "ghost.h"
 #include "initfile.h"
 #include "invent.h"
 #include "l_defs.h"
diff --git a/crawl-ref/source/melee_attack.cc b/crawl-ref/source/melee_attack.cc
index c6df2a9185..95ae1c22b6 100644
--- a/crawl-ref/source/melee_attack.cc
+++ b/crawl-ref/source/melee_attack.cc
@@ -39,7 +39,6 @@
 #include "message.h"
 #include "misc.h"
 #include "mon-abil.h"
-#include "mon-act.h"
 #include "mon-behv.h"
 #include "mon-cast.h"
 #include "mon-clone.h"
diff --git a/crawl-ref/source/menu.cc b/crawl-ref/source/menu.cc
index b75865876b..289c4e53bf 100644
--- a/crawl-ref/source/menu.cc
+++ b/crawl-ref/source/menu.cc
@@ -29,7 +29,6 @@
  #include "tilefont.h"
  #include "tilereg-crt.h"
  #include "tilereg-menu.h"
- #include "tilereg-popup.h"
 #endif
 #ifdef USE_TILE
  #include "mon-stuff.h"
diff --git a/crawl-ref/source/message.cc b/crawl-ref/source/message.cc
index 735611eda6..3a141629c8 100644
--- a/crawl-ref/source/message.cc
+++ b/crawl-ref/source/message.cc
@@ -19,7 +19,6 @@
 #include "options.h"
 #include "player.h"
 #include "religion.h"
-#include "showsymb.h"
 #include "stash.h"
 #include "state.h"
 #include "areas.h"
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index 867a4a9de7..948e6dbc3e 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -30,11 +30,9 @@
 #include "coordit.h"
 #include "database.h"
 #include "delay.h"
-#include "describe.h"
 #include "dgn-shoals.h"
 #include "dgnevent.h"
 #include "env.h"
-#include "exercise.h"
 #include "feature.h"
 #include "fight.h"
 #include "files.h"
diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc
index 51f188b911..3006ed2567 100644
--- a/crawl-ref/source/mon-abil.cc
+++ b/crawl-ref/source/mon-abil.cc
@@ -46,7 +46,6 @@
 #include "random.h"
 #include "religion.h"
 #include "spl-miscast.h"
-#include "spl-summoning.h"
 #include "spl-util.h"
 #include "state.h"
 #include "stuff.h"
@@ -58,7 +57,6 @@
 #include "ouch.h"
 #include "target.h"
 #include "items.h"
-#include "mapmark.h"
 #include "teleport.h"
 
 #include <algorithm>
diff --git a/crawl-ref/source/mon-act.cc b/crawl-ref/source/mon-act.cc
index 801c208272..44d6383449 100644
--- a/crawl-ref/source/mon-act.cc
+++ b/crawl-ref/source/mon-act.cc
@@ -29,7 +29,6 @@
 #include "items.h"
 #include "item_use.h"
 #include "libutil.h"
-#include "map_knowledge.h"
 #include "mapmark.h"
 #include "message.h"
 #include "misc.h"
diff --git a/crawl-ref/source/mon-behv.cc b/crawl-ref/source/mon-behv.cc
index 4fd734d823..a83731b999 100644
--- a/crawl-ref/source/mon-behv.cc
+++ b/crawl-ref/source/mon-behv.cc
@@ -18,7 +18,6 @@
 #include "env.h"
 #include "fprop.h"
 #include "exclude.h"
-#include "itemprop.h"
 #include "losglobal.h"
 #include "macro.h"
 #include "mon-act.h"
diff --git a/crawl-ref/source/mon-cast.cc b/crawl-ref/source/mon-cast.cc
index 18e2ddb5db..26084df3d1 100644
--- a/crawl-ref/source/mon-cast.cc
+++ b/crawl-ref/source/mon-cast.cc
@@ -21,7 +21,6 @@
 #include "fight.h"
 #include "fprop.h"
 #include "ghost.h"
-#include "itemprop.h"
 #include "items.h"
 #include "libutil.h"
 #include "losglobal.h"
diff --git a/crawl-ref/source/mon-death.cc b/crawl-ref/source/mon-death.cc
index dbee1c1e92..af5a5a9a42 100644
--- a/crawl-ref/source/mon-death.cc
+++ b/crawl-ref/source/mon-death.cc
@@ -12,7 +12,6 @@
 #include "cloud.h"
 #include "coordit.h"
 #include "database.h"
-#include "dactions.h"
 #include "env.h"
 #include "fineff.h"
 #include "items.h"
diff --git a/crawl-ref/source/mon-ench.cc b/crawl-ref/source/mon-ench.cc
index 75dc6e02f4..13c67a5987 100644
--- a/crawl-ref/source/mon-ench.cc
+++ b/crawl-ref/source/mon-ench.cc
@@ -5,17 +5,17 @@
 
 #include "AppHdr.h"
 
+#include <sstream>
+
 #include "act-iter.h"
 #include "actor.h"
 #include "areas.h"
 #include "cloud.h"
 #include "coordit.h"
 #include "delay.h"
-#include "describe.h"
 #include "dgn-shoals.h"
 #include "env.h"
 #include "fight.h"
-#include "fprop.h"
 #include "hints.h"
 #include "itemprop.h"
 #include "items.h"
diff --git a/crawl-ref/source/mon-enum.h b/crawl-ref/source/mon-enum.h
index e57f74adc0..72e530dcce 100644
--- a/crawl-ref/source/mon-enum.h
+++ b/crawl-ref/source/mon-enum.h
@@ -9,8 +9,6 @@
 #ifndef MON_ENUM_H
 #define MON_ENUM_H
 
-// #include "tag-version.h"
-
 #define HERD_COMFORT_RANGE 6
 
 enum corpse_effect_type
diff --git a/crawl-ref/source/mon-info.cc b/crawl-ref/source/mon-info.cc
index fe04533a23..47a697c685 100644
--- a/crawl-ref/source/mon-info.cc
+++ b/crawl-ref/source/mon-info.cc
@@ -27,7 +27,6 @@
 #include "monster.h"
 #include "options.h"
 #include "religion.h"
-#include "showsymb.h"
 #include "skills2.h"
 #include "spl-summoning.h"
 #include "state.h"
diff --git a/crawl-ref/source/mon-place.cc b/crawl-ref/source/mon-place.cc
index a10f0535af..2c3127e272 100644
--- a/crawl-ref/source/mon-place.cc
+++ b/crawl-ref/source/mon-place.cc
@@ -11,7 +11,6 @@
 #include "mgen_data.h"
 
 #include "abyss.h"
-#include "act-iter.h"
 #include "areas.h"
 #include "arena.h"
 #include "branch.h"
@@ -31,19 +30,15 @@
 #include "message.h"
 #include "mislead.h"
 #include "mon-behv.h"
-#include "mon-chimera.h"
 #include "mon-death.h"
 #include "mon-gear.h"
 #include "mon-pick.h"
 #include "mon-stuff.h"
-#include "place.h"
 #include "random.h"
 #include "religion.h"
 #include "shopping.h"
 #include "spl-clouds.h"
 #include "spl-damage.h"
-#include "sprint.h"
-#include "stairs.h"
 #include "state.h"
 #include "env.h"
 #include "terrain.h"
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 7a72322a9a..01dac137d0 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -41,7 +41,6 @@
 #include "mon-stuff.h"
 #include "notes.h"
 #include "options.h"
-#include "orb.h"
 #include "random.h"
 #include "religion.h"
 #include "showsymb.h"
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index 42adc8d5a4..0c3eb630f1 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -30,7 +30,6 @@
 #include "species.h"
 #include "state.h"
 #include "stuff.h"
-#include "version.h"
 
 #ifdef USE_TILE_LOCAL
 #include "tilereg-crt.h"
diff --git a/crawl-ref/source/ng-setup.cc b/crawl-ref/source/ng-setup.cc
index 6d27ec4346..6512d655b2 100644
--- a/crawl-ref/source/ng-setup.cc
+++ b/crawl-ref/source/ng-setup.cc
@@ -29,7 +29,6 @@
 #include "spl-util.h"
 #include "state.h"
 #include "stuff.h"
-#include "tilepick.h"
 #include "tutorial.h"
 
 #define MIN_START_STAT       3
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index 1ecdc48f48..af0066a9d4 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -52,7 +52,6 @@
 #include "viewchar.h"
 #include "viewgeom.h"
 #include "showsymb.h"
-#include "spl-transloc.h"
 
 #ifndef USE_TILE_LOCAL
 #include "directn.h"
diff --git a/crawl-ref/source/player-act.cc b/crawl-ref/source/player-act.cc
index e354a7f8e9..aeae525505 100644
--- a/crawl-ref/source/player-act.cc
+++ b/crawl-ref/source/player-act.cc
@@ -18,7 +18,6 @@
 #include "food.h"
 #include "goditem.h"
 #include "hints.h"
-#include "itemname.h"
 #include "itemprop.h"
 #include "items.h"
 #include "libutil.h"
diff --git a/crawl-ref/source/player-equip.cc b/crawl-ref/source/player-equip.cc
index 5615eabcb7..fa72cb96dd 100644
--- a/crawl-ref/source/player-equip.cc
+++ b/crawl-ref/source/player-equip.cc
@@ -6,7 +6,6 @@
 #include "areas.h"
 #include "artefact.h"
 #include "delay.h"
-#include "describe.h"
 #include "food.h"
 #include "goditem.h"
 #include "godpassive.h"
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index d93641b150..772e75b07d 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -48,7 +48,6 @@
 #include "kills.h"
 #include "libutil.h"
 #include "macro.h"
-#include "map_knowledge.h"
 #include "melee_attack.h"
 #include "message.h"
 #include "misc.h"
diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc
index 03be1a4400..f672246ed0 100644
--- a/crawl-ref/source/shopping.cc
+++ b/crawl-ref/source/shopping.cc
@@ -19,7 +19,6 @@
 #include "describe.h"
 #include "decks.h"
 #include "dgn-overview.h"
-#include "files.h"
 #include "food.h"
 #include "invent.h"
 #include "items.h"
@@ -30,7 +29,6 @@
 #include "menu.h"
 #include "misc.h"
 #include "notes.h"
-#include "options.h"
 #include "place.h"
 #include "player.h"
 #include "spl-book.h"
diff --git a/crawl-ref/source/show.cc b/crawl-ref/source/show.cc
index d79090b5b9..818d139c22 100644
--- a/crawl-ref/source/show.cc
+++ b/crawl-ref/source/show.cc
@@ -25,7 +25,6 @@
 #include "monster.h"
 #include "options.h"
 #include "random.h"
-#include "showsymb.h"
 #include "state.h"
 #include "areas.h"
 #include "terrain.h"
diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc
index 1c149c3b85..0aa12e0deb 100644
--- a/crawl-ref/source/spl-book.cc
+++ b/crawl-ref/source/spl-book.cc
@@ -37,7 +37,6 @@
 #include "religion.h"
 #include "species.h"
 #include "spl-cast.h"
-#include "spl-miscast.h"
 #include "spl-util.h"
 #include "state.h"
 #include "stuff.h"
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 22dd7411c1..d618dcf62e 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -29,8 +29,6 @@
 #include "godconduct.h"
 #include "goditem.h"
 #include "hints.h"
-#include "item_use.h"
-#include "items.h"
 #include "libutil.h"
 #include "macro.h"
 #include "menu.h"
diff --git a/crawl-ref/source/spl-clouds.cc b/crawl-ref/source/spl-clouds.cc
index d6c9f31207..81b4061dd4 100644
--- a/crawl-ref/source/spl-clouds.cc
+++ b/crawl-ref/source/spl-clouds.cc
@@ -17,9 +17,7 @@
 #include "coordit.h"
 #include "env.h"
 #include "fprop.h"
-#include "itemprop.h"
 #include "items.h"
-#include "libutil.h"
 #include "losglobal.h"
 #include "message.h"
 #include "misc.h"
@@ -27,7 +25,6 @@
 #include "mon-util.h"
 #include "ouch.h"
 #include "player.h"
-#include "skills.h"
 #include "spl-util.h"
 #include "stuff.h"
 #include "terrain.h"
diff --git a/crawl-ref/source/spl-goditem.cc b/crawl-ref/source/spl-goditem.cc
index dfcf5f2214..2964825af6 100644
--- a/crawl-ref/source/spl-goditem.cc
+++ b/crawl-ref/source/spl-goditem.cc
@@ -14,7 +14,6 @@
 #include "coord.h"
 #include "coordit.h"
 #include "decks.h"
-#include "describe.h"
 #include "env.h"
 #include "godconduct.h"
 #include "godpassive.h"
diff --git a/crawl-ref/source/spl-monench.cc b/crawl-ref/source/spl-monench.cc
index 7b3c7a11c4..3f8d638257 100644
--- a/crawl-ref/source/spl-monench.cc
+++ b/crawl-ref/source/spl-monench.cc
@@ -10,16 +10,13 @@
 #include "externs.h"
 
 #include "areas.h"
-#include "coord.h"
 #include "env.h"
 #include "message.h"
 #include "mon-stuff.h"
 #include "random.h"
-#include "shout.h"
 #include "spl-util.h"
 #include "stuff.h"
 #include "terrain.h"
-#include "viewmap.h"
 
 int englaciate(coord_def where, int pow, int, actor *agent)
 {
diff --git a/crawl-ref/source/spl-other.cc b/crawl-ref/source/spl-other.cc
index 765ec0a2f9..7c46da7967 100644
--- a/crawl-ref/source/spl-other.cc
+++ b/crawl-ref/source/spl-other.cc
@@ -19,7 +19,6 @@
 #include "itemname.h"
 #include "itemprop.h"
 #include "items.h"
-#include "libutil.h"
 #include "makeitem.h"
 #include "message.h"
 #include "misc.h"
diff --git a/crawl-ref/source/spl-selfench.cc b/crawl-ref/source/spl-selfench.cc
index 0871e09f0d..4bcbd79e06 100644
--- a/crawl-ref/source/spl-selfench.cc
+++ b/crawl-ref/source/spl-selfench.cc
@@ -9,7 +9,6 @@
 #include "externs.h"
 
 #include "areas.h"
-#include "delay.h"
 #include "env.h"
 #include "godconduct.h"
 #include "hints.h"
@@ -18,7 +17,6 @@
 #include "misc.h"
 #include "options.h"
 #include "religion.h"
-#include "shout.h"
 #include "spl-cast.h"
 #include "spl-transloc.h"
 #include "spl-util.h"
diff --git a/crawl-ref/source/spl-tornado.cc b/crawl-ref/source/spl-tornado.cc
index b4082299b6..ae0f42fd13 100644
--- a/crawl-ref/source/spl-tornado.cc
+++ b/crawl-ref/source/spl-tornado.cc
@@ -12,7 +12,6 @@
 #include "godconduct.h"
 #include "libutil.h"
 #include "los.h"
-#include "losglobal.h"
 #include "misc.h"
 #include "mon-behv.h"
 #include "ouch.h"
diff --git a/crawl-ref/source/spl-transloc.cc b/crawl-ref/source/spl-transloc.cc
index 6b50899d27..36bb493ea8 100644
--- a/crawl-ref/source/spl-transloc.cc
+++ b/crawl-ref/source/spl-transloc.cc
@@ -24,7 +24,6 @@
 #include "env.h"
 #include "fprop.h"
 #include "invent.h"
-#include "item_use.h"
 #include "itemprop.h"
 #include "items.h"
 #include "libutil.h"
@@ -33,7 +32,6 @@
 #include "misc.h"
 #include "mon-behv.h"
 #include "mon-util.h"
-#include "mon-stuff.h"
 #include "orb.h"
 #include "random.h"
 #include "shout.h"
diff --git a/crawl-ref/source/spl-util.cc b/crawl-ref/source/spl-util.cc
index 6fdda5aaa1..45de8b3160 100644
--- a/crawl-ref/source/spl-util.cc
+++ b/crawl-ref/source/spl-util.cc
@@ -39,7 +39,6 @@
 #include "spl-zap.h"
 #include "target.h"
 #include "terrain.h"
-#include "item_use.h"
 #include "transform.h"
 
 
diff --git a/crawl-ref/source/sprint.cc b/crawl-ref/source/sprint.cc
index 3370fa8295..6e9fff4d36 100644
--- a/crawl-ref/source/sprint.cc
+++ b/crawl-ref/source/sprint.cc
@@ -3,8 +3,6 @@
 #include "sprint.h"
 
 #include "externs.h"
-#include "maps.h"
-#include "mon-util.h"
 #include "monster.h"
 #include "mpr.h"
 #include "player.h"
diff --git a/crawl-ref/source/stairs.cc b/crawl-ref/source/stairs.cc
index 8693f30354..a99955572e 100644
--- a/crawl-ref/source/stairs.cc
+++ b/crawl-ref/source/stairs.cc
@@ -35,7 +35,6 @@
 #include "spl-clouds.h"
 #include "spl-damage.h"
 #include "spl-other.h"
-#include "spl-summoning.h"
 #include "spl-transloc.h"
 #include "stash.h"
 #include "state.h"
diff --git a/crawl-ref/source/stash.cc b/crawl-ref/source/stash.cc
index 376ed6ac58..4f029f0d54 100644
--- a/crawl-ref/source/stash.cc
+++ b/crawl-ref/source/stash.cc
@@ -16,7 +16,6 @@
 #include "directn.h"
 #include "itemname.h"
 #include "itemprop.h"
-#include "files.h"
 #include "godpassive.h"
 #include "godprayer.h"
 #include "invent.h"
@@ -28,7 +27,6 @@
 #include "message.h"
 #include "mon-util.h"
 #include "notes.h"
-#include "options.h"
 #include "place.h"
 #include "religion.h"
 #include "shopping.h"
diff --git a/crawl-ref/source/state.cc b/crawl-ref/source/state.cc
index 6eee1c2133..d2c41f3fbd 100644
--- a/crawl-ref/source/state.cc
+++ b/crawl-ref/source/state.cc
@@ -15,7 +15,6 @@
 #include "menu.h"
 #include "message.h"
 #include "misc.h"
-// #include "mon-util.h"
 #include "monster.h"
 #include "player.h"
 #include "religion.h"
diff --git a/crawl-ref/source/target.cc b/crawl-ref/source/target.cc
index 085272df23..7ec9a4a56f 100644
--- a/crawl-ref/source/target.cc
+++ b/crawl-ref/source/target.cc
@@ -7,8 +7,6 @@
 #include "coordit.h"
 #include "env.h"
 #include "fight.h"
-#include "godabil.h"
-#include "itemprop.h"
 #include "libutil.h"
 #include "losglobal.h"
 #include "player.h"
diff --git a/crawl-ref/source/target.h b/crawl-ref/source/target.h
index 489fee39ee..86b8cdf74b 100644
--- a/crawl-ref/source/target.h
+++ b/crawl-ref/source/target.h
@@ -2,7 +2,6 @@
 #define TARGET_H
 
 #include "beam.h"
-// #include "mon-info.h"
 
 enum aff_type // sign and non-zeroness matters
 {
diff --git a/crawl-ref/source/teleport.cc b/crawl-ref/source/teleport.cc
index eb4fbbe7ac..304f0d606b 100644
--- a/crawl-ref/source/teleport.cc
+++ b/crawl-ref/source/teleport.cc
@@ -13,7 +13,6 @@
 #include "delay.h"
 #include "env.h"
 #include "fprop.h"
-#include "item_use.h"
 #include "los.h"
 #include "losglobal.h"
 #include "monster.h"
diff --git a/crawl-ref/source/throw.cc b/crawl-ref/source/throw.cc
index a1d76b74d5..22a56d9a04 100644
--- a/crawl-ref/source/throw.cc
+++ b/crawl-ref/source/throw.cc
@@ -4,11 +4,11 @@
 **/
 
 #include "AppHdr.h"
+#include <sstream>
+#include <math.h>
 
 #include "throw.h"
 
-#include <math.h>
-
 #include "externs.h"
 
 #include "artefact.h"
@@ -16,7 +16,6 @@
 #include "colour.h"
 #include "command.h"
 #include "delay.h"
-#include "describe.h"
 #include "env.h"
 #include "exercise.h"
 #include "fight.h"
diff --git a/crawl-ref/source/tiledgnbuf.cc b/crawl-ref/source/tiledgnbuf.cc
index 7970b2dfc4..e468040b47 100644
--- a/crawl-ref/source/tiledgnbuf.cc
+++ b/crawl-ref/source/tiledgnbuf.cc
@@ -11,7 +11,6 @@
 #include "tiledoll.h"
 #include "tilemcache.h"
 #include "tilepick.h"
-#include "tilepick-p.h"
 
 DungeonCellBuffer::DungeonCellBuffer(ImageManager *im) :
     m_buf_floor(&im->m_textures[TEX_FLOOR]),
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 34ac344d88..70b6a637b3 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -21,7 +21,6 @@
 #include "options.h"
 #include "player.h"
 #include "shopping.h"
-#include "showsymb.h"
 #include "state.h"
 #include "terrain.h"
 #include "tiledef-dngn.h"
diff --git a/crawl-ref/source/tilereg-popup.cc b/crawl-ref/source/tilereg-popup.cc
index df0dd3f09b..2d2056e12a 100644
--- a/crawl-ref/source/tilereg-popup.cc
+++ b/crawl-ref/source/tilereg-popup.cc
@@ -7,11 +7,9 @@
 
 #include "menu.h"
 #include "macro.h"
-#include "options.h"
 #include "tilebuf.h"
 #include "tilefont.h"
 #include "cio.h"
-#include "process_desc.h"
 
 PopupRegion::PopupRegion(ImageManager *im, FontWrapper *entry) :
     MenuRegion(im, entry),
diff --git a/crawl-ref/source/tileview.cc b/crawl-ref/source/tileview.cc
index 2d8df25eda..03ef64c65e 100644
--- a/crawl-ref/source/tileview.cc
+++ b/crawl-ref/source/tileview.cc
@@ -15,7 +15,6 @@
 #include "mon-util.h"
 #include "options.h"
 #include "player.h"
-#include "showsymb.h"
 #include "state.h"
 #include "stuff.h"
 #include "terrain.h"
diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc
index 328d92ff12..139acf6957 100644
--- a/crawl-ref/source/tutorial.cc
+++ b/crawl-ref/source/tutorial.cc
@@ -9,7 +9,6 @@
 #include "externs.h"
 #include "hints.h"
 #include "message.h"
-#include "mon-ench.h"
 #include "mpr.h"
 #include "player.h"
 #include "skills.h"
diff --git a/crawl-ref/source/version.cc b/crawl-ref/source/version.cc
index 8c26931a65..d5419e98bb 100644
--- a/crawl-ref/source/version.cc
+++ b/crawl-ref/source/version.cc
@@ -8,7 +8,6 @@
 #include "version.h"
 #include "build.h"
 #include "compflag.h"
-#include "libutil.h"
 
 namespace Version
 {
diff --git a/crawl-ref/source/wiz-item.cc b/crawl-ref/source/wiz-item.cc
index cad2faff6b..591a70a94e 100644
--- a/crawl-ref/source/wiz-item.cc
+++ b/crawl-ref/source/wiz-item.cc
@@ -18,7 +18,6 @@
 #include "cio.h"
 #include "dbg-util.h"
 #include "decks.h"
-#include "describe.h"
 #include "effects.h"
 #include "env.h"
 #include "godpassive.h"
diff --git a/crawl-ref/source/wiz-mon.cc b/crawl-ref/source/wiz-mon.cc
index ff16c8e345..98a0a27424 100644
--- a/crawl-ref/source/wiz-mon.cc
+++ b/crawl-ref/source/wiz-mon.cc
@@ -4,6 +4,7 @@
 **/
 
 #include "AppHdr.h"
+#include <sstream>
 
 #include "wiz-mon.h"
 
@@ -15,7 +16,6 @@
 #include "colour.h"
 #include "dbg-util.h"
 #include "delay.h"
-#include "describe.h"
 #include "directn.h"
 #include "dungeon.h"
 #include "env.h"
@@ -38,7 +38,6 @@
 #include "output.h"
 #include "religion.h"
 #include "shout.h"
-#include "showsymb.h"
 #include "spl-miscast.h"
 #include "spl-util.h"
 #include "state.h"
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index 43712288a4..7dbc5d430f 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -56,7 +56,6 @@
 #include "spl-cast.h"
 #include "spl-goditem.h"
 #include "spl-miscast.h"
-#include "spl-summoning.h"
 #include "spl-transloc.h"
 #include "spl-util.h"
 #include "stairs.h"