Removed the class Screen.

Minor #include tweaks to 'new' plugin system.