diff --git a/cv.h b/cv.h
index 6b8f6486c7..d5d0ce4b26 100644
--- a/cv.h
+++ b/cv.h
@@ -12,7 +12,7 @@
 
 struct xpvcv {
     _XPV_HEAD;
-    _XPVCV_COMMON;
+    XPVCV_COMMON_;
 };
 
 /*
diff --git a/perl.h b/perl.h
index 41e1fc66c1..b5e2acca4c 100644
--- a/perl.h
+++ b/perl.h
@@ -4553,7 +4553,7 @@ struct Perl_OpDumpContext;
 /* defined in sv.c, but also used in [ach]v.c */
 #undef _XPV_HEAD
 #undef _XPVMG_HEAD
-#undef _XPVCV_COMMON
+#undef XPVCV_COMMON_
 
 #include "parser.h"
 
diff --git a/sv.h b/sv.h
index 11af19b7f3..cf8fcc7033 100644
--- a/sv.h
+++ b/sv.h
@@ -640,7 +640,7 @@ struct xpvgv {
 
 typedef U32 cv_flags_t;
 
-#define _XPVCV_COMMON								\
+#define XPVCV_COMMON_								\
     HV *	xcv_stash;							\
     union {									\
         OP *	xcv_start;							\
@@ -670,7 +670,7 @@ typedef U32 cv_flags_t;
 
 struct xpvfm {
     _XPV_HEAD;
-    _XPVCV_COMMON;
+    XPVCV_COMMON_;
 };