Fixed circular includes
Removed includes
Removed columnCount
Auto intend