diff --git a/batched/KokkosBatched_Util.hpp b/batched/KokkosBatched_Util.hpp
index 520427e8c6..1ee00fd267 100644
--- a/batched/KokkosBatched_Util.hpp
+++ b/batched/KokkosBatched_Util.hpp
@@ -98,7 +98,24 @@
 #endif
 
 #if defined(KOKKOSKERNELS_ENABLE_TPL_LAPACKE)
-#define __KOKKOSBATCHED_ENABLE_LAPACKE__ 1
+#define KOKKOSBATCHED_IMPL_ENABLE_LAPACKE 1
+#if defined(KOKKOS_COMPILER_MSVC)
+#define __KOKKOSBATCHED_ENABLE_LAPACKE__                                                      \
+  (                                                                                           \
+      __pragma(message("warning: __KOKKOSBATCHED_ENABLE_LAPACKE__ is deprecated and will be " \
+                       "removed in a future version")) KOKKOSBATCHED_IMPL_ENABLE_LAPACKE)
+#elif defined(KOKKOS_COMPILER_GNU) || defined(KOKKOS_COMPILER_CLANG)
+#define __KOKKOSBATCHED_ENABLE_LAPACKE__                                                    \
+  (__extension__({                                                                          \
+    _Pragma(                                                                                \
+        "\"__KOKKOSBATCHED_ENABLE_LAPACKE__ is deprecated and will be removed in a future " \
+        "version\"");                                                                       \
+    KOKKOSBATCHED_IMPL_ENABLE_LAPACKE;                                                      \
+  }))
+#else
+#define __KOKKOSBATCHED_ENABLE_LAPACKE__ KOKKOSBATCHED_IMPL_ENABLE_LAPACKE  // no good way to deprecate?
+#endif
+
 #include "lapacke.h"
 #endif
 
diff --git a/batched/dense/impl/KokkosBatched_Eigendecomposition_Serial_Internal.hpp b/batched/dense/impl/KokkosBatched_Eigendecomposition_Serial_Internal.hpp
index 62852f7872..9badd0a38b 100644
--- a/batched/dense/impl/KokkosBatched_Eigendecomposition_Serial_Internal.hpp
+++ b/batched/dense/impl/KokkosBatched_Eigendecomposition_Serial_Internal.hpp
@@ -338,7 +338,7 @@ struct SerialEigendecompositionInternal {
   inline static int host_invoke(const int m, RealType* A, const int as0, const int as1, RealType* er, const int ers,
                                 RealType* ei, const int eis, RealType* UL, const int uls0, const int uls1, RealType* UR,
                                 const int urs0, const int urs1, RealType* w, const int wlen) {
-#if defined(__KOKKOSBATCHED_ENABLE_LAPACKE__) || defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL)
+#if defined(KOKKOSBATCHED_IMPL_ENABLE_LAPACKE) || defined(KOKKOSBATCHED_IMPL_ENABLE_INTEL_MKL)
     int matrix_layout(0), lda(0), uls(0), urs(0);
     if (as0 == 1) {
       assert(uls0 == 1 && "UL is not column major");