fixed includes in subdirectories