diff --git a/DESCRIPTION b/DESCRIPTION
index cbc9c92..88fc9b2 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -32,7 +32,9 @@ Suggests:
     rmarkdown,
     purrr,
     tidyr,
-    cowplot
+    cowplot,
+    pc,
+    infoxtr
 VignetteBuilder: knitr
 Config/roxygen2/markdown: TRUE
 Config/roxygen2/version: 8.0.0
diff --git a/src/Makevars b/src/Makevars
index 6dfdb23..848303b 100644
--- a/src/Makevars
+++ b/src/Makevars
@@ -4,6 +4,6 @@
 
 #PKG_LIBS = `"$(R_HOME)/bin/Rscript" -e "RcppThread::LdFlags()"`
 
-PKG_CXXFLAGS = -DARMA_USE_CURRENT
-PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) \
+PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
+PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) \
            `"$(R_HOME)/bin/Rscript" -e "RcppThread::LdFlags()"`
diff --git a/src/Makevars.win b/src/Makevars.win
index 6dfdb23..848303b 100644
--- a/src/Makevars.win
+++ b/src/Makevars.win
@@ -4,6 +4,6 @@
 
 #PKG_LIBS = `"$(R_HOME)/bin/Rscript" -e "RcppThread::LdFlags()"`
 
-PKG_CXXFLAGS = -DARMA_USE_CURRENT
-PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) \
+PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
+PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) \
            `"$(R_HOME)/bin/Rscript" -e "RcppThread::LdFlags()"`