Fix yet another broken type declarations