updates to various include mapping modules