Trim unnecessary #includes.

49 files changed, 0 insertions, 75 deletions

diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index 27d7c0522c..d2b5866ef5 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -15,7 +15,6 @@
 #include <ctype.h>
 
 #include "externs.h"
-#include "options.h"
 
 #include "abyss.h"
 #include "artefact.h"
@@ -30,14 +29,12 @@
 #include "food.h"
 #include "godabil.h"
 #include "it_use2.h"
-#include "itemprop.h"
 #include "macro.h"
 #include "message.h"
 #include "menu.h"
 #include "misc.h"
 #include "mon-place.h"
 #include "mgen_data.h"
-#include "coord.h"
 #include "mutation.h"
 #include "notes.h"
 #include "ouch.h"
diff --git a/crawl-ref/source/actor-los.cc b/crawl-ref/source/actor-los.cc
index 9471a871f6..35c93a8c9d 100644
--- a/crawl-ref/source/actor-los.cc
+++ b/crawl-ref/source/actor-los.cc
@@ -4,7 +4,6 @@
 #include "player.h"
 #include "monster.h"
 #include "state.h"
-#include "viewgeom.h"
 
 bool actor::observable() const
 {
diff --git a/crawl-ref/source/areas.cc b/crawl-ref/source/areas.cc
index 2200b445b1..76dd02088f 100644
--- a/crawl-ref/source/areas.cc
+++ b/crawl-ref/source/areas.cc
@@ -26,7 +26,6 @@
 #include "terrain.h"
 #include "traps.h"
 #include "travel.h"
-#include "viewgeom.h"
 
 ///////////////
 // Sanctuary
diff --git a/crawl-ref/source/behold.cc b/crawl-ref/source/behold.cc
index e529c8e55f..82928d7a12 100644
--- a/crawl-ref/source/behold.cc
+++ b/crawl-ref/source/behold.cc
@@ -11,14 +11,12 @@
 #include "debug.h"
 #include "env.h"
 #include "fprop.h"
-#include "los.h"
 #include "mon-util.h"
 #include "monster.h"
 #include "random.h"
 #include "state.h"
 #include "stuff.h"
 #include "areas.h"
-#include "view.h"
 
 // Add a monster to the list of beholders.
 void player::add_beholder(const monsters* mon)
diff --git a/crawl-ref/source/cloud.cc b/crawl-ref/source/cloud.cc
index 60cde0db60..2e9a5a282e 100644
--- a/crawl-ref/source/cloud.cc
+++ b/crawl-ref/source/cloud.cc
@@ -29,7 +29,6 @@
 #include "env.h"
 #include "terrain.h"
 #ifdef USE_TILE
-#include "tiles.h"
 #include "tiledef-gui.h"
 #include "tiledef-main.h"
 #endif
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index 7c7dc54671..981da89674 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -38,7 +38,6 @@
 #include "ouch.h"
 #include "place.h"
 #include "player.h"
-#include "quiver.h"
 #include "religion.h"
 #include "showsymb.h"
 #include "skills2.h"
diff --git a/crawl-ref/source/coordit.cc b/crawl-ref/source/coordit.cc
index e4cf878f37..1485ed1564 100644
--- a/crawl-ref/source/coordit.cc
+++ b/crawl-ref/source/coordit.cc
@@ -7,7 +7,6 @@
 
 #include "coordit.h"
 
-#include "coord.h"
 #include "coord-circle.h"
 #include "player.h"
 
diff --git a/crawl-ref/source/dbg-util.cc b/crawl-ref/source/dbg-util.cc
index 84e0f87a0e..e8ad98b093 100644
--- a/crawl-ref/source/dbg-util.cc
+++ b/crawl-ref/source/dbg-util.cc
@@ -14,7 +14,6 @@
 #include "dungeon.h"
 #include "env.h"
 #include "mon-stuff.h"
-#include "mon-util.h"
 #include "religion.h"
 #include "shopping.h"
 #include "skills2.h"
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index f1d1c8182c..d7ac791a3d 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -32,7 +32,6 @@
 #include "flood_find.h"
 #include "fprop.h"
 #include "externs.h"
-#include "options.h"
 #include "dbg-maps.h"
 #include "dbg-scan.h"
 #include "directn.h"
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index d59ea2770f..e61a7a74e2 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -14,7 +14,6 @@
 #include <algorithm>
 
 #include "externs.h"
-#include "options.h"
 
 #include "areas.h"
 #include "artefact.h"
diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc
index 00a862a3ab..03c79a8769 100644
--- a/crawl-ref/source/files.cc
+++ b/crawl-ref/source/files.cc
@@ -51,7 +51,6 @@
 #include "env.h"
 #include "ghost.h"
 #include "initfile.h"
-#include "itemprop.h"
 #include "items.h"
 #include "jobs.h"
 #include "kills.h"
diff --git a/crawl-ref/source/godwrath.cc b/crawl-ref/source/godwrath.cc
index a2ad1c79ed..7610e40bc4 100644
--- a/crawl-ref/source/godwrath.cc
+++ b/crawl-ref/source/godwrath.cc
@@ -31,7 +31,6 @@
 #include "mon-stuff.h"
 #include "mutation.h"
 #include "ouch.h"
-#include "quiver.h"
 #include "religion.h"
 #include "spells1.h"
 #include "spells2.h"
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index f5e0296422..1bbebfdb56 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -29,7 +29,6 @@
 #endif
 #include "invent.h"
 #include "item_use.h"
-#include "itemprop.h"
 #include "libutil.h"
 #include "macro.h"
 #include "message.h"
diff --git a/crawl-ref/source/it_use2.cc b/crawl-ref/source/it_use2.cc
index 1221daad12..48ee4229fb 100644
--- a/crawl-ref/source/it_use2.cc
+++ b/crawl-ref/source/it_use2.cc
@@ -25,7 +25,6 @@
 #include "misc.h"
 #include "mutation.h"
 #include "player.h"
-#include "quiver.h"
 #include "religion.h"
 #include "skills2.h"
 #include "spells2.h"
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index 969b1afbac..57adb82b8c 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -41,8 +41,6 @@
 #include "libutil.h"
 #include "message.h"
 #include "misc.h"
-#include "mon-place.h"
-#include "mon-stuff.h"
 #include "mon-util.h"
 #include "mutation.h"
 #include "notes.h"
diff --git a/crawl-ref/source/l_dgngrd.cc b/crawl-ref/source/l_dgngrd.cc
index c5e89b175f..05fbe3d7ac 100644
--- a/crawl-ref/source/l_dgngrd.cc
+++ b/crawl-ref/source/l_dgngrd.cc
@@ -13,7 +13,6 @@
 #include "directn.h"
 #include "dungeon.h"
 #include "env.h"
-#include "religion.h"
 #include "terrain.h"
 
 static int dgn_feature_number(lua_State *ls)
diff --git a/crawl-ref/source/l_spells.cc b/crawl-ref/source/l_spells.cc
index 8e5c2feffa..b622dd0e4d 100644
--- a/crawl-ref/source/l_spells.cc
+++ b/crawl-ref/source/l_spells.cc
@@ -9,14 +9,8 @@
 #include "cluautil.h"
 #include "l_libs.h"
 
-#include "coord.h"
-#include "dungeon.h"
 #include "env.h"
-#include "spells1.h"
 #include "spells2.h"
-#include "spells3.h"
-#include "spells4.h"
-#include "terrain.h"
 
 LUAWRAP(_refrigeration, cast_refrigeration(luaL_checkint(ls, 1), true))
 LUAWRAP(_toxic_radiance, cast_toxic_radiance(true))
diff --git a/crawl-ref/source/lev-pand.cc b/crawl-ref/source/lev-pand.cc
index 57d6ae931c..57e2ed8bf8 100644
--- a/crawl-ref/source/lev-pand.cc
+++ b/crawl-ref/source/lev-pand.cc
@@ -15,7 +15,6 @@
 #include "env.h"
 #include "mon-place.h"
 #include "mgen_data.h"
-#include "coord.h"
 #include "mon-pick.h"
 #include "random.h"
 
diff --git a/crawl-ref/source/libgui.cc b/crawl-ref/source/libgui.cc
index 2ee2f87119..cb9b339d72 100644
--- a/crawl-ref/source/libgui.cc
+++ b/crawl-ref/source/libgui.cc
@@ -16,11 +16,9 @@
 #include "cio.h"
 #include "defines.h"
 #include "env.h"
-#include "itemprop.h"
 #include "externs.h"
 #include "tilereg.h"
 #include "message.h"
-#include "showsymb.h"
 #include "stash.h"
 #include "state.h"
 #include "stuff.h"
diff --git a/crawl-ref/source/los.cc b/crawl-ref/source/los.cc
index 47916487c4..6512de377e 100644
--- a/crawl-ref/source/los.cc
+++ b/crawl-ref/source/los.cc
@@ -57,11 +57,9 @@
 #include "losparam.h"
 #include "player.h"
 #include "ray.h"
-#include "state.h"
 #include "stuff.h"
 #include "env.h"
 #include "terrain.h"
-#include "viewgeom.h"
 
 // This determines which cells are considered out of range during
 // precalculations (only positive quadrant used).
diff --git a/crawl-ref/source/main.cc b/crawl-ref/source/main.cc
index d85f4941ba..3d9e0694b2 100644
--- a/crawl-ref/source/main.cc
+++ b/crawl-ref/source/main.cc
@@ -86,7 +86,6 @@
 #include "mon-act.h"
 #include "mon-cast.h"
 #include "mon-iter.h"
-#include "mon-place.h"
 #include "mon-stuff.h"
 #include "mon-util.h"
 #include "mutation.h"
diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc
index c30dadace0..b4c5ff6504 100644
--- a/crawl-ref/source/mon-abil.cc
+++ b/crawl-ref/source/mon-abil.cc
@@ -8,7 +8,6 @@
 #include "mon-abil.h"
 
 #include "externs.h"
-#include "options.h"
 
 #include "arena.h"
 #include "beam.h"
diff --git a/crawl-ref/source/mon-act.cc b/crawl-ref/source/mon-act.cc
index da7b274724..b2176c29bd 100644
--- a/crawl-ref/source/mon-act.cc
+++ b/crawl-ref/source/mon-act.cc
@@ -39,7 +39,6 @@
 #include "mon-stuff.h"
 #include "mutation.h"
 #include "notes.h"
-#include "options.h"
 #include "player.h"
 #include "random.h"
 #include "religion.h"
diff --git a/crawl-ref/source/mon-behv.cc b/crawl-ref/source/mon-behv.cc
index 5120688038..c48e01301a 100644
--- a/crawl-ref/source/mon-behv.cc
+++ b/crawl-ref/source/mon-behv.cc
@@ -8,17 +8,14 @@
 #include "mon-behv.h"
 
 #include "externs.h"
-#include "options.h"
 
 #include "coord.h"
 #include "coordit.h"
 #include "env.h"
 #include "fprop.h"
 #include "exclude.h"
-#include "los.h"
 #include "mon-iter.h"
 #include "mon-movetarget.h"
-#include "mon-place.h"
 #include "mon-pathfind.h"
 #include "mon-stuff.h"
 #include "mon-util.h"
diff --git a/crawl-ref/source/mon-place.cc b/crawl-ref/source/mon-place.cc
index a59ba91b20..770d743cc7 100644
--- a/crawl-ref/source/mon-place.cc
+++ b/crawl-ref/source/mon-place.cc
@@ -22,7 +22,6 @@
 #include "options.h"
 #include "ghost.h"
 #include "lev-pand.h"
-#include "makeitem.h"
 #include "message.h"
 #include "mislead.h"
 #include "mon-behv.h"
diff --git a/crawl-ref/source/mon-speak.cc b/crawl-ref/source/mon-speak.cc
index 9d2d8ecc85..59e17efaeb 100644
--- a/crawl-ref/source/mon-speak.cc
+++ b/crawl-ref/source/mon-speak.cc
@@ -21,7 +21,6 @@
 #include "dlua.h"
 #include "ghost.h"
 #include "message.h"
-#include "mon-stuff.h"
 #include "mon-util.h"
 #include "jobs.h"
 #include "player.h"
diff --git a/crawl-ref/source/mon-stuff.cc b/crawl-ref/source/mon-stuff.cc
index 5977db482f..21a7f8dde9 100644
--- a/crawl-ref/source/mon-stuff.cc
+++ b/crawl-ref/source/mon-stuff.cc
@@ -39,7 +39,6 @@
 #include "coord.h"
 #include "mon-speak.h"
 #include "notes.h"
-#include "options.h"
 #include "player.h"
 #include "random.h"
 #include "religion.h"
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index c84993bd35..c1919d0750 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -18,7 +18,6 @@
 #endif
 
 #include "externs.h"
-#include "options.h"
 
 #include "abl-show.h"
 #include "cio.h"
diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc
index fb3d9d181c..aac1260b97 100644
--- a/crawl-ref/source/ouch.cc
+++ b/crawl-ref/source/ouch.cc
@@ -52,7 +52,6 @@
 #include "mon-util.h"
 #include "mon-place.h"
 #include "mgen_data.h"
-#include "coord.h"
 #include "mon-stuff.h"
 #include "notes.h"
 #include "output.h"
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index 8226d157f0..9c22b8ead2 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -26,7 +26,6 @@
 #include "godabil.h"
 #include "initfile.h"
 #include "itemname.h"
-#include "itemprop.h"
 #include "item_use.h"
 #include "menu.h"
 #include "message.h"
@@ -38,7 +37,6 @@
 #include "ouch.h"
 #include "player.h"
 #include "place.h"
-#include "quiver.h"
 #include "religion.h"
 #include "skills2.h"
 #include "stuff.h"
diff --git a/crawl-ref/source/overmap.cc b/crawl-ref/source/overmap.cc
index 6e823ddcd9..7442812383 100644
--- a/crawl-ref/source/overmap.cc
+++ b/crawl-ref/source/overmap.cc
@@ -33,7 +33,6 @@
 #include "env.h"
 #include "terrain.h"
 #include "travel.h"
-#include "view.h"
 
 typedef std::map<branch_type, level_id> stair_map_type;
 typedef std::map<level_pos, shop_type> shop_map_type;
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index c7796a09d8..46a2ea593b 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -69,7 +69,6 @@
 #include "ouch.h"
 #include "output.h"
 #include "player.h"
-#include "quiver.h"
 #include "shopping.h"
 #include "skills2.h"
 #include "spells1.h"
diff --git a/crawl-ref/source/shout.cc b/crawl-ref/source/shout.cc
index 561313a09c..2795c1ad8e 100644
--- a/crawl-ref/source/shout.cc
+++ b/crawl-ref/source/shout.cc
@@ -22,7 +22,6 @@
 #include "mon-pathfind.h"
 #include "monster.h"
 #include "mon-stuff.h"
-#include "options.h"
 #include "player.h"
 #include "random.h"
 #include "skills.h"
diff --git a/crawl-ref/source/showsymb.cc b/crawl-ref/source/showsymb.cc
index 36f5261c0b..1aae919164 100644
--- a/crawl-ref/source/showsymb.cc
+++ b/crawl-ref/source/showsymb.cc
@@ -10,25 +10,17 @@
 
 #include "showsymb.h"
 
-#include <stdint.h> // For uint32_t
-
-#include "areas.h"
 #include "colour.h"
 #include "env.h"
 #include "map_knowledge.h"
-#include "fprop.h"
 #include "mon-util.h"
 #include "monster.h"
 #include "options.h"
-#include "overmap.h"
-#include "random.h"
 #include "show.h"
 #include "state.h"
 #include "stuff.h"
 #include "terrain.h"
-#include "viewchar.h"
 #include "viewgeom.h"
-#include "viewmap.h"
 
 glyph get_show_glyph(show_type object)
 {
diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc
index 2d182e0b4b..5fd8cc9c0b 100644
--- a/crawl-ref/source/skills2.cc
+++ b/crawl-ref/source/skills2.cc
@@ -20,7 +20,6 @@
 #include "cio.h"
 #include "describe.h"
 #include "externs.h"
-#include "options.h"
 #include "fight.h"
 #include "itemprop.h"
 #include "menu.h"
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc
index c83b90db83..673512bac1 100644
--- a/crawl-ref/source/spells2.cc
+++ b/crawl-ref/source/spells2.cc
@@ -30,7 +30,6 @@
 #include "goditem.h"
 #include "invent.h"
 #include "itemprop.h"
-#include "itemname.h"
 #include "items.h"
 #include "it_use2.h"
 #include "makeitem.h"
diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc
index a885e9eb42..8421779580 100644
--- a/crawl-ref/source/spells3.cc
+++ b/crawl-ref/source/spells3.cc
@@ -58,7 +58,6 @@
 #include "travel.h"
 #include "view.h"
 #include "shout.h"
-#include "viewgeom.h"
 #include "xom.h"
 
 bool cast_selective_amnesia(bool force)
diff --git a/crawl-ref/source/spl-mis.cc b/crawl-ref/source/spl-mis.cc
index 0e98233ab7..7fc97b46bb 100644
--- a/crawl-ref/source/spl-mis.cc
+++ b/crawl-ref/source/spl-mis.cc
@@ -22,7 +22,6 @@
 #include "misc.h"
 #include "mon-place.h"
 #include "mgen_data.h"
-#include "coord.h"
 #include "mon-stuff.h"
 #include "mon-util.h"
 #include "mutation.h"
diff --git a/crawl-ref/source/state.cc b/crawl-ref/source/state.cc
index 72f0e4f71d..0f5ddf0b8b 100644
--- a/crawl-ref/source/state.cc
+++ b/crawl-ref/source/state.cc
@@ -7,7 +7,6 @@
 #include "AppHdr.h"
 
 #include "externs.h"
-#include "options.h"
 
 #include "dbg-util.h"
 #include "delay.h"
diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc
index 9094d9b214..69b9e278ff 100644
--- a/crawl-ref/source/stuff.cc
+++ b/crawl-ref/source/stuff.cc
@@ -52,7 +52,6 @@
 #include "delay.h"
 #include "externs.h"
 #include "options.h"
-#include "itemprop.h"
 #include "items.h"
 #include "macro.h"
 #include "misc.h"
diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc
index 3f0ee61f5a..e41bf74387 100644
--- a/crawl-ref/source/tags.cc
+++ b/crawl-ref/source/tags.cc
@@ -70,7 +70,6 @@
 #include "files.h"
 #include "ghost.h"
 #include "itemname.h"
-#include "itemprop.h"
 #include "mapmark.h"
 #include "mon-util.h"
 #include "mon-transit.h"
@@ -83,7 +82,6 @@
 #include "tiles.h"
 #include "tilemcache.h"
 #include "travel.h"
-#include "view.h"
 
 #if defined(DEBUG) || defined(DEBUG_MONS_SCAN)
 #include "coord.h"
diff --git a/crawl-ref/source/tile2.cc b/crawl-ref/source/tile2.cc
index c4350791fa..109eb5a2e1 100644
--- a/crawl-ref/source/tile2.cc
+++ b/crawl-ref/source/tile2.cc
@@ -12,7 +12,6 @@
 
 #include "branch.h"
 #include "env.h"
-#include "itemprop.h"
 #include "player.h"
 #include "stuff.h"
 #include "tiles.h"
diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc
index 04cbd5c33c..8886b5d737 100644
--- a/crawl-ref/source/tilereg.cc
+++ b/crawl-ref/source/tilereg.cc
@@ -34,7 +34,6 @@
 #include "mon-util.h"
 #include "options.h"
 #include "player.h"
-#include "quiver.h"
 #include "religion.h"
 #include "species.h"
 #include "spl-book.h"
diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc
index 0e5fdead1e..67d376d180 100644
--- a/crawl-ref/source/traps.cc
+++ b/crawl-ref/source/traps.cc
@@ -29,7 +29,6 @@
 #include "mon-util.h"
 #include "mon-stuff.h"
 #include "mon-transit.h"
-#include "options.h"
 #include "ouch.h"
 #include "player.h"
 #include "skills.h"
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index 3e6ad5f627..cefbce11a8 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -33,15 +33,12 @@
 #include "coord.h"
 #include "coordit.h"
 #include "database.h"
-#include "debug.h"
 #include "delay.h"
 #include "directn.h"
-#include "dungeon.h"
 #include "exclude.h"
 #include "feature.h"
 #include "files.h"
 #include "godabil.h"
-#include "itemprop.h"
 #include "macro.h"
 #include "message.h"
 #include "misc.h"
diff --git a/crawl-ref/source/viewmap.cc b/crawl-ref/source/viewmap.cc
index 1760620eb1..1ddb474a63 100644
--- a/crawl-ref/source/viewmap.cc
+++ b/crawl-ref/source/viewmap.cc
@@ -21,7 +21,6 @@
 #include "files.h"
 #include "format.h"
 #include "macro.h"
-#include "mon-util.h"
 #include "options.h"
 #include "place.h"
 #include "player.h"
diff --git a/crawl-ref/source/wiz-fsim.cc b/crawl-ref/source/wiz-fsim.cc
index b5451a7748..6e0ce8522b 100644
--- a/crawl-ref/source/wiz-fsim.cc
+++ b/crawl-ref/source/wiz-fsim.cc
@@ -21,12 +21,10 @@
 #include "message.h"
 #include "mon-place.h"
 #include "mgen_data.h"
-#include "coord.h"
 #include "monster.h"
 #include "mon-stuff.h"
 #include "options.h"
 #include "player.h"
-#include "quiver.h"
 #include "skills2.h"
 #include "species.h"
 
diff --git a/crawl-ref/source/wiz-item.cc b/crawl-ref/source/wiz-item.cc
index 56b1b9bba0..451456b650 100644
--- a/crawl-ref/source/wiz-item.cc
+++ b/crawl-ref/source/wiz-item.cc
@@ -36,7 +36,6 @@
 #include "stash.h"
 #include "stuff.h"
 #include "terrain.h"
-#include "view.h"
 
 #ifdef WIZARD
 static void _make_all_books()
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index 1ea7e3c76f..437c28eec6 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -23,7 +23,6 @@
 #include "map_knowledge.h"
 #include "feature.h"
 #include "goditem.h"
-#include "hiscores.h"
 #include "it_use2.h"
 #include "itemprop.h"
 #include "items.h"
@@ -45,7 +44,6 @@
 #include "ouch.h"
 #include "item_use.h" // for safe_to_remove_or_wear()
 #include "output.h"   // for the monster list
-#include "quiver.h"   // to update the quiver if necessary
 #include "player.h"
 #include "religion.h"
 #include "spells2.h"