fixing up include dependency graph