#1404 - Clean up of LoginViewController header includes. Removing which are no longer required.

Fixes #1404