diff --git a/RandBLAS/dense_skops.hh b/RandBLAS/dense_skops.hh
index 5bd01ab4..295d9a9c 100644
--- a/RandBLAS/dense_skops.hh
+++ b/RandBLAS/dense_skops.hh
@@ -41,7 +41,7 @@
 #include <string>
 #include <tuple>
 
-#include <math.h>
+#include <cmath>
 #include <typeinfo>
 
 
diff --git a/RandBLAS/random_gen.hh b/RandBLAS/random_gen.hh
index a964565f..3e5e19bc 100644
--- a/RandBLAS/random_gen.hh
+++ b/RandBLAS/random_gen.hh
@@ -37,7 +37,7 @@
 #if !defined(_GNU_SOURCE)
 #define _GNU_SOURCE
 #endif
-#include <math.h>
+#include <cmath>
 
 #if !defined(R123_NO_SINCOS) && defined(__APPLE__)
 /* MacOS X 10.10.5 (2015) doesn't have sincosf */
@@ -47,13 +47,13 @@
 
 #if R123_NO_SINCOS /* enable this if sincos and sincosf are not in the math library */
 R123_CUDA_DEVICE R123_STATIC_INLINE void sincosf(float x, float *s, float *c) {
-    *s = sinf(x);
-    *c = cosf(x);
+    *s = std::sinf(x);
+    *c = std::cosf(x);
 }
 
 R123_CUDA_DEVICE R123_STATIC_INLINE void sincos(double x, double *s, double *c) {
-    *s = sin(x);
-    *c = cos(x);
+    *s = std::sin(x);
+    *c = std::cos(x);
 }
 #endif /* sincos is not in the math library */
 
diff --git a/RandBLAS/skge.hh b/RandBLAS/skge.hh
index b13c86c6..5bc2ee89 100644
--- a/RandBLAS/skge.hh
+++ b/RandBLAS/skge.hh
@@ -39,7 +39,7 @@
 #include <stdexcept>
 #include <string>
 
-#include <math.h>
+#include <cmath>
 #include <typeinfo>
 
 
diff --git a/RandBLAS/skve.hh b/RandBLAS/skve.hh
index fcdcb806..b756899d 100644
--- a/RandBLAS/skve.hh
+++ b/RandBLAS/skve.hh
@@ -38,7 +38,7 @@
 #include <stdexcept>
 #include <string>
 
-#include <math.h>
+#include <cmath>
 #include <typeinfo>
 
 
diff --git a/examples/sparse-low-rank-approx/qrcp_matrixmarket.cc b/examples/sparse-low-rank-approx/qrcp_matrixmarket.cc
index 15ef89e8..fd96cb39 100644
--- a/examples/sparse-low-rank-approx/qrcp_matrixmarket.cc
+++ b/examples/sparse-low-rank-approx/qrcp_matrixmarket.cc
@@ -33,7 +33,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <iostream>
-#include <math.h>
+#include <cmath>
 #include <time.h>
 #include <stdlib.h>
 #include <chrono>
diff --git a/examples/sparse-low-rank-approx/svd_matrixmarket.cc b/examples/sparse-low-rank-approx/svd_matrixmarket.cc
index 71eaea90..35ee1f64 100644
--- a/examples/sparse-low-rank-approx/svd_matrixmarket.cc
+++ b/examples/sparse-low-rank-approx/svd_matrixmarket.cc
@@ -34,7 +34,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <iostream>
-#include <math.h>
+#include <cmath>
 #include <time.h>
 #include <stdlib.h>
 #include <chrono>
diff --git a/examples/sparse-low-rank-approx/svd_rank1_plus_noise.cc b/examples/sparse-low-rank-approx/svd_rank1_plus_noise.cc
index c0670679..85066519 100644
--- a/examples/sparse-low-rank-approx/svd_rank1_plus_noise.cc
+++ b/examples/sparse-low-rank-approx/svd_rank1_plus_noise.cc
@@ -34,7 +34,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <iostream>
-#include <math.h>
+#include <cmath>
 #include <time.h>
 #include <stdlib.h>
 #include <chrono>
diff --git a/examples/total-least-squares/tls_dense_skop.cc b/examples/total-least-squares/tls_dense_skop.cc
index 6b3f9349..811e82fc 100644
--- a/examples/total-least-squares/tls_dense_skop.cc
+++ b/examples/total-least-squares/tls_dense_skop.cc
@@ -35,7 +35,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <iostream>
-#include <math.h>
+#include <cmath>
 #include <time.h>
 #include <stdlib.h>
 #include <chrono>
diff --git a/examples/total-least-squares/tls_sparse_skop.cc b/examples/total-least-squares/tls_sparse_skop.cc
index 64aa44ae..5bcbf178 100644
--- a/examples/total-least-squares/tls_sparse_skop.cc
+++ b/examples/total-least-squares/tls_sparse_skop.cc
@@ -35,7 +35,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <iostream>
-#include <math.h>
+#include <cmath>
 #include <time.h>
 #include <stdlib.h>
 #include <chrono>
diff --git a/test/comparison.hh b/test/comparison.hh
index a02cf4a9..118c1909 100644
--- a/test/comparison.hh
+++ b/test/comparison.hh
@@ -31,7 +31,7 @@
 
 #include "RandBLAS.hh"
 #include <gtest/gtest.h>
-#include <math.h>
+#include <cmath>
 #include <cmath>
 #include <numeric>
 #include <iostream>
diff --git a/test/test_basic_rng/test_r123.cc b/test/test_basic_rng/test_r123.cc
index da17842d..b63a4ab8 100644
--- a/test/test_basic_rng/test_r123.cc
+++ b/test/test_basic_rng/test_r123.cc
@@ -37,7 +37,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
-#include <math.h>
+#include <cmath>
 
 #include <sstream>
 #include <iostream>
diff --git a/test/test_datastructures/test_sparseskop.cc b/test/test_datastructures/test_sparseskop.cc
index c94d32d9..e329bb7b 100644
--- a/test/test_datastructures/test_sparseskop.cc
+++ b/test/test_datastructures/test_sparseskop.cc
@@ -32,7 +32,7 @@
 #include <RandBLAS/util.hh>
 #include "test/comparison.hh"
 #include <gtest/gtest.h>
-#include <math.h>
+#include <cmath>
 
 using RandBLAS::RNGState;
 using RandBLAS::SignedInteger;