Bug 924622 - Move some #includes around to fix the build on a CLOSED TREE