Correct layouts and includes.