Restructured includes, removed chunk debug output