Add missing shim inclusions

</ouch>