Updated build to work with the FHV/DeveloperTools project.