diff --git a/src/txmempool.h b/src/txmempool.h
index da9f993686..34536cd5b7 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -28,7 +28,6 @@
 #include <util/epochguard.h>
 #include <util/hasher.h>
 
-#include <boost/optional.hpp>
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/hashed_index.hpp>
 #include <boost/multi_index/ordered_index.hpp>
@@ -840,7 +839,7 @@ public:
         return m_epoch.visited(it->m_epoch_marker);
     }
 
-    bool visited(boost::optional<txiter> it) const EXCLUSIVE_LOCKS_REQUIRED(cs, m_epoch) {
+    bool visited(std::optional<txiter> it) const EXCLUSIVE_LOCKS_REQUIRED(cs, m_epoch) {
         assert(m_epoch.guarded());
         return !it || visited(*it);
     }
diff --git a/test/lint/lint-includes.sh b/test/lint/lint-includes.sh
index 4ffe5745b0..e3f13c624f 100755
--- a/test/lint/lint-includes.sh
+++ b/test/lint/lint-includes.sh
@@ -58,7 +58,6 @@ EXPECTED_BOOST_INCLUDES=(
     boost/multi_index/ordered_index.hpp
     boost/multi_index/sequenced_index.hpp
     boost/multi_index_container.hpp
-    boost/optional.hpp
     boost/pool/pool_alloc.hpp
     boost/process.hpp
     boost/signals2/connection.hpp