Bug 1050884: Fix includes, r=red