bug 1068857: Fix includes to appeas the style checker on a CLOSED TREE (r=red)