Remove redundant "extern" on function declarations

66 files changed, 911 insertions, 914 deletions

diff --git a/src/birth.hpp b/src/birth.hpp
index 7c171610..27ad3d2b 100644
--- a/src/birth.hpp
+++ b/src/birth.hpp
@@ -2,10 +2,10 @@
 
 #include "h-basic.h"
 
-extern void print_desc_aux(cptr txt, int y, int x);
-extern void save_savefile_names(void);
-extern bool_ begin_screen(void);
-extern void player_birth(void);
-extern bool_ no_begin_screen;
-
+void print_desc_aux(cptr txt, int y, int x);
+void save_savefile_names(void);
+bool_ begin_screen(void);
+void player_birth(void);
 void roll_player_hp();
+
+extern bool_ no_begin_screen;
diff --git a/src/bldg.hpp b/src/bldg.hpp
index 00eb6a9e..a55d7419 100644
--- a/src/bldg.hpp
+++ b/src/bldg.hpp
@@ -4,7 +4,7 @@
 #include "store_action_type_fwd.hpp"
 #include "store_type_fwd.hpp"
 
-extern bool_ bldg_process_command(store_type const *s_ptr, store_action_type const *action);
-extern void show_building(store_type const *s_ptr);
-extern bool_ is_state(store_type const *s_ptr, int state);
-extern void enter_quest(void);
+bool_ bldg_process_command(store_type const *s_ptr, store_action_type const *action);
+void show_building(store_type const *s_ptr);
+bool_ is_state(store_type const *s_ptr, int state);
+void enter_quest(void);
diff --git a/src/cave.hpp b/src/cave.hpp
index 5eade816..a014279f 100644
--- a/src/cave.hpp
+++ b/src/cave.hpp
@@ -4,54 +4,54 @@
 #include "cave_type_fwd.hpp"
 #include "object_type_fwd.hpp"
 
-extern int distance(int y1, int x1, int y2, int x2);
-extern bool_ los(int y1, int x1, int y2, int x2);
-extern bool_ cave_valid_bold(int y, int x);
-extern bool_ no_lite(void);
-extern void map_info_default(int y, int x, byte *ap, char *cp);
-extern void move_cursor_relative(int row, int col);
-extern void print_rel(char c, byte a, int y, int x);
-extern void note_spot(int y, int x);
-extern void lite_spot(int y, int x);
-extern void prt_map(void);
-extern void display_map(int *cy, int *cx);
-extern void do_cmd_view_map(void);
-extern errr vinfo_init(void);
-extern void forget_view(void);
-extern void update_view(void);
-extern void forget_mon_lite(void);
-extern void update_mon_lite(void);
-extern void update_flow(void);
-extern void map_area(void);
-extern void wiz_lite(void);
-extern void wiz_lite_extra(void);
-extern void wiz_dark(void);
-extern void cave_set_feat(int y, int x, int feat);
-extern void place_floor(int y, int x);
-extern void place_floor_convert_glass(int y, int x);
-extern void place_filler(int y, int x);
-extern void mmove2(int *y, int *x, int y1, int x1, int y2, int x2);
-extern bool_ projectable(int y1, int x1, int y2, int x2);
-extern void scatter(int *yp, int *xp, int y, int x, int d);
-extern void health_track(int m_idx);
-extern void monster_race_track(int r_idx, int ego);
-extern void object_track(object_type *o_ptr);
-extern void disturb();
-extern void disturb_on_state();
-extern void disturb_on_other();
-extern int is_quest(int level);
-extern int new_effect(int type, int dam, int time, int cy, int cx, int rad, s32b flags);
-extern bool cave_floor_bold(int y, int x);
-extern bool cave_floor_grid(cave_type const *c);
-extern bool cave_plain_floor_bold(int y, int x);
-extern bool cave_plain_floor_grid(cave_type const *c);
-extern bool cave_sight_bold(int y, int x);
-extern bool cave_sight_grid(cave_type const *c);
-extern bool cave_clean_bold(int y, int x);
-extern bool cave_empty_bold(int y, int x);
-extern bool cave_naked_bold(int y, int x);
-extern bool cave_naked_bold2(int y, int x);
-extern bool cave_perma_bold(int y, int x);
-extern bool cave_perma_grid(cave_type const *c);
-extern bool player_has_los_bold(int y, int x);
-extern bool player_can_see_bold(int y, int x);
+int distance(int y1, int x1, int y2, int x2);
+bool_ los(int y1, int x1, int y2, int x2);
+bool_ cave_valid_bold(int y, int x);
+bool_ no_lite(void);
+void map_info_default(int y, int x, byte *ap, char *cp);
+void move_cursor_relative(int row, int col);
+void print_rel(char c, byte a, int y, int x);
+void note_spot(int y, int x);
+void lite_spot(int y, int x);
+void prt_map(void);
+void display_map(int *cy, int *cx);
+void do_cmd_view_map(void);
+errr vinfo_init(void);
+void forget_view(void);
+void update_view(void);
+void forget_mon_lite(void);
+void update_mon_lite(void);
+void update_flow(void);
+void map_area(void);
+void wiz_lite(void);
+void wiz_lite_extra(void);
+void wiz_dark(void);
+void cave_set_feat(int y, int x, int feat);
+void place_floor(int y, int x);
+void place_floor_convert_glass(int y, int x);
+void place_filler(int y, int x);
+void mmove2(int *y, int *x, int y1, int x1, int y2, int x2);
+bool_ projectable(int y1, int x1, int y2, int x2);
+void scatter(int *yp, int *xp, int y, int x, int d);
+void health_track(int m_idx);
+void monster_race_track(int r_idx, int ego);
+void object_track(object_type *o_ptr);
+void disturb();
+void disturb_on_state();
+void disturb_on_other();
+int is_quest(int level);
+int new_effect(int type, int dam, int time, int cy, int cx, int rad, s32b flags);
+bool cave_floor_bold(int y, int x);
+bool cave_floor_grid(cave_type const *c);
+bool cave_plain_floor_bold(int y, int x);
+bool cave_plain_floor_grid(cave_type const *c);
+bool cave_sight_bold(int y, int x);
+bool cave_sight_grid(cave_type const *c);
+bool cave_clean_bold(int y, int x);
+bool cave_empty_bold(int y, int x);
+bool cave_naked_bold(int y, int x);
+bool cave_naked_bold2(int y, int x);
+bool cave_perma_bold(int y, int x);
+bool cave_perma_grid(cave_type const *c);
+bool player_has_los_bold(int y, int x);
+bool player_can_see_bold(int y, int x);
diff --git a/src/cmd1.hpp b/src/cmd1.hpp
index c7c4f064..3d5d72b8 100644
--- a/src/cmd1.hpp
+++ b/src/cmd1.hpp
@@ -4,22 +4,22 @@
 #include "monster_type_fwd.hpp"
 #include "object_type_fwd.hpp"
 
-extern void attack_special(monster_type *m_ptr, s32b special, int dam);
-extern bool_ test_hit_fire(int chance, int ac, int vis);
-extern bool_ test_hit_norm(int chance, int ac, int vis);
-extern s16b critical_shot(int weight, int plus, int dam, int skill);
-extern s16b critical_norm(int weight, int plus, int dam, int weapon_tval, bool_ *done_crit);
-extern s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, s32b *special);
-extern void search(void);
-extern void carry(int pickup);
-extern void py_attack(int y, int x, int max_blow);
-extern bool_ player_can_enter(byte feature);
-extern void move_player(int dir, int do_pickup);
-extern void move_player_aux(int dir, int do_pickup, int run);
-extern void run_step(int dir);
-extern void do_cmd_pet(void);
-extern void do_cmd_integrate_body();
-extern bool_ do_cmd_leave_body(bool_ drop_body);
-extern bool_ execute_inscription(byte i, byte y, byte x);
-extern void do_cmd_engrave(void);
-extern void do_spin(void);
+void attack_special(monster_type *m_ptr, s32b special, int dam);
+bool_ test_hit_fire(int chance, int ac, int vis);
+bool_ test_hit_norm(int chance, int ac, int vis);
+s16b critical_shot(int weight, int plus, int dam, int skill);
+s16b critical_norm(int weight, int plus, int dam, int weapon_tval, bool_ *done_crit);
+s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, s32b *special);
+void search(void);
+void carry(int pickup);
+void py_attack(int y, int x, int max_blow);
+bool_ player_can_enter(byte feature);
+void move_player(int dir, int do_pickup);
+void move_player_aux(int dir, int do_pickup, int run);
+void run_step(int dir);
+void do_cmd_pet(void);
+void do_cmd_integrate_body();
+bool_ do_cmd_leave_body(bool_ drop_body);
+bool_ execute_inscription(byte i, byte y, byte x);
+void do_cmd_engrave(void);
+void do_spin(void);
diff --git a/src/cmd2.hpp b/src/cmd2.hpp
index b5390c2a..9c903dba 100644
--- a/src/cmd2.hpp
+++ b/src/cmd2.hpp
@@ -4,29 +4,29 @@
 #include "object_type_fwd.hpp"
 #include <vector>
 
-extern std::vector<s16b> show_monster_inven(int m_idx);
-extern int breakage_chance(object_type *o_ptr);
-extern void do_cmd_go_up(void);
-extern void do_cmd_go_down(void);
-extern void do_cmd_search(void);
-extern void do_cmd_toggle_search(void);
-extern void do_cmd_open(void);
-extern void do_cmd_close(void);
-extern void do_cmd_chat(void);
-extern void do_cmd_give(void);
-extern void do_cmd_tunnel(void);
-extern void do_cmd_bash(void);
-extern void do_cmd_alter(void);
-extern void do_cmd_spike(void);
-extern void do_cmd_walk(int pickup);
-extern void do_cmd_stay(int pickup);
-extern void do_cmd_run(void);
-extern void do_cmd_rest(void);
-extern int get_shooter_mult(object_type *o_ptr);
-extern void do_cmd_fire(void);
-extern void do_cmd_throw(void);
-extern void do_cmd_boomerang(void);
-extern void do_cmd_immovable_special(void);
-extern void fetch(int dir, int wgt, bool_ require_los);
-extern void do_cmd_sacrifice(void);
-extern void do_cmd_steal(void);
+std::vector<s16b> show_monster_inven(int m_idx);
+int breakage_chance(object_type *o_ptr);
+void do_cmd_go_up(void);
+void do_cmd_go_down(void);
+void do_cmd_search(void);
+void do_cmd_toggle_search(void);
+void do_cmd_open(void);
+void do_cmd_close(void);
+void do_cmd_chat(void);
+void do_cmd_give(void);
+void do_cmd_tunnel(void);
+void do_cmd_bash(void);
+void do_cmd_alter(void);
+void do_cmd_spike(void);
+void do_cmd_walk(int pickup);
+void do_cmd_stay(int pickup);
+void do_cmd_run(void);
+void do_cmd_rest(void);
+int get_shooter_mult(object_type *o_ptr);
+void do_cmd_fire(void);
+void do_cmd_throw(void);
+void do_cmd_boomerang(void);
+void do_cmd_immovable_special(void);
+void fetch(int dir, int wgt, bool_ require_los);
+void do_cmd_sacrifice(void);
+void do_cmd_steal(void);
diff --git a/src/cmd3.hpp b/src/cmd3.hpp
index 5c664118..4b240dda 100644
--- a/src/cmd3.hpp
+++ b/src/cmd3.hpp
@@ -2,22 +2,22 @@
 
 #include "h-basic.h"
 
-extern void do_cmd_html_dump(void);
-extern void cli_add(cptr active, cptr trigger, cptr descr);
-extern void do_cmd_cli(void);
-extern void do_cmd_cli_help(void);
-extern void do_cmd_inven(void);
-extern void do_cmd_equip(void);
-extern void do_cmd_wield(void);
-extern void do_cmd_takeoff(void);
-extern void do_cmd_drop(void);
-extern void do_cmd_destroy(void);
-extern void do_cmd_observe(void);
-extern void do_cmd_uninscribe(void);
-extern void do_cmd_inscribe(void);
-extern void do_cmd_refill(void);
-extern void do_cmd_target(void);
-extern void do_cmd_look(void);
-extern void do_cmd_locate(void);
-extern void do_cmd_query_symbol(void);
-extern bool_ do_cmd_sense_grid_mana(void);
+void do_cmd_html_dump(void);
+void cli_add(cptr active, cptr trigger, cptr descr);
+void do_cmd_cli(void);
+void do_cmd_cli_help(void);
+void do_cmd_inven(void);
+void do_cmd_equip(void);
+void do_cmd_wield(void);
+void do_cmd_takeoff(void);
+void do_cmd_drop(void);
+void do_cmd_destroy(void);
+void do_cmd_observe(void);
+void do_cmd_uninscribe(void);
+void do_cmd_inscribe(void);
+void do_cmd_refill(void);
+void do_cmd_target(void);
+void do_cmd_look(void);
+void do_cmd_locate(void);
+void do_cmd_query_symbol(void);
+bool_ do_cmd_sense_grid_mana(void);
diff --git a/src/cmd4.hpp b/src/cmd4.hpp
index 4470c94f..44a7b97c 100644
--- a/src/cmd4.hpp
+++ b/src/cmd4.hpp
@@ -2,27 +2,27 @@
 
 #include "h-basic.h"
 
