Everything builds properly now.
Merge branch 'master' of github.com:deldreth/SacredDoorway