diff --git a/hv_func.h b/hv_func.h
index a4e70d52bc6e..e5a91bb0f239 100644
--- a/hv_func.h
+++ b/hv_func.h
@@ -6,8 +6,8 @@
  * If USE_HASH_SEED is defined, hash randomisation is done by default
  * (see also perl.c:perl_parse() and S_init_tls_and_interp() and util.c:get_hash_seed())
  */
-#ifndef PERL_SEEN_HV_FUNC_H_ /* compile once */
-#define PERL_SEEN_HV_FUNC_H_
+#ifndef PERL_HV_FUNC_H_ /* compile once */
+#define PERL_HV_FUNC_H_
 #include "hv_macro.h"
 
 #if !( 0 \
diff --git a/hv_macro.h b/hv_macro.h
index eba62131edd0..ffa245e4b62f 100644
--- a/hv_macro.h
+++ b/hv_macro.h
@@ -1,5 +1,5 @@
-#ifndef PERL_SEEN_HV_MACRO_H_ /* compile once */
-#define PERL_SEEN_HV_MACRO_H_
+#ifndef PERL_HV_MACRO_H_ /* compile once */
+#define PERL_HV_MACRO_H_
 
 #if IVSIZE == 8
 #define CAN64BITHASH
diff --git a/perl_inc_macro.h b/perl_inc_macro.h
index bfbba94a96c6..02984c9ac25e 100644
--- a/perl_inc_macro.h
+++ b/perl_inc_macro.h
@@ -17,10 +17,10 @@
 * - INCPUSH_PERL_OTHERLIBDIRS_ARCHONLY
 */
 
-#ifndef PERL_INC_MACROS_H
+#ifndef PERL_INC_MACRO_H
 
 /* protect against multiple inclusions */
-#define PERL_INC_MACROS_H 1
+#define PERL_INC_MACRO_H 1
 
 #ifdef APPLLIB_EXP
 #	define INCPUSH_APPLLIB_EXP  S_incpush_use_sep(aTHX_ STR_WITH_LEN(APPLLIB_EXP), \
diff --git a/regcomp_internal.h b/regcomp_internal.h
index 4f2c03a81d3e..06059f2a3e59 100644
--- a/regcomp_internal.h
+++ b/regcomp_internal.h
@@ -1,5 +1,5 @@
-#ifndef REGCOMP_INTERNAL_H
-#define REGCOMP_INTERNAL_H
+#ifndef PERL_REGCOMP_INTERNAL_H
+#define PERL_REGCOMP_INTERNAL_H
 #ifndef STATIC
 #define STATIC  static
 #endif
@@ -1216,4 +1216,4 @@ static const scan_data_t zero_scan_data = {
 #define REGNODE_STEP_OVER(ret,t1,t2) \
     NEXT_OFF(REGNODE_p(ret)) = ((sizeof(t1)+sizeof(t2))/sizeof(regnode))
 
-#endif /* REGCOMP_INTERNAL_H */
+#endif /* PERL_REGCOMP_INTERNAL_H */
diff --git a/sbox32_hash.h b/sbox32_hash.h
index b4744037da97..ce5d24641509 100644
--- a/sbox32_hash.h
+++ b/sbox32_hash.h
@@ -27,7 +27,7 @@
 #define SBOX32_WARN2(pat,v0,v1)
 #endif
 
-#ifndef PERL_SEEN_HV_FUNC_H_
+#ifndef PERL_HV_FUNC_H_
 #if !defined(U32) 
 #include <stdint.h>
 #define U32 uint32_t
diff --git a/zaphod32_hash.h b/zaphod32_hash.h
index 834d8cb3fd84..b49be33503eb 100644
--- a/zaphod32_hash.h
+++ b/zaphod32_hash.h
@@ -38,7 +38,7 @@
 #endif
 #endif
 
-#ifndef PERL_SEEN_HV_FUNC_H_
+#ifndef PERL_HV_FUNC_H_
 #if !defined(U64)
 #include <stdint.h>
 #define U64 uint64_t