diff --git a/src/optional.cpp b/src/optional.cpp
index 8c5dd76..f2fbfdf 100644
--- a/src/optional.cpp
+++ b/src/optional.cpp
@@ -7,18 +7,18 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "optional"
 #include "experimental/optional"
 
-_LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL
-
-#ifdef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-
-bad_optional_access::~bad_optional_access() _NOEXCEPT {}
-
-#else
+namespace std
+{
 
 bad_optional_access::~bad_optional_access() _NOEXCEPT = default;
 
-#endif
+} // std
+
+_LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL
+
+bad_optional_access::~bad_optional_access() _NOEXCEPT = default;
 
 _LIBCPP_END_NAMESPACE_EXPERIMENTAL