Now including ROSSIO headers from the correct place