Bug 914508 - Move more stuff out of inlines.h/-inl.h files, and remove some unnecessary #include statements.  r=terrence.

--HG--
extra : rebase_source : 547936b30f4436af6471eaaa7e459db03196e363