Bug 866225 - remove some useless #includes, r=mccr8

--HG--
extra : rebase_source : 6cfd39ac879e525fc02961dd002f6920b1c11775