diff --git a/cpp11test/R/cpp11.R b/cpp11test/R/cpp11.R
index 038e7b76..2ef90804 100644
--- a/cpp11test/R/cpp11.R
+++ b/cpp11test/R/cpp11.R
@@ -156,6 +156,34 @@ rcpp_release_ <- function(n) {
   invisible(.Call(`_cpp11test_rcpp_release_`, n))
 }
 
+notroxcpp1_ <- function(x) {
+  .Call(`_cpp11test_notroxcpp1_`, x)
+}
+
+roxcpp2_ <- function(x) {
+  .Call(`_cpp11test_roxcpp2_`, x)
+}
+
+roxcpp3_ <- function(x) {
+  .Call(`_cpp11test_roxcpp3_`, x)
+}
+
+roxcpp4_ <- function(x) {
+  .Call(`_cpp11test_roxcpp4_`, x)
+}
+
+roxcpp5_ <- function(x) {
+  .Call(`_cpp11test_roxcpp5_`, x)
+}
+
+notroxcpp6_ <- function(x) {
+  .Call(`_cpp11test_notroxcpp6_`, x)
+}
+
+roxcpp7_ <- function(x) {
+  .Call(`_cpp11test_roxcpp7_`, x)
+}
+
 cpp11_safe_ <- function(x_sxp) {
   .Call(`_cpp11test_cpp11_safe_`, x_sxp)
 }
@@ -168,6 +196,26 @@ string_push_back_ <- function() {
   .Call(`_cpp11test_string_push_back_`)
 }
 
+grow_strings_cpp11_ <- function(n, seed) {
+  .Call(`_cpp11test_grow_strings_cpp11_`, n, seed)
+}
+
+grow_strings_rcpp_ <- function(n, seed) {
+  .Call(`_cpp11test_grow_strings_rcpp_`, n, seed)
+}
+
+grow_strings_manual_ <- function(n, seed) {
+  .Call(`_cpp11test_grow_strings_manual_`, n, seed)
+}
+
+assign_cpp11_ <- function(n, seed) {
+  .Call(`_cpp11test_assign_cpp11_`, n, seed)
+}
+
+assign_rcpp_ <- function(n, seed) {
+  .Call(`_cpp11test_assign_rcpp_`, n, seed)
+}
+
 sum_dbl_for_ <- function(x) {
   .Call(`_cpp11test_sum_dbl_for_`, x)
 }
@@ -236,6 +284,14 @@ rcpp_push_and_truncate_ <- function(size_sxp) {
   .Call(`_cpp11test_rcpp_push_and_truncate_`, size_sxp)
 }
 
+nullable_extptr_1 <- function() {
+  .Call(`_cpp11test_nullable_extptr_1`)
+}
+
+nullable_extptr_2 <- function() {
+  .Call(`_cpp11test_nullable_extptr_2`)
+}
+
 test_destruction_inner <- function() {
   invisible(.Call(`_cpp11test_test_destruction_inner`))
 }
