diff --git a/DESCRIPTION b/DESCRIPTION
index 0278147c..461605f2 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,12 +1,13 @@
 Package: cpp11
 Title: A C++11 Interface for R's C Interface
-Version: 0.5.0.9000
+Version: 0.5.1
 Authors@R:
     c(
       person("Davis", "Vaughan", email = "davis@posit.co", role = c("aut", "cre"), comment = c(ORCID = "0000-0003-4777-038X")),
       person("Jim","Hester", role = "aut", comment = c(ORCID = "0000-0002-2739-7082")),
       person("Romain", "François", role = "aut", comment = c(ORCID = "0000-0002-2444-4226")),
       person("Benjamin", "Kietzman", role = "ctb"),
+      person("Mauricio", "Vargas Sepulveda", role = "ctb", comment = c(ORCID = "0000-0003-1017-7574")),
       person("Posit Software, PBC", role = c("cph", "fnd"))
     )
 Description: Provides a header only, C++11 interface to R's C
@@ -55,4 +56,4 @@ Config/Needs/cpp11/cpp_register:
     vctrs
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
diff --git a/NEWS.md b/NEWS.md
index be8a47cc..eced916d 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,10 @@
 # cpp11 (development version)
 
+# cpp11 0.5.1
+
+* Conditionally uses `R_NO_REMAP` and `STRICT_R_HEADERS` to avoid the 
+  warning `macro redefined [-Wmacro-redefined]` on clang19 (#403).
+
 # cpp11 0.5.0
 
 ## R non-API related changes
diff --git a/inst/include/cpp11/R.hpp b/inst/include/cpp11/R.hpp
index 769f8304..5fc7ebd2 100644
--- a/inst/include/cpp11/R.hpp
+++ b/inst/include/cpp11/R.hpp
@@ -8,8 +8,14 @@
 #endif
 #endif
 
+#ifndef R_NO_REMAP
 #define R_NO_REMAP
+#endif
+
+#ifndef STRICT_R_HEADERS
 #define STRICT_R_HEADERS
+#endif
+
 #include "R_ext/Boolean.h"
 #include "Rinternals.h"
 #include "Rversion.h"
diff --git a/man/cpp11-package.Rd b/man/cpp11-package.Rd
index 36477150..6315e6fe 100644
--- a/man/cpp11-package.Rd
+++ b/man/cpp11-package.Rd
@@ -29,6 +29,7 @@ Authors:
 Other contributors:
 \itemize{
   \item Benjamin Kietzman [contributor]
+  \item Mauricio Vargas Sepulveda (\href{https://orcid.org/0000-0003-1017-7574}{ORCID}) [contributor]
   \item Posit Software, PBC [copyright holder, funder]
 }