run IWYU for some files

src/action.cpp

@@ -10,17 +10,20 @@
 #include <utility>
 
 #include "avatar.h"
-#include "cached_options.h"
+#include "cached_options.h" // IWYU pragma: keep
 #include "cata_utility.h"
 #include "character.h"
 #include "creature.h"
 #include "creature_tracker.h"
 #include "debug.h"
 #include "flag.h"
 #include "game.h"
+#include "game_constants.h"
 #include "input_context.h"
+#include "input_enums.h"
 #include "inventory.h"
 #include "item.h"
+#include "item_location.h"
 #include "map.h"
 #include "map_iterator.h"
 #include "mapdata.h"

src/action.h

@@ -13,6 +13,7 @@
 
 struct input_event;
 struct point;
+struct tripoint;
 
 /**
  * Enumerates all discrete actions that can be performed by player

src/avatar.cpp

@@ -2,9 +2,9 @@
 
 #include <algorithm>
 #include <array>
-#include <climits>
 #include <cmath>
-#include <cstdlib>
+#include <cstddef>
+#include <functional>
 #include <iterator>
 #include <list>
 #include <map>
@@ -15,18 +15,17 @@
 #include <utility>
 
 #include "action.h"
-#include "activity_type.h"
 #include "activity_actor_definitions.h"
-#include "bionics.h"
 #include "bodypart.h"
 #include "calendar.h"
 #include "cata_assert.h"
+#include "cata_utility.h"
 #include "catacharset.h"
 #include "character.h"
 #include "character_id.h"
 #include "character_martial_arts.h"
-#include "clzones.h"
 #include "color.h"
+#include "creature.h"
 #include "cursesdef.h"
 #include "debug.h"
 #include "diary.h"
@@ -36,19 +35,22 @@
 #include "event_bus.h"
 #include "faction.h"
 #include "field_type.h"
+#include "flexbuffer_json-inl.h"
+#include "flexbuffer_json.h"
 #include "game.h"
 #include "game_constants.h"
+#include "game_inventory.h"
 #include "help.h"
 #include "inventory.h"
 #include "item.h"
 #include "item_location.h"
 #include "itype.h"
 #include "iuse.h"
-#include "kill_tracker.h"
-#include "make_static.h"
-#include "magic_enchantment.h"
+#include "json.h"
+#include "line.h"
 #include "map.h"
 #include "map_memory.h"
+#include "mapdata.h"
 #include "martialarts.h"
 #include "messages.h"
 #include "mission.h"
@@ -57,15 +59,14 @@
 #include "move_mode.h"
 #include "mutation.h"
 #include "npc.h"
-#include "options.h"
 #include "output.h"
 #include "overmap.h"
 #include "overmapbuffer.h"
 #include "pathfinding.h"
 #include "pimpl.h"
-#include "player_activity.h"
 #include "profession.h"
 #include "ranged.h"
+#include "recipe.h"
 #include "ret_val.h"
 #include "rng.h"
 #include "scenario.h"
@@ -74,8 +75,8 @@
 #include "string_formatter.h"
 #include "talker.h"
 #include "talker_avatar.h"
-#include "translations.h"
 #include "timed_event.h"
+#include "translations.h"
 #include "trap.h"
 #include "type_id.h"
 #include "ui.h"
@@ -85,6 +86,8 @@
 #include "vehicle.h"
 #include "vpart_position.h"
 
+class monfaction;
+
 static const bionic_id bio_cloak( "bio_cloak" );
 static const bionic_id bio_soporific( "bio_soporific" );
 

src/avatar.h

@@ -2,56 +2,58 @@
 #ifndef CATA_SRC_AVATAR_H
 #define CATA_SRC_AVATAR_H
 
-#include <cstddef>
-#include <iosfwd>
+#include <array>
 #include <list>
 #include <map>
 #include <memory>
+#include <set>
 #include <string>
+#include <string_view>
 #include <unordered_set>
+#include <utility>
 #include <vector>
 
+#include "bodypart.h"
 #include "calendar.h"
 #include "character.h"
+#include "character_id.h"
 #include "coordinates.h"
 #include "enums.h"
 #include "game_constants.h"
+#include "item.h"
 #include "magic_teleporter_list.h"
 #include "mdarray.h"
-#include "memory_fast.h"
 #include "point.h"
 #include "type_id.h"
+#include "units.h"
 
 class advanced_inv_area;
 class advanced_inv_listitem;
 class advanced_inventory_pane;
 class cata_path;
 class diary;
 class faction;
-class item;
 class item_location;
 class JsonObject;
 class JsonOut;
+class map_memory;
+class memorized_tile;
 class mission;
 class monster;
 class nc_color;
 class npc;
 class talker;
 struct bionic;
+struct mtype;
 
 namespace catacurses
 {
 class window;
 } // namespace catacurses
-enum class character_type : int;
-class map_memory;
-class memorized_tile;
-
 namespace debug_menu
 {
 class mission_debug;
 }  // namespace debug_menu
-struct mtype;
 enum class pool_type;
 
 // Monster visible in different directions (safe mode & compass)

src/character.cpp

@@ -99,6 +99,7 @@
 #include "trap.h"
 #include "ui.h"
 #include "ui_manager.h"
+#include "uistate.h"
 #include "units.h"
 #include "value_ptr.h"
 #include "veh_type.h"

src/diary.cpp

@@ -1,26 +1,40 @@
 #include "diary.h"
 
 #include <algorithm>
+#include <filesystem>
 #include <fstream>
-#include <iostream>
-#include <list>
 #include <string>
 #include <utility>
 
 #include "avatar.h"
 #include "bionics.h"
 #include "calendar.h"
+#include "cata_path.h"
 #include "cata_utility.h"
+#include "catacharset.h"
+#include "color.h"
 #include "filesystem.h"
+#include "flexbuffer_json-inl.h"
+#include "flexbuffer_json.h"
 #include "game.h"
+#include "json.h"
+#include "json_error.h"
+#include "kill_tracker.h"
+#include "magic.h"
 #include "mission.h"
 #include "mtype.h"
 #include "mutation.h"
+#include "npc.h"
 #include "output.h"
 #include "path_info.h"
+#include "pimpl.h"
+#include "proficiency.h"
 #include "skill.h"
 #include "string_formatter.h"
+#include "translation.h"
+#include "translations.h"
 #include "type_id.h"
+#include "weather.h"
 
 diary_page::diary_page() = default;
 

src/diary.h

@@ -2,21 +2,26 @@
 #ifndef CATA_SRC_DIARY_H
 #define CATA_SRC_DIARY_H
 
+#include <functional>
+#include <iosfwd>
+#include <map>
+#include <memory>
 #include <string>
-#include <list>
 #include <vector>
 
-#include "achievement.h"
-#include "character.h"
-#include "kill_tracker.h"
-#include "skill.h"
-#include "stats_tracker.h"
-#include "ui.h"
+#include "calendar.h"
+#include "mutation.h"
+#include "type_id.h"
 #include "units.h"
 
-enum class time_accuracy;
+class JsonOut;
 class JsonValue;
 
+namespace catacurses
+{
+class window;
+}  // namespace catacurses
+
 /// <summary>
 /// diary page, to save current character progression
 /// </summary>

src/diary_ui.cpp

@@ -1,11 +1,13 @@
 #include "game.h" // IWYU pragma: associated
 
 #include <algorithm>
+#include <initializer_list>
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
 
+#include "catacharset.h"
 #include "color.h"
 #include "cursesdef.h"
 #include "diary.h"