Changed header_decl to use either "layout" or "header_type" keywords