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

--HG--
extra : rebase_source : abf63fa6f680266c8c53a630174989f33be06a32