Fix the static build
A few missing files for the static build to work (got a bunch of undefined references, unsurprisingly, without adding these in).
A few missing files for the static build to work (got a bunch of undefined references, unsurprisingly, without adding these in).