types/layout.h removed