diff --git a/include/boost/config/detail/suffix.hpp b/include/boost/config/detail/suffix.hpp
index d7c74aa4..1d6a9eac 100644
--- a/include/boost/config/detail/suffix.hpp
+++ b/include/boost/config/detail/suffix.hpp
@@ -1024,8 +1024,12 @@ namespace std{ using ::type_info; }
 #endif
 
 // This is a catch all case for obsolete compilers / std libs:
-#if !defined(__has_include) || !__has_include(<optional>)
+#if !defined(__has_include)
 #  define BOOST_NO_CXX17_HDR_OPTIONAL
+#else
+#if !__has_include(<optional>)
+#  define BOOST_NO_CXX17_HDR_OPTIONAL
+#endif
 #endif
 
 //