diff --git a/include/boost/optional/optional.hpp b/include/boost/optional/optional.hpp
index 062a86f..603facd 100644
--- a/include/boost/optional/optional.hpp
+++ b/include/boost/optional/optional.hpp
@@ -63,8 +63,7 @@
 #define BOOST_OPTIONAL_WEAK_OVERLOAD_RESOLUTION
 #endif
 
-#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) > 302 \
-    && !defined(__INTEL_COMPILER)
+#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
 // GCC since 3.3 has may_alias attribute that helps to alleviate optimizer issues with
 // regard to violation of the strict aliasing rules. The optional< T > storage type is marked
 // with this attribute in order to let the compiler know that it will alias objects of type T
diff --git a/include/boost/optional/optional_io.hpp b/include/boost/optional/optional_io.hpp
index a0ad4cf..4c1c610 100644
--- a/include/boost/optional/optional_io.hpp
+++ b/include/boost/optional/optional_io.hpp
@@ -12,18 +12,8 @@
 #ifndef BOOST_OPTIONAL_OPTIONAL_IO_FLC_19NOV2002_HPP
 #define BOOST_OPTIONAL_OPTIONAL_IO_FLC_19NOV2002_HPP
 
-#if defined __GNUC__
-#  if (__GNUC__ == 2 && __GNUC_MINOR__ <= 97)
-#    define BOOST_OPTIONAL_NO_TEMPLATED_STREAMS
-#  endif
-#endif // __GNUC__
-
-#if defined BOOST_OPTIONAL_NO_TEMPLATED_STREAMS
-#  include <iostream>
-#else
-#  include <istream>
-#  include <ostream>
-#endif
+#include <istream>
+#include <ostream>
 
 #include <boost/none.hpp>
 #include <boost/assert.hpp>