-extern void macro_recorder_start(void);
-extern void macro_recorder_add(char c);
-extern void macro_recorder_stop(void);
-extern void do_cmd_macro_recorder(void);
-extern void do_cmd_redraw(void);
-extern void do_cmd_change_name(void);
-extern void do_cmd_message_one(void);
-extern void do_cmd_messages(void);
-extern void do_cmd_options(void);
-extern void do_cmd_pref(void);
-extern void do_cmd_macros(void);
-extern void do_cmd_visuals(void);
-extern void do_cmd_colors(void);
-extern void do_cmd_note(void);
-extern void do_cmd_version(void);
-extern void do_cmd_feeling(void);
-extern void do_cmd_load_screen(void);
-extern void do_cmd_save_screen(void);
-extern void do_cmd_knowledge(void);
-extern void do_cmd_checkquest(void);
-extern void do_cmd_change_tactic(int i);
-extern void do_cmd_change_movement(int i);
-extern void do_cmd_time(void);
-extern void do_cmd_options_aux(int page, cptr info, bool_ read_only);
+void macro_recorder_start(void);
+void macro_recorder_add(char c);
+void macro_recorder_stop(void);
+void do_cmd_macro_recorder(void);
+void do_cmd_redraw(void);
+void do_cmd_change_name(void);
+void do_cmd_message_one(void);
+void do_cmd_messages(void);
+void do_cmd_options(void);
+void do_cmd_pref(void);
+void do_cmd_macros(void);
+void do_cmd_visuals(void);
+void do_cmd_colors(void);
+void do_cmd_note(void);
+void do_cmd_version(void);
+void do_cmd_feeling(void);
+void do_cmd_load_screen(void);
+void do_cmd_save_screen(void);
+void do_cmd_knowledge(void);
+void do_cmd_checkquest(void);
+void do_cmd_change_tactic(int i);
+void do_cmd_change_movement(int i);
+void do_cmd_time(void);
+void do_cmd_options_aux(int page, cptr info, bool_ read_only);
diff --git a/src/cmd5.cc b/src/cmd5.cc
index 91c12e83..f9094482 100644
--- a/src/cmd5.cc
+++ b/src/cmd5.cc
@@ -225,7 +225,7 @@ static void browse_school_spell(int book, int spell_idx, object_type *o_ptr)
  * and in the dark, primarily to allow browsing in stores.
  */
 
