Fix sections
Add 1 level deep includes
Add recursive includes