diff --git a/wpiutil/src/main/native/include/wpi/ArrayRef.h b/wpiutil/src/main/native/include/wpi/ArrayRef.h
index 3aa8e4179e..754d0d3403 100644
--- a/wpiutil/src/main/native/include/wpi/ArrayRef.h
+++ b/wpiutil/src/main/native/include/wpi/ArrayRef.h
@@ -25,7 +25,7 @@
 #include <optional>
 #include <type_traits>
 #include <vector>
-#if __has_include(<span>)
+#if __cplusplus >= 202002L && __has_include(<span>)
 #include <span>
 #endif
 
diff --git a/wpiutil/src/main/native/include/wpi/span.h b/wpiutil/src/main/native/include/wpi/span.h
index 479b98d9d2..cf71d79f80 100644
--- a/wpiutil/src/main/native/include/wpi/span.h
+++ b/wpiutil/src/main/native/include/wpi/span.h
@@ -17,7 +17,7 @@ http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2019/n4820.pdf
 #include <cstddef>
 #include <cstdint>
 #include <type_traits>
-#if __has_include(<span>)
+#if __cplusplus >= 202002L && __has_include(<span>)
 #include <span>
 #endif