Modify mappings for include and forward declare