summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2015-03-22 15:22:02 +0100
committerBardur Arantsson <bardur@scientician.net>2015-03-22 16:01:22 +0100
commitc17c9486a22ce9f2160b2d2ad559d9a19e453f83 (patch)
tree4d32c8d5bfac290c15d858beccff80ce5fd933f1 /src
parentf498e18ca748427db1de1bf0301df5113e4f5ba2 (diff)
Rename miscellaneous .h headers to .hpp
Diffstat (limited to 'src')
-rw-r--r--src/birth.cc4
-rw-r--r--src/bldg.cc2
-rw-r--r--src/cmd1.cc4
-rw-r--r--src/cmd2.cc2
-rw-r--r--src/cmd3.cc4
-rw-r--r--src/cmd4.cc4
-rw-r--r--src/cmd5.cc2
-rw-r--r--src/cmd6.cc2
-rw-r--r--src/cmd7.cc4
-rw-r--r--src/device_allocation.cc2
-rw-r--r--src/device_allocation.hpp (renamed from src/device_allocation.h)12
-rw-r--r--src/device_allocation_fwd.hpp (renamed from src/device_allocation_fwd.h)8
-rw-r--r--src/dice.cc2
-rw-r--r--src/dice.hpp (renamed from src/dice.h)10
-rw-r--r--src/dice_fwd.hpp (renamed from src/dice_fwd.h)8
-rw-r--r--src/dungeon.cc6
-rw-r--r--src/files.cc4
-rw-r--r--src/generate.cc2
-rw-r--r--src/help.cc2
-rw-r--r--src/hiscore.cc2
-rw-r--r--src/hiscore.hpp (renamed from src/hiscore.h)8
-rw-r--r--src/hooks.cc2
-rw-r--r--src/hooks.hpp (renamed from src/hooks.h)8
-rw-r--r--src/init2.cc6
-rw-r--r--src/loadsave.cc6
-rw-r--r--src/lua_bind.cc2
-rw-r--r--src/melee2.cc6
-rw-r--r--src/messages.cc3
-rw-r--r--src/messages.hpp (renamed from src/messages.h)9
-rw-r--r--src/modules.cc2
-rw-r--r--src/monster2.cc2
-rw-r--r--src/object1.cc4
-rw-r--r--src/object2.cc4
-rw-r--r--src/powers.cc4
-rw-r--r--src/q_betwen.cc2
-rw-r--r--src/q_dragons.cc2
-rw-r--r--src/q_eol.cc2
-rw-r--r--src/q_evil.cc2
-rw-r--r--src/q_fireprof.cc4
-rw-r--r--src/q_god.cc4
-rw-r--r--src/q_haunted.cc2
-rw-r--r--src/q_hobbit.cc4
-rw-r--r--src/q_invas.cc2
-rw-r--r--src/q_library.cc4
-rw-r--r--src/q_main.cc2
-rw-r--r--src/q_narsil.cc2
-rw-r--r--src/q_nazgul.cc2
-rw-r--r--src/q_nirna.cc2
-rw-r--r--src/q_one.cc2
-rw-r--r--src/q_poison.cc6
-rw-r--r--src/q_rand.cc4
-rw-r--r--src/q_shroom.cc4
-rw-r--r--src/q_spider.cc2
-rw-r--r--src/q_thief.cc2
-rw-r--r--src/q_thrain.cc6
-rw-r--r--src/q_troll.cc2
-rw-r--r--src/q_ultrag.cc2
-rw-r--r--src/q_wight.cc4
-rw-r--r--src/q_wolves.cc2
-rw-r--r--src/quark.cc3
-rw-r--r--src/quark.hpp (renamed from src/quark.h)8
-rw-r--r--src/quest.cc2
-rw-r--r--src/quest.h11
-rw-r--r--src/quest.hpp3
-rw-r--r--src/randart.cc2
-rw-r--r--src/range.cc2
-rw-r--r--src/range.hpp (renamed from src/range.h)10
-rw-r--r--src/range_fwd.h12
-rw-r--r--src/range_fwd.hpp4
-rw-r--r--src/skills.cc2
-rw-r--r--src/spell_type.cc6
-rw-r--r--src/spell_type.hpp4
-rw-r--r--src/spells2.cc2
-rw-r--r--src/spells5.cc2
-rw-r--r--src/squelch/condition.cc2
-rw-r--r--src/squelch/rule.cc2
-rw-r--r--src/store.cc4
-rw-r--r--src/util.cc4
-rw-r--r--src/wild.cc2
-rw-r--r--src/wizard2.cc2
-rw-r--r--src/xtra1.cc4
-rw-r--r--src/xtra2.cc4
82 files changed, 117 insertions, 204 deletions
diff --git a/src/birth.cc b/src/birth.cc
index 55705a45..81ee4007 100644
--- a/src/birth.cc
+++ b/src/birth.cc
@@ -16,10 +16,10 @@
#include "files.hpp"
#include "gods.hpp"
#include "help.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "init2.hpp"
#include "mimic.hpp"
-#include "messages.h"
+#include "messages.hpp"
#include "modules.hpp"
#include "monster2.hpp"
#include "notes.hpp"
diff --git a/src/bldg.cc b/src/bldg.cc
index 0718cb93..0c62a826 100644
--- a/src/bldg.cc
+++ b/src/bldg.cc
@@ -16,7 +16,7 @@
#include "angband.h"
#include "cmd3.hpp"
#include "files.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "mimic.hpp"
#include "object1.hpp"
#include "object2.hpp"
diff --git a/src/cmd1.cc b/src/cmd1.cc
index 2b1b6ea1..f387fc26 100644
--- a/src/cmd1.cc
+++ b/src/cmd1.cc
@@ -14,7 +14,7 @@
#include "cmd5.hpp"
#include "files.hpp"
#include "gods.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "lua_bind.hpp"
#include "melee1.hpp"
#include "melee2.hpp"
@@ -24,7 +24,7 @@
#include "object1.hpp"
#include "object2.hpp"
#include "options.hpp"
-#include "quark.h"
+#include "quark.hpp"
#include "skills.hpp"
#include "spells1.hpp"
#include "spells2.hpp"
diff --git a/src/cmd2.cc b/src/cmd2.cc
index ac6cbf1e..41b9f54c 100644
--- a/src/cmd2.cc
+++ b/src/cmd2.cc
@@ -14,7 +14,7 @@
#include "cmd1.hpp"
#include "files.hpp"
#include "gods.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "levels.hpp"
#include "monster2.hpp"
#include "monster3.hpp"
diff --git a/src/cmd3.cc b/src/cmd3.cc
index dd517bf5..2b69d288 100644
--- a/src/cmd3.cc
+++ b/src/cmd3.cc
@@ -11,12 +11,12 @@
#include "cave.hpp"
#include "files.hpp"
#include "gods.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "monster1.hpp"
#include "object1.hpp"
#include "object2.hpp"
#include "options.hpp"
-#include "quark.h"
+#include "quark.hpp"
#include "squeltch.hpp"
#include "store.hpp"
#include "tables.hpp"
diff --git a/src/cmd4.cc b/src/cmd4.cc
index b2c83b9c..02e826b2 100644
--- a/src/cmd4.cc
+++ b/src/cmd4.cc
@@ -10,10 +10,10 @@
#include "angband.h"
#include "corrupt.hpp"
#include "files.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "init1.hpp"
#include "levels.hpp"
-#include "messages.h"
+#include "messages.hpp"
#include "monster2.hpp"
#include "notes.hpp"
#include "object1.hpp"
diff --git a/src/cmd5.cc b/src/cmd5.cc
index 81e909f3..f57c6d62 100644
--- a/src/cmd5.cc
+++ b/src/cmd5.cc
@@ -27,7 +27,7 @@
#include "util.h"
#include "variable.h"
#include "variable.hpp"
-#include "quark.h"
+#include "quark.hpp"
#include "wizard2.hpp"
#include "xtra1.hpp"
#include "xtra2.hpp"
diff --git a/src/cmd6.cc b/src/cmd6.cc
index 6d3dcf56..c1d49c72 100644
--- a/src/cmd6.cc
+++ b/src/cmd6.cc
@@ -14,7 +14,7 @@
#include "cmd7.hpp"
#include "corrupt.hpp"
#include "files.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "lua_bind.hpp"
#include "mimic.hpp"
#include "monster2.hpp"
diff --git a/src/cmd7.cc b/src/cmd7.cc
index faa5825c..81296411 100644
--- a/src/cmd7.cc
+++ b/src/cmd7.cc
@@ -14,13 +14,13 @@
#include "cmd5.hpp"
#include "cmd6.hpp"
#include "files.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "mimic.hpp"
#include "monster2.hpp"
#include "object1.hpp"
#include "object2.hpp"
#include "options.hpp"
-#include "quark.h"
+#include "quark.hpp"
#include "skills.hpp"
#include "spells1.hpp"
#include "spells2.hpp"
diff --git a/src/device_allocation.cc b/src/device_allocation.cc
index 9d8267e8..ec2d208c 100644
--- a/src/device_allocation.cc
+++ b/src/device_allocation.cc
@@ -1,4 +1,4 @@
-#include "device_allocation.h"
+#include "device_allocation.hpp"
#include <cassert>
diff --git a/src/device_allocation.h b/src/device_allocation.hpp
index f4fc5c38..28854eac 100644
--- a/src/device_allocation.h
+++ b/src/device_allocation.hpp
@@ -1,11 +1,7 @@
#pragma once
-#include "device_allocation_fwd.h"
-#include "range.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "device_allocation_fwd.hpp"
+#include "range.hpp"
/*
* Device allocation for skill
@@ -19,7 +15,3 @@ struct device_allocation
};
struct device_allocation *device_allocation_new(byte tval);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/device_allocation_fwd.h b/src/device_allocation_fwd.hpp
index 1bfe41a1..8d5b3c6a 100644
--- a/src/device_allocation_fwd.h
+++ b/src/device_allocation_fwd.hpp
@@ -2,15 +2,7 @@
#include "angband.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
typedef struct device_allocation device_allocation;
struct device_allocation;
struct device_allocation *device_allocation_new(byte tval);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/dice.cc b/src/dice.cc
index 2f024d6a..91bbdca9 100644
--- a/src/dice.cc
+++ b/src/dice.cc
@@ -1,4 +1,4 @@
-#include "dice.h"
+#include "dice.hpp"
#include <cassert>
diff --git a/src/dice.h b/src/dice.hpp
index 9b07357e..40a49e37 100644
--- a/src/dice.h
+++ b/src/dice.hpp
@@ -1,10 +1,6 @@
#pragma once
-#include "dice_fwd.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "dice_fwd.hpp"
/**
* Dice
@@ -15,7 +11,3 @@ struct dice_type
long num; /* Number of dice */
long sides; /* Sides per dice */
};
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/dice_fwd.h b/src/dice_fwd.hpp
index be1ed85f..ffc8fbfa 100644
--- a/src/dice_fwd.h
+++ b/src/dice_fwd.hpp
@@ -2,10 +2,6 @@
#include "angband.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
typedef struct dice_type dice_type;
struct dice_type;
@@ -14,7 +10,3 @@ bool_ dice_parse(dice_type *dice, cptr s);
void dice_parse_checked(dice_type *dice, cptr s);
long dice_roll(dice_type *dice);
void dice_print(dice_type *dice, char *buf);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/dungeon.cc b/src/dungeon.cc
index 68ccef82..953ea536 100644
--- a/src/dungeon.cc
+++ b/src/dungeon.cc
@@ -27,7 +27,7 @@
#include "gen_evol.hpp"
#include "gods.hpp"
#include "help.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "init2.hpp"
#include "levels.hpp"
#include "loadsave.h"
@@ -43,8 +43,8 @@
#include "object2.hpp"
#include "options.hpp"
#include "powers.hpp"
-#include "quest.h"
-#include "quark.h"
+#include "quest.hpp"
+#include "quark.hpp"
#include "skills.hpp"
#include "spell_type.hpp"
#include "spells1.hpp"
diff --git a/src/files.cc b/src/files.cc
index 78784938..25cadc05 100644
--- a/src/files.cc
+++ b/src/files.cc
@@ -13,8 +13,8 @@
#include "cave.hpp"
#include "corrupt.hpp"
#include "cmd3.hpp"
-#include "hiscore.h"
-#include "hooks.h"
+#include "hiscore.hpp"
+#include "hooks.hpp"
#include "init1.hpp"
#include "levels.hpp"
#include "loadsave.h"
diff --git a/src/generate.cc b/src/generate.cc
index 7362b0a2..a874a6e9 100644
--- a/src/generate.cc
+++ b/src/generate.cc
@@ -8,7 +8,7 @@
#include "angband.h"
#include "cave.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "init1.hpp"
#include "levels.hpp"
#include "loadsave.hpp"
diff --git a/src/help.cc b/src/help.cc
index 0fb910d8..6391851d 100644
--- a/src/help.cc
+++ b/src/help.cc
@@ -11,7 +11,7 @@
#include "angband.h"
#include "files.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "object1.hpp"
#include "options.hpp"
#include "skills.hpp"
diff --git a/src/hiscore.cc b/src/hiscore.cc
index 2f17237f..9d55bbde 100644
--- a/src/hiscore.cc
+++ b/src/hiscore.cc
@@ -1,4 +1,4 @@
-#include "hiscore.h"
+#include "hiscore.hpp"
#include "angband.h"
#include "util.hpp"
diff --git a/src/hiscore.h b/src/hiscore.hpp
index e4923165..0e9afa41 100644
--- a/src/hiscore.h
+++ b/src/hiscore.hpp
@@ -2,10 +2,6 @@
#include "h-basic.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/*
* Semi-Portable High Score List Entry (128 bytes) -- BEN
*
@@ -80,7 +76,3 @@ int highscore_where(int highscore_fd, high_score *score);
* best) or -1 on "failure"
*/
int highscore_add(int highscore_fd, high_score *score);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/hooks.cc b/src/hooks.cc
index 77b93cf7..43c6e6d3 100644
--- a/src/hooks.cc
+++ b/src/hooks.cc
@@ -5,7 +5,7 @@
* not for profit purposes provided that this copyright and statement are
* included in all such copies.
*/
-#include "hooks.h"
+#include "hooks.hpp"
#include "angband.h"
#include <algorithm>
diff --git a/src/hooks.h b/src/hooks.hpp
index 76587faf..9c17fe56 100644
--- a/src/hooks.h
+++ b/src/hooks.hpp
@@ -2,17 +2,9 @@
#include "angband.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
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);
extern int process_hooks_restart;
extern bool_ process_hooks_new(int h_idx, void *in, void *out);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/init2.cc b/src/init2.cc
index b924c914..a30bb15f 100644
--- a/src/init2.cc
+++ b/src/init2.cc
@@ -7,12 +7,12 @@
#include "generate.hpp"
#include "gen_evol.hpp"
#include "gen_maze.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "init1.hpp"
#include "lua_bind.hpp"
-#include "messages.h"
+#include "messages.hpp"
#include "modules.hpp"
-#include "quark.h"
+#include "quark.hpp"
#include "randart.hpp"
#include "script.h"
#include "spells3.hpp"
diff --git a/src/loadsave.cc b/src/loadsave.cc
index 9c897c47..b21bc723 100644
--- a/src/loadsave.cc
+++ b/src/loadsave.cc
@@ -6,13 +6,13 @@
#include "init1.hpp"
#include "init2.hpp"
#include "levels.hpp"
-#include "messages.h"
+#include "messages.hpp"
#include "modules.hpp"
#include "monster2.hpp"
#include "object1.hpp"
#include "object2.hpp"
-#include "quark.h"
-#include "hooks.h"
+#include "quark.hpp"
+#include "hooks.hpp"
#include "tables.hpp"
#include "util.hpp"
#include "util.h"
diff --git a/src/lua_bind.cc b/src/lua_bind.cc
index 9237678f..501d9edc 100644
--- a/src/lua_bind.cc
+++ b/src/lua_bind.cc
@@ -13,7 +13,7 @@
#include "corrupt.hpp"
#include "init1.hpp"
#include "monster2.hpp"
-#include "range.h"
+#include "range.hpp"
#include "skills.hpp"
#include "spell_type.hpp"
#include "spells2.hpp"
diff --git a/src/melee2.cc b/src/melee2.cc
index fdd31846..09c47340 100644
--- a/src/melee2.cc
+++ b/src/melee2.cc
@@ -17,15 +17,15 @@
#include "cave.hpp"
#include "cmd1.hpp"
#include "files.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "melee1.hpp"
-#include "messages.h"
+#include "messages.hpp"
#include "monster2.hpp"
#include "monster3.hpp"
#include "object1.hpp"
#include "object2.hpp"
#include "options.hpp"
-#include "quark.h"
+#include "quark.hpp"
#include "skills.hpp"
#include "spells1.hpp"
#include "spells2.hpp"
diff --git a/src/messages.cc b/src/messages.cc
index 32117198..4701f86e 100644
--- a/src/messages.cc
+++ b/src/messages.cc
@@ -1,4 +1,5 @@
-#include "messages.h"
+#include "messages.hpp"
+
#include "tome/make_array.hpp"
#include "angband.h"
diff --git a/src/messages.h b/src/messages.hpp
index 0e9e2d14..22943ab9 100644
--- a/src/messages.h
+++ b/src/messages.hpp
@@ -2,17 +2,8 @@
#include "h-basic.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
void message_init();
s16b message_num();
cptr message_str(int age);
byte message_color(int age);
-byte message_type(int age);
void message_add(cptr msg, byte color);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/modules.cc b/src/modules.cc
index 071f1ae9..ffcf743c 100644
--- a/src/modules.cc
+++ b/src/modules.cc
@@ -14,7 +14,7 @@
#include "cave.hpp"
#include "corrupt.hpp"
#include "files.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "joke.hpp"
#include "lua_bind.hpp"
#include "monster2.hpp"
diff --git a/src/monster2.cc b/src/monster2.cc
index 039b53e9..d7f96974 100644
--- a/src/monster2.cc
+++ b/src/monster2.cc
@@ -10,7 +10,7 @@
#include "angband.h"
#include "cave.hpp"
#include "files.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "levels.hpp"
#include "mimic.hpp"
#include "monster3.hpp"
diff --git a/src/object1.cc b/src/object1.cc
index 2e9f09ff..3c269c60 100644
--- a/src/object1.cc
+++ b/src/object1.cc
@@ -14,14 +14,14 @@
#include "cmd6.hpp"
#include "dungeon.hpp"
#include "files.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "lua_bind.hpp"
#include "mimic.hpp"
#include "monster1.hpp"
#include "monster2.hpp"
#include "object2.hpp"
#include "options.hpp"
-#include "quark.h"
+#include "quark.hpp"
#include "skills.hpp"
#include "spell_type.hpp"
#include "spells5.hpp"
diff --git a/src/object2.cc b/src/object2.cc
index c5f4fa44..a3abdbba 100644
--- a/src/object2.cc
+++ b/src/object2.cc
@@ -11,8 +11,8 @@
#include "angband.h"
#include "cave.hpp"
#include "spell_type.hpp"
-#include "device_allocation.h"
-#include "hooks.h"
+#include "device_allocation.hpp"
+#include "hooks.hpp"
#include "mimic.hpp"
#include "monster2.hpp"
#include "object1.hpp"
diff --git a/src/powers.cc b/src/powers.cc
index 4c85f2d9..0b4f87bc 100644
--- a/src/powers.cc
+++ b/src/powers.cc
@@ -14,14 +14,14 @@
#include "cmd2.hpp"
#include "cmd7.hpp"
#include "files.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "mimic.hpp"
#include "monster2.hpp"
#include "monster3.hpp"
#include "object1.hpp"
#include "object2.hpp"
#include "options.hpp"
-#include "quark.h"
+#include "quark.hpp"
#include "spells1.hpp"
#include "spells2.hpp"
#include "tables.hpp"
diff --git a/src/q_betwen.cc b/src/q_betwen.cc
index 7b660d4a..2dafc804 100644
--- a/src/q_betwen.cc
+++ b/src/q_betwen.cc
@@ -1,7 +1,7 @@
#include "q_betwen.hpp"
#include "cave.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "init1.hpp"
#include "monster2.hpp"
#include "object2.hpp"
diff --git a/src/q_dragons.cc b/src/q_dragons.cc
index be0d1ccd..cd8b2efe 100644
--- a/src/q_dragons.cc
+++ b/src/q_dragons.cc
@@ -1,7 +1,7 @@
#include "q_dragons.hpp"
#include "cave.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "init1.hpp"
#include "monster2.hpp"
#include "tables.hpp"
diff --git a/src/q_eol.cc b/src/q_eol.cc
index 62c0eddc..c5ce5232 100644
--- a/src/q_eol.cc
+++ b/src/q_eol.cc
@@ -2,7 +2,7 @@
#include "cave.hpp"
#include "generate.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "monster2.hpp"
#include "object2.hpp"
#include "tables.hpp"
diff --git a/src/q_evil.cc b/src/q_evil.cc
index d8ef0eb6..1398ccf3 100644
--- a/src/q_evil.cc
+++ b/src/q_evil.cc
@@ -1,7 +1,7 @@
#include "q_evil.hpp"
#include "cave.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "init1.hpp"
#include "monster2.hpp"
#include "tables.hpp"
diff --git a/src/q_fireprof.cc b/src/q_fireprof.cc
index e092102f..4a88965a 100644
--- a/src/q_fireprof.cc
+++ b/src/q_fireprof.cc
@@ -1,6 +1,6 @@
#include "q_fireprof.hpp"
-#include "quark.h"
-#include "hooks.h"
+#include "quark.hpp"
+#include "hooks.hpp"
#include "lua_bind.hpp"
#include "object1.hpp"
#include "object2.hpp"
diff --git a/src/q_god.cc b/src/q_god.cc
index aa1516f4..c6488170 100644
--- a/src/q_god.cc
+++ b/src/q_god.cc
@@ -1,6 +1,6 @@
#include "q_god.hpp"
-#include "quark.h"
-#include "hooks.h"
+#include "quark.hpp"
+#include "hooks.hpp"
#include "object2.hpp"
#include "tables.hpp"
#include "util.hpp"
diff --git a/src/q_haunted.cc b/src/q_haunted.cc
index 0b577361..3b0b99fe 100644
--- a/src/q_haunted.cc
+++ b/src/q_haunted.cc
@@ -1,7 +1,7 @@
#include "q_haunted.hpp"
#include "cave.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "init1.hpp"
#include "monster2.hpp"
#include "traps.hpp"
diff --git a/src/q_hobbit.cc b/src/q_hobbit.cc
index aca1cf01..38dbcf68 100644
--- a/src/q_hobbit.cc
+++ b/src/q_hobbit.cc
@@ -1,8 +1,8 @@
#include "q_hobbit.hpp"
#include "cave.hpp"
-#include "hooks.h"
-#include "messages.h"
+#include "hooks.hpp"
+#include "messages.hpp"
#include "monster2.hpp"
#include "object2.hpp"
#include "tables.hpp"
diff --git a/src/q_invas.cc b/src/q_invas.cc
index e9d80cc8..a34b67c7 100644
--- a/src/q_invas.cc
+++ b/src/q_invas.cc
@@ -1,7 +1,7 @@
#include "q_invas.hpp"
#include "cave.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "init1.hpp"
#include "monster2.hpp"
#include "tables.hpp"
diff --git a/src/q_library.cc b/src/q_library.cc
index 94570ebd..f8f7fb29 100644
--- a/src/q_library.cc
+++ b/src/q_library.cc
@@ -1,6 +1,6 @@
#include "q_library.hpp"
-#include "quark.h"
-#include "hooks.h"
+#include "quark.hpp"
+#include "hooks.hpp"
#include "lua_bind.hpp"
#include "monster2.hpp"
#include "object2.hpp"
diff --git a/src/q_main.cc b/src/q_main.cc
index 45c50e9b..27aa9ad6 100644
--- a/src/q_main.cc
+++ b/src/q_main.cc
@@ -1,6 +1,6 @@
#include "q_main.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "tables.hpp"
#include "util.hpp"
#include "variable.hpp"
diff --git a/src/q_narsil.cc b/src/q_narsil.cc
index a9359739..e2188c3b 100644
--- a/src/q_narsil.cc
+++ b/src/q_narsil.cc
@@ -1,6 +1,6 @@
#include "q_narsil.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "object2.hpp"
#include "tables.hpp"
#include "util.hpp"
diff --git a/src/q_nazgul.cc b/src/q_nazgul.cc
index e298f41f..267e712a 100644
--- a/src/q_nazgul.cc
+++ b/src/q_nazgul.cc
@@ -1,7 +1,7 @@
#include "q_nazgul.hpp"
#include "cave.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "monster2.hpp"
#include "object2.hpp"
#include "tables.hpp"
diff --git a/src/q_nirna.cc b/src/q_nirna.cc
index 0f9ec203..a86f9a19 100644
--- a/src/q_nirna.cc
+++ b/src/q_nirna.cc
@@ -1,7 +1,7 @@
#include "q_nirna.hpp"
#include "cave.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "init1.hpp"
#include "monster2.hpp"
#include "tables.hpp"
diff --git a/src/q_one.cc b/src/q_one.cc
index 1780b4d3..19076f4f 100644
--- a/src/q_one.cc
+++ b/src/q_one.cc
@@ -2,7 +2,7 @@
#include "cave.hpp"
#include "gods.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "monster2.hpp"
#include "object1.hpp"
#include "object2.hpp"
diff --git a/src/q_poison.cc b/src/q_poison.cc
index 7d709db5..3a834e31 100644
--- a/src/q_poison.cc
+++ b/src/q_poison.cc
@@ -1,11 +1,11 @@
#include "q_poison.hpp"
#include "cave.hpp"
-#include "quark.h"
-#include "messages.h"
+#include "quark.hpp"
+#include "messages.hpp"
#include "monster2.hpp"
#include "object2.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "tables.hpp"
#include "util.hpp"
#include "variable.hpp"
diff --git a/src/q_rand.cc b/src/q_rand.cc
index 904fa5d4..2703705a 100644
--- a/src/q_rand.cc
+++ b/src/q_rand.cc
@@ -2,10 +2,10 @@
#include "cave.hpp"
#include "generate.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "init1.hpp"
#include "lua_bind.hpp"
-#include "messages.h"
+#include "messages.hpp"
#include "monster2.hpp"
#include "monster3.hpp"
#include "object1.hpp"
diff --git a/src/q_shroom.cc b/src/q_shroom.cc
index 5cef00c8..3e2ffed5 100644
--- a/src/q_shroom.cc
+++ b/src/q_shroom.cc
@@ -1,8 +1,8 @@
#include "q_shroom.hpp"
#include "cave.hpp"
-#include "hooks.h"
-#include "messages.h"
+#include "hooks.hpp"
+#include "messages.hpp"
#include "monster2.hpp"
#include "object2.hpp"
#include "tables.hpp"
diff --git a/src/q_spider.cc b/src/q_spider.cc
index beddc16d..957399ae 100644
--- a/src/q_spider.cc
+++ b/src/q_spider.cc
@@ -2,7 +2,7 @@
#include "cave.hpp"
#include "gods.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "init1.hpp"
#include "monster2.hpp"
#include "object2.hpp"
diff --git a/src/q_thief.cc b/src/q_thief.cc
index 9ae23f8e..2560e9fd 100644
--- a/src/q_thief.cc
+++ b/src/q_thief.cc
@@ -1,7 +1,7 @@
#include "q_thief.hpp"
#include "cave.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "init1.hpp"
#include "monster2.hpp"
#include "object1.hpp"
diff --git a/src/q_thrain.cc b/src/q_thrain.cc
index 96d1d9bb..dc215fe3 100644
--- a/src/q_thrain.cc
+++ b/src/q_thrain.cc
@@ -2,12 +2,12 @@
#include "cave.hpp"
#include "generate.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "init1.hpp"
#include "lua_bind.hpp"
-#include "quark.h"
+#include "quark.hpp"
#include "randart.hpp"
-#include "messages.h"
+#include "messages.hpp"
#include "monster2.hpp"
#include "object2.hpp"
#include "tables.hpp"
diff --git a/src/q_troll.cc b/src/q_troll.cc
index 0289d9e9..500c62cf 100644
--- a/src/q_troll.cc
+++ b/src/q_troll.cc
@@ -1,7 +1,7 @@
#include "q_troll.hpp"
#include "cave.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "init1.hpp"
#include "monster2.hpp"
#include "object2.hpp"
diff --git a/src/q_ultrag.cc b/src/q_ultrag.cc
index d9af6f9f..96c80d02 100644
--- a/src/q_ultrag.cc
+++ b/src/q_ultrag.cc
@@ -1,7 +1,7 @@
#include "q_ultrag.hpp"
#include "cave.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "object1.hpp"
#include "object2.hpp"
#include "options.hpp"
diff --git a/src/q_wight.cc b/src/q_wight.cc
index 2fd72668..70ea86d2 100644
--- a/src/q_wight.cc
+++ b/src/q_wight.cc
@@ -1,11 +1,11 @@
#include "q_wight.hpp"
#include "cave.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "init1.hpp"
#include "monster2.hpp"
#include "object2.hpp"
-#include "quark.h"
+#include "quark.hpp"
#include "tables.hpp"
#include "util.hpp"
#include "variable.hpp"
diff --git a/src/q_wolves.cc b/src/q_wolves.cc
index b6f9d8e2..2270f498 100644
--- a/src/q_wolves.cc
+++ b/src/q_wolves.cc
@@ -1,7 +1,7 @@
#include "q_wolves.hpp"
#include "cave.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "init1.hpp"
#include "monster2.hpp"
#include "tables.hpp"
diff --git a/src/quark.cc b/src/quark.cc
index f6db6653..add16830 100644
--- a/src/quark.cc
+++ b/src/quark.cc
@@ -1,4 +1,5 @@
-#include "quark.h"
+#include "quark.hpp"
+
#include "angband.h"
#include <cassert>
diff --git a/src/quark.h b/src/quark.hpp
index 1eec6eae..f573ec21 100644
--- a/src/quark.h
+++ b/src/quark.hpp
@@ -2,14 +2,6 @@
#include "h-basic.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
void quark_init();
cptr quark_str(s16b num);
s16b quark_add(cptr str);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/quest.cc b/src/quest.cc
index f93abefe..c4e68872 100644
--- a/src/quest.cc
+++ b/src/quest.cc
@@ -1,4 +1,4 @@
-#include "quest.h"
+#include "quest.hpp"
#include "angband.h"
#include "tables.hpp"
diff --git a/src/quest.h b/src/quest.h
deleted file mode 100644
index 58ff98e4..00000000
--- a/src/quest.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern void init_hooks_quests();
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/quest.hpp b/src/quest.hpp
new file mode 100644
index 00000000..7ff3cd3c
--- /dev/null
+++ b/src/quest.hpp
@@ -0,0 +1,3 @@
+#pragma once
+
+extern void init_hooks_quests();
diff --git a/src/randart.cc b/src/randart.cc
index 7d88ada6..69adecc4 100644
--- a/src/randart.cc
+++ b/src/randart.cc
@@ -11,7 +11,7 @@
#include "object1.hpp"
#include "object2.hpp"
#include "options.hpp"
-#include "quark.h"
+#include "quark.hpp"
#include "spells2.hpp"
#include "util.hpp"
#include "variable.h"
diff --git a/src/range.cc b/src/range.cc
index 412c187a..7bd407c7 100644
--- a/src/range.cc
+++ b/src/range.cc
@@ -1,4 +1,4 @@
-#include "range.h"
+#include "range.hpp"
#include <cassert>
diff --git a/src/range.h b/src/range.hpp
index 0cd049dc..8e2c949e 100644
--- a/src/range.h
+++ b/src/range.hpp
@@ -1,12 +1,8 @@
#pragma once
-#include "range_fwd.h"
+#include "range_fwd.hpp"
#include "angband.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/*
* Range
*/
@@ -17,7 +13,3 @@ struct range_type
};
void range_init(range_type *range, s32b min, s32b max);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/range_fwd.h b/src/range_fwd.h
deleted file mode 100644
index 1e76e354..00000000
--- a/src/range_fwd.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct range_type range_type;
-struct range_type;
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/range_fwd.hpp b/src/range_fwd.hpp
new file mode 100644
index 00000000..b5eef3fa
--- /dev/null
+++ b/src/range_fwd.hpp
@@ -0,0 +1,4 @@
+#pragma once
+
+typedef struct range_type range_type;
+struct range_type;
diff --git a/src/skills.cc b/src/skills.cc
index 5b93ce2e..87aebd9c 100644
--- a/src/skills.cc
+++ b/src/skills.cc
@@ -14,7 +14,7 @@
#include "cmd7.hpp"
#include "gods.hpp"
#include "help.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "lua_bind.hpp"
#include "monster2.hpp"
#include "monster3.hpp"
diff --git a/src/spell_type.cc b/src/spell_type.cc
index 867068f8..1b9d31ec 100644
--- a/src/spell_type.cc
+++ b/src/spell_type.cc
@@ -1,7 +1,7 @@
#include "spell_type.hpp"
-#include "range.h"
-#include "device_allocation.h"
-#include "dice.h"
+#include "range.hpp"
+#include "device_allocation.hpp"
+#include "dice.hpp"
#include "spells4.hpp"
#include "angband.h"
diff --git a/src/spell_type.hpp b/src/spell_type.hpp
index c053f9fd..c08742dd 100644
--- a/src/spell_type.hpp
+++ b/src/spell_type.hpp
@@ -6,8 +6,8 @@
#include <functional>
#include "h-basic.h"
#include "types_fwd.h"
-#include "device_allocation_fwd.h"
-#include "range_fwd.h"
+#include "device_allocation_fwd.hpp"
+#include "range_fwd.hpp"
/*
* Casting type
diff --git a/src/spells2.cc b/src/spells2.cc
index a15c0e39..fe26a53f 100644
--- a/src/spells2.cc
+++ b/src/spells2.cc
@@ -13,7 +13,7 @@
#include "cmd1.hpp"
#include "cmd7.hpp"
#include "files.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "melee2.hpp"
#include "monster2.hpp"
#include "monster3.hpp"
diff --git a/src/spells5.cc b/src/spells5.cc
index 6dcb8f84..d1e5b433 100644
--- a/src/spells5.cc
+++ b/src/spells5.cc
@@ -2,7 +2,7 @@
#include "angband.h"
#include "spell_type.hpp"
-#include "device_allocation.h"
+#include "device_allocation.hpp"
#include "spells3.hpp"
#include "spells4.hpp"
#include "variable.hpp"
diff --git a/src/squelch/condition.cc b/src/squelch/condition.cc
index 221ab677..8d8eb028 100644
--- a/src/squelch/condition.cc
+++ b/src/squelch/condition.cc
@@ -9,7 +9,7 @@
#include "object1.hpp"
#include "object2.hpp"
#include "skills.hpp"
-#include "quark.h"
+#include "quark.hpp"
#include "util.hpp"
#include "variable.hpp"
diff --git a/src/squelch/rule.cc b/src/squelch/rule.cc
index a8bcd19e..44c110cb 100644
--- a/src/squelch/rule.cc
+++ b/src/squelch/rule.cc
@@ -8,7 +8,7 @@
#include "../modules.hpp"
#include "../object1.hpp"
#include "../object2.hpp"
-#include "../quark.h"
+#include "../quark.hpp"
#include "../tables.hpp"
#include "../util.hpp"
#include "../variable.hpp"
diff --git a/src/store.cc b/src/store.cc
index e61e3685..1a26f536 100644
--- a/src/store.cc
+++ b/src/store.cc
@@ -14,11 +14,11 @@
#include "cmd4.hpp"
#include "cmd5.hpp"
#include "files.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "object1.hpp"
#include "object2.hpp"
#include "options.hpp"
-#include "quark.h"
+#include "quark.hpp"
#include "spell_type.hpp"
#include "skills.hpp"
#include "spells5.hpp"
diff --git a/src/util.cc b/src/util.cc
index fc1d6aa8..65143e52 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -9,9 +9,9 @@
#include "cmd3.hpp"
#include "cmd4.hpp"
#include "init1.hpp"
-#include "messages.h"
+#include "messages.hpp"
#include "options.hpp"
-#include "quark.h"
+#include "quark.hpp"
#include "tables.h"
#include "tables.hpp"
#include "variable.h"
diff --git a/src/wild.cc b/src/wild.cc
index 5ac9f739..7e42bdb9 100644
--- a/src/wild.cc
+++ b/src/wild.cc
@@ -10,7 +10,7 @@
#include "angband.h"
#include "cave.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "init1.hpp"
#include "monster2.hpp"
#include "options.hpp"
diff --git a/src/wizard2.cc b/src/wizard2.cc
index 37f31156..046a95bc 100644
--- a/src/wizard2.cc
+++ b/src/wizard2.cc
@@ -13,7 +13,7 @@
#include "cmd4.hpp"
#include "corrupt.hpp"
#include "files.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "monster2.hpp"
#include "object1.hpp"
#include "object2.hpp"
diff --git a/src/xtra1.cc b/src/xtra1.cc
index 1dfa0566..bf1dce39 100644
--- a/src/xtra1.cc
+++ b/src/xtra1.cc
@@ -14,9 +14,9 @@
#include "cmd7.hpp"
#include "files.hpp"
#include "gods.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "levels.hpp"
-#include "messages.h"
+#include "messages.hpp"
#include "mimic.hpp"
#include "monster1.hpp"
#include "monster2.hpp"
diff --git a/src/xtra2.cc b/src/xtra2.cc
index 80179045..7f20b466 100644
--- a/src/xtra2.cc
+++ b/src/xtra2.cc
@@ -13,7 +13,7 @@
#include "corrupt.hpp"
#include "files.hpp"
#include "gods.hpp"
-#include "hooks.h"
+#include "hooks.hpp"
#include "melee2.hpp"
#include "mimic.hpp"
#include "monster1.hpp"
@@ -23,7 +23,7 @@
#include "object1.hpp"
#include "object2.hpp"
#include "options.hpp"
-#include "quark.h"
+#include "quark.hpp"
#include "randart.hpp"
#include "skills.hpp"
#include "spells1.hpp"