reverted some BOOST_INCLUDE_DIR removals