Fix broken includes from wildcard elimination