Revert removal of obsolete headers as it breaks existing code.
See https://svn.boost.org/trac/boost/ticket/9783.