Fix build errors by adding missing layouts.