diff --git a/embed.fnc b/embed.fnc
index 85e3cd2647..fe280c1fef 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -4203,7 +4203,7 @@ Mp	|bool	|do_exec	|NN const char *cmd
 p	|bool	|do_exec	|NN const char *cmd
 #endif
 #if defined(PERL_DONT_CREATE_GVSV)
-Admp	|GV *	|gv_SVadd	|NULLOK GV *gv
+AMbdp	|GV *	|gv_SVadd	|NULLOK GV *gv
 #endif
 #if defined(PERL_IMPLICIT_SYS)
 CTo	|PerlInterpreter *|perl_alloc_using				\
diff --git a/embed.h b/embed.h
index ed7681926e..76ffbbf875 100644
--- a/embed.h
+++ b/embed.h
@@ -2060,9 +2060,6 @@
 #   define finalize_optree(a)                   Perl_finalize_optree(aTHX_ a)
 #   define optimize_optree(a)                   Perl_optimize_optree(aTHX_ a)
 # endif
-# if defined(PERL_DONT_CREATE_GVSV)
-#   define gv_SVadd(a)                          Perl_gv_SVadd(aTHX,a)
-# endif
 # if !defined(PERL_IMPLICIT_SYS)
 #   define my_pclose(a)                         Perl_my_pclose(aTHX_ a)
 #   define my_popen(a,b)                        Perl_my_popen(aTHX_ a,b)
diff --git a/gv.h b/gv.h
index 866f0b783e..4b13e7df26 100644
--- a/gv.h
+++ b/gv.h
@@ -346,7 +346,7 @@ Make sure there is a slot of the given type (AV, HV, IO, SV) in the GV C<gv>.
 #define gv_AVadd(gv) gv_add_by_type((gv), SVt_PVAV)
 #define gv_HVadd(gv) gv_add_by_type((gv), SVt_PVHV)
 #define gv_IOadd(gv) gv_add_by_type((gv), SVt_PVIO)
-#define Perl_gv_SVadd(mTHX, gv)  Perl_gv_add_by_type(aTHX_ (gv), SVt_NULL)
+#define gv_SVadd(gv) gv_add_by_type((gv), SVt_NULL)
 
 /*
  * ex: set ts=8 sts=4 sw=4 et:
diff --git a/mathoms.c b/mathoms.c
index 5d4de18505..694be13627 100644
--- a/mathoms.c
+++ b/mathoms.c
@@ -666,6 +666,14 @@ Perl_save_op(pTHX)
     save_op();
 }
 
+#ifdef PERL_DONT_CREATE_GVSV
+GV *
+Perl_gv_SVadd(pTHX_ GV *gv)
+{
+    return gv_SVadd(gv);
+}
+#endif
+
 GV *
 Perl_gv_AVadd(pTHX_ GV *gv)
 {
diff --git a/proto.h b/proto.h
index 5b26f952e9..021b2d6636 100644
--- a/proto.h
+++ b/proto.h
@@ -6149,6 +6149,12 @@ Perl_uvuni_to_utf8(pTHX_ U8 *d, UV uv)
 # define PERL_ARGS_ASSERT_UVUNI_TO_UTF8         \
         assert(d)
 
+# if defined(PERL_DONT_CREATE_GVSV)
+PERL_CALLCONV GV *
+Perl_gv_SVadd(pTHX_ GV *gv);
+#   define PERL_ARGS_ASSERT_GV_SVADD
+
+# endif
 # if defined(PERL_IN_MATHOMS_C) || defined(PERL_IN_OP_C) || \
      defined(PERL_IN_PERLY_C)   || defined(PERL_IN_TOKE_C)
 PERL_CALLCONV OP *
@@ -6270,11 +6276,6 @@ Perl_do_exec(pTHX_ const char *cmd)
 # define PERL_ARGS_ASSERT_DO_EXEC               \
         assert(cmd)
 
-#endif
-#if defined(PERL_DONT_CREATE_GVSV)
-/* PERL_CALLCONV GV *
-Perl_gv_SVadd(pTHX_ GV *gv); */
-
 #endif
 #if defined(PERL_IMPLICIT_SYS)
 PERL_CALLCONV PerlInterpreter *