Add missing includes and formula requirements

We were assuming these were included from elsewhere, don't; be explicit