Add missing requires
Remove trailing whitespace