Bug 1043808: bustage fix for #includes that didn't get deleted r=bustage