diff --git a/cmake/KokkosComm_configuration.hpp.in b/cmake/KokkosComm_configuration.hpp.in
index 13e4c1b7..52ef637b 100644
--- a/cmake/KokkosComm_configuration.hpp.in
+++ b/cmake/KokkosComm_configuration.hpp.in
@@ -20,7 +20,11 @@
 #define KOKKOSCOMM_VERSION_MINOR @KOKKOSCOMM_VERSION_MINOR@
 #define KOKKOSCOMM_VERSION_PATCH @KOKKOSCOMM_VERSION_PATCH@
 
-#cmakedefine KOKKOSCOMM_ENABLE_MDSPAN
-#cmakedefine KOKKOSCOMM_USE_STD_MDSPAN
-#cmakedefine  KOKKOSCOMM_USE_KOKKOS_MDSPAN
-#cmakedefine KOKKOSCOMM_MDSPAN_IN_EXPERIMENTAL
+#cmakedefine01 KOKKOSCOMM_ENABLE_MDSPAN
+#if KOKKOSCOMM_ENABLE_MDSPAN
+#  cmakedefine01 KOKKOSCOMM_USE_STD_MDSPAN
+#  cmakedefine01  KOKKOSCOMM_USE_KOKKOS_MDSPAN
+#  if KOKKOSCOMM_USE_KOKKOS_MDSPAN
+#    define  KOKKOSCOMM_MDSPAN_IN_EXPERIMENTAL 1
+#  endif // KOKKOSCOMM_USE_KOKKOS_MDSPAN
+#endif // KOKKOSCOMM_ENABLE_MDSPAN
diff --git a/src/KokkosComm_traits.hpp b/src/KokkosComm_traits.hpp
index 565ff631..c194aedd 100644
--- a/src/KokkosComm_traits.hpp
+++ b/src/KokkosComm_traits.hpp
@@ -104,7 +104,7 @@ struct Traits<Span> {
   }
 
   template <typename ExecSpace>
-  static void pack(const ExecSpace &space, non_const_packed_view_type &dst,
+  static void pack(const ExecSpace &, non_const_packed_view_type &dst,
                    const Span &src) {
     using md_index = std::array<typename Span::index_type, rank()>;
 
@@ -143,7 +143,7 @@ struct Traits<Span> {
   }
 
   template <typename ExecSpace>
-  static void unpack(const ExecSpace &space, Span &dst,
+  static void unpack(const ExecSpace &, Span &dst,
                      const non_const_packed_view_type &src) {
     using md_index = std::array<typename Span::index_type, rank()>;
 
diff --git a/unit_tests/test_isendrecv.cpp b/unit_tests/test_isendrecv.cpp
index 709acf0a..82be1374 100644
--- a/unit_tests/test_isendrecv.cpp
+++ b/unit_tests/test_isendrecv.cpp
@@ -14,6 +14,10 @@
 //
 //@HEADER
 
+#include <gtest/gtest.h>
+
+#include "KokkosComm.hpp"
+
 #if KOKKOSCOMM_ENABLE_MDSPAN
 #if KOKKOSCOMM_MDSPAN_IN_EXPERIMENTAL
 #include <experimental/mdspan>
@@ -29,10 +33,6 @@ using std::MDSPAN_PREFIX() layout_stride;
 using std::MDSPAN_PREFIX() mdspan;
 #endif  // KOKKOSCOMM_ENABLE_MDSPAN
 
-#include <gtest/gtest.h>
-
-#include "KokkosComm.hpp"
-
 template <typename T>
 class IsendRecv : public testing::Test {
  public: