summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/birth.cc2
-rw-r--r--src/bldg.cc6
-rw-r--r--src/cave.cc2
-rw-r--r--src/q_betwen.cc2
-rw-r--r--src/q_betwen.h13
-rw-r--r--src/q_betwen.hpp5
-rw-r--r--src/q_bounty.cc2
-rw-r--r--src/q_bounty.hpp (renamed from src/q_bounty.h)9
-rw-r--r--src/q_dragons.cc2
-rw-r--r--src/q_dragons.h13
-rw-r--r--src/q_dragons.hpp5
-rw-r--r--src/q_eol.cc2
-rw-r--r--src/q_eol.h13
-rw-r--r--src/q_eol.hpp5
-rw-r--r--src/q_evil.cc2
-rw-r--r--src/q_evil.h13
-rw-r--r--src/q_evil.hpp5
-rw-r--r--src/q_fireprof.cc2
-rw-r--r--src/q_fireprof.hpp (renamed from src/q_fireprof.h)8
-rw-r--r--src/q_god.cc2
-rw-r--r--src/q_god.hpp (renamed from src/q_god.h)8
-rw-r--r--src/q_haunted.cc2
-rw-r--r--src/q_haunted.h13
-rw-r--r--src/q_haunted.hpp5
-rw-r--r--src/q_hobbit.cc2
-rw-r--r--src/q_hobbit.h13
-rw-r--r--src/q_hobbit.hpp5
-rw-r--r--src/q_invas.cc2
-rw-r--r--src/q_invas.h13
-rw-r--r--src/q_invas.hpp5
-rw-r--r--src/q_library.cc2
-rw-r--r--src/q_library.hpp (renamed from src/q_library.h)8
-rw-r--r--src/q_main.cc2
-rw-r--r--src/q_main.hpp (renamed from src/q_main.h)8
-rw-r--r--src/q_narsil.cc2
-rw-r--r--src/q_narsil.h13
-rw-r--r--src/q_narsil.hpp5
-rw-r--r--src/q_nazgul.cc2
-rw-r--r--src/q_nazgul.h13
-rw-r--r--src/q_nazgul.hpp5
-rw-r--r--src/q_nirna.cc2
-rw-r--r--src/q_nirna.h13
-rw-r--r--src/q_nirna.hpp5
-rw-r--r--src/q_one.cc2
-rw-r--r--src/q_one.h13
-rw-r--r--src/q_one.hpp5
-rw-r--r--src/q_poison.cc2
-rw-r--r--src/q_poison.h13
-rw-r--r--src/q_poison.hpp5
-rw-r--r--src/q_rand.cc2
-rw-r--r--src/q_rand.hpp (renamed from src/q_rand.h)8
-rw-r--r--src/q_shroom.cc2
-rw-r--r--src/q_shroom.h13
-rw-r--r--src/q_shroom.hpp5
-rw-r--r--src/q_spider.cc2
-rw-r--r--src/q_spider.h13
-rw-r--r--src/q_spider.hpp5
-rw-r--r--src/q_thief.cc2
-rw-r--r--src/q_thief.h13
-rw-r--r--src/q_thief.hpp5
-rw-r--r--src/q_thrain.cc2
-rw-r--r--src/q_thrain.hpp (renamed from src/q_thrain.h)8
-rw-r--r--src/q_troll.cc2
-rw-r--r--src/q_troll.h13
-rw-r--r--src/q_troll.hpp5
-rw-r--r--src/q_ultrae.cc2
-rw-r--r--src/q_ultrae.h13
-rw-r--r--src/q_ultrae.hpp5
-rw-r--r--src/q_ultrag.cc2
-rw-r--r--src/q_ultrag.h13
-rw-r--r--src/q_ultrag.hpp5
-rw-r--r--src/q_wight.cc2
-rw-r--r--src/q_wight.h13
-rw-r--r--src/q_wight.hpp5
-rw-r--r--src/q_wolves.cc2
-rw-r--r--src/q_wolves.h13
-rw-r--r--src/q_wolves.hpp5
-rw-r--r--src/script.cc2
-rw-r--r--src/tables.cc54
79 files changed, 160 insertions, 377 deletions
diff --git a/src/birth.cc b/src/birth.cc
index 4a822a61..55705a45 100644
--- a/src/birth.cc
+++ b/src/birth.cc
@@ -26,7 +26,7 @@
#include "object1.hpp"
#include "object2.hpp"
#include "options.hpp"
-#include "q_rand.h"
+#include "q_rand.hpp"
#include "skills.hpp"
#include "spells2.hpp"
#include "spells3.hpp"
diff --git a/src/bldg.cc b/src/bldg.cc
index 065b75c9..0718cb93 100644
--- a/src/bldg.cc
+++ b/src/bldg.cc
@@ -20,9 +20,9 @@
#include "mimic.hpp"
#include "object1.hpp"
#include "object2.hpp"
-#include "q_library.h"
-#include "q_fireprof.h"
-#include "q_bounty.h"
+#include "q_library.hpp"
+#include "q_fireprof.hpp"
+#include "q_bounty.hpp"
#include "spells2.hpp"
#include "store.hpp"
#include "tables.hpp"
diff --git a/src/cave.cc b/src/cave.cc
index bb1c7318..fef642da 100644
--- a/src/cave.cc
+++ b/src/cave.cc
@@ -4,7 +4,7 @@
#include "monster2.hpp"
#include "object1.hpp"
#include "options.hpp"
-#include "q_rand.h"
+#include "q_rand.hpp"
#include "spells1.hpp"
#include "tables.hpp"
#include "util.hpp"
diff --git a/src/q_betwen.cc b/src/q_betwen.cc
index 498ea9b4..7b660d4a 100644
--- a/src/q_betwen.cc
+++ b/src/q_betwen.cc
@@ -1,4 +1,4 @@
-#include "q_betwen.h"
+#include "q_betwen.hpp"
#include "cave.hpp"
#include "hooks.h"
diff --git a/src/q_betwen.h b/src/q_betwen.h
deleted file mode 100644
index 80ce5e42..00000000
--- a/src/q_betwen.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "angband.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-bool_ quest_between_init_hook(int q_idx);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/q_betwen.hpp b/src/q_betwen.hpp
new file mode 100644
index 00000000..86132ac8
--- /dev/null
+++ b/src/q_betwen.hpp
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "angband.h"
+
+bool_ quest_between_init_hook(int q_idx);
diff --git a/src/q_bounty.cc b/src/q_bounty.cc
index 33a5981d..d8fc63e0 100644
--- a/src/q_bounty.cc
+++ b/src/q_bounty.cc
@@ -1,4 +1,4 @@
-#include "q_bounty.h"
+#include "q_bounty.hpp"
#include "monster2.hpp"
#include "object1.hpp"
diff --git a/src/q_bounty.h b/src/q_bounty.hpp
index c0a4027c..869dfc3e 100644
--- a/src/q_bounty.h
+++ b/src/q_bounty.hpp
@@ -2,16 +2,7 @@
#include "angband.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/******* Plot Bounty Quest ********/
extern bool_ quest_bounty_init_hook(int q_idx);
extern bool_ quest_bounty_drop_item();
extern bool_ quest_bounty_get_item();
extern bool_ quest_bounty_describe(FILE *fff);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/q_dragons.cc b/src/q_dragons.cc
index fbed0821..be0d1ccd 100644
--- a/src/q_dragons.cc
+++ b/src/q_dragons.cc
@@ -1,4 +1,4 @@
-#include "q_dragons.h"
+#include "q_dragons.hpp"
#include "cave.hpp"
#include "hooks.h"
diff --git a/src/q_dragons.h b/src/q_dragons.h
deleted file mode 100644
index 2d3acc5a..00000000
--- a/src/q_dragons.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "angband.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-bool_ quest_dragons_init_hook(int q_idx);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/q_dragons.hpp b/src/q_dragons.hpp
new file mode 100644
index 00000000..9131e08d
--- /dev/null
+++ b/src/q_dragons.hpp
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "angband.h"
+
+bool_ quest_dragons_init_hook(int q_idx);
diff --git a/src/q_eol.cc b/src/q_eol.cc
index fff73299..62c0eddc 100644
--- a/src/q_eol.cc
+++ b/src/q_eol.cc
@@ -1,4 +1,4 @@
-#include "q_eol.h"
+#include "q_eol.hpp"
#include "cave.hpp"
#include "generate.hpp"
diff --git a/src/q_eol.h b/src/q_eol.h
deleted file mode 100644
index c3abbf1e..00000000
--- a/src/q_eol.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "angband.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-bool_ quest_eol_init_hook(int q_idx);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/q_eol.hpp b/src/q_eol.hpp
new file mode 100644
index 00000000..2fe26578
--- /dev/null
+++ b/src/q_eol.hpp
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "angband.h"
+
+bool_ quest_eol_init_hook(int q_idx);
diff --git a/src/q_evil.cc b/src/q_evil.cc
index b3491d78..d8ef0eb6 100644
--- a/src/q_evil.cc
+++ b/src/q_evil.cc
@@ -1,4 +1,4 @@
-#include "q_evil.h"
+#include "q_evil.hpp"
#include "cave.hpp"
#include "hooks.h"
diff --git a/src/q_evil.h b/src/q_evil.h
deleted file mode 100644
index 8b6739e9..00000000
--- a/src/q_evil.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "angband.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-bool_ quest_evil_init_hook(int q_idx);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/q_evil.hpp b/src/q_evil.hpp
new file mode 100644
index 00000000..35c57d98
--- /dev/null
+++ b/src/q_evil.hpp
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "angband.h"
+
+bool_ quest_evil_init_hook(int q_idx);
diff --git a/src/q_fireprof.cc b/src/q_fireprof.cc
index 9eed970e..e092102f 100644
--- a/src/q_fireprof.cc
+++ b/src/q_fireprof.cc
@@ -1,4 +1,4 @@
-#include "q_fireprof.h"
+#include "q_fireprof.hpp"
#include "quark.h"
#include "hooks.h"
#include "lua_bind.hpp"
diff --git a/src/q_fireprof.h b/src/q_fireprof.hpp
index eb6a048c..587cf6cb 100644
--- a/src/q_fireprof.h
+++ b/src/q_fireprof.hpp
@@ -2,14 +2,6 @@
#include "angband.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
extern void quest_fireproof_building(bool_ *paid, bool_ *recreate);
extern bool_ quest_fireproof_init_hook(int q);
extern bool_ quest_fireproof_describe(FILE *fff);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/q_god.cc b/src/q_god.cc
index 8186ce96..aa1516f4 100644
--- a/src/q_god.cc
+++ b/src/q_god.cc
@@ -1,4 +1,4 @@
-#include "q_god.h"
+#include "q_god.hpp"
#include "quark.h"
#include "hooks.h"
#include "object2.hpp"
diff --git a/src/q_god.h b/src/q_god.hpp
index 2f3ce104..5ab6e84b 100644
--- a/src/q_god.h
+++ b/src/q_god.hpp
@@ -2,13 +2,5 @@
#include "angband.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
bool_ quest_god_describe(FILE *);
bool_ quest_god_init_hook(int q);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/q_haunted.cc b/src/q_haunted.cc
index 395c6e4a..0b577361 100644
--- a/src/q_haunted.cc
+++ b/src/q_haunted.cc
@@ -1,4 +1,4 @@
-#include "q_haunted.h"
+#include "q_haunted.hpp"
#include "cave.hpp"
#include "hooks.h"
diff --git a/src/q_haunted.h b/src/q_haunted.h
deleted file mode 100644
index 332ec199..00000000
--- a/src/q_haunted.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "angband.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-bool_ quest_haunted_init_hook(int q_idx);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/q_haunted.hpp b/src/q_haunted.hpp
new file mode 100644
index 00000000..c78c02cd
--- /dev/null
+++ b/src/q_haunted.hpp
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "angband.h"
+
+bool_ quest_haunted_init_hook(int q_idx);
diff --git a/src/q_hobbit.cc b/src/q_hobbit.cc
index 9893e483..aca1cf01 100644
--- a/src/q_hobbit.cc
+++ b/src/q_hobbit.cc
@@ -1,4 +1,4 @@
-#include "q_hobbit.h"
+#include "q_hobbit.hpp"
#include "cave.hpp"
#include "hooks.h"
diff --git a/src/q_hobbit.h b/src/q_hobbit.h
deleted file mode 100644
index 6295ae10..00000000
--- a/src/q_hobbit.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "angband.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-bool_ quest_hobbit_init_hook(int q_idx);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/q_hobbit.hpp b/src/q_hobbit.hpp
new file mode 100644
index 00000000..de796990
--- /dev/null
+++ b/src/q_hobbit.hpp
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "angband.h"
+
+bool_ quest_hobbit_init_hook(int q_idx);
diff --git a/src/q_invas.cc b/src/q_invas.cc
index 739d3c67..e9d80cc8 100644
--- a/src/q_invas.cc
+++ b/src/q_invas.cc
@@ -1,4 +1,4 @@
-#include "q_invas.h"
+#include "q_invas.hpp"
#include "cave.hpp"
#include "hooks.h"
diff --git a/src/q_invas.h b/src/q_invas.h
deleted file mode 100644
index dc34e76a..00000000
--- a/src/q_invas.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "angband.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-bool_ quest_invasion_init_hook(int q_idx);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/q_invas.hpp b/src/q_invas.hpp
new file mode 100644
index 00000000..56625a1d
--- /dev/null
+++ b/src/q_invas.hpp
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "angband.h"
+
+bool_ quest_invasion_init_hook(int q_idx);
diff --git a/src/q_library.cc b/src/q_library.cc
index 4645150b..94570ebd 100644
--- a/src/q_library.cc
+++ b/src/q_library.cc
@@ -1,4 +1,4 @@
-#include "q_library.h"
+#include "q_library.hpp"
#include "quark.h"
#include "hooks.h"
#include "lua_bind.hpp"
diff --git a/src/q_library.h b/src/q_library.hpp
index 0ba02970..a7a35666 100644
--- a/src/q_library.h
+++ b/src/q_library.hpp
@@ -2,15 +2,7 @@
#include "angband.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
bool_ quest_library_init_hook(int q);
bool_ quest_library_describe(FILE *fff);
void quest_library_building(bool_ *paid, bool_ *recreate);
void initialize_bookable_spells();
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/q_main.cc b/src/q_main.cc
index a71ec15f..45c50e9b 100644
--- a/src/q_main.cc
+++ b/src/q_main.cc
@@ -1,4 +1,4 @@
-#include "q_main.h"
+#include "q_main.hpp"
#include "hooks.h"
#include "tables.hpp"
diff --git a/src/q_main.h b/src/q_main.hpp
index 618a2386..8cc6440d 100644
--- a/src/q_main.h
+++ b/src/q_main.hpp
@@ -2,14 +2,6 @@
#include "angband.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
bool_ quest_necro_init_hook(int q_idx);
bool_ quest_sauron_init_hook(int q_idx);
bool_ quest_morgoth_init_hook(int q_idx);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/q_narsil.cc b/src/q_narsil.cc
index c9f2d365..a9359739 100644
--- a/src/q_narsil.cc
+++ b/src/q_narsil.cc
@@ -1,4 +1,4 @@
-#include "q_narsil.h"
+#include "q_narsil.hpp"
#include "hooks.h"
#include "object2.hpp"
diff --git a/src/q_narsil.h b/src/q_narsil.h
deleted file mode 100644
index 227c0db7..00000000
--- a/src/q_narsil.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "angband.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-bool_ quest_narsil_init_hook(int q_idx);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/q_narsil.hpp b/src/q_narsil.hpp
new file mode 100644
index 00000000..e0f2d257
--- /dev/null
+++ b/src/q_narsil.hpp
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "angband.h"
+
+bool_ quest_narsil_init_hook(int q_idx);
diff --git a/src/q_nazgul.cc b/src/q_nazgul.cc
index 53f5d430..e298f41f 100644
--- a/src/q_nazgul.cc
+++ b/src/q_nazgul.cc
@@ -1,4 +1,4 @@
-#include "q_nazgul.h"
+#include "q_nazgul.hpp"
#include "cave.hpp"
#include "hooks.h"
diff --git a/src/q_nazgul.h b/src/q_nazgul.h
deleted file mode 100644
index 60720e3f..00000000
--- a/src/q_nazgul.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "angband.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-bool_ quest_nazgul_init_hook(int q_idx);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/q_nazgul.hpp b/src/q_nazgul.hpp
new file mode 100644
index 00000000..206b3af3
--- /dev/null
+++ b/src/q_nazgul.hpp
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "angband.h"
+
+bool_ quest_nazgul_init_hook(int q_idx);
diff --git a/src/q_nirna.cc b/src/q_nirna.cc
index 0bfeb453..0f9ec203 100644
--- a/src/q_nirna.cc
+++ b/src/q_nirna.cc
@@ -1,4 +1,4 @@
-#include "q_nirna.h"
+#include "q_nirna.hpp"
#include "cave.hpp"
#include "hooks.h"
diff --git a/src/q_nirna.h b/src/q_nirna.h
deleted file mode 100644
index 1c4a050b..00000000
--- a/src/q_nirna.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "angband.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-bool_ quest_nirnaeth_init_hook(int q_idx);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/q_nirna.hpp b/src/q_nirna.hpp
new file mode 100644
index 00000000..bdf470aa
--- /dev/null
+++ b/src/q_nirna.hpp
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "angband.h"
+
+bool_ quest_nirnaeth_init_hook(int q_idx);
diff --git a/src/q_one.cc b/src/q_one.cc
index 8f1d16bf..1780b4d3 100644
--- a/src/q_one.cc
+++ b/src/q_one.cc
@@ -1,4 +1,4 @@
-#include "q_one.h"
+#include "q_one.hpp"
#include "cave.hpp"
#include "gods.hpp"
diff --git a/src/q_one.h b/src/q_one.h
deleted file mode 100644
index 3b0313a7..00000000
--- a/src/q_one.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "angband.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-bool_ quest_one_init_hook(int q_idx);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/q_one.hpp b/src/q_one.hpp
new file mode 100644
index 00000000..1bd6ddf6
--- /dev/null
+++ b/src/q_one.hpp
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "angband.h"
+
+bool_ quest_one_init_hook(int q_idx);
diff --git a/src/q_poison.cc b/src/q_poison.cc
index 124894c2..7d709db5 100644
--- a/src/q_poison.cc
+++ b/src/q_poison.cc
@@ -1,4 +1,4 @@
-#include "q_poison.h"
+#include "q_poison.hpp"
#include "cave.hpp"
#include "quark.h"
diff --git a/src/q_poison.h b/src/q_poison.h
deleted file mode 100644
index 73fcd0e5..00000000
--- a/src/q_poison.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "angband.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-bool_ quest_poison_init_hook(int q_idx);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/q_poison.hpp b/src/q_poison.hpp
new file mode 100644
index 00000000..b38ae22c
--- /dev/null
+++ b/src/q_poison.hpp
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "angband.h"
+
+bool_ quest_poison_init_hook(int q_idx);
diff --git a/src/q_rand.cc b/src/q_rand.cc
index cfb76ff0..904fa5d4 100644
--- a/src/q_rand.cc
+++ b/src/q_rand.cc
@@ -1,4 +1,4 @@
-#include "q_rand.h"
+#include "q_rand.hpp"
#include "cave.hpp"
#include "generate.hpp"
diff --git a/src/q_rand.h b/src/q_rand.hpp
index 6d4e5eba..a86830f3 100644
--- a/src/q_rand.h
+++ b/src/q_rand.hpp
@@ -2,15 +2,7 @@
#include "angband.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
void initialize_random_quests(int n);
bool_ is_randhero(int level);
bool_ quest_random_init_hook(int q_idx);
bool_ quest_random_describe(FILE *fff);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/q_shroom.cc b/src/q_shroom.cc
index c22cbe56..5cef00c8 100644
--- a/src/q_shroom.cc
+++ b/src/q_shroom.cc
@@ -1,4 +1,4 @@
-#include "q_shroom.h"
+#include "q_shroom.hpp"
#include "cave.hpp"
#include "hooks.h"
diff --git a/src/q_shroom.h b/src/q_shroom.h
deleted file mode 100644
index bb47b12a..00000000
--- a/src/q_shroom.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "angband.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-bool_ quest_shroom_init_hook(int q_idx);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/q_shroom.hpp b/src/q_shroom.hpp
new file mode 100644
index 00000000..f35ba52c
--- /dev/null
+++ b/src/q_shroom.hpp
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "angband.h"
+
+bool_ quest_shroom_init_hook(int q_idx);
diff --git a/src/q_spider.cc b/src/q_spider.cc
index 0571ebc6..beddc16d 100644
--- a/src/q_spider.cc
+++ b/src/q_spider.cc
@@ -1,4 +1,4 @@
-#include "q_spider.h"
+#include "q_spider.hpp"
#include "cave.hpp"
#include "gods.hpp"
diff --git a/src/q_spider.h b/src/q_spider.h
deleted file mode 100644
index 2a4dab27..00000000
--- a/src/q_spider.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "angband.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-bool_ quest_spider_init_hook(int q_idx);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/q_spider.hpp b/src/q_spider.hpp
new file mode 100644
index 00000000..ac4cf5b8
--- /dev/null
+++ b/src/q_spider.hpp
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "angband.h"
+
+bool_ quest_spider_init_hook(int q_idx);
diff --git a/src/q_thief.cc b/src/q_thief.cc
index 896bd553..9ae23f8e 100644
--- a/src/q_thief.cc
+++ b/src/q_thief.cc
@@ -1,4 +1,4 @@
-#include "q_thief.h"
+#include "q_thief.hpp"
#include "cave.hpp"
#include "hooks.h"
diff --git a/src/q_thief.h b/src/q_thief.h
deleted file mode 100644
index 1962ee34..00000000
--- a/src/q_thief.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "angband.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-bool_ quest_thieves_init_hook(int q_idx);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/q_thief.hpp b/src/q_thief.hpp
new file mode 100644
index 00000000..57fdc79d
--- /dev/null
+++ b/src/q_thief.hpp
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "angband.h"
+
+bool_ quest_thieves_init_hook(int q_idx);
diff --git a/src/q_thrain.cc b/src/q_thrain.cc
index 8ddf3d1c..96d1d9bb 100644
--- a/src/q_thrain.cc
+++ b/src/q_thrain.cc
@@ -1,4 +1,4 @@
-#include "q_thrain.h"
+#include "q_thrain.hpp"
#include "cave.hpp"
#include "generate.hpp"
diff --git a/src/q_thrain.h b/src/q_thrain.hpp
index 04c85823..705e5968 100644
--- a/src/q_thrain.h
+++ b/src/q_thrain.hpp
@@ -2,12 +2,4 @@
#include "angband.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
extern bool_ quest_thrain_init_hook(int q_idx);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/q_troll.cc b/src/q_troll.cc
index 5c4ddaa2..0289d9e9 100644
--- a/src/q_troll.cc
+++ b/src/q_troll.cc
@@ -1,4 +1,4 @@
-#include "q_troll.h"
+#include "q_troll.hpp"
#include "cave.hpp"
#include "hooks.h"
diff --git a/src/q_troll.h b/src/q_troll.h
deleted file mode 100644
index 759baa86..00000000
--- a/src/q_troll.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "angband.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-bool_ quest_troll_init_hook(int q_idx);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/q_troll.hpp b/src/q_troll.hpp
new file mode 100644
index 00000000..a3b25994
--- /dev/null
+++ b/src/q_troll.hpp
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "angband.h"
+
+bool_ quest_troll_init_hook(int q_idx);
diff --git a/src/q_ultrae.cc b/src/q_ultrae.cc
index 44f54158..d42b9c6f 100644
--- a/src/q_ultrae.cc
+++ b/src/q_ultrae.cc
@@ -1,4 +1,4 @@
-#include "q_ultrae.h"
+#include "q_ultrae.hpp"
#define cquest (quest[QUEST_ULTRA_EVIL])
diff --git a/src/q_ultrae.h b/src/q_ultrae.h
deleted file mode 100644
index 3f97fcb3..00000000
--- a/src/q_ultrae.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "angband.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-bool_ quest_ultra_evil_init_hook(int q_idx);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/q_ultrae.hpp b/src/q_ultrae.hpp
new file mode 100644
index 00000000..1b6a0fb8
--- /dev/null
+++ b/src/q_ultrae.hpp
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "angband.h"
+
+bool_ quest_ultra_evil_init_hook(int q_idx);
diff --git a/src/q_ultrag.cc b/src/q_ultrag.cc
index 632c6bc3..d9af6f9f 100644
--- a/src/q_ultrag.cc
+++ b/src/q_ultrag.cc
@@ -1,4 +1,4 @@
-#include "q_ultrag.h"
+#include "q_ultrag.hpp"
#include "cave.hpp"
#include "hooks.h"
diff --git a/src/q_ultrag.h b/src/q_ultrag.h
deleted file mode 100644
index 09d9f80c..00000000
--- a/src/q_ultrag.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "angband.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-bool_ quest_ultra_good_init_hook(int q_idx);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/q_ultrag.hpp b/src/q_ultrag.hpp
new file mode 100644
index 00000000..ead1fdca
--- /dev/null
+++ b/src/q_ultrag.hpp
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "angband.h"
+
+bool_ quest_ultra_good_init_hook(int q_idx);
diff --git a/src/q_wight.cc b/src/q_wight.cc
index 7ac376eb..2fd72668 100644
--- a/src/q_wight.cc
+++ b/src/q_wight.cc
@@ -1,4 +1,4 @@
-#include "q_wight.h"
+#include "q_wight.hpp"
#include "cave.hpp"
#include "hooks.h"
diff --git a/src/q_wight.h b/src/q_wight.h
deleted file mode 100644
index 31b58882..00000000
--- a/src/q_wight.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "angband.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-bool_ quest_wight_init_hook(int q_idx);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/q_wight.hpp b/src/q_wight.hpp
new file mode 100644
index 00000000..eb0386b6
--- /dev/null
+++ b/src/q_wight.hpp
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "angband.h"
+
+bool_ quest_wight_init_hook(int q_idx);
diff --git a/src/q_wolves.cc b/src/q_wolves.cc
index 2585a449..b6f9d8e2 100644
--- a/src/q_wolves.cc
+++ b/src/q_wolves.cc
@@ -1,4 +1,4 @@
-#include "q_wolves.h"
+#include "q_wolves.hpp"
#include "cave.hpp"
#include "hooks.h"
diff --git a/src/q_wolves.h b/src/q_wolves.h
deleted file mode 100644
index f006716f..00000000
--- a/src/q_wolves.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "angband.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-bool_ quest_wolves_init_hook(int q_idx);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
diff --git a/src/q_wolves.hpp b/src/q_wolves.hpp
new file mode 100644
index 00000000..a8deba15
--- /dev/null
+++ b/src/q_wolves.hpp
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "angband.h"
+
+bool_ quest_wolves_init_hook(int q_idx);
diff --git a/src/script.cc b/src/script.cc
index 3f7e63c7..6b0f4ebd 100644
--- a/src/script.cc
+++ b/src/script.cc
@@ -10,7 +10,7 @@
#include "angband.h"
#include "init2.hpp"
-#include "q_library.h"
+#include "q_library.hpp"
#include "spells4.hpp"
#include "spells5.hpp"
#include "spells6.hpp"
diff --git a/src/tables.cc b/src/tables.cc
index c11bc60d..adb4ecf7 100644
--- a/src/tables.cc
+++ b/src/tables.cc
@@ -12,33 +12,33 @@
#include "angband.h"
#include "modules.hpp"
#include "options.hpp"
-#include "q_library.h"
-#include "q_fireprof.h"
-#include "q_bounty.h"
-#include "q_thrain.h"
-#include "q_narsil.h"
-#include "q_evil.h"
-#include "q_betwen.h"
-#include "q_haunted.h"
-#include "q_invas.h"
-#include "q_nirna.h"
-#include "q_eol.h"
-#include "q_god.h"
-#include "q_dragons.h"
-#include "q_poison.h"
-#include "q_spider.h"
-#include "q_wolves.h"
-#include "q_shroom.h"
-#include "q_nazgul.h"
-#include "q_wight.h"
-#include "q_troll.h"
-#include "q_hobbit.h"
-#include "q_thief.h"
-#include "q_ultrae.h"
-#include "q_ultrag.h"
-#include "q_one.h"
-#include "q_main.h"
-#include "q_rand.h"
+#include "q_library.hpp"
+#include "q_fireprof.hpp"
+#include "q_bounty.hpp"
+#include "q_thrain.hpp"
+#include "q_narsil.hpp"
+#include "q_evil.hpp"
+#include "q_betwen.hpp"
+#include "q_haunted.hpp"
+#include "q_invas.hpp"
+#include "q_nirna.hpp"
+#include "q_eol.hpp"
+#include "q_god.hpp"
+#include "q_dragons.hpp"
+#include "q_poison.hpp"
+#include "q_spider.hpp"
+#include "q_wolves.hpp"
+#include "q_shroom.hpp"
+#include "q_nazgul.hpp"
+#include "q_wight.hpp"
+#include "q_troll.hpp"
+#include "q_hobbit.hpp"
+#include "q_thief.hpp"
+#include "q_ultrae.hpp"
+#include "q_ultrag.hpp"
+#include "q_one.hpp"
+#include "q_main.hpp"
+#include "q_rand.hpp"
#include "variable.hpp"