Optimized the include tree