diff --git a/SDL2pp/Optional.hh b/SDL2pp/Optional.hh
index 3c647c8..137afd0 100644
--- a/SDL2pp/Optional.hh
+++ b/SDL2pp/Optional.hh
@@ -22,6 +22,25 @@
 #ifndef SDL2PP_OPTIONAL_HH
 #define SDL2PP_OPTIONAL_HH
 
+#include <SDL2pp/Config.hh>
+
+#if defined(SDL2PP_WITH_EXPERIMENTAL_OPTIONAL)
+
+#include <experimental/optional>
+
+namespace SDL2pp {
+
+template<typename T>
+using Optional = std::experimental::optional<T>;
+
+using BadOptionalAccess = std::experimental::bad_optional_access;
+
+constexpr std::experimental::nullopt_t NullOpt = std::experimental::nullopt;
+
+}
+
+#else
+
 #include <SDL2pp/external/libcpp_optional.hh>
 
 namespace SDL2pp {
@@ -36,3 +55,5 @@ constexpr sdl2pp_libcpp_optional::nullopt_t NullOpt = sdl2pp_libcpp_optional::nu
 }
 
 #endif
+
+#endif