Fix bustage from #includes cleanup in bug 919330, bug 919326, bug 919325, r=bustage-fix to reopen CLOSED TREE.