Added additional include subdirectory, changed include directory mapping.