diff --git a/lib/base/tlsstream.hpp b/lib/base/tlsstream.hpp
index 6156a3d2f..e9027e24f 100644
--- a/lib/base/tlsstream.hpp
+++ b/lib/base/tlsstream.hpp
@@ -9,6 +9,7 @@
 #include "base/stream.hpp"
 #include "base/tlsutility.hpp"
 #include "base/fifo.hpp"
+#include <memory>
 #include <utility>
 #include <boost/asio/buffered_stream.hpp>
 #include <boost/asio/io_service.hpp>
@@ -163,6 +164,9 @@ private:
 	}
 };
 
+typedef boost::asio::buffered_stream<boost::asio::ip::tcp::socket> AsioTcpStream;
+typedef std::pair<std::shared_ptr<AsioTlsStream>, std::shared_ptr<AsioTcpStream>> OptionalTlsStream;
+
 }
 
 #endif /* TLSSTREAM_H */