Update includes and layouts