Bug 928900 - Reduce some content/ #includes; r=jst

--HG--
extra : rebase_source : d2932ff888affe7e1e7a10233dfacac6fb9f07a7