Fixed includes in base application