Fixed issue where header files was not added to mappings