Bug 1003918 followup - Fix non-unified builds. r=red