Infrastructure change due to problems with endless includes.