-extern void do_cmd_browse_aux(object_type *o_ptr)
+void do_cmd_browse_aux(object_type *o_ptr)
 {
 	auto const flags = object_flags(o_ptr);
 
diff --git a/src/cmd5.hpp b/src/cmd5.hpp
index 89bbab8c..753b8f68 100644
--- a/src/cmd5.hpp
+++ b/src/cmd5.hpp
@@ -8,16 +8,16 @@
 #include <string>
 #include <vector>
 
-extern bool_ is_magestaff(void);
-extern void do_cmd_browse_aux(object_type *o_ptr);
-extern void do_cmd_browse(void);
-extern void fetch(int dir, int wgt, bool_ require_los);
-extern void do_poly_self(void);
-extern std::string symbiote_name(bool capitalize);
-extern int use_symbiotic_power(int r_idx, bool great);
-extern void use_monster_power(int r_idx, bool great);
-extern bool_ is_ok_spell(s32b spell_idx, s32b pval);
-extern s32b get_school_spell(cptr do_what, s16b force_book);
-extern void do_cmd_copy_spell(void);
-extern void cast_school_spell(void);
-extern std::vector<monster_power const *> extract_monster_powers(monster_race const *r_ptr, bool great);
+bool_ is_magestaff(void);
+void do_cmd_browse_aux(object_type *o_ptr);
+void do_cmd_browse(void);
+void fetch(int dir, int wgt, bool_ require_los);
+void do_poly_self(void);
+std::string symbiote_name(bool capitalize);
+int use_symbiotic_power(int r_idx, bool great);
+void use_monster_power(int r_idx, bool great);
+bool_ is_ok_spell(s32b spell_idx, s32b pval);
+s32b get_school_spell(cptr do_what, s16b force_book);
+void do_cmd_copy_spell(void);
+void cast_school_spell(void);
+std::vector<monster_power const *> extract_monster_powers(monster_race const *r_ptr, bool great);
diff --git a/src/cmd6.hpp b/src/cmd6.hpp
index ad6619f6..6c4b0d47 100644
--- a/src/cmd6.hpp
+++ b/src/cmd6.hpp
@@ -3,16 +3,16 @@
 #include "h-basic.h"
 #include "object_type_fwd.hpp"
 
-extern void set_stick_mode(object_type *o_ptr);
-extern void unset_stick_mode(void);
-extern void do_cmd_eat_food(void);
-extern void do_cmd_quaff_potion(void);
-extern void do_cmd_read_scroll(void);
-extern void do_cmd_aim_wand(void);
-extern void do_cmd_use_staff(void);
-extern void do_cmd_zap_rod(void);
-extern const char *activation_aux(object_type *o_ptr, bool_ desc, int item);
-extern void do_cmd_activate(void);
-extern void do_cmd_cut_corpse(void);
-extern void do_cmd_cure_meat(void);
-extern void do_cmd_drink_fountain(void);
+void set_stick_mode(object_type *o_ptr);
+void unset_stick_mode(void);
+void do_cmd_eat_food(void);
+void do_cmd_quaff_potion(void);
+void do_cmd_read_scroll(void);
+void do_cmd_aim_wand(void);
+void do_cmd_use_staff(void);
+void do_cmd_zap_rod(void);
+const char *activation_aux(object_type *o_ptr, bool_ desc, int item);
+void do_cmd_activate(void);
+void do_cmd_cut_corpse(void);
+void do_cmd_cure_meat(void);
+void do_cmd_drink_fountain(void);
diff --git a/src/cmd7.cc b/src/cmd7.cc
index 38e5d6cd..b51ba229 100644
--- a/src/cmd7.cc
+++ b/src/cmd7.cc
@@ -3296,7 +3296,7 @@ void do_cmd_create_boulder()
 /*
  * Clamp failure chance
  */
-extern int clamp_failure_chance(int chance, int minfail)
+int clamp_failure_chance(int chance, int minfail)
 {
 	if (minfail < 0) minfail = 0;
 
diff --git a/src/cmd7.hpp b/src/cmd7.hpp
index 0c650210..4d8b5240 100644
--- a/src/cmd7.hpp
+++ b/src/cmd7.hpp
@@ -3,23 +3,23 @@
 #include "h-basic.h"
 #include "object_type_fwd.hpp"
 
-extern void do_cmd_pray(void);
-extern void do_cmd_create_boulder(void);
-extern void necro_info(char *p, int power);
-extern void mindcraft_info(char *p, int power);
-extern void symbiotic_info(char *p, int power);
-extern void mimic_info(char *p, int power);
-extern void do_cmd_summoner(void);
-extern void do_cmd_mindcraft(void);
-extern void do_cmd_mimic(void);
-extern void use_ability_blade(void);
-extern void do_cmd_beastmaster(void);
-extern void do_cmd_powermage(void);
-extern void do_cmd_possessor(void);
-extern void do_cmd_archer(void);
-extern void do_cmd_set_piercing(void);
-extern void do_cmd_necromancer(void);
-extern void do_cmd_unbeliever(void);
-extern void do_cmd_symbiotic(void);
-extern s32b sroot(s32b n);
-extern int clamp_failure_chance(int chance, int minfail);
+void do_cmd_pray(void);
+void do_cmd_create_boulder(void);
+void necro_info(char *p, int power);
+void mindcraft_info(char *p, int power);
+void symbiotic_info(char *p, int power);
+void mimic_info(char *p, int power);
+void do_cmd_summoner(void);
+void do_cmd_mindcraft(void);
+void do_cmd_mimic(void);
+void use_ability_blade(void);
+void do_cmd_beastmaster(void);
+void do_cmd_powermage(void);
+void do_cmd_possessor(void);
+void do_cmd_archer(void);
+void do_cmd_set_piercing(void);
+void do_cmd_necromancer(void);
+void do_cmd_unbeliever(void);
+void do_cmd_symbiotic(void);
+s32b sroot(s32b n);
+int clamp_failure_chance(int chance, int minfail);
diff --git a/src/corrupt.hpp b/src/corrupt.hpp
index d7ab2e97..77a7496e 100644
--- a/src/corrupt.hpp
+++ b/src/corrupt.hpp
@@ -2,12 +2,12 @@
 
 #include <string>
 
-extern void gain_random_corruption();
-extern std::string dump_corruptions(bool color, bool header);
-extern void lose_corruption();
-extern bool_ player_has_corruption(int corruption_idx);
-extern void player_gain_corruption(int corruption_idx);
-extern s16b get_corruption_power(int corruption_idx);
+void gain_random_corruption();
+std::string dump_corruptions(bool color, bool header);
+void lose_corruption();
+bool_ player_has_corruption(int corruption_idx);
+void player_gain_corruption(int corruption_idx);
+s16b get_corruption_power(int corruption_idx);
 
 /*
  * Corruptions
diff --git a/src/dungeon.h b/src/dungeon.h
index 2a178dd1..b5a81a59 100644
--- a/src/dungeon.h
+++ b/src/dungeon.h
@@ -5,7 +5,7 @@
 extern "C" {
 #endif
 
-extern void play_game();
+void play_game();
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/src/dungeon.hpp b/src/dungeon.hpp
index bbe6da87..e14f4a12 100644
--- a/src/dungeon.hpp
+++ b/src/dungeon.hpp
@@ -2,5 +2,5 @@
 
 #include <vector>
 
-extern void sense_inventory();
-extern void sense_objects(std::vector<int> const &object_idxs);
+void sense_inventory();
+void sense_objects(std::vector<int> const &object_idxs);
diff --git a/src/files.h b/src/files.h
index 951c3c00..ddb9c5c8 100644
--- a/src/files.h
+++ b/src/files.h
@@ -7,8 +7,8 @@
 extern "C" {
 #endif
 
-extern void do_cmd_save_game(void);
-extern void predict_score_gui(bool_ *initialized, bool_ *game_in_progress);
+void do_cmd_save_game(void);
+void predict_score_gui(bool_ *initialized, bool_ *game_in_progress);
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/src/files.hpp b/src/files.hpp
index bd39c759..d86307e8 100644
--- a/src/files.hpp
+++ b/src/files.hpp
@@ -7,27 +7,27 @@
 #include <string>
 #include <vector>
 
-extern void html_screenshot(cptr name);
-extern void help_file_screenshot(cptr name);
-extern object_flag_set player_flags();
-extern void wipe_saved(void);
-extern s16b tokenize(char *buf, s16b num, char **tokens, char delim1, char delim2);
-extern void display_player(int mode);
-extern std::string describe_player_location();
-extern errr file_character(cptr name, bool_ full);
-extern errr process_pref_file_aux(char *buf);
-extern errr process_pref_file(cptr name);
-extern void show_string(const char *lines, const char *title, int line = 0);
-extern void show_file(cptr name, cptr what, int line = 0);
-extern void do_cmd_help(void);
-extern void process_player_base(void);
-extern void get_name(void);
-extern void do_cmd_suicide(void);
-extern void autosave_checkpoint();
-extern void close_game(void);
-extern errr get_rnd_line(const char * file_name, char * output);
-extern char *get_line(const char* fname, cptr fdir, char *linbuf, int line);
-extern void race_legends(void);
-extern void show_highclass(int building);
-extern errr get_xtra_line(const char * file_name, monster_type *m_ptr, char * output);
-extern void process_player_name(bool_ sf);
+void html_screenshot(cptr name);
+void help_file_screenshot(cptr name);
+object_flag_set player_flags();
+void wipe_saved(void);
+s16b tokenize(char *buf, s16b num, char **tokens, char delim1, char delim2);
+void display_player(int mode);
+std::string describe_player_location();
+errr file_character(cptr name, bool_ full);
+errr process_pref_file_aux(char *buf);
+errr process_pref_file(cptr name);
+void show_string(const char *lines, const char *title, int line = 0);
+void show_file(cptr name, cptr what, int line = 0);
+void do_cmd_help(void);
+void process_player_base(void);
+void get_name(void);
+void do_cmd_suicide(void);
+void autosave_checkpoint();
+void close_game(void);
+errr get_rnd_line(const char * file_name, char * output);
+char *get_line(const char* fname, cptr fdir, char *linbuf, int line);
+void race_legends(void);
+void show_highclass(int building);
+errr get_xtra_line(const char * file_name, monster_type *m_ptr, char * output);
+void process_player_name(bool_ sf);
diff --git a/src/gen_evol.hpp b/src/gen_evol.hpp
index 65b1320d..6e5087c8 100644
--- a/src/gen_evol.hpp
+++ b/src/gen_evol.hpp
@@ -2,5 +2,5 @@
 
 #include "h-basic.h"
 
-extern bool_ level_generate_life();
-extern void evolve_level(bool_ noise);
+bool_ level_generate_life();
+void evolve_level(bool_ noise);
diff --git a/src/gen_maze.hpp b/src/gen_maze.hpp
index 28c092e3..bc03b575 100644
--- a/src/gen_maze.hpp
+++ b/src/gen_maze.hpp
@@ -2,4 +2,4 @@
 
 #include "h-basic.h"
 
-extern bool_ level_generate_maze();
+bool_ level_generate_maze();
diff --git a/src/generate.hpp b/src/generate.hpp
index d09907b5..296afb8d 100644
--- a/src/generate.hpp
+++ b/src/generate.hpp
@@ -2,11 +2,11 @@
 
 #include "h-basic.h"
 
-extern bool_ new_player_spot(int branch);
-extern void add_level_generator(cptr name, bool_ (*generator)());
-extern bool_ level_generate_dungeon();
-extern bool_ generate_fracave(int y0, int x0,int xsize,int ysize,int cutoff,bool_ light,bool_ room);
-extern void generate_hmap(int y0, int x0,int xsiz,int ysiz,int grd,int roug,int cutoff);
-extern bool_ room_alloc(int x,int y,bool_ crowded,int by0,int bx0,int *xx,int *yy);
-extern void generate_cave(void);
-extern void build_rectangle(int y1, int x1, int y2, int x2, int feat, int info);
+bool_ new_player_spot(int branch);
+void add_level_generator(cptr name, bool_ (*generator)());
+bool_ level_generate_dungeon();
+bool_ generate_fracave(int y0, int x0,int xsize,int ysize,int cutoff,bool_ light,bool_ room);
+void generate_hmap(int y0, int x0,int xsiz,int ysiz,int grd,int roug,int cutoff);
+bool_ room_alloc(int x,int y,bool_ crowded,int by0,int bx0,int *xx,int *yy);
+void generate_cave(void);
+void build_rectangle(int y1, int x1, int y2, int x2, int feat, int info);
diff --git a/src/gods.hpp b/src/gods.hpp
index 7035dd14..2a5f2bb5 100644
--- a/src/gods.hpp
+++ b/src/gods.hpp
@@ -2,12 +2,12 @@
 
 #include "h-basic.h"
 
-extern void inc_piety(int god, s32b amt);
-extern void abandon_god(int god);
-extern int wisdom_scale(int max);
-extern int find_god(cptr name);
-extern void follow_god(int god, bool_ silent);
-extern bool_ god_enabled(struct deity_type *deity);
-extern deity_type *god_at(byte god_idx);
-extern bool_ show_god_info();
-extern bool praying_to(int god);
+void inc_piety(int god, s32b amt);
+void abandon_god(int god);
+int wisdom_scale(int max);
+int find_god(cptr name);
+void follow_god(int god, bool_ silent);
+bool_ god_enabled(struct deity_type *deity);
+deity_type *god_at(byte god_idx);
+bool_ show_god_info();
+bool praying_to(int god);
diff --git a/src/help.hpp b/src/help.hpp
index 5adf1381..a805a62b 100644
--- a/src/help.hpp
+++ b/src/help.hpp
@@ -4,10 +4,10 @@
 
 #include <string>
 
-extern void init_hooks_help();
-extern void help_race(std::string const &race);
-extern void help_subrace(std::string const &subrace);
-extern void help_class(std::string const &klass);
-extern void help_god(cptr god);
-extern void help_skill(std::string const &skill);
-extern void help_ability(std::string const &ability);
+void init_hooks_help();
+void help_race(std::string const &race);
+void help_subrace(std::string const &subrace);
+void help_class(std::string const &klass);
+void help_god(cptr god);
+void help_skill(std::string const &skill);
+void help_ability(std::string const &ability);
diff --git a/src/hooks.hpp b/src/hooks.hpp
index b6124e6a..78896def 100644
--- a/src/hooks.hpp
+++ b/src/hooks.hpp
@@ -4,7 +4,7 @@
 
 typedef bool_ (*hook_func_t)(void *, void *, void *);
 
-extern void add_hook_new(int h_idx, hook_func_t hook_func, cptr name, void *data);
-extern void del_hook_new(int h_idx, hook_func_t hook_func);
+void add_hook_new(int h_idx, hook_func_t hook_func, cptr name, void *data);
+void del_hook_new(int h_idx, hook_func_t hook_func);
 extern int process_hooks_restart;
-extern bool_ process_hooks_new(int h_idx, void *in, void *out);
+bool_ process_hooks_new(int h_idx, void *in, void *out);
diff --git a/src/init1.hpp b/src/init1.hpp
index 3f0198a7..1c417285 100644
--- a/src/init1.hpp
+++ b/src/init1.hpp
@@ -3,25 +3,25 @@
 #include "h-basic.h"
 #include "dungeon_flag_set.hpp"
 
-extern int color_char_to_attr(char c);
+int color_char_to_attr(char c);
 extern byte conv_color[16];
-extern errr init_player_info_txt(FILE *fp);
-extern errr init_ab_info_txt(FILE *fp);
-extern errr init_s_info_txt(FILE *fp);
-extern errr init_set_info_txt(FILE *fp);
-extern errr init_v_info_txt(FILE *fp);
-extern errr init_f_info_txt(FILE *fp);
-extern errr init_k_info_txt(FILE *fp);
-extern errr init_a_info_txt(FILE *fp);
-extern errr init_ra_info_txt(FILE *fp);
-extern errr init_e_info_txt(FILE *fp);
-extern errr init_r_info_txt(FILE *fp);
-extern errr init_re_info_txt(FILE *fp);
-extern errr init_d_info_txt(FILE *fp);
-extern errr init_t_info_txt(FILE *fp);
-extern errr init_ba_info_txt(FILE *fp);
-extern errr init_st_info_txt(FILE *fp);
-extern errr init_ow_info_txt(FILE *fp);
-extern errr init_wf_info_txt(FILE *fp);
-extern errr grab_one_dungeon_flag(dungeon_flag_set *flags, const char *str);
-extern errr process_dungeon_file(cptr name, int *yval, int *xval, int ymax, int xmax, bool_ init, bool_ full);
+errr init_player_info_txt(FILE *fp);
+errr init_ab_info_txt(FILE *fp);
+errr init_s_info_txt(FILE *fp);
+errr init_set_info_txt(FILE *fp);
+errr init_v_info_txt(FILE *fp);
+errr init_f_info_txt(FILE *fp);
+errr init_k_info_txt(FILE *fp);
+errr init_a_info_txt(FILE *fp);
+errr init_ra_info_txt(FILE *fp);
+errr init_e_info_txt(FILE *fp);
+errr init_r_info_txt(FILE *fp);
+errr init_re_info_txt(FILE *fp);
+errr init_d_info_txt(FILE *fp);
+errr init_t_info_txt(FILE *fp);
+errr init_ba_info_txt(FILE *fp);
+errr init_st_info_txt(FILE *fp);
+errr init_ow_info_txt(FILE *fp);
+errr init_wf_info_txt(FILE *fp);
+errr grab_one_dungeon_flag(dungeon_flag_set *flags, const char *str);
+errr process_dungeon_file(cptr name, int *yval, int *xval, int ymax, int xmax, bool_ init, bool_ full);
diff --git a/src/init2.h b/src/init2.h
index ba18f2d7..d99cd62c 100644
--- a/src/init2.h
+++ b/src/init2.h
@@ -5,8 +5,8 @@
 extern "C" {
 #endif
 
-extern void init_file_paths(char *path);
-extern void init_angband(void);
+void init_file_paths(char *path);
+void init_angband(void);
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/src/init2.hpp b/src/init2.hpp
index 707a2706..e1c3b4ef 100644
--- a/src/init2.hpp
+++ b/src/init2.hpp
@@ -2,8 +2,8 @@
 
 #include "h-basic.h"
 
-extern void init_corruptions();
-extern void create_stores_stock(int t);
-extern errr init_v_info(void);
+void init_corruptions();
+void create_stores_stock(int t);
+errr init_v_info(void);
 extern s16b error_idx;
 extern s16b error_line;
diff --git a/src/joke.hpp b/src/joke.hpp
index 05ac1843..46795e7c 100644
--- a/src/joke.hpp
+++ b/src/joke.hpp
@@ -2,4 +2,4 @@
 
 #include "h-basic.h"
 
-extern bool_ gen_joke_monsters(void *data, void *in, void *out);
+bool_ gen_joke_monsters(void *data, void *in, void *out);
diff --git a/src/levels.hpp b/src/levels.hpp
index 187092b1..fb3169b4 100644
--- a/src/levels.hpp
+++ b/src/levels.hpp
@@ -2,12 +2,12 @@
 
 #include "h-basic.h"
 
-extern bool_ get_dungeon_generator(char *buf);
-extern bool_ get_level_desc(char *buf);
-extern void get_level_flags(void);
-extern bool_ get_dungeon_name(char *buf);
-extern bool_ get_dungeon_special(char *buf);
-extern int get_branch(void);
-extern int get_fbranch(void);
-extern int get_flevel(void);
-extern bool_ get_dungeon_save(char *buf);
+bool_ get_dungeon_generator(char *buf);
+bool_ get_level_desc(char *buf);
+void get_level_flags(void);
+bool_ get_dungeon_name(char *buf);
+bool_ get_dungeon_special(char *buf);
+int get_branch(void);
+int get_fbranch(void);
+int get_flevel(void);
+bool_ get_dungeon_save(char *buf);
diff --git a/src/loadsave.h b/src/loadsave.h
index 61bfced7..0d2c4ff5 100644
--- a/src/loadsave.h
+++ b/src/loadsave.h
@@ -7,9 +7,8 @@
 extern "C" {
 #endif
 
-/* loadsave.c */
-extern void save_dungeon(void);
-extern bool_ save_player(void);
+void save_dungeon(void);
+bool_ save_player(void);
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/src/loadsave.hpp b/src/loadsave.hpp
index a9eb9dc8..d80a3e7e 100644
--- a/src/loadsave.hpp
+++ b/src/loadsave.hpp
@@ -2,6 +2,6 @@
 
 #include "h-basic.h"
 
-extern bool_ file_exist(cptr buf);
-extern bool_ load_dungeon(char *ext);
-extern bool_ load_player(void);
+bool_ file_exist(cptr buf);
+bool_ load_dungeon(char *ext);
+bool_ load_player(void);
diff --git a/src/lua_bind.hpp b/src/lua_bind.hpp
index 9882edad..39fc2159 100644
--- a/src/lua_bind.hpp
+++ b/src/lua_bind.hpp
@@ -5,26 +5,26 @@
 #include "timer_type_fwd.hpp"
 
 /** Calculate spell failure rate for a device, i.e. a wand or staff. */
-extern s32b spell_chance_device(spell_type *spell_ptr);
+s32b spell_chance_device(spell_type *spell_ptr);
 
 /** Calculate spell failure rate for a spell book. */
-extern s32b spell_chance_book(s32b s);
+s32b spell_chance_book(s32b s);
 
 
-extern s32b lua_get_level(struct spell_type *spell, s32b lvl, s32b max, s32b min, s32b bonus);
-extern int get_mana(s32b s);
-extern s32b get_power(s32b s);
-extern s32b get_level(s32b s, s32b max);
-extern s32b get_level_s(int sp, int max);
-extern void get_level_school(struct spell_type *spell, s32b max, s32b min, s32b *level, bool_ *na);
+s32b lua_get_level(struct spell_type *spell, s32b lvl, s32b max, s32b min, s32b bonus);
+int get_mana(s32b s);
+s32b get_power(s32b s);
+s32b get_level(s32b s, s32b max);
+s32b get_level_s(int sp, int max);
+void get_level_school(struct spell_type *spell, s32b max, s32b min, s32b *level, bool_ *na);
 
 extern s32b get_level_max_stick;
 extern s32b get_level_use_stick;
 
-extern void get_map_size(const char *name, int *ysize, int *xsize);
-extern void load_map(const char *name, int *y, int *x);
+void get_map_size(const char *name, int *ysize, int *xsize);
+void load_map(const char *name, int *y, int *x);
 
-extern void increase_mana(int delta);
+void increase_mana(int delta);
 
 extern timer_type *TIMER_AGGRAVATE_EVIL;
 
diff --git a/src/main-x11.c b/src/main-x11.c
index 99778c77..19d2ac94 100644
--- a/src/main-x11.c
+++ b/src/main-x11.c
@@ -555,7 +555,7 @@ int Term_queue_space(void)
  *
  * NB: The keys added here will be interpreted by any macros or keymaps.
  */
-errr type_string(char *str, uint len)
+static errr type_string(char *str, uint len)
 {
 	char *s;
 
@@ -1740,8 +1740,6 @@ error:
 	XSendEvent(DPY, rq->requestor, FALSE, NoEventMask, &event);
 }
 
-extern errr type_string(char *str, uint len);
-
 /*
  * Add the contents of the PRIMARY buffer to the input queue.
  *
diff --git a/src/melee1.hpp b/src/melee1.hpp
index e84c8f03..90ece431 100644
--- a/src/melee1.hpp
+++ b/src/melee1.hpp
@@ -2,6 +2,6 @@
 
 #include "h-basic.h"
 
-extern int get_attack_power(int effect);
-extern bool_ carried_make_attack_normal(int r_idx);
-extern bool_ make_attack_normal(int m_idx, byte divis);
+int get_attack_power(int effect);
+bool_ carried_make_attack_normal(int r_idx);
+bool_ make_attack_normal(int m_idx, byte divis);
diff --git a/src/melee2.hpp b/src/melee2.hpp
index fece0564..d3af972f 100644
--- a/src/melee2.hpp
+++ b/src/melee2.hpp
@@ -4,9 +4,9 @@
 #include "monster_type_fwd.hpp"
 
 extern int monst_spell_monst_spell;
-extern bool_ mon_take_hit_mon(int s_idx, int m_idx, int dam, bool_ *fear, cptr note);
-extern void mon_handle_fear(monster_type *m_ptr, int dam, bool_ *fear);
-extern int check_hit2(int power, int level, int ac);
-extern void process_monsters(void);
-extern void curse_equipment(int chance, int heavy_chance);
-extern void curse_equipment_dg(int chance, int heavy_chance);
+bool_ mon_take_hit_mon(int s_idx, int m_idx, int dam, bool_ *fear, cptr note);
+void mon_handle_fear(monster_type *m_ptr, int dam, bool_ *fear);
+int check_hit2(int power, int level, int ac);
+void process_monsters(void);
+void curse_equipment(int chance, int heavy_chance);
+void curse_equipment_dg(int chance, int heavy_chance);
diff --git a/src/mimic.hpp b/src/mimic.hpp
index d9c8f3bd..4ce9a6e8 100644
--- a/src/mimic.hpp
+++ b/src/mimic.hpp
@@ -1,10 +1,10 @@
 #include "h-basic.h"
 
-extern s16b resolve_mimic_name(cptr name);
-extern s16b find_random_mimic_shape(byte level, bool_ limit);
-extern cptr get_mimic_name(s16b mf_idx);
-extern cptr get_mimic_object_name(s16b mf_idx);
-extern byte get_mimic_level(s16b mf_idx);
-extern s32b get_mimic_random_duration(s16b mf_idx);
-extern byte calc_mimic();
-extern void calc_mimic_power();
+s16b resolve_mimic_name(cptr name);
+s16b find_random_mimic_shape(byte level, bool_ limit);
+cptr get_mimic_name(s16b mf_idx);
+cptr get_mimic_object_name(s16b mf_idx);
+byte get_mimic_level(s16b mf_idx);
+s32b get_mimic_random_duration(s16b mf_idx);
+byte calc_mimic();
+void calc_mimic_power();
diff --git a/src/modules.hpp b/src/modules.hpp
index 7a8a055f..e8a413df 100644
--- a/src/modules.hpp
+++ b/src/modules.hpp
@@ -2,12 +2,12 @@
 
 #include "h-basic.h"
 
-extern bool_ select_module(void);
-extern bool_ module_savefile_loadable(cptr savefile_mod);
-extern void tome_intro();
-extern void theme_intro();
-extern s16b *theme_race_status(int r_idx);
-extern void init_hooks_module();
-extern int find_module(cptr name);
-extern bool_ private_check_user_directory(cptr dirpath);
+bool_ select_module(void);
+bool_ module_savefile_loadable(cptr savefile_mod);
+void tome_intro();
+void theme_intro();
+s16b *theme_race_status(int r_idx);
+void init_hooks_module();
+int find_module(cptr name);
+bool_ private_check_user_directory(cptr dirpath);
 extern cptr force_module;
diff --git a/src/monster1.hpp b/src/monster1.hpp
index 9f7128ea..34f54346 100644
--- a/src/monster1.hpp
+++ b/src/monster1.hpp
@@ -1,5 +1,5 @@
 #pragma once
 
-extern void screen_roff(int r_idx, int ego);
-extern void display_roff(int r_idx, int ego);
-extern void monster_description_out(int r_idx, int ego);
+void screen_roff(int r_idx, int ego);
+void display_roff(int r_idx, int ego);
+void monster_description_out(int r_idx, int ego);
diff --git a/src/monster2.hpp b/src/monster2.hpp
index 5ef5eaf9..552331ef 100644
--- a/src/monster2.hpp
+++ b/src/monster2.hpp
@@ -6,45 +6,45 @@
 #include "object_type_fwd.hpp"
 #include <memory>
 
-extern s32b monster_exp(s16b level);
-extern void monster_set_level(int m_idx, int level);
-extern s32b modify_aux(s32b a, s32b b, char mod);
-extern void monster_msg_simple(cptr s);
-extern bool_ mego_ok(monster_race const *r_ptr, int ego);
-extern void monster_check_experience(int m_idx, bool_ silent);
-extern void monster_gain_exp(int m_idx, u32b exp, bool_ silent);
-extern std::shared_ptr<monster_race> race_info_idx(int r_idx, int ego);
-extern void delete_monster_idx(int i);
-extern void delete_monster(int y, int x);
-extern void compact_monsters(int size);
-extern void wipe_m_list(void);
-extern s16b m_pop(void);
-extern errr get_mon_num_prep(void);
-extern s16b get_mon_num(int level);
-extern void monster_desc(char *desc, monster_type *m_ptr, int mode);
-extern void monster_race_desc(char *desc, int r_idx, int ego);
-extern void update_mon(int m_idx, bool_ full);
-extern void update_monsters(bool_ full);
-extern void monster_carry(monster_type *m_ptr, int m_idx, object_type *q_ptr);
+s32b monster_exp(s16b level);
+void monster_set_level(int m_idx, int level);
+s32b modify_aux(s32b a, s32b b, char mod);
+void monster_msg_simple(cptr s);
+bool_ mego_ok(monster_race const *r_ptr, int ego);
+void monster_check_experience(int m_idx, bool_ silent);
+void monster_gain_exp(int m_idx, u32b exp, bool_ silent);
+std::shared_ptr<monster_race> race_info_idx(int r_idx, int ego);
+void delete_monster_idx(int i);
+void delete_monster(int y, int x);
+void compact_monsters(int size);
+void wipe_m_list(void);
+s16b m_pop(void);
+errr get_mon_num_prep(void);
+s16b get_mon_num(int level);
+void monster_desc(char *desc, monster_type *m_ptr, int mode);
+void monster_race_desc(char *desc, int r_idx, int ego);
+void update_mon(int m_idx, bool_ full);
+void update_monsters(bool_ full);
+void monster_carry(monster_type *m_ptr, int m_idx, object_type *q_ptr);
 extern bool_ bypass_r_ptr_max_num ;
-extern bool_ place_monster_aux(int y, int x, int r_idx, bool_ slp, bool_ grp, int status);
-extern bool_ place_monster(int y, int x, bool_ slp, bool_ grp);
-extern bool_ alloc_horde(int y, int x);
-extern bool_ alloc_monster(int dis, bool_ slp);
+bool_ place_monster_aux(int y, int x, int r_idx, bool_ slp, bool_ grp, int status);
+bool_ place_monster(int y, int x, bool_ slp, bool_ grp);
+bool_ alloc_horde(int y, int x);
+bool_ alloc_monster(int dis, bool_ slp);
 extern int summon_specific_level;
-extern bool_ summon_specific(int y1, int x1, int lev, int type);
-extern void monster_swap(int y1, int x1, int y2, int x2);
-extern bool_ multiply_monster(int m_idx, bool_ charm, bool_ clone);
+bool_ summon_specific(int y1, int x1, int lev, int type);
+void monster_swap(int y1, int x1, int y2, int x2);
+bool_ multiply_monster(int m_idx, bool_ charm, bool_ clone);
 extern bool_ hack_message_pain_may_silent;
-extern void message_pain(int m_idx, int dam);
-extern void update_smart_learn(int m_idx, int what);
-extern bool_ summon_specific_friendly(int y1, int x1, int lev, int type, bool_ Group_ok);
+void message_pain(int m_idx, int dam);
+void update_smart_learn(int m_idx, int what);
+bool_ summon_specific_friendly(int y1, int x1, int lev, int type, bool_ Group_ok);
 extern bool_ place_monster_one_no_drop;
-extern s16b place_monster_one(int y, int x, int r_idx, int ego, bool_ slp, int status);
-extern s16b player_place(int y, int x);
-extern void monster_drop_carried_objects(monster_type *m_ptr);
-extern bool_ monster_dungeon(int r_idx);
-extern bool_ monster_quest(int r_idx);
-extern void set_mon_num_hook(void);
-extern void set_mon_num2_hook(int y, int x);
-extern bool_ monster_can_cross_terrain(byte feat, std::shared_ptr<monster_race> r_ptr);
+s16b place_monster_one(int y, int x, int r_idx, int ego, bool_ slp, int status);
+s16b player_place(int y, int x);
+void monster_drop_carried_objects(monster_type *m_ptr);
+bool_ monster_dungeon(int r_idx);
+bool_ monster_quest(int r_idx);
+void set_mon_num_hook(void);
+void set_mon_num2_hook(int y, int x);
+bool_ monster_can_cross_terrain(byte feat, std::shared_ptr<monster_race> r_ptr);
diff --git a/src/monster3.hpp b/src/monster3.hpp
index 7cf8ccd0..2ad6ba30 100644
--- a/src/monster3.hpp
+++ b/src/monster3.hpp
@@ -3,18 +3,18 @@
 #include "h-basic.h"
 #include "monster_type_fwd.hpp"
 
-extern void dump_companions(FILE *outfile);
-extern void do_cmd_companion(void);
-extern bool_ do_control_reconnect(void);
-extern bool_ do_control_drop(void);
-extern bool_ do_control_magic(void);
-extern bool_ do_control_pickup(void);
-extern bool_ do_control_inven(void);
-extern bool_ do_control_walk(void);
-extern bool_ can_create_companion(void);
-extern void ai_deincarnate(int m_idx);
-extern bool_ ai_possessor(int m_idx, int o_idx);
-extern bool_ ai_multiply(int m_idx);
-extern bool_ change_side(monster_type *m_ptr);
-extern int is_friend(monster_type *m_ptr);
-extern bool_ is_enemy(monster_type *m_ptr, monster_type *t_ptr);
+void dump_companions(FILE *outfile);
+void do_cmd_companion(void);
+bool_ do_control_reconnect(void);
+bool_ do_control_drop(void);
+bool_ do_control_magic(void);
+bool_ do_control_pickup(void);
+bool_ do_control_inven(void);
+bool_ do_control_walk(void);
+bool_ can_create_companion(void);
+void ai_deincarnate(int m_idx);
+bool_ ai_possessor(int m_idx, int o_idx);
+bool_ ai_multiply(int m_idx);
+bool_ change_side(monster_type *m_ptr);
+int is_friend(monster_type *m_ptr);
+bool_ is_enemy(monster_type *m_ptr, monster_type *t_ptr);
diff --git a/src/notes.hpp b/src/notes.hpp
index dbe5c04f..05514635 100644
--- a/src/notes.hpp
+++ b/src/notes.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-extern void show_notes_file(void);
-extern void output_note(char const *final_note);
-extern void add_note(char *note, char code);
-extern void add_note_type(int note_number);
+void show_notes_file(void);
+void output_note(char const *final_note);
+void add_note(char *note, char code);
+void add_note_type(int note_number);
diff --git a/src/object1.hpp b/src/object1.hpp
index f585b013..2701d1bb 100644
--- a/src/object1.hpp
+++ b/src/object1.hpp
@@ -9,41 +9,41 @@
 
 typedef std::function<boost::optional<int>(object_filter_t const &filter)> select_by_name_t;
 
-extern byte get_item_letter_color(object_type const *o_ptr);
-extern void object_pickup(int this_o_idx);
-extern void apply_set(s16b a_idx, s16b set_idx);
-extern bool_ takeoff_set(s16b a_idx, s16b set_idx);
-extern bool_ wield_set(s16b a_idx, s16b set_idx, bool_ silent);
-extern bool_ verify(cptr prompt, int item);
-extern void flavor_init(void);
-extern void reset_visuals(void);
-extern int object_power(object_type *o_ptr);
+byte get_item_letter_color(object_type const *o_ptr);
+void object_pickup(int this_o_idx);
+void apply_set(s16b a_idx, s16b set_idx);
+bool_ takeoff_set(s16b a_idx, s16b set_idx);
+bool_ wield_set(s16b a_idx, s16b set_idx, bool_ silent);
+bool_ verify(cptr prompt, int item);
+void flavor_init(void);
+void reset_visuals(void);
+int object_power(object_type *o_ptr);
 extern bool_ object_flags_no_set;
-extern object_flag_set object_flags(object_type const *o_ptr);
-extern object_flag_set object_flags_known(object_type const *o_ptr);
+object_flag_set object_flags(object_type const *o_ptr);
+object_flag_set object_flags_known(object_type const *o_ptr);
 
-extern s32b calc_object_need_exp(object_type const *o_ptr);
-extern void object_desc(char *buf, object_type const *o_ptr, int pref, int mode);
-extern void object_desc_store(char *buf, object_type *o_ptr, int pref, int mode);
-extern bool_ object_out_desc(object_type *o_ptr, FILE *fff, bool_ trim_down, bool_ wait_for_it);
-extern char index_to_label(int i);
-extern s16b wield_slot_ideal(object_type const *o_ptr, bool_ ideal);
-extern s16b wield_slot(object_type const *o_ptr);
-extern cptr describe_use(int i);
-extern void display_inven(void);
-extern void display_equip(void);
-extern void show_inven_full();
-extern void show_equip_full();
-extern void toggle_inven_equip(void);
-extern bool_ get_item(int *cp, cptr pmt, cptr str, int mode, object_filter_t const &filter = object_filter::True(), select_by_name_t const &select_by_name = select_by_name_t());
-extern cptr item_activation(object_type *o_ptr);
-extern void py_pickup_floor(int pickup);
-extern void object_gain_level(object_type *o_ptr);
-extern byte object_attr(object_type const *o_ptr);
-extern byte object_attr_default(object_type *o_ptr);
-extern char object_char(object_type const *o_ptr);
-extern char object_char_default(object_type const *o_ptr);
-extern bool artifact_p(object_type const *o_ptr);
-extern bool ego_item_p(object_type const *o_ptr);
-extern bool is_ego_p(object_type const *o_ptr, s16b ego);
-extern bool cursed_p(object_type const *o_ptr);
+s32b calc_object_need_exp(object_type const *o_ptr);
+void object_desc(char *buf, object_type const *o_ptr, int pref, int mode);
+void object_desc_store(char *buf, object_type *o_ptr, int pref, int mode);
+bool_ object_out_desc(object_type *o_ptr, FILE *fff, bool_ trim_down, bool_ wait_for_it);
+char index_to_label(int i);
+s16b wield_slot_ideal(object_type const *o_ptr, bool_ ideal);
+s16b wield_slot(object_type const *o_ptr);
+cptr describe_use(int i);
+void display_inven(void);
+void display_equip(void);
+void show_inven_full();
+void show_equip_full();
+void toggle_inven_equip(void);
+bool_ get_item(int *cp, cptr pmt, cptr str, int mode, object_filter_t const &filter = object_filter::True(), select_by_name_t const &select_by_name = select_by_name_t());
+cptr item_activation(object_type *o_ptr);
+void py_pickup_floor(int pickup);
+void object_gain_level(object_type *o_ptr);
+byte object_attr(object_type const *o_ptr);
+byte object_attr_default(object_type *o_ptr);
+char object_char(object_type const *o_ptr);
+char object_char_default(object_type const *o_ptr);
+bool artifact_p(object_type const *o_ptr);
+bool ego_item_p(object_type const *o_ptr);
+bool is_ego_p(object_type const *o_ptr, s16b ego);
+bool cursed_p(object_type const *o_ptr);
diff --git a/src/object2.hpp b/src/object2.hpp
index 7c16be85..8444f408 100644
--- a/src/object2.hpp
+++ b/src/object2.hpp
@@ -10,60 +10,60 @@
 typedef enum { OPTIMIZE, NO_OPTIMIZE } optimize_flag;
 typedef enum { DESCRIBE, NO_DESCRIBE } describe_flag;
 
-extern void inc_stack_size(int item, int delta);
-extern void inc_stack_size_ex(int item, int delta, optimize_flag opt, describe_flag desc);
-extern object_type *get_object(int item);
-extern s32b calc_total_weight(void);
-extern void add_random_ego_flag(object_type *o_ptr, ego_flag_set const &fego, bool_ *limit_blows);
-extern bool init_match_theme(obj_theme const &theme);
-extern bool_ kind_is_artifactable(int k_idx);
-extern bool_ kind_is_legal(int k_idx);
-extern void inven_item_charges(int item);
-extern void inven_item_describe(int item);
-extern void inven_item_increase(int item, int num);
-extern bool_ inven_item_optimize(int item);
-extern void floor_item_charges(int item);
-extern void floor_item_describe(int item);
-extern void floor_item_increase(int item, int num);
-extern void floor_item_optimize(int item);
-extern bool_ inven_carry_okay(object_type const *o_ptr);
-extern s16b inven_carry(object_type *o_ptr, bool_ final);
-extern s16b inven_takeoff(int item, int amt, bool_ force_drop);
-extern void inven_drop(int item, int amt, int dy, int dx, bool_ silent);
-extern void excise_object_idx(int o_idx);
-extern void delete_object_idx(int o_idx);
-extern void delete_object(int y, int x);
-extern void compact_objects(int size);
-extern void wipe_o_list(void);
-extern s16b o_pop(void);
-extern errr get_obj_num_prep(void);
-extern s16b get_obj_num(int level);
-extern void object_known(object_type *o_ptr);
-extern bool object_known_p(object_type const *o_ptr);
-extern void object_aware(object_type *o_ptr);
-extern bool object_aware_p(object_type const *o_ptr);
-extern void object_tried(object_type *o_ptr);
-extern bool object_tried_p(object_type const *o_ptr);
-extern s32b object_value(object_type const *o_ptr);
-extern s32b object_value_real(object_type const *o_ptr);
-extern bool_ object_similar(object_type const *o_ptr, object_type const *j_ptr);
-extern void object_absorb(object_type *o_ptr, object_type *j_ptr);
-extern s16b lookup_kind(int tval, int sval);
-extern void object_wipe(object_type *o_ptr);
-extern void object_prep(object_type *o_ptr, int k_idx);
-extern void object_copy(object_type *o_ptr, object_type *j_ptr);
-extern void apply_magic(object_type *o_ptr, int lev, bool_ okay, bool_ good, bool_ great, boost::optional<int> force_power = boost::none);
-extern bool_ make_object(object_type *j_ptr, bool_ good, bool_ great, obj_theme const &theme);
-extern void place_object(int y, int x, bool_ good, bool_ great, int where);
-extern bool_ make_gold(object_type *j_ptr);
-extern void place_gold(int y, int x);
-extern s16b drop_near(object_type *o_ptr, int chance, int y, int x);
-extern void acquirement(int y1, int x1, int num, bool_ great, bool_ known);
-extern void combine_pack(void);
-extern void reorder_pack(void);
-extern void random_artifact_resistance (object_type * o_ptr);
-extern s16b floor_carry(int y, int x, object_type *j_ptr);
-extern void pack_decay(int item);
-extern void floor_decay(int item);
-extern s16b m_bonus(int max, int level);
-extern s32b flag_cost(object_type const *o_ptr, int plusses);
+void inc_stack_size(int item, int delta);
+void inc_stack_size_ex(int item, int delta, optimize_flag opt, describe_flag desc);
+object_type *get_object(int item);
+s32b calc_total_weight(void);
+void add_random_ego_flag(object_type *o_ptr, ego_flag_set const &fego, bool_ *limit_blows);
+bool init_match_theme(obj_theme const &theme);
+bool_ kind_is_artifactable(int k_idx);
+bool_ kind_is_legal(int k_idx);
+void inven_item_charges(int item);
+void inven_item_describe(int item);
+void inven_item_increase(int item, int num);
+bool_ inven_item_optimize(int item);
+void floor_item_charges(int item);
+void floor_item_describe(int item);
+void floor_item_increase(int item, int num);
+void floor_item_optimize(int item);
+bool_ inven_carry_okay(object_type const *o_ptr);
+s16b inven_carry(object_type *o_ptr, bool_ final);
+s16b inven_takeoff(int item, int amt, bool_ force_drop);
+void inven_drop(int item, int amt, int dy, int dx, bool_ silent);
+void excise_object_idx(int o_idx);
+void delete_object_idx(int o_idx);
+void delete_object(int y, int x);
+void compact_objects(int size);
+void wipe_o_list(void);
+s16b o_pop(void);
+errr get_obj_num_prep(void);
+s16b get_obj_num(int level);
+void object_known(object_type *o_ptr);
+bool object_known_p(object_type const *o_ptr);
+void object_aware(object_type *o_ptr);
+bool object_aware_p(object_type const *o_ptr);
+void object_tried(object_type *o_ptr);
+bool object_tried_p(object_type const *o_ptr);
+s32b object_value(object_type const *o_ptr);
+s32b object_value_real(object_type const *o_ptr);
+bool_ object_similar(object_type const *o_ptr, object_type const *j_ptr);
+void object_absorb(object_type *o_ptr, object_type *j_ptr);
+s16b lookup_kind(int tval, int sval);
+void object_wipe(object_type *o_ptr);
+void object_prep(object_type *o_ptr, int k_idx);
+void object_copy(object_type *o_ptr, object_type *j_ptr);
+void apply_magic(object_type *o_ptr, int lev, bool_ okay, bool_ good, bool_ great, boost::optional<int> force_power = boost::none);
+bool_ make_object(object_type *j_ptr, bool_ good, bool_ great, obj_theme const &theme);
+void place_object(int y, int x, bool_ good, bool_ great, int where);
+bool_ make_gold(object_type *j_ptr);
+void place_gold(int y, int x);
+s16b drop_near(object_type *o_ptr, int chance, int y, int x);
+void acquirement(int y1, int x1, int num, bool_ great, bool_ known);
+void combine_pack(void);
+void reorder_pack(void);
+void random_artifact_resistance(object_type * o_ptr);
+s16b floor_carry(int y, int x, object_type *j_ptr);
+void pack_decay(int item);
+void floor_decay(int item);
+s16b m_bonus(int max, int level);
+s32b flag_cost(object_type const *o_ptr, int plusses);
diff --git a/src/powers.hpp b/src/powers.hpp
index fcb39ef3..aa24e7d0 100644
--- a/src/powers.hpp
+++ b/src/powers.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-extern void do_cmd_power();
+void do_cmd_power();
 
 /*
  * Powers (mutation, activations, ...)
diff --git a/src/q_bounty.hpp b/src/q_bounty.hpp
index 960a391b..e4ebe084 100644
--- a/src/q_bounty.hpp
+++ b/src/q_bounty.hpp
@@ -4,7 +4,7 @@
 
 #include <string>
 
-extern bool_ quest_bounty_init_hook();
-extern bool_ quest_bounty_drop_item();
-extern bool_ quest_bounty_get_item();
-extern std::string quest_bounty_describe();
+bool_ quest_bounty_init_hook();
+bool_ quest_bounty_drop_item();
+bool_ quest_bounty_get_item();
+std::string quest_bounty_describe();
diff --git a/src/q_fireprof.hpp b/src/q_fireprof.hpp
index 7c897954..39b319e5 100644
--- a/src/q_fireprof.hpp
+++ b/src/q_fireprof.hpp
@@ -4,6 +4,6 @@
 
 #include <string>
 
-extern void quest_fireproof_building(bool_ *paid, bool_ *recreate);
-extern bool_ quest_fireproof_init_hook();
-extern std::string quest_fireproof_describe();
+void quest_fireproof_building(bool_ *paid, bool_ *recreate);
+bool_ quest_fireproof_init_hook();
+std::string quest_fireproof_describe();
diff --git a/src/q_thrain.hpp b/src/q_thrain.hpp
index ab69102f..4e269357 100644
--- a/src/q_thrain.hpp
+++ b/src/q_thrain.hpp
@@ -2,4 +2,4 @@
 
 #include "h-basic.h"
 
-extern bool_ quest_thrain_init_hook();
+bool_ quest_thrain_init_hook();
diff --git a/src/quest.hpp b/src/quest.hpp
index 7ff3cd3c..1897bcfa 100644
--- a/src/quest.hpp
+++ b/src/quest.hpp
@@ -1,3 +1,3 @@
 #pragma once
 
-extern void init_hooks_quests();
+void init_hooks_quests();
diff --git a/src/randart.hpp b/src/randart.hpp
index 385ee2a5..99e4b9b8 100644
--- a/src/randart.hpp
+++ b/src/randart.hpp
@@ -3,6 +3,6 @@
 #include "h-basic.h"
 #include "object_type_fwd.hpp"
 
-extern void build_prob(cptr learn);
-extern bool_ create_artifact(object_type *o_ptr, bool_ a_scroll, bool_ get_name);
-extern bool_ artifact_scroll(void);
+void build_prob(cptr learn);
+bool_ create_artifact(object_type *o_ptr, bool_ a_scroll, bool_ get_name);
+bool_ artifact_scroll(void);
diff --git a/src/skills.hpp b/src/skills.hpp
index 4872d448..edb96796 100644
--- a/src/skills.hpp
+++ b/src/skills.hpp
@@ -5,24 +5,24 @@
 #include <cstddef>
 
 /* Skill functions */
-extern void dump_skills(FILE *fff);
-extern s16b find_skill(cptr name);
-extern s16b find_skill_i(cptr name);
-extern s16b get_skill(int skill);
-extern s16b get_skill_scale(int skill, u32b scale);
-extern void do_cmd_skill(void);
-extern void do_cmd_activate_skill(void);
-extern cptr get_melee_name();
-extern s16b get_melee_skills(void);
-extern s16b get_melee_skill(void);
-extern bool_ forbid_gloves(void);
-extern bool_ forbid_non_blessed(void);
-extern void compute_skills(s32b *v, s32b *m, std::size_t i);
-extern void select_default_melee(void);
-extern void do_get_new_skill(void);
-extern void init_skill(s32b value, s32b mod, std::size_t i);
-extern s16b find_ability(cptr name);
-extern void dump_abilities(FILE *fff);
-extern void do_cmd_ability(void);
-extern void apply_level_abilities(int level);
-extern void recalc_skills(bool_ init);
+void dump_skills(FILE *fff);
+s16b find_skill(cptr name);
+s16b find_skill_i(cptr name);
+s16b get_skill(int skill);
+s16b get_skill_scale(int skill, u32b scale);
+void do_cmd_skill(void);
+void do_cmd_activate_skill(void);
+cptr get_melee_name();
+s16b get_melee_skills(void);
+s16b get_melee_skill(void);
+bool_ forbid_gloves(void);
+bool_ forbid_non_blessed(void);
+void compute_skills(s32b *v, s32b *m, std::size_t i);
+void select_default_melee(void);
+void do_get_new_skill(void);
+void init_skill(s32b value, s32b mod, std::size_t i);
+s16b find_ability(cptr name);
+void dump_abilities(FILE *fff);
+void do_cmd_ability(void);
+void apply_level_abilities(int level);
+void recalc_skills(bool_ init);
diff --git a/src/spells1.hpp b/src/spells1.hpp
index b67f73bb..a2996bf8 100644
--- a/src/spells1.hpp
+++ b/src/spells1.hpp
@@ -5,32 +5,32 @@
 #include "h-basic.h"
 #include "random_spell_fwd.hpp"
 
-extern byte spell_color(int type);
-extern s16b poly_r_idx(int r_idx);
-extern void get_pos_player(int dis, int *ny, int *nx);
+byte spell_color(int type);
+s16b poly_r_idx(int r_idx);
+void get_pos_player(int dis, int *ny, int *nx);
 extern bool_ teleport_player_bypass;
-extern void teleport_player_directed(int rad, int dir);
-extern void teleport_away(int m_idx, int dis);
-extern void teleport_player(int dis);
-extern void teleport_player_to(int ny, int nx);
-extern void teleport_monster_to(int m_idx, int ny, int nx);
-extern void teleport_player_level(void);
-extern void recall_player(int d, int f);
-extern void take_hit(int damage, cptr kb_str);
-extern void take_sanity_hit(int damage, cptr hit_from);
-extern void acid_dam(int dam, cptr kb_str);
-extern void elec_dam(int dam, cptr kb_str);
-extern void fire_dam(int dam, cptr kb_str);
-extern void cold_dam(int dam, cptr kb_str);
-extern bool_ dec_stat(int stat, int amount, int mode);
-extern bool_ res_stat(int stat, bool_ full);
-extern bool_ apply_disenchant(int mode);
-extern bool_ project_m(int who, int r, int y, int x, int dam, int typ);
-extern bool_ project(int who, int rad, int y, int x, int dam, int typ, int flg);
-extern bool_ potion_smash_effect(int who, int y, int x, int o_sval);
-extern void do_poly_self(void);
-extern void corrupt_player(void);
-extern std::string name_spell(random_spell const *);
-extern void generate_spell(int plev);
+void teleport_player_directed(int rad, int dir);
+void teleport_away(int m_idx, int dis);
+void teleport_player(int dis);
+void teleport_player_to(int ny, int nx);
+void teleport_monster_to(int m_idx, int ny, int nx);
+void teleport_player_level(void);
+void recall_player(int d, int f);
+void take_hit(int damage, cptr kb_str);
+void take_sanity_hit(int damage, cptr hit_from);
+void acid_dam(int dam, cptr kb_str);
+void elec_dam(int dam, cptr kb_str);
+void fire_dam(int dam, cptr kb_str);
+void cold_dam(int dam, cptr kb_str);
+bool_ dec_stat(int stat, int amount, int mode);
+bool_ res_stat(int stat, bool_ full);
+bool_ apply_disenchant(int mode);
+bool_ project_m(int who, int r, int y, int x, int dam, int typ);
+bool_ project(int who, int rad, int y, int x, int dam, int typ, int flg);
+bool_ potion_smash_effect(int who, int y, int x, int o_sval);
+void do_poly_self(void);
+void corrupt_player(void);
+std::string name_spell(random_spell const *);
+void generate_spell(int plev);
 extern bool_ unsafe;
-extern s16b do_poly_monster(int y, int x);
+s16b do_poly_monster(int y, int x);
diff --git a/src/spells2.hpp b/src/spells2.hpp
index 13f2790e..45b3cd7e 100644
--- a/src/spells2.hpp
+++ b/src/spells2.hpp
@@ -6,107 +6,107 @@
 #include "object_filter.hpp"
 #include "object_type_fwd.hpp"
 
-extern void curse_artifact(object_type * o_ptr);
-extern void grow_things(s16b type, int rad);
-extern void grow_grass(int rad);
-extern void grow_trees(int rad);
-extern bool_ hp_player(int num);
-extern bool_ heal_insanity(int val);
-extern void warding_glyph(void);
-extern void explosive_rune(void);
-extern bool_ do_dec_stat(int stat, int mode);
-extern bool_ do_res_stat(int stat, bool_ full);
-extern bool_ do_inc_stat(int stat);
-extern void identify_hooks(int i, object_type *o_ptr, identify_mode type);
-extern bool_ identify_pack(void);
-extern void identify_pack_fully(void);
-extern bool_ remove_curse(void);
-extern bool_ remove_all_curse(void);
-extern bool_ restore_level(void);
-extern bool_ lose_all_info(void);
-extern bool_ detect_traps(int rad);
-extern bool_ detect_doors(int rad);
-extern bool_ detect_stairs(int rad);
-extern bool_ detect_treasure(int rad);
-extern bool detect_objects_gold(int rad);
-extern bool detect_objects_normal(int rad);
-extern bool_ detect_monsters_normal(int rad);
-extern bool_ detect_monsters_invis(int rad);
-extern void detect_monsters_orcs(int rad);
-extern bool_ detect_all(int rad);
-extern void stair_creation(void);
-extern bool_ wall_stone(int y, int x);
-extern bool_ enchant(object_type *o_ptr, int n, int eflag);
-extern bool_ enchant_spell(int num_hit, int num_dam, int num_ac, int num_pval);
-extern bool_ ident_spell(void);
-extern bool_ ident_all(void);
-extern bool_ identify_fully(void);
-extern bool_ recharge(int num);
-extern void aggravate_monsters(int who);
-extern bool_ genocide_aux(bool_ player_cast, char typ);
-extern bool_ genocide(bool_ player_cast);
-extern bool_ mass_genocide(bool_ player_cast);
-extern void change_wild_mode(void);
-extern bool_ banish_evil(int dist);
-extern bool_ dispel_evil(int dam);
-extern bool_ dispel_good(int dam);
-extern bool_ dispel_undead(int dam);
-extern bool_ dispel_monsters(int dam);
-extern void destroy_area(int y1, int x1, int r);
-extern void earthquake(int cy, int cx, int r);
-extern void lite_room(int y1, int x1);
-extern void unlite_room(int y1, int x1);
-extern bool_ lite_area(int dam, int rad);
-extern bool_ unlite_area(int dam, int rad);
-extern bool_ fire_cloud(int typ, int dir, int dam, int rad, int time);
-extern bool_ fire_wave(int typ, int dir, int dam, int rad, int time, s32b eff);
-extern bool_ fire_wall(int typ, int dir, int dam, int time);
-extern bool_ fire_ball(int typ, int dir, int dam, int rad);
-extern bool_ fire_bolt(int typ, int dir, int dam);
-extern bool_ fire_beam(int typ, int dir, int dam);
-extern void call_chaos(void);
-extern bool_ fire_bolt_or_beam(int prob, int typ, int dir, int dam);
-extern bool_ lite_line(int dir);
-extern bool_ drain_life(int dir, int dam);
-extern bool_ wall_to_mud(int dir);
-extern bool_ wizard_lock(int dir);
-extern bool_ slow_monster(int dir);
-extern bool_ sleep_monster(int dir);
-extern bool_ confuse_monster(int dir, int plev);
-extern bool_ fear_monster(int dir, int plev);
-extern bool_ poly_monster(int dir);
-extern bool_ teleport_monster(int dir);
-extern bool_ trap_creation(void);
-extern bool_ destroy_doors_touch(void);
-extern bool_ destroy_traps_touch(void);
-extern bool_ sleep_monsters_touch(void);
-extern bool_ alchemy(void);
-extern void activate_ty_curse(void);
-extern void activate_dg_curse(void);
-extern void summon_cyber(void);
-extern bool_ confuse_monsters(int dam);
-extern bool_ charm_monsters(int dam);
-extern bool_ charm_animals(int dam);
-extern bool_ stun_monsters(int dam);
-extern bool_ banish_monsters(int dist);
-extern bool_ turn_monsters(int dam);
-extern bool_ charm_monster(int dir, int plev);
-extern bool_ control_one_undead(int dir, int plev);
-extern bool_ charm_animal(int dir, int plev);
-extern bool_ mindblast_monsters(int dam);
-extern void alter_reality(void);
-extern void report_magics(void);
-extern void teleport_swap(int dir);
-extern void swap_position(int lty, int ltx);
-extern object_filter_t const &item_tester_hook_recharge();
-extern bool_ project_hack(int typ, int dam);
-extern void project_meteor(int radius, int typ, int dam, u32b flg);
-extern object_filter_t const &item_tester_hook_artifactable();
-extern bool_ passwall(int dir, bool_ safe);
-extern bool_ project_hook(int typ, int dir, int dam, int flg);
-extern bool_ reset_recall(bool_ no_trepas_max_depth);
-extern void geomancy_random_wall(int y, int x);
-extern void geomancy_random_floor(int y, int x, bool_ kill_wall);
-extern void geomancy_dig(int oy, int ox, int dir, int length);
-extern void channel_the_elements(int y, int x, int level);
-extern void random_resistance(object_type *o_ptr, int specific);
+void curse_artifact(object_type * o_ptr);
+void grow_things(s16b type, int rad);
+void grow_grass(int rad);
+void grow_trees(int rad);
+bool_ hp_player(int num);
+bool_ heal_insanity(int val);
+void warding_glyph(void);
+void explosive_rune(void);
+bool_ do_dec_stat(int stat, int mode);
+bool_ do_res_stat(int stat, bool_ full);
+bool_ do_inc_stat(int stat);
+void identify_hooks(int i, object_type *o_ptr, identify_mode type);
+bool_ identify_pack(void);
+void identify_pack_fully(void);
+bool_ remove_curse(void);
+bool_ remove_all_curse(void);
+bool_ restore_level(void);
+bool_ lose_all_info(void);
+bool_ detect_traps(int rad);
+bool_ detect_doors(int rad);
+bool_ detect_stairs(int rad);
+bool_ detect_treasure(int rad);
+bool detect_objects_gold(int rad);
+bool detect_objects_normal(int rad);
+bool_ detect_monsters_normal(int rad);
+bool_ detect_monsters_invis(int rad);
+void detect_monsters_orcs(int rad);
+bool_ detect_all(int rad);
+void stair_creation(void);
+bool_ wall_stone(int y, int x);
+bool_ enchant(object_type *o_ptr, int n, int eflag);
+bool_ enchant_spell(int num_hit, int num_dam, int num_ac, int num_pval);
+bool_ ident_spell(void);
+bool_ ident_all(void);
+bool_ identify_fully(void);
+bool_ recharge(int num);
+void aggravate_monsters(int who);
+bool_ genocide_aux(bool_ player_cast, char typ);
+bool_ genocide(bool_ player_cast);
+bool_ mass_genocide(bool_ player_cast);
+void change_wild_mode(void);
+bool_ banish_evil(int dist);
+bool_ dispel_evil(int dam);
+bool_ dispel_good(int dam);
+bool_ dispel_undead(int dam);
+bool_ dispel_monsters(int dam);
+void destroy_area(int y1, int x1, int r);
+void earthquake(int cy, int cx, int r);
+void lite_room(int y1, int x1);
+void unlite_room(int y1, int x1);
+bool_ lite_area(int dam, int rad);
+bool_ unlite_area(int dam, int rad);
+bool_ fire_cloud(int typ, int dir, int dam, int rad, int time);
+bool_ fire_wave(int typ, int dir, int dam, int rad, int time, s32b eff);
+bool_ fire_wall(int typ, int dir, int dam, int time);
+bool_ fire_ball(int typ, int dir, int dam, int rad);
+bool_ fire_bolt(int typ, int dir, int dam);
+bool_ fire_beam(int typ, int dir, int dam);
+void call_chaos(void);
+bool_ fire_bolt_or_beam(int prob, int typ, int dir, int dam);
+bool_ lite_line(int dir);
+bool_ drain_life(int dir, int dam);
+bool_ wall_to_mud(int dir);
+bool_ wizard_lock(int dir);
+bool_ slow_monster(int dir);
+bool_ sleep_monster(int dir);
+bool_ confuse_monster(int dir, int plev);
+bool_ fear_monster(int dir, int plev);
+bool_ poly_monster(int dir);
+bool_ teleport_monster(int dir);
+bool_ trap_creation(void);
+bool_ destroy_doors_touch(void);
+bool_ destroy_traps_touch(void);
+bool_ sleep_monsters_touch(void);
+bool_ alchemy(void);
+void activate_ty_curse(void);
+void activate_dg_curse(void);
+void summon_cyber(void);
+bool_ confuse_monsters(int dam);
+bool_ charm_monsters(int dam);
+bool_ charm_animals(int dam);
+bool_ stun_monsters(int dam);
+bool_ banish_monsters(int dist);
+bool_ turn_monsters(int dam);
+bool_ charm_monster(int dir, int plev);
+bool_ control_one_undead(int dir, int plev);
+bool_ charm_animal(int dir, int plev);
+bool_ mindblast_monsters(int dam);
+void alter_reality(void);
+void report_magics(void);
+void teleport_swap(int dir);
+void swap_position(int lty, int ltx);
+object_filter_t const &item_tester_hook_recharge();
+bool_ project_hack(int typ, int dam);
+void project_meteor(int radius, int typ, int dam, u32b flg);
+object_filter_t const &item_tester_hook_artifactable();
+bool_ passwall(int dir, bool_ safe);
+bool_ project_hook(int typ, int dir, int dam, int flg);
+bool_ reset_recall(bool_ no_trepas_max_depth);
+void geomancy_random_wall(int y, int x);
+void geomancy_random_floor(int y, int x, bool_ kill_wall);
+void geomancy_dig(int oy, int ox, int dir, int length);
+void channel_the_elements(int y, int x, int level);
+void random_resistance(object_type *o_ptr, int specific);
diff --git a/src/squeltch.hpp b/src/squeltch.hpp
index 65ddfb51..d0ec8b8c 100644
--- a/src/squeltch.hpp
+++ b/src/squeltch.hpp
@@ -4,10 +4,10 @@
 #include "object_type_fwd.hpp"
 #include <boost/filesystem.hpp>
 
-extern void squeltch_inventory(void);
-extern void squeltch_grid(void);
-extern void do_cmd_automatizer(void);
-extern void automatizer_add_rule(object_type *o_ptr);
+void squeltch_inventory(void);
+void squeltch_grid(void);
+void do_cmd_automatizer(void);
+void automatizer_add_rule(object_type *o_ptr);
 extern bool_ automatizer_create;
-extern void automatizer_init();
-extern bool automatizer_load(boost::filesystem::path const &path);
+void automatizer_init();
+bool automatizer_load(boost::filesystem::path const &path);
diff --git a/src/store.hpp b/src/store.hpp
index f67d94eb..0f189167 100644
--- a/src/store.hpp
+++ b/src/store.hpp
@@ -1,12 +1,12 @@
 #pragma once
 
-extern void do_cmd_store();
-extern void store_shuffle(int which);
-extern void store_maint(int town_num, int store_num);
-extern void store_init(int town_num, int store_num);
-extern void do_cmd_home_trump();
-extern void store_sell();
-extern void store_purchase();
-extern void store_examine();
-extern void store_stole();
-extern void store_prt_gold();
+void do_cmd_store();
+void store_shuffle(int which);
+void store_maint(int town_num, int store_num);
+void store_init(int town_num, int store_num);
+void do_cmd_home_trump();
+void store_sell();
+void store_purchase();
+void store_examine();
+void store_stole();
+void store_prt_gold();
diff --git a/src/tables.cc b/src/tables.cc
index 22e9a98b..1caa4bcf 100644
--- a/src/tables.cc
+++ b/src/tables.cc
@@ -2332,7 +2332,7 @@ cptr sense_desc[] =
  * Flags 4,
  * ESP,
  */
-extern std::vector<flags_group> const &flags_groups()
+std::vector<flags_group> const &flags_groups()
 {
 	static auto *instance = new std::vector<flags_group> {
 		flags_group {
diff --git a/src/tables.hpp b/src/tables.hpp
index 58dfaae2..613dbddb 100644
--- a/src/tables.hpp
+++ b/src/tables.hpp
@@ -63,7 +63,7 @@ extern tactic_info_type tactic_info[9];
 extern activation activation_info[MAX_T_ACT];
 extern inscription_info_type inscription_info[MAX_INSCRIPTIONS];
 extern cptr sense_desc[];
-extern std::vector<flags_group> const &flags_groups();
+std::vector<flags_group> const &flags_groups();
 extern power_type powers_type[POWER_MAX];
 extern cptr artifact_names_list;
 extern monster_power monster_powers[MONSTER_POWERS_MAX];
diff --git a/src/util.cc b/src/util.cc
index ce791015..f049d79c 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -2349,7 +2349,7 @@ static int complete_command(char *buf, int clen, int mlen)
 }
 
 
-extern bool askfor_aux(std::string *buf, std::size_t max_len)
+bool askfor_aux(std::string *buf, std::size_t max_len)
 {
 	// Buffer
 	char cstr[1024];
diff --git a/src/util.h b/src/util.h
index 6d9d4655..e341a058 100644
--- a/src/util.h
+++ b/src/util.h
@@ -7,12 +7,12 @@
 extern "C" {
 #endif
 
-extern errr path_build(char *buf, int max, cptr path, cptr file);
-extern void bell(void);
-extern errr macro_add(cptr pat, cptr act);
-extern sint macro_find_exact(cptr pat);
-extern char inkey(void);
-extern void prt(cptr str, int row, int col);
+errr path_build(char *buf, int max, cptr path, cptr file);
+void bell(void);
+errr macro_add(cptr pat, cptr act);
+sint macro_find_exact(cptr pat);
+char inkey(void);
+void prt(cptr str, int row, int col);
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/src/util.hpp b/src/util.hpp
index cc896e69..e57235a9 100644
--- a/src/util.hpp
+++ b/src/util.hpp
@@ -8,78 +8,78 @@
 
 #define MAX_IGNORE_KEYMAPS 12
 
-extern bool input_box(std::string const &text, int y, int x, std::string *buf, std::size_t max);
-extern std::string input_box_auto(std::string const &title, std::size_t max);
-extern bool input_box_auto(std::string const &prompt, std::string *buf, std::size_t max);
-extern void draw_box(int y, int x, int h, int w);
-extern void display_list(int y, int x, int h, int w, cptr title, std::vector<std::string> const &list, std::size_t begin, std::size_t sel, byte sel_color);
-extern std::string get_player_race_name(int pr, int ps);
-extern std::string get_day(s32b day);
-extern s32b bst(s32b what, s32b t);
-extern FILE *my_fopen(cptr file, cptr mode);
-extern errr my_fgets(FILE *fff, char *buf, huge n);
-extern errr my_fclose(FILE *fff);
-extern errr fd_kill(cptr file);
-extern errr fd_move(cptr file, cptr what);
-extern int fd_make(cptr file, int mode);
-extern int fd_open(cptr file, int flags);
-extern errr fd_seek(int fd, huge n);
-extern errr fd_read(int fd, char *buf, huge n);
-extern errr fd_write(int fd, cptr buf, huge n);
-extern errr fd_close(int fd);
-extern void flush(void);
-extern void flush_on_failure();
-extern void move_cursor(int row, int col);
-extern void text_to_ascii(char *buf, cptr str);
-extern void ascii_to_text(char *buf, cptr str);
-extern char inkey_scan(void);
-extern void display_message(int x, int y, int split, byte color, cptr t);
-extern void cmsg_print(byte color, cptr msg);
-extern void msg_print(cptr msg);
-extern void cmsg_format(byte color, cptr fmt, ...);
-extern void msg_format(cptr fmt, ...);
-extern void screen_save(void);
-extern void screen_load(void);
-extern void c_put_str(byte attr, cptr str, int row, int col);
-extern void c_put_str(byte attr, std::string const &str, int row, int col);
-extern void put_str(cptr str, int row, int col);
-extern void put_str(std::string const &s, int row, int col);
-extern void c_prt(byte attr, cptr str, int row, int col);
-extern void c_prt(byte attr, std::string const &s, int row, int col);
-extern void prt(std::string const &s, int row, int col);
-extern void text_out_to_screen(byte a, cptr str);
-extern void text_out_to_file(byte a, cptr str);
-extern void text_out(cptr str);
-extern void text_out_c(byte a, cptr str);
-extern void clear_from(int row);
-extern int ask_menu(cptr ask, const std::vector<std::string> &items);
-extern bool askfor_aux(std::string *buf, std::size_t max_len);
-extern bool_ askfor_aux(char *buf, int len);
-extern bool_ askfor_aux_with_completion(char *buf, int len);
-extern bool_ get_string(cptr prompt, char *buf, int len);
-extern bool_ get_check(cptr prompt);
-extern bool_ get_com(cptr prompt, char *command);
-extern s32b get_quantity(cptr prompt, s32b max);
+bool input_box(std::string const &text, int y, int x, std::string *buf, std::size_t max);
+std::string input_box_auto(std::string const &title, std::size_t max);
+bool input_box_auto(std::string const &prompt, std::string *buf, std::size_t max);
+void draw_box(int y, int x, int h, int w);
+void display_list(int y, int x, int h, int w, cptr title, std::vector<std::string> const &list, std::size_t begin, std::size_t sel, byte sel_color);
+std::string get_player_race_name(int pr, int ps);
+std::string get_day(s32b day);
+s32b bst(s32b what, s32b t);
+FILE *my_fopen(cptr file, cptr mode);
+errr my_fgets(FILE *fff, char *buf, huge n);
+errr my_fclose(FILE *fff);
+errr fd_kill(cptr file);
+errr fd_move(cptr file, cptr what);
+int fd_make(cptr file, int mode);
+int fd_open(cptr file, int flags);
+errr fd_seek(int fd, huge n);
+errr fd_read(int fd, char *buf, huge n);
+errr fd_write(int fd, cptr buf, huge n);
+errr fd_close(int fd);
+void flush(void);
+void flush_on_failure();
+void move_cursor(int row, int col);
+void text_to_ascii(char *buf, cptr str);
+void ascii_to_text(char *buf, cptr str);
+char inkey_scan(void);
+void display_message(int x, int y, int split, byte color, cptr t);
+void cmsg_print(byte color, cptr msg);
+void msg_print(cptr msg);
+void cmsg_format(byte color, cptr fmt, ...);
+void msg_format(cptr fmt, ...);
+void screen_save(void);
+void screen_load(void);
+void c_put_str(byte attr, cptr str, int row, int col);
+void c_put_str(byte attr, std::string const &str, int row, int col);
+void put_str(cptr str, int row, int col);
+void put_str(std::string const &s, int row, int col);
+void c_prt(byte attr, cptr str, int row, int col);
+void c_prt(byte attr, std::string const &s, int row, int col);
+void prt(std::string const &s, int row, int col);
+void text_out_to_screen(byte a, cptr str);
+void text_out_to_file(byte a, cptr str);
+void text_out(cptr str);
+void text_out_c(byte a, cptr str);
+void clear_from(int row);
+int ask_menu(cptr ask, const std::vector<std::string> &items);
+bool askfor_aux(std::string *buf, std::size_t max_len);
+bool_ askfor_aux(char *buf, int len);
+bool_ askfor_aux_with_completion(char *buf, int len);
+bool_ get_string(cptr prompt, char *buf, int len);
+bool_ get_check(cptr prompt);
+bool_ get_com(cptr prompt, char *command);
+s32b get_quantity(cptr prompt, s32b max);
 extern char request_command_ignore_keymaps[MAX_IGNORE_KEYMAPS];
 extern bool_ request_command_inven_mode;
-extern void request_command(int shopping);
-extern bool_ is_a_vowel(int ch);
-extern int get_keymap_dir(char ch);
-extern byte count_bits(u32b array);
-extern void strlower(char *buf);
-extern int test_monster_name(cptr name);
-extern int test_mego_name(cptr name);
-extern int test_item_name(cptr name);
-extern char msg_box_auto(std::string const &title);
-extern timer_type *new_timer(void (*callback)(), s32b delay);
-extern int get_keymap_mode();
-extern void repeat_push(int what);
-extern bool_ repeat_pull(int *what);
-extern void repeat_check(void);
-extern void get_count(int number, int max);
-extern bool in_bounds(int y, int x);
-extern bool in_bounds2(int y, int x);
-extern bool panel_contains(int y, int x);
-extern errr path_parse(char *buf, int max, cptr file);
-extern void pause_line(int row);
-extern std::string user_name();
+void request_command(int shopping);
+bool_ is_a_vowel(int ch);
+int get_keymap_dir(char ch);
+byte count_bits(u32b array);
+void strlower(char *buf);
+int test_monster_name(cptr name);
+int test_mego_name(cptr name);
+int test_item_name(cptr name);
+char msg_box_auto(std::string const &title);
+timer_type *new_timer(void (*callback)(), s32b delay);
+int get_keymap_mode();
+void repeat_push(int what);
+bool_ repeat_pull(int *what);
+void repeat_check(void);
+void get_count(int number, int max);
+bool in_bounds(int y, int x);
+bool in_bounds2(int y, int x);
+bool panel_contains(int y, int x);
+errr path_parse(char *buf, int max, cptr file);
+void pause_line(int row);
+std::string user_name();
diff --git a/src/variable.hpp b/src/variable.hpp
index ebbca153..38db36b4 100644
--- a/src/variable.hpp
+++ b/src/variable.hpp
@@ -35,7 +35,7 @@ extern char *macro_trigger_keycode[2][MAX_MACRO_TRIG];
 extern bool_ character_dungeon;
 extern bool_ character_loaded;
 extern bool_ character_xtra;
-extern seed_t &seed_flavor();
+seed_t &seed_flavor();
 extern s16b command_cmd;
 extern s16b command_arg;
 extern s16b command_rep;
@@ -198,7 +198,7 @@ extern s32b DUNGEON_ASTRAL_WILD_X;
 extern s32b DUNGEON_ASTRAL_WILD_Y;
 extern deity_type deity_info[MAX_GODS];
 extern timer_type *gl_timers;
-extern const char *get_version_string();
+const char *get_version_string();
 extern bool_ arg_wizard;
 extern bool_ arg_force_original;
 extern bool_ arg_force_roguelike;
diff --git a/src/wild.hpp b/src/wild.hpp
index 4cd9f0e7..54dd9526 100644
--- a/src/wild.hpp
+++ b/src/wild.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-extern void wilderness_gen();
-extern void wilderness_gen_small(void);
-extern void reveal_wilderness_around_player(int y, int x, int h, int w);
-extern void town_gen(int t_idx);
+void wilderness_gen();
+void wilderness_gen_small(void);
+void reveal_wilderness_around_player(int y, int x, int h, int w);
+void town_gen(int t_idx);
diff --git a/src/wizard2.hpp b/src/wizard2.hpp
index d1061d45..b406c9ef 100644
--- a/src/wizard2.hpp
+++ b/src/wizard2.hpp
@@ -4,7 +4,7 @@
 
 #include <cstddef>
 
-extern void do_cmd_rerate(void);
-extern void do_cmd_wiz_cure_all(void);
-extern void do_cmd_wiz_named_friendly(std::size_t r_idx, bool_ slp);
-extern void do_cmd_debug();
+void do_cmd_rerate(void);
+void do_cmd_wiz_cure_all(void);
+void do_cmd_wiz_named_friendly(std::size_t r_idx, bool_ slp);
+void do_cmd_debug();
diff --git a/src/xtra1.hpp b/src/xtra1.hpp
index 0c1b93bf..7f685fdc 100644
--- a/src/xtra1.hpp
+++ b/src/xtra1.hpp
@@ -6,22 +6,22 @@
 
 #include <string>
 
-extern void fix_message(void);
-extern void apply_flags(object_flag_set const &f, s16b pval, s16b tval, s16b to_h, s16b to_d, s16b to_a);
-extern int luck(int min, int max);
-extern int weight_limit(void);
+void fix_message(void);
+void apply_flags(object_flag_set const &f, s16b pval, s16b tval, s16b to_h, s16b to_d, s16b to_a);
+int luck(int min, int max);
+int weight_limit(void);
 extern bool_ calc_powers_silent;
-extern void cnv_stat(int i, char *out_val);
-extern s16b modify_stat_value(int value, int amount);
-extern void calc_hitpoints(void);
-extern void notice_stuff(void);
-extern void update_stuff(void);
-extern void redraw_stuff(void);
-extern void window_stuff(void);
-extern void handle_stuff(void);
-extern bool_ monk_heavy_armor(void);
-extern void calc_bonuses(bool_ silent);
-extern void gain_fate(byte fate);
-extern std::string fate_desc(int fate);
-extern std::string dump_fates();
-extern bool race_flags_p(player_race_flag_set const &flags_mask);
+void cnv_stat(int i, char *out_val);
+s16b modify_stat_value(int value, int amount);
+void calc_hitpoints(void);
+void notice_stuff(void);
+void update_stuff(void);
+void redraw_stuff(void);
+void window_stuff(void);
+void handle_stuff(void);
+bool_ monk_heavy_armor(void);
+void calc_bonuses(bool_ silent);
+void gain_fate(byte fate);
+std::string fate_desc(int fate);
+std::string dump_fates();
+bool race_flags_p(player_race_flag_set const &flags_mask);
diff --git a/src/xtra2.hpp b/src/xtra2.hpp
index c81bef73..b61114a4 100644
--- a/src/xtra2.hpp
+++ b/src/xtra2.hpp
@@ -7,83 +7,83 @@
 
 #include <memory>
 
-extern void do_rebirth(void);
-extern void switch_subrace(std::size_t racem, bool_ copy_old);
-extern void drop_from_wild(void);
-extern bool_ set_roots(int v, s16b ac, s16b dam);
-extern bool_ set_project(int v, s16b gf, s16b dam, s16b rad, s16b flag);
-extern bool_ set_parasite(int v, int r);
-extern bool_ set_disrupt_shield(int v);
-extern bool_ set_prob_travel(int v);
-extern bool_ set_absorb_soul(int v);
-extern bool_ set_tim_breath(int v, bool_ magical);
-extern bool_ set_tim_precognition(int v);
-extern bool_ set_tim_deadly(int v);
-extern bool_ set_tim_reflect(int v);
-extern bool_ set_tim_thunder(int v, int p1, int p2);
-extern bool_ set_strike(int v);
-extern bool_ set_tim_regen(int v, int p);
-extern bool_ set_tim_ffall(int v);
-extern bool_ set_tim_fly(int v);
-extern bool_ set_poison(int v);
-extern bool_ set_holy(int v);
-extern void set_grace(s32b v);
-extern bool_ set_mimic(int v, int p, int level);
-extern bool_ set_no_breeders(int v);
-extern bool_ set_invis(int v,int p);
-extern bool_ set_lite(int v);
-extern bool_ set_blind(int v);
-extern bool_ set_confused(int v);
-extern bool_ set_poisoned(int v);
-extern bool_ set_afraid(int v);
-extern bool_ set_paralyzed(int v);
-extern void dec_paralyzed();
-extern bool_ set_image(int v);
-extern bool_ set_fast(int v, int p);
-extern bool_ set_light_speed(int v);
-extern bool_ set_slow(int v);
-extern bool_ set_shield(int v, int p, s16b o, s16b d1, s16b d2);
-extern bool_ set_blessed(int v);
-extern bool_ set_hero(int v);
-extern bool_ set_shero(int v);
-extern bool_ set_protevil(int v);
-extern bool_ set_invuln(int v);
-extern bool_ set_tim_invis(int v);
-extern bool_ set_tim_infra(int v);
-extern bool_ set_mental_barrier(int v);
-extern bool_ set_oppose_acid(int v);
-extern bool_ set_oppose_elec(int v);
-extern bool_ set_oppose_fire(int v);
-extern bool_ set_oppose_cold(int v);
-extern bool_ set_oppose_pois(int v);
-extern bool_ set_oppose_cc(int v);
-extern bool_ set_stun(int v);
-extern bool_ set_cut(int v);
-extern bool_ set_food(int v);
-extern void check_experience(void);
-extern void check_experience_obj(object_type *o_ptr);
-extern void gain_exp(s32b amount);
-extern void lose_exp(s32b amount);
-extern int get_coin_type(std::shared_ptr<monster_race const> r_ptr);
-extern void monster_death(int m_idx);
-extern bool_ mon_take_hit(int m_idx, int dam, bool_ *fear, cptr note);
-extern bool_ change_panel(int dy, int dx);
-extern void verify_panel(void);
-extern bool_ target_okay(void);
-extern bool_ target_set(int mode);
-extern bool_ get_aim_dir(int *dp);
-extern bool_ get_rep_dir(int *dp);
-extern bool_ set_shadow(int v);
-extern bool_ set_tim_esp(int v);
-extern bool_ tgp_pt(int *x, int * y);
-extern bool_ tgt_pt (int *x, int *y);
-extern void do_poly_self(void);
-extern bool_ curse_weapon(void);
-extern bool_ curse_armor(void);
-extern void make_wish(void);
-extern void create_between_gate(int dist, int y, int x);
+void do_rebirth(void);
+void switch_subrace(std::size_t racem, bool_ copy_old);
+void drop_from_wild(void);
+bool_ set_roots(int v, s16b ac, s16b dam);
+bool_ set_project(int v, s16b gf, s16b dam, s16b rad, s16b flag);
+bool_ set_parasite(int v, int r);
+bool_ set_disrupt_shield(int v);
+bool_ set_prob_travel(int v);
+bool_ set_absorb_soul(int v);
+bool_ set_tim_breath(int v, bool_ magical);
+bool_ set_tim_precognition(int v);
+bool_ set_tim_deadly(int v);
+bool_ set_tim_reflect(int v);
+bool_ set_tim_thunder(int v, int p1, int p2);
+bool_ set_strike(int v);
+bool_ set_tim_regen(int v, int p);
+bool_ set_tim_ffall(int v);
+bool_ set_tim_fly(int v);
+bool_ set_poison(int v);
+bool_ set_holy(int v);
+void set_grace(s32b v);
+bool_ set_mimic(int v, int p, int level);
+bool_ set_no_breeders(int v);
+bool_ set_invis(int v,int p);
+bool_ set_lite(int v);
+bool_ set_blind(int v);
+bool_ set_confused(int v);
+bool_ set_poisoned(int v);
+bool_ set_afraid(int v);
+bool_ set_paralyzed(int v);
+void dec_paralyzed();
+bool_ set_image(int v);
+bool_ set_fast(int v, int p);
+bool_ set_light_speed(int v);
+bool_ set_slow(int v);
+bool_ set_shield(int v, int p, s16b o, s16b d1, s16b d2);
+bool_ set_blessed(int v);
+bool_ set_hero(int v);
+bool_ set_shero(int v);
+bool_ set_protevil(int v);
+bool_ set_invuln(int v);
+bool_ set_tim_invis(int v);
+bool_ set_tim_infra(int v);
+bool_ set_mental_barrier(int v);
+bool_ set_oppose_acid(int v);
+bool_ set_oppose_elec(int v);
+bool_ set_oppose_fire(int v);
+bool_ set_oppose_cold(int v);
+bool_ set_oppose_pois(int v);
+bool_ set_oppose_cc(int v);
+bool_ set_stun(int v);
+bool_ set_cut(int v);
+bool_ set_food(int v);
+void check_experience(void);
+void check_experience_obj(object_type *o_ptr);
+void gain_exp(s32b amount);
+void lose_exp(s32b amount);
+int get_coin_type(std::shared_ptr<monster_race const> r_ptr);
+void monster_death(int m_idx);
+bool_ mon_take_hit(int m_idx, int dam, bool_ *fear, cptr note);
+bool_ change_panel(int dy, int dx);
+void verify_panel(void);
+bool_ target_okay(void);
+bool_ target_set(int mode);
+bool_ get_aim_dir(int *dp);
+bool_ get_rep_dir(int *dp);
+bool_ set_shadow(int v);
+bool_ set_tim_esp(int v);
+bool_ tgp_pt(int *x, int * y);
+bool_ tgt_pt (int *x, int *y);
+void do_poly_self(void);
+bool_ curse_weapon(void);
+bool_ curse_armor(void);
+void make_wish(void);
+void create_between_gate(int dist, int y, int x);
 
 extern "C" {
-	extern void resize_map(void);
-	extern void resize_window(void);
+	void resize_map(void);
+	void resize_window(void);
 }
diff --git a/src/z-form.h b/src/z-form.h
index ac49c658..f67d1484 100644
--- a/src/z-form.h
+++ b/src/z-form.h
@@ -21,16 +21,16 @@ extern "C" {
 /**** Available Functions ****/
 
 /* Format arguments into given bounded-length buffer */
-extern uint vstrnfmt(char *buf, uint max, cptr fmt, va_list vp);
+uint vstrnfmt(char *buf, uint max, cptr fmt, va_list vp);
 
 /* Simple interface to "vstrnfmt()" */
-extern uint strnfmt(char *buf, uint max, cptr fmt, ...);
+uint strnfmt(char *buf, uint max, cptr fmt, ...);
 
 /* Simple interface to "vformat()" */
-extern char *format(cptr fmt, ...);
+char *format(cptr fmt, ...);
 
 /* Vararg interface to "quit()", using "format()" */
-extern void quit_fmt(cptr fmt, ...);
+void quit_fmt(cptr fmt, ...);
 
 #ifdef __cplusplus
 } /* extern "C" */
diff --git a/src/z-term.h b/src/z-term.h
index 01795629..fc9c0598 100644
--- a/src/z-term.h
+++ b/src/z-term.h
@@ -220,46 +220,46 @@ extern term *Term;
 
 /**** Available Functions ****/
 
-extern errr Term_xtra(int n, int v);
-
-extern void Term_queue_char(int x, int y, byte a, char c);
-extern void Term_queue_chars(int x, int y, int n, byte a, cptr s);
-
-extern errr Term_fresh(void);
-extern errr Term_set_cursor(int v);
-extern errr Term_gotoxy(int x, int y);
-extern errr Term_draw(int x, int y, byte a, char c);
-extern errr Term_addch(byte a, char c);
-extern errr Term_addstr(int n, byte a, cptr s);
-extern errr Term_putch(int x, int y, byte a, char c);
-extern errr Term_putstr(int x, int y, int n, byte a, cptr s);
-extern errr Term_erase(int x, int y, int n);
-extern errr Term_clear(void);
-extern errr Term_redraw(void);
-extern errr Term_redraw_section(int x1, int y1, int x2, int y2);
-extern void Term_bell();
-
-extern errr Term_get_cursor(int *v);
-extern errr Term_get_size(int *w, int *h);
-extern errr Term_locate(int *x, int *y);
-extern errr Term_what(int x, int y, byte *a, char *c);
-
-extern errr Term_flush(void);
-extern errr Term_keypress(int k);
-extern errr Term_key_push(int k);
-extern errr Term_inkey(char *ch, bool_ wait, bool_ take);
-
-extern errr Term_save(void);
-extern term_win* Term_save_to(void);
-extern errr Term_load(void);
-extern errr Term_load_from(term_win *save);
-
-extern errr Term_resize(int w, int h);
-
-extern errr Term_activate(term *t);
-
-extern errr term_nuke(term *t);
-extern errr term_init(term *t, int w, int h, int k);
+errr Term_xtra(int n, int v);
+
+void Term_queue_char(int x, int y, byte a, char c);
+void Term_queue_chars(int x, int y, int n, byte a, cptr s);
+
+errr Term_fresh(void);
+errr Term_set_cursor(int v);
+errr Term_gotoxy(int x, int y);
+errr Term_draw(int x, int y, byte a, char c);
+errr Term_addch(byte a, char c);
+errr Term_addstr(int n, byte a, cptr s);
+errr Term_putch(int x, int y, byte a, char c);
+errr Term_putstr(int x, int y, int n, byte a, cptr s);
+errr Term_erase(int x, int y, int n);
+errr Term_clear(void);
+errr Term_redraw(void);
+errr Term_redraw_section(int x1, int y1, int x2, int y2);
+void Term_bell();
+
+errr Term_get_cursor(int *v);
+errr Term_get_size(int *w, int *h);
+errr Term_locate(int *x, int *y);
+errr Term_what(int x, int y, byte *a, char *c);
+
+errr Term_flush(void);
+errr Term_keypress(int k);
+errr Term_key_push(int k);
+errr Term_inkey(char *ch, bool_ wait, bool_ take);
+
+errr Term_save(void);
+term_win* Term_save_to(void);
+errr Term_load(void);
+errr Term_load_from(term_win *save);
+
+errr Term_resize(int w, int h);
+
+errr Term_activate(term *t);
+
+errr term_nuke(term *t);
+errr term_init(term *t, int w, int h, int k);
 
 #ifdef __cplusplus
 } /* extern "C" */
diff --git a/src/z-util.h b/src/z-util.h
index 914a64e7..d2fa79dc 100644
--- a/src/z-util.h
+++ b/src/z-util.h
@@ -21,19 +21,19 @@ extern void (*quit_aux)(cptr);
 
 
 /* Test equality, prefix, suffix */
-extern bool_ streq(cptr s, cptr t);
-extern bool_ prefix(cptr s, cptr t);
-extern bool_ suffix(cptr s, cptr t);
+bool_ streq(cptr s, cptr t);
+bool_ prefix(cptr s, cptr t);
+bool_ suffix(cptr s, cptr t);
 
 
 /* Capitalize the first letter of string. Ignores whitespace at the start of string. */
-extern void capitalize(char *s);
+void capitalize(char *s);
 
 /* Print an error message */
-extern void plog(cptr str);
+void plog(cptr str);
 
 /* Exit, with optional message */
-extern void quit(cptr str);
+void quit(cptr str);
 
 
 #ifdef __cplusplus