Revert "Add includes to the layout."

This reverts commit d06133a193d04fc45dff18f24d34421a91ca36e6.
Add includes to the layout.