fixing up inclusion of files