Bug 1036691 - Fix settings includes for browser shims