Bug 906790 - Minimize layout/base #includes; r=roc