Bug 1016523 - Followup: fix include order.