Fix build problems with reorganized version of Spire.