Bug 942137 - Fix non-unified build after bug 932102; r=dbaron