Fix bug causing reordering of included files, 0.24.2