Merge pull request #2758 from CodeShark/CBlock-to-core
Finish moving core data structures into core.h.