summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/hiscore.h7
-rw-r--r--src/messages.h11
-rw-r--r--src/quark.h7
-rw-r--r--src/spell_type.h2
4 files changed, 13 insertions, 14 deletions
diff --git a/src/hiscore.h b/src/hiscore.h
index 0eed91b4..c74525a1 100644
--- a/src/hiscore.h
+++ b/src/hiscore.h
@@ -1,7 +1,6 @@
-#ifndef H_267bf1c1_eada_4b18_9558_d96330fa7258
-#define H_267bf1c1_eada_4b18_9558_d96330fa7258
+#pragma once
-#include "h-type.h"
+#include "h-basic.h"
#ifdef __cplusplus
extern "C" {
@@ -85,5 +84,3 @@ int highscore_add(int highscore_fd, high_score *score);
#ifdef __cplusplus
} // extern "C"
#endif
-
-#endif
diff --git a/src/messages.h b/src/messages.h
index 401c5727..0e9e2d14 100644
--- a/src/messages.h
+++ b/src/messages.h
@@ -1,7 +1,10 @@
-#ifndef H_f6dac2dc_0449_4764_9942_1c1fe7a70bc4
-#define H_f6dac2dc_0449_4764_9942_1c1fe7a70bc4
+#pragma once
-#include "h-type.h"
+#include "h-basic.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
void message_init();
s16b message_num();
@@ -10,4 +13,6 @@ 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/quark.h b/src/quark.h
index 9488b105..1eec6eae 100644
--- a/src/quark.h
+++ b/src/quark.h
@@ -1,7 +1,6 @@
-#ifndef H_eeb941c7_1a44_405a_8db3_ba14732c5b94
-#define H_eeb941c7_1a44_405a_8db3_ba14732c5b94
+#pragma once
-#include "h-type.h"
+#include "h-basic.h"
#ifdef __cplusplus
extern "C" {
@@ -14,5 +13,3 @@ s16b quark_add(cptr str);
#ifdef __cplusplus
} // extern "C"
#endif
-
-#endif
diff --git a/src/spell_type.h b/src/spell_type.h
index 7f985bca..48d52ef0 100644
--- a/src/spell_type.h
+++ b/src/spell_type.h
@@ -2,7 +2,7 @@
#include "spell_type_fwd.h"
-#include "h-type.h"
+#include "h-basic.h"
#include "types_fwd.h"
#include "device_allocation_fwd.h"
#include "range_fwd.h"