diff --git a/include/CLI/Macros.hpp b/include/CLI/Macros.hpp
index 21d584ea..9c10b081 100644
--- a/include/CLI/Macros.hpp
+++ b/include/CLI/Macros.hpp
@@ -35,6 +35,8 @@ namespace CLI {
 
 #if defined(PYBIND11_CPP14)
 #define CLI11_DEPRECATED(reason) [[deprecated(reason)]]
+#elif defined(_MSC_VER)
+#define CLI11_DEPRECATED(reason) __declspec(deprecated(reason))
 #else
 #define CLI11_DEPRECATED(reason) __attribute__((deprecated(reason)))
 #endif
diff --git a/include/CLI/Option.hpp b/include/CLI/Option.hpp
index 9b8ea03c..6985308a 100644
--- a/include/CLI/Option.hpp
+++ b/include/CLI/Option.hpp
@@ -306,14 +306,17 @@ class Option : public OptionBase<Option> {
     Option *requires(Option *opt) { return needs(opt); }
 
     /// Can find a string if needed \deprecated
-    CLI11_DEPRECATED("Use needs instead of requires (eventual keyword clash)")
-    template <typename T = App> Option *requires(std::string opt_name) { return needs<T>(opt_name); }
+    template <typename T = App> Option *requires(std::string opt_name) {
+        for(const Option_p &opt : dynamic_cast<T *>(parent_)->options_)
+            if(opt.get() != this && opt->check_name(opt_name))
+                return requires(opt.get());
+        throw IncorrectConstruction::MissingOption(opt_name);
+    }
 
     /// Any number supported, any mix of string and Opt \deprecated
-    CLI11_DEPRECATED("Use needs instead of requires (eventual keyword clash)")
     template <typename A, typename B, typename... ARG> Option *requires(A opt, B opt1, ARG... args) {
-        needs(opt);
-        return needs(opt1, args...);
+        requires(opt);
+        return requires(opt1, args...);
     }
 #endif
 
diff --git a/tests/OptionalTest.cpp b/tests/OptionalTest.cpp
index c38a3cac..d1a26c27 100644
--- a/tests/OptionalTest.cpp
+++ b/tests/OptionalTest.cpp
@@ -2,11 +2,11 @@
 #include <iostream>
 
 #ifdef __has_include
-#if __has_include(<optional>)
+#if defined(CLI11_CPP17) && __has_include(<optional>)
 #include <optional>
 #define have_optional 1
 using std::experimental::optional;
-#elif __has_include(<experimental/optional>)
+#elif defined(CPP11_CPP14) && __has_include(<experimental/optional>)
 #include <experimental/optional>
 #define have_optional 1
 using std::optional;