Fix subdirectory includes