Move some #includes out of meta-headers into the files that need them

I want to merge this intermediate state into master, because have been some build fixes that I want in the packages, as well.