diff --git a/RcppTskit/R/RcppExports.R b/RcppTskit/R/RcppExports.R
index ca4ef06..ac3b830 100644
--- a/RcppTskit/R/RcppExports.R
+++ b/RcppTskit/R/RcppExports.R
@@ -1,7 +1,7 @@
 # Generated by using Rcpp::compileAttributes() -> do not edit by hand
 # Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
 
-#' @title Report the version of the installed kastore C API
+#' @title Report the version of installed kastore C API
 #' @details The version is stored in the installed header \code{kastore.h}.
 #' @return A named vector with three elements \code{major}, \code{minor}, and
 #'   \code{patch}.
@@ -12,7 +12,7 @@ kastore_version <- function() {
     .Call(`_RcppTskit_kastore_version`)
 }
 
-#' @title Report the version of the installed tskit C API
+#' @title Report the version of installed tskit C API
 #' @details The version is defined in the installed header \code{tskit/core.h}.
 #' @return A named vector with three elements \code{major}, \code{minor}, and
 #'   \code{patch}.
@@ -110,3 +110,4 @@ test_tsk_trace_error_c <- function() {
 test_tsk_trace_error_cpp <- function() {
     invisible(.Call(`_RcppTskit_test_tsk_trace_error_cpp`))
 }
+
diff --git a/RcppTskit/man/kastore_version.Rd b/RcppTskit/man/kastore_version.Rd
index a9b700a..bb13d33 100644
--- a/RcppTskit/man/kastore_version.Rd
+++ b/RcppTskit/man/kastore_version.Rd
@@ -2,7 +2,7 @@
 % Please edit documentation in R/RcppExports.R
 \name{kastore_version}
 \alias{kastore_version}
-\title{Report the version of the installed kastore C API}
+\title{Report the version of installed kastore C API}
 \usage{
 kastore_version()
 }
@@ -11,7 +11,7 @@ A named vector with three elements \code{major}, \code{minor}, and
   \code{patch}.
 }
 \description{
-Report the version of the installed kastore C API
+Report the version of installed kastore C API
 }
 \details{
 The version is stored in the installed header \code{kastore.h}.
diff --git a/RcppTskit/man/tskit_version.Rd b/RcppTskit/man/tskit_version.Rd
index 66482d6..5c8737f 100644
--- a/RcppTskit/man/tskit_version.Rd
+++ b/RcppTskit/man/tskit_version.Rd
@@ -2,7 +2,7 @@
 % Please edit documentation in R/RcppExports.R
 \name{tskit_version}
 \alias{tskit_version}
-\title{Report the version of the installed tskit C API}
+\title{Report the version of installed tskit C API}
 \usage{
 tskit_version()
 }
@@ -11,7 +11,7 @@ A named vector with three elements \code{major}, \code{minor}, and
   \code{patch}.
 }
 \description{
-Report the version of the installed tskit C API
+Report the version of installed tskit C API
 }
 \details{
 The version is defined in the installed header \code{tskit/core.h}.
diff --git a/RcppTskit/src/Makevars.in b/RcppTskit/src/Makevars.in
index 26c3fae..4355bf1 100644
--- a/RcppTskit/src/Makevars.in
+++ b/RcppTskit/src/Makevars.in
@@ -32,12 +32,12 @@ OBJECTS = $(TSKIT_OBJECTS) $(RCPPTSKIT_OBJECTS)
 
 # Include paths and preprocessor defines
 # * A bit complicated include/tskit structure due to how we include tskit headers
-# * $(R_HOME)/include is for <R_ext/Error.h>
+# * $(R_INCLUDE_DIR) is for <R_ext/Error.h>
 PKG_CPPFLAGS = \
 	-I../inst/include \
 	-I../inst/include/tskit \
 	-I../inst/include/tskit/tskit \
-	-I$(R_HOME)/include
+	-I$(R_INCLUDE_DIR)
 
 # Compiler flags
 PKG_CFLAGS = -DNDEBUG # to remove calls to assert() as per the R extensions manual
@@ -46,7 +46,7 @@ PKG_CFLAGS = -DNDEBUG # to remove calls to assert() as per the R extensions manu
 
 # Explicit compile rule for tskit C files
 tskit/%.o: tskit/%.c
-	$(CC) $(PKG_CPPFLAGS) $(PKG_CFLAGS) $(CFLAGS) $(CPICFLAGS) -c $< -o $@
+	$(CC) $(ALL_CPPFLAGS) $(PKG_CFLAGS) $(CFLAGS) $(CPICFLAGS) -c $< -o $@
 
 # Linking
 PKG_LIBS = @RCPPTSKIT_LIB@