Fix: problem with includes tripping on log() macro. Moved affected
headers to top of log.h - solves the issue