Merge branch '2020-08-01-misc-cleanups'

- Further cleanup of common.h and dm.h usage in headers