diff options
| author | Robert Vollmert <rvollmert@gmx.net> | 2009-10-09 22:16:24 +0200 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2009-10-09 22:16:24 +0200 |
| commit | 959b8c9837050b06db5bd4b980db13d72ce90c8c (patch) | |
| tree | 5e0392b2ac525b1e9c7abc976b3b317fe7b004c7 | |
| parent | c22f98cb6fa940a2465b830d72f6a91094adbfe7 (diff) | |
| download | crawl-ref-959b8c9837050b06db5bd4b980db13d72ce90c8c.tar.gz crawl-ref-959b8c9837050b06db5bd4b980db13d72ce90c8c.zip | |
Remove a lot of unneccessary includes.
The console version still compiles on Linux; both console and
tiles version compile in OS X. I haven't been able to test the
DOS and Windows compiles -- please fix or tell me about any
errors that show up.
67 files changed, 0 insertions, 140 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index 822ac0bb4f..3f2711455b 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -45,7 +45,6 @@ REVISION("$Rev$"); #include "player.h" #include "religion.h" #include "skills.h" -#include "skills2.h" #include "spl-cast.h" #include "spl-util.h" #include "spells1.h" diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 4eb680190f..6aaf2c5414 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -67,7 +67,6 @@ REVISION("$Rev$"); #include "initfile.h" #include "invent.h" #include "item_use.h" -#include "it_use2.h" #include "it_use3.h" #include "itemname.h" #include "itemprop.h" diff --git a/crawl-ref/source/arena.cc b/crawl-ref/source/arena.cc index d5cfe0e218..f022265b73 100644 --- a/crawl-ref/source/arena.cc +++ b/crawl-ref/source/arena.cc @@ -9,7 +9,6 @@ REVISION("$Rev$"); #include "externs.h" #include "arena.h" #include "artefact.h" -#include "chardump.h" #include "cio.h" #include "command.h" #include "dungeon.h" @@ -25,8 +24,6 @@ REVISION("$Rev$"); #include "monstuff.h" #include "monplace.h" #include "mstuff2.h" -#include "output.h" -#include "skills2.h" #include "spl-mis.h" #include "spl-util.h" #include "state.h" diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 39bd4313ec..08d0970c60 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -57,7 +57,6 @@ REVISION("$Rev$"); #include "terrain.h" #include "transfor.h" #include "traps.h" -#include "tutorial.h" #include "view.h" #include "xom.h" diff --git a/crawl-ref/source/branch.cc b/crawl-ref/source/branch.cc index 85d2632eee..84fcd8b2c9 100644 --- a/crawl-ref/source/branch.cc +++ b/crawl-ref/source/branch.cc @@ -7,7 +7,6 @@ REVISION("$Rev$"); #include "branch.h" -#include "cloud.h" #include "externs.h" #include "mon-pick.h" #include "place.h" diff --git a/crawl-ref/source/cloud.cc b/crawl-ref/source/cloud.cc index d2c9f5c30b..38a5240081 100644 --- a/crawl-ref/source/cloud.cc +++ b/crawl-ref/source/cloud.cc @@ -15,10 +15,8 @@ REVISION("$Rev$"); #include "branch.h" #include "cloud.h" -#include "it_use2.h" #include "mapmark.h" #include "ouch.h" -#include "place.h" #include "player.h" #include "spells4.h" #include "stuff.h" diff --git a/crawl-ref/source/clua.cc b/crawl-ref/source/clua.cc index 1b96d7d005..8a9c7bc5b9 100644 --- a/crawl-ref/source/clua.cc +++ b/crawl-ref/source/clua.cc @@ -27,7 +27,6 @@ REVISION("$Rev$"); #include "itemprop.h" #include "items.h" #include "item_use.h" -#include "it_use2.h" #include "libutil.h" #include "macro.h" #include "mapdef.h" diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc index d37827a6ad..7fd609fe20 100644 --- a/crawl-ref/source/command.cc +++ b/crawl-ref/source/command.cc @@ -29,7 +29,6 @@ REVISION("$Rev$"); #include "initfile.h" #include "invent.h" #include "itemname.h" -#include "item_use.h" #include "items.h" #include "libutil.h" #include "menu.h" diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc index 9472203741..37486576e2 100644 --- a/crawl-ref/source/debug.cc +++ b/crawl-ref/source/debug.cc @@ -58,7 +58,6 @@ REVISION("$Rev$"); #include "monspeak.h" #include "monstuff.h" #include "mon-util.h" -#include "mstuff2.h" #include "mutation.h" #include "newgame.h" #include "ouch.h" diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc index 19378ab9b2..a743dbe952 100644 --- a/crawl-ref/source/decks.cc +++ b/crawl-ref/source/decks.cc @@ -33,7 +33,6 @@ REVISION("$Rev$"); #include "monstuff.h" #include "mutation.h" #include "ouch.h" -#include "output.h" #include "player.h" #include "religion.h" #include "skills2.h" diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 3ed643d310..009f7635ed 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -31,7 +31,6 @@ REVISION("$Rev$"); #include "food.h" #include "ghost.h" #include "invent.h" -#include "it_use2.h" #include "itemname.h" #include "itemprop.h" #include "items.h" diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index 1882388af6..728deeecb8 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -44,7 +44,6 @@ REVISION("$Rev$"); #include "shopping.h" #include "state.h" #include "stuff.h" -#include "spells4.h" #include "stash.h" #ifdef USE_TILE #include "tiles.h" diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index ee1571569b..c8103e2f1a 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -27,7 +27,6 @@ REVISION("$Rev$"); #include "directn.h" #include "dungeon.h" #include "files.h" -#include "food.h" #include "itemname.h" #include "itemprop.h" #include "items.h" @@ -39,20 +38,16 @@ REVISION("$Rev$"); #include "message.h" #include "misc.h" #include "mon-util.h" -#include "mon-pick.h" #include "monplace.h" -#include "monstuff.h" #include "notes.h" #include "place.h" #include "player.h" #include "religion.h" #include "spells3.h" -#include "spl-book.h" #include "state.h" #include "stuff.h" #include "tags.h" #include "terrain.h" -#include "tiles.h" #include "traps.h" #include "travel.h" #include "view.h" diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index acfd160e10..c636a38d5a 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -24,7 +24,6 @@ REVISION("$Rev$"); #include "cloud.h" #include "decks.h" #include "delay.h" -#include "describe.h" #include "directn.h" #include "dgnevent.h" #include "food.h" @@ -43,7 +42,6 @@ REVISION("$Rev$"); #include "monstuff.h" #include "mon-util.h" #include "mutation.h" -#include "newgame.h" #include "notes.h" #include "ouch.h" #include "player.h" diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index ef190433ea..14ca371c64 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -29,7 +29,6 @@ REVISION("$Rev$"); #include "effects.h" #include "food.h" #include "invent.h" -#include "it_use2.h" #include "items.h" #include "itemname.h" #include "itemprop.h" @@ -40,7 +39,6 @@ REVISION("$Rev$"); #include "message.h" #include "misc.h" #include "monplace.h" -#include "mon-pick.h" #include "monstuff.h" #include "mon-util.h" #include "mstuff2.h" @@ -52,7 +50,6 @@ REVISION("$Rev$"); #include "skills.h" #include "spells1.h" #include "spells3.h" -#include "spells4.h" #include "spl-mis.h" #include "spl-util.h" #include "state.h" diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc index b6a87e8cd3..6068619aba 100644 --- a/crawl-ref/source/files.cc +++ b/crawl-ref/source/files.cc @@ -51,7 +51,6 @@ REVISION("$Rev$"); #include "effects.h" #include "ghost.h" #include "initfile.h" -#include "itemname.h" #include "itemprop.h" #include "items.h" #include "kills.h" @@ -70,7 +69,6 @@ REVISION("$Rev$"); #include "overmap.h" #include "place.h" #include "player.h" -#include "skills2.h" #include "stash.h" #include "state.h" #include "stuff.h" @@ -80,7 +78,6 @@ REVISION("$Rev$"); #include "travel.h" #include "tutorial.h" #include "view.h" -#include "xom.h" #if _MSC_VER #include <direct.h> diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc index cb5d951f17..faedc59983 100644 --- a/crawl-ref/source/food.cc +++ b/crawl-ref/source/food.cc @@ -28,7 +28,6 @@ REVISION("$Rev$"); #include "debug.h" #include "delay.h" #include "effects.h" -#include "initfile.h" #include "invent.h" #include "items.h" #include "itemname.h" diff --git a/crawl-ref/source/it_use3.cc b/crawl-ref/source/it_use3.cc index e76cc41675..92f3c4a9ff 100644 --- a/crawl-ref/source/it_use3.cc +++ b/crawl-ref/source/it_use3.cc @@ -27,7 +27,6 @@ REVISION("$Rev$"); #include "invent.h" #include "items.h" #include "item_use.h" -#include "it_use2.h" #include "itemname.h" #include "itemprop.h" #include "los.h" @@ -35,7 +34,6 @@ REVISION("$Rev$"); #include "message.h" #include "monplace.h" #include "misc.h" -#include "overmap.h" #include "player.h" #include "religion.h" #include "skills.h" @@ -44,7 +42,6 @@ REVISION("$Rev$"); #include "spells2.h" #include "spl-book.h" #include "spl-cast.h" -#include "spl-util.h" #include "state.h" #include "stuff.h" #include "view.h" diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index f074ea20a0..4d3a0c5974 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -61,7 +61,6 @@ REVISION("$Rev$"); #include "spl-util.h" #include "state.h" #include "stuff.h" -#include "tiles.h" #include "transfor.h" #include "traps.h" #include "tutorial.h" diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index f25cfc89c6..b17a7fabbd 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -23,11 +23,9 @@ REVISION("$Rev$"); #include "artefact.h" #include "decks.h" -#include "describe.h" #include "food.h" #include "initfile.h" #include "invent.h" -#include "it_use2.h" #include "item_use.h" #include "itemprop.h" #include "items.h" diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc index c72de4af46..7d5aa3e235 100644 --- a/crawl-ref/source/itemprop.cc +++ b/crawl-ref/source/itemprop.cc @@ -26,14 +26,12 @@ REVISION("$Rev$"); #include "invent.h" #include "items.h" #include "itemprop.h" -#include "it_use2.h" #include "macro.h" #include "mon-util.h" #include "monstuff.h" #include "notes.h" #include "player.h" #include "quiver.h" -#include "skills2.h" #include "stuff.h" #include "transfor.h" #include "xom.h" diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index d6bcc32ed1..c0dc3d1b20 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -26,7 +26,6 @@ REVISION("$Rev$"); #include "artefact.h" #include "beam.h" #include "branch.h" -#include "cloud.h" #include "debug.h" #include "delay.h" #include "dgnevent.h" @@ -44,11 +43,9 @@ REVISION("$Rev$"); #include "misc.h" #include "monplace.h" #include "monstuff.h" -#include "mstuff2.h" #include "mon-util.h" #include "mutation.h" #include "notes.h" -#include "overmap.h" #include "place.h" #include "player.h" #include "quiver.h" @@ -56,14 +53,11 @@ REVISION("$Rev$"); #include "shopping.h" #include "skills2.h" #include "spl-book.h" -#include "spl-util.h" #include "state.h" #include "stuff.h" #include "stash.h" -#include "tiles.h" #include "state.h" #include "terrain.h" -#include "transfor.h" #include "tutorial.h" #include "view.h" #include "xom.h" diff --git a/crawl-ref/source/kills.cc b/crawl-ref/source/kills.cc index a70c627585..6539edfb6c 100644 --- a/crawl-ref/source/kills.cc +++ b/crawl-ref/source/kills.cc @@ -9,13 +9,11 @@ REVISION("$Rev$"); #include <algorithm> -#include "chardump.h" #include "describe.h" #include "mon-util.h" #include "monstuff.h" #include "files.h" #include "ghost.h" -#include "itemname.h" #include "place.h" #include "travel.h" #include "tags.h" diff --git a/crawl-ref/source/libgui.cc b/crawl-ref/source/libgui.cc index e548d111dd..189a44e8c4 100644 --- a/crawl-ref/source/libgui.cc +++ b/crawl-ref/source/libgui.cc @@ -14,22 +14,11 @@ REVISION("$Rev$"); #include "cio.h" #include "defines.h" -#include "describe.h" #include "directn.h" -#include "files.h" -#include "food.h" -#include "itemname.h" #include "itemprop.h" -#include "items.h" -#include "it_use2.h" #include "externs.h" #include "tilereg.h" -#include "initfile.h" #include "message.h" -#include "misc.h" -#include "mon-util.h" -#include "newgame.h" -#include "player.h" #include "stash.h" #include "state.h" #include "stuff.h" diff --git a/crawl-ref/source/libunix.cc b/crawl-ref/source/libunix.cc index d2f7a0c36d..4f1f3c0d65 100644 --- a/crawl-ref/source/libunix.cc +++ b/crawl-ref/source/libunix.cc @@ -32,7 +32,6 @@ REVISION("$Rev$"); #include "enum.h" #include "externs.h" #include "files.h" -#include "initfile.h" #include "state.h" #include "stuff.h" #include "view.h" diff --git a/crawl-ref/source/libutil.cc b/crawl-ref/source/libutil.cc index 6c3e60be9d..e3aa4e4c6b 100644 --- a/crawl-ref/source/libutil.cc +++ b/crawl-ref/source/libutil.cc @@ -8,7 +8,6 @@ REVISION("$Rev$"); #include "defines.h" #include "directn.h" -#include "initfile.h" #include "itemname.h" // is_vowel() #include "libutil.h" #include "externs.h" diff --git a/crawl-ref/source/los.cc b/crawl-ref/source/los.cc index f7a77bd82f..d8a24b1582 100644 --- a/crawl-ref/source/los.cc +++ b/crawl-ref/source/los.cc @@ -11,7 +11,6 @@ REVISION("$Rev$"); #include <cmath> #include <algorithm> -#include "cloud.h" #include "debug.h" #include "directn.h" #include "externs.h" diff --git a/crawl-ref/source/macro.cc b/crawl-ref/source/macro.cc index 4c2c5b40bf..eeb5442f58 100644 --- a/crawl-ref/source/macro.cc +++ b/crawl-ref/source/macro.cc @@ -39,7 +39,6 @@ REVISION("$Rev$"); #include <cstdlib> #include "cio.h" -#include "delay.h" #include "externs.h" #include "message.h" #include "state.h" diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index fdb344ccff..a3b7329c91 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -18,8 +18,6 @@ REVISION("$Rev$"); #include "describe.h" #include "dungeon.h" #include "food.h" -#include "it_use2.h" -#include "itemname.h" #include "itemprop.h" #include "items.h" #include "misc.h" diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc index db17585693..a9e1fc855d 100644 --- a/crawl-ref/source/mapdef.cc +++ b/crawl-ref/source/mapdef.cc @@ -27,7 +27,6 @@ REVISION("$Rev$"); #include "mapdef.h" #include "mapmark.h" #include "maps.h" -#include "message.h" #include "misc.h" #include "monplace.h" #include "mon-util.h" diff --git a/crawl-ref/source/maps.cc b/crawl-ref/source/maps.cc index 3d50bfdb0b..15279c6917 100644 --- a/crawl-ref/source/maps.cc +++ b/crawl-ref/source/maps.cc @@ -24,7 +24,6 @@ REVISION("$Rev$"); #include "message.h" #include "monplace.h" #include "mapdef.h" -#include "misc.h" #include "state.h" #include "stuff.h" #include "terrain.h" diff --git a/crawl-ref/source/menu.cc b/crawl-ref/source/menu.cc index ff8d358a61..66666a337d 100644 --- a/crawl-ref/source/menu.cc +++ b/crawl-ref/source/menu.cc @@ -26,7 +26,6 @@ REVISION("$Rev$"); #endif #include "tutorial.h" #include "view.h" -#include "initfile.h" MenuDisplay::MenuDisplay(Menu *menu) : m_menu(menu) { diff --git a/crawl-ref/source/mgrow.cc b/crawl-ref/source/mgrow.cc index be96e4dadc..2d0d701089 100644 --- a/crawl-ref/source/mgrow.cc +++ b/crawl-ref/source/mgrow.cc @@ -8,7 +8,6 @@ REVISION("$Rev$"); #include "enum.h" -#include "ghost.h" #include "mgrow.h" #include "mon-util.h" #include "monstuff.h" diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index e0e49b5f83..7c7109f8f4 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -46,7 +46,6 @@ REVISION("$Rev$"); #include "fight.h" #include "files.h" #include "food.h" -#include "format.h" #include "hiscores.h" #include "itemprop.h" #include "items.h" diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index a52cb91523..e5c4cca512 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -50,7 +50,6 @@ REVISION("$Rev$"); #include "state.h" #include "stuff.h" #include "terrain.h" -#include "tiles.h" #include "traps.h" #include "tutorial.h" #include "view.h" diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc index 72597b1746..dbe77740de 100644 --- a/crawl-ref/source/monplace.cc +++ b/crawl-ref/source/monplace.cc @@ -27,7 +27,6 @@ REVISION("$Rev$"); #include "religion.h" #include "state.h" #include "stuff.h" -#include "spells4.h" #include "terrain.h" #include "traps.h" #include "view.h" diff --git a/crawl-ref/source/monspeak.cc b/crawl-ref/source/monspeak.cc index 84f762f44d..b0aa1c1ffc 100644 --- a/crawl-ref/source/monspeak.cc +++ b/crawl-ref/source/monspeak.cc @@ -22,20 +22,13 @@ REVISION("$Rev$"); #include "beam.h" #include "database.h" #include "debug.h" -#include "fight.h" #include "ghost.h" -#include "itemname.h" #include "message.h" -#include "misc.h" -#include "monplace.h" #include "monstuff.h" #include "mon-util.h" -#include "mstuff2.h" #include "newgame.h" #include "player.h" #include "religion.h" -#include "spells2.h" -#include "spells4.h" #include "state.h" #include "stuff.h" #include "view.h" diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 226abf2fcd..0ac41d1d73 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -45,7 +45,6 @@ REVISION("$Rev$"); #include "monplace.h" #include "monspeak.h" #include "mon-los.h" -#include "mon-pick.h" #include "mon-util.h" #include "mutation.h" #include "mstuff2.h" @@ -55,7 +54,6 @@ REVISION("$Rev$"); #include "spl-mis.h" #include "spl-util.h" #include "spells3.h" -#include "spells4.h" #include "state.h" #include "stuff.h" #include "terrain.h" diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc index 26d76393ab..0357e9a9a1 100644 --- a/crawl-ref/source/mstuff2.cc +++ b/crawl-ref/source/mstuff2.cc @@ -40,7 +40,6 @@ REVISION("$Rev$"); #include "religion.h" #include "spells1.h" #include "spells3.h" -#include "spells4.h" #include "spl-cast.h" #include "spl-mis.h" #include "spl-util.h" diff --git a/crawl-ref/source/mtransit.cc b/crawl-ref/source/mtransit.cc index fa230fab96..9f06b61832 100644 --- a/crawl-ref/source/mtransit.cc +++ b/crawl-ref/source/mtransit.cc @@ -16,7 +16,6 @@ REVISION("$Rev$"); #include "items.h" #include "monplace.h" #include "mon-util.h" -#include "monstuff.h" #include "stuff.h" #define MAX_LOST 100 diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index 720e6110d0..0956368c8e 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -37,11 +37,8 @@ REVISION("$Rev$"); #include "describe.h" #include "dungeon.h" #include "files.h" -#include "fight.h" #include "food.h" #include "initfile.h" -#include "it_use2.h" -#include "item_use.h" #include "itemname.h" #include "itemprop.h" #include "items.h" @@ -49,7 +46,6 @@ REVISION("$Rev$"); #include "makeitem.h" #include "menu.h" #include "misc.h" -#include "place.h" #include "player.h" #include "religion.h" #include "skills.h" @@ -58,7 +54,6 @@ REVISION("$Rev$"); #include "spl-util.h" #include "state.h" #include "stuff.h" -#include "tiles.h" #include "tutorial.h" #include "version.h" diff --git a/crawl-ref/source/notes.cc b/crawl-ref/source/notes.cc index 20a64451db..748da46ac2 100644 --- a/crawl-ref/source/notes.cc +++ b/crawl-ref/source/notes.cc @@ -19,8 +19,6 @@ REVISION("$Rev$"); #include "files.h" #include "kills.h" #include "hiscores.h" -#include "message.h" -#include "mon-pick.h" #include "mutation.h" #include "place.h" #include "religion.h" diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index e036ab19ca..fb20fa59c2 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -28,7 +28,6 @@ REVISION("$Rev$"); #include "initfile.h" #include "itemname.h" #include "itemprop.h" -#include "items.h" #include "item_use.h" #include "menu.h" #include "message.h" @@ -44,7 +43,6 @@ REVISION("$Rev$"); #include "skills2.h" #include "stuff.h" #include "transfor.h" -#include "tiles.h" #include "travel.h" #include "view.h" diff --git a/crawl-ref/source/overmap.cc b/crawl-ref/source/overmap.cc index 30c526ee15..bb59e46571 100644 --- a/crawl-ref/source/overmap.cc +++ b/crawl-ref/source/overmap.cc @@ -27,7 +27,6 @@ REVISION("$Rev$"); #include "files.h" #include "initfile.h" #include "menu.h" -#include "misc.h" #include "religion.h" #include "shopping.h" #include "state.h" diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 3f31de9ebc..ac567372a5 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -25,7 +25,6 @@ REVISION("$Rev$"); #include "artefact.h" #include "branch.h" -#include "cio.h" #include "cloud.h" #include "clua.h" #include "delay.h" @@ -48,7 +47,6 @@ REVISION("$Rev$"); #include "notes.h" #include "ouch.h" #include "output.h" -#include "place.h" #include "quiver.h" #include "religion.h" #include "skills.h" diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc index 3c40c18c8a..ac3b9a091e 100644 --- a/crawl-ref/source/shopping.cc +++ b/crawl-ref/source/shopping.cc @@ -7,7 +7,6 @@ #include "AppHdr.h" REVISION("$Rev$"); -#include "chardump.h" #include "shopping.h" #include "message.h" @@ -25,7 +24,6 @@ REVISION("$Rev$"); #include "describe.h" #include "food.h" #include "invent.h" -#include "it_use2.h" #include "items.h" #include "itemname.h" #include "itemprop.h" diff --git a/crawl-ref/source/skills.cc b/crawl-ref/source/skills.cc index 815440616f..f353e0dff4 100644 --- a/crawl-ref/source/skills.cc +++ b/crawl-ref/source/skills.cc @@ -16,7 +16,6 @@ REVISION("$Rev$"); #include "externs.h" #include "itemprop.h" -#include "macro.h" #include "notes.h" #include "output.h" #include "player.h" diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc index 97e94b829a..1cb9fa9d3e 100644 --- a/crawl-ref/source/skills2.cc +++ b/crawl-ref/source/skills2.cc @@ -30,7 +30,6 @@ REVISION("$Rev$"); #include "menu.h" #include "player.h" #include "stuff.h" -#include "transfor.h" #include "tutorial.h" typedef std::string (*string_fn)(); diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc index ba43290b3e..69181d7834 100644 --- a/crawl-ref/source/spells1.cc +++ b/crawl-ref/source/spells1.cc @@ -31,7 +31,6 @@ REVISION("$Rev$"); #include "los.h" #include "message.h" #include "misc.h" -#include "monplace.h" #include "monstuff.h" #include "mon-util.h" #include "player.h" diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index ce26de1e21..364aa2484c 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -46,7 +46,6 @@ REVISION("$Rev$"); #include "terrain.h" #include "traps.h" #include "view.h" -#include "xom.h" int detect_traps(int pow) { diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index 23b49dd8f5..55a96db776 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -30,15 +30,12 @@ REVISION("$Rev$"); #include "itemname.h" #include "itemprop.h" #include "items.h" -#include "item_use.h" #include "los.h" #include "message.h" #include "misc.h" #include "monplace.h" -#include "mon-pick.h" #include "monstuff.h" #include "mon-util.h" -#include "place.h" #include "player.h" #include "quiver.h" #include "religion.h" diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc index 406047cff1..b3180963a7 100644 --- a/crawl-ref/source/spells4.cc +++ b/crawl-ref/source/spells4.cc @@ -21,14 +21,12 @@ REVISION("$Rev$"); #include "cloud.h" #include "debug.h" #include "delay.h" -#include "describe.h" #include "directn.h" #include "dungeon.h" #include "effects.h" #include "invent.h" #include "it_use2.h" #include "item_use.h" -#include "itemname.h" #include "itemprop.h" #include "items.h" #include "los.h" diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc index 9d545e6a19..420684b5be 100644 --- a/crawl-ref/source/spl-book.cc +++ b/crawl-ref/source/spl-book.cc @@ -31,13 +31,11 @@ REVISION("$Rev$"); #include "itemname.h" #include "itemprop.h" #include "items.h" -#include "it_use3.h" #include "kills.h" #include "macro.h" #include "message.h" #include "player.h" #include "religion.h" -#include "skills2.h" #include "spl-cast.h" #include "spl-mis.h" #include "spl-util.h" diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index 56ea04f0d0..17fc6a881f 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -17,10 +17,8 @@ REVISION("$Rev$"); #include "beam.h" #include "describe.h" #include "effects.h" -#include "fight.h" #include "food.h" #include "format.h" -#include "initfile.h" #include "invent.h" #include "it_use2.h" #include "item_use.h" @@ -36,7 +34,6 @@ REVISION("$Rev$"); #include "mutation.h" #include "ouch.h" #include "player.h" -#include "quiver.h" #include "religion.h" #include "skills.h" #include "skills2.h" diff --git a/crawl-ref/source/spl-util.cc b/crawl-ref/source/spl-util.cc index 95740e4aeb..27d1e4169b 100644 --- a/crawl-ref/source/spl-util.cc +++ b/crawl-ref/source/spl-util.cc @@ -23,16 +23,13 @@ REVISION("$Rev$"); #include "directn.h" #include "debug.h" #include "stuff.h" -#include "itemname.h" #include "los.h" #include "macro.h" -#include "misc.h" #include "monstuff.h" #include "notes.h" #include "player.h" #include "religion.h" #include "spells4.h" -#include "spl-book.h" #include "spl-cast.h" #include "spl-util.h" #include "terrain.h" diff --git a/crawl-ref/source/stash.cc b/crawl-ref/source/stash.cc index c052c806a0..d35a5a9751 100644 --- a/crawl-ref/source/stash.cc +++ b/crawl-ref/source/stash.cc @@ -8,7 +8,6 @@ REVISION("$Rev$"); #include "artefact.h" -#include "branch.h" #include "chardump.h" #include "cio.h" #include "clua.h" @@ -30,7 +29,6 @@ REVISION("$Rev$"); #include "mon-util.h" #include "monstuff.h" #include "notes.h" -#include "overmap.h" #include "place.h" #include "shopping.h" #include "spl-book.h" diff --git a/crawl-ref/source/state.cc b/crawl-ref/source/state.cc index e5fb1362d5..21b500954c 100644 --- a/crawl-ref/source/state.cc +++ b/crawl-ref/source/state.cc @@ -17,7 +17,6 @@ REVISION("$Rev$"); #include "menu.h" // For print_formatted_paragraph() #include "message.h" #include "mon-util.h" -#include "output.h" #include "player.h" #include "religion.h" #include "state.h" diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc index fecb00a578..d3cf2de31a 100644 --- a/crawl-ref/source/stuff.cc +++ b/crawl-ref/source/stuff.cc @@ -72,7 +72,6 @@ REVISION("$Rev$"); #include "output.h" #include "player.h" #include "religion.h" -#include "skills2.h" #include "tutorial.h" #include "view.h" diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc index db02547cc9..4729730a1f 100644 --- a/crawl-ref/source/tags.cc +++ b/crawl-ref/source/tags.cc @@ -60,7 +60,6 @@ #include "AppHdr.h" REVISION("$Rev$"); -#include "abl-show.h" #include "artefact.h" #include "branch.h" #include "describe.h" @@ -72,7 +71,6 @@ REVISION("$Rev$"); #include "itemname.h" #include "itemprop.h" #include "mapmark.h" -#include "monstuff.h" #include "mon-util.h" #include "mtransit.h" #include "quiver.h" diff --git a/crawl-ref/source/tile2.cc b/crawl-ref/source/tile2.cc index e1ac72c874..2b76eb6500 100644 --- a/crawl-ref/source/tile2.cc +++ b/crawl-ref/source/tile2.cc @@ -12,20 +12,10 @@ REVISION("$Rev$"); #include <string.h> #include "branch.h" -#include "describe.h" -#include "directn.h" -#include "dungeon.h" -#include "files.h" -#include "ghost.h" -#include "tilereg.h" #include "itemprop.h" -#include "it_use2.h" -#include "place.h" #include "player.h" -#include "spells3.h" #include "stuff.h" #include "tiles.h" -#include "transfor.h" void tile_default_flv(level_area_type lev, branch_type br, tile_flavour &flv) { diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc index e71b52d284..3a7650eac5 100644 --- a/crawl-ref/source/tilereg.cc +++ b/crawl-ref/source/tilereg.cc @@ -14,7 +14,6 @@ REVISION("$Rev$"); #include "files.h" #include "food.h" #include "itemname.h" -#include "it_use2.h" #include "item_use.h" #include "items.h" #include "los.h" diff --git a/crawl-ref/source/tiletex.cc b/crawl-ref/source/tiletex.cc index c42d3a168d..39993ca9e0 100644 --- a/crawl-ref/source/tiletex.cc +++ b/crawl-ref/source/tiletex.cc @@ -2,7 +2,6 @@ REVISION("$Rev$"); #include "files.h" -#include "tiles.h" #include "tiletex.h" #include <SDL.h> diff --git a/crawl-ref/source/transfor.cc b/crawl-ref/source/transfor.cc index 11b15bd239..fcadaef4dd 100644 --- a/crawl-ref/source/transfor.cc +++ b/crawl-ref/source/transfor.cc @@ -21,7 +21,6 @@ REVISION("$Rev$"); #include "item_use.h" #include "itemprop.h" #include "items.h" -#include "misc.h" #include "output.h" #include "player.h" #include "skills2.h" diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc index 398c2c0625..d1dc8fb92a 100644 --- a/crawl-ref/source/traps.cc +++ b/crawl-ref/source/traps.cc @@ -18,7 +18,6 @@ REVISION("$Rev$"); #include "delay.h" #include "describe.h" #include "directn.h" -#include "it_use2.h" #include "itemname.h" #include "itemprop.h" #include "items.h" @@ -30,10 +29,8 @@ REVISION("$Rev$"); #include "monstuff.h" #include "mtransit.h" #include "ouch.h" -#include "place.h" #include "player.h" #include "skills.h" -#include "spells3.h" #include "spl-mis.h" #include "spl-util.h" #include "state.h" diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc index 7844de77c7..14fc9ca3d4 100644 --- a/crawl-ref/source/tutorial.cc +++ b/crawl-ref/source/tutorial.cc @@ -39,13 +39,11 @@ REVISION("$Rev$"); #include "monstuff.h" #include "mutation.h" #include "newgame.h" -#include "output.h" #include "player.h" #include "religion.h" #include "shopping.h" #include "skills2.h" #include "spl-book.h" -#include "spl-util.h" #include "stuff.h" #include "tags.h" #include "terrain.h" diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index 5fea829d23..8d10d1e5d3 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -33,10 +33,8 @@ REVISION("$Rev$"); #include "dungeon.h" #include "format.h" #include "ghost.h" -#include "initfile.h" #include "itemprop.h" #include "los.h" -#include "luadgn.h" #include "macro.h" #include "message.h" #include "misc.h" @@ -51,10 +49,8 @@ REVISION("$Rev$"); #include "player.h" #include "religion.h" #include "skills.h" -#include "skills2.h" #include "stuff.h" #include "spells3.h" -#include "spells4.h" #include "stash.h" #include "tiles.h" #include "state.h" diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index a49571aae8..3704537647 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -30,7 +30,6 @@ REVISION("$Rev$"); #include "ouch.h" #include "player.h" #include "religion.h" -#include "spells1.h" #include "spells2.h" #include "spells3.h" #include "spl-book.h" |