Combed out the include hierarchy