fix includes (were missing due to over-include in timeout.hpp)