Attempt to fix building of bdiana in a "pure" build environment.