Revert "Normalizes includes"

This reverts commit 98a21e92c07104637b13ea7b65a4025c0b66bbf8.