Header file cleanup

Adapted to newest ssvu