Added missing headers.
Merge branch '20140606-Quick-Fixes' into 20140401-dev-stable