Merge branch '2019-12-02-master-imports'

- A large series of clean-ups to reduce common.h contents