Added include cycle detection