[Bug 847110] Fix up includes in layout/style r=dbaron