i965g: clean-ups, mostly for header inclusions