diff --git a/cpp11test/man/roxcpp2_.Rd b/cpp11test/man/roxcpp2_.Rd
new file mode 100644
index 00000000..dd000a0f
--- /dev/null
+++ b/cpp11test/man/roxcpp2_.Rd
@@ -0,0 +1,17 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/cpp11.R
+\name{roxcpp2_}
+\alias{roxcpp2_}
+\title{Roxygenise C++ function II}
+\usage{
+roxcpp2_(x)
+}
+\arguments{
+\item{x}{numeric value}
+}
+\description{
+Dummy function to test roxygen2. It adds 2.0 to a double.
+}
+\examples{
+roxcpp2_(1.0)
+}
diff --git a/cpp11test/man/roxcpp3_.Rd b/cpp11test/man/roxcpp3_.Rd
new file mode 100644
index 00000000..3d31d143
--- /dev/null
+++ b/cpp11test/man/roxcpp3_.Rd
@@ -0,0 +1,17 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/cpp11.R
+\name{roxcpp3_}
+\alias{roxcpp3_}
+\title{Roxygenise C++ function III}
+\usage{
+roxcpp3_(x)
+}
+\arguments{
+\item{x}{numeric value}
+}
+\description{
+Dummy function to test roxygen2. It adds 3.0 to a double.
+}
+\examples{
+roxcpp3_(1.0)
+}
diff --git a/cpp11test/man/roxcpp4_.Rd b/cpp11test/man/roxcpp4_.Rd
new file mode 100644
index 00000000..f9cbb022
--- /dev/null
+++ b/cpp11test/man/roxcpp4_.Rd
@@ -0,0 +1,17 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/cpp11.R
+\name{roxcpp4_}
+\alias{roxcpp4_}
+\title{Roxygenise C++ function IV}
+\usage{
+roxcpp4_(x)
+}
+\arguments{
+\item{x}{numeric value}
+}
+\description{
+Dummy function to test roxygen2. It adds 4.0 to a double.
+}
+\examples{
+roxcpp4_(1.0)
+}
diff --git a/cpp11test/man/roxcpp5_.Rd b/cpp11test/man/roxcpp5_.Rd
new file mode 100644
index 00000000..ada8f9ee
--- /dev/null
+++ b/cpp11test/man/roxcpp5_.Rd
@@ -0,0 +1,17 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/cpp11.R
+\name{roxcpp5_}
+\alias{roxcpp5_}
+\title{Roxygenise C++ function V}
+\usage{
+roxcpp5_(x)
+}
+\arguments{
+\item{x}{numeric value}
+}
+\description{
+Dummy function to test roxygen2. It adds 5.0 to a double.
+}
+\examples{
+roxcpp5_(1.0)
+}
diff --git a/cpp11test/man/roxcpp7_.Rd b/cpp11test/man/roxcpp7_.Rd
new file mode 100644
index 00000000..17466bf6
--- /dev/null
+++ b/cpp11test/man/roxcpp7_.Rd
@@ -0,0 +1,22 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/cpp11.R
+\name{roxcpp7_}
+\alias{roxcpp7_}
+\title{Roxygenise C++ function VII}
+\usage{
+roxcpp7_(x)
+}
+\arguments{
+\item{x}{numeric value}
+}
+\description{
+Dummy function to test roxygen2. It adds 7.0 to a double.
+}
+\examples{
+my_fun <- function(x) {
+  roxcpp7_(x)
+}
+}
+\seealso{
+\code{\link{roxcpp1_}}
+}
diff --git a/cpp11test/src/roxygen1.cpp b/cpp11test/src/roxygen1.cpp
new file mode 100644
index 00000000..6ce5dea8
--- /dev/null
+++ b/cpp11test/src/roxygen1.cpp
@@ -0,0 +1,22 @@
+#include "cpp11/doubles.hpp"
+using namespace cpp11;
+
+// Test: not documented + documented
+
+// Not Roxygenised C++ function I
+[[cpp11::register]] double notroxcpp1_(double x) {
+  double y = x + 1.0;
+  return y;
+}
+
+/* roxygen start
+@title Roxygenise C++ function II
+@param x numeric value
+@description Dummy function to test roxygen2. It adds 2.0 to a double.
+@export
+@examples roxcpp2_(1.0)
+roxygen end */
+[[cpp11::register]] double roxcpp2_(double x) {
+  double y = x + 2.0;
+  return y;
+}
diff --git a/cpp11test/src/roxygen2.cpp b/cpp11test/src/roxygen2.cpp
new file mode 100644
index 00000000..ecd50221
--- /dev/null
+++ b/cpp11test/src/roxygen2.cpp
@@ -0,0 +1,28 @@
+#include "cpp11/doubles.hpp"
+using namespace cpp11;
+
+// Test: documented + documented
+
+/* roxygen start
+@title Roxygenise C++ function III
+@param x numeric value
+@description Dummy function to test roxygen2. It adds 3.0 to a double.
+@export
+@examples roxcpp3_(1.0)
+roxygen end */
+[[cpp11::register]] double roxcpp3_(double x) {
+  double y = x + 3.0;
+  return y;
+}
+
+/* roxygen start
+@title Roxygenise C++ function IV
+@param x numeric value
+@description Dummy function to test roxygen2. It adds 4.0 to a double.
+@export
+@examples roxcpp4_(1.0)
+roxygen end */
+[[cpp11::register]] double roxcpp4_(double x) {
+  double y = x + 4.0;
+  return y;
+}
diff --git a/cpp11test/src/roxygen3.cpp b/cpp11test/src/roxygen3.cpp
new file mode 100644
index 00000000..7ede7a08
--- /dev/null
+++ b/cpp11test/src/roxygen3.cpp
@@ -0,0 +1,38 @@
+#include "cpp11/doubles.hpp"
+using namespace cpp11;
+
+// Test: documented + not documented + documented
+
+/* roxygen start
+@title Roxygenise C++ function V
+@param x numeric value
+@description Dummy function to test roxygen2. It adds 5.0 to a double.
+@export
+@examples roxcpp5_(1.0)
+roxygen end */
+[[cpp11::register]] double roxcpp5_(double x) {
+  double y = x + 5.0;
+  return y;
+}
+
+// Not Roxygenised C++ function VI
+[[cpp11::register]] double notroxcpp6_(double x) {
+  double y = x + 6.0;
+  return y;
+}
+
+/* roxygen start
+@title Roxygenise C++ function VII
+@param x numeric value
+@description Dummy function to test roxygen2. It adds 7.0 to a double.
+@export
+@examples
+my_fun <- function(x) {
+  roxcpp7_(x)
+}
+@seealso \code{\link{roxcpp1_}}
+roxygen end */
+[[cpp11::register]] double roxcpp7_(double x) {
+  double y = x + 7.0;
+  return y;
+}