Explicitly include subpar if we're using its macro.

Explicitly include subpar if we're using its macro. #53