Modifying source to use bitbake variables and resolve inclusion problem