Resolve includes to match the hotkey refactoring.