Fix build without precompiled headers in rP22649.
Also remove an un-needed variable.
Patch by: elexis