Bug 943554 - Extend the checks added in bug 941854 to all unified files; r=gps