Refactor some header includes
* move log struct into its own header for easier including
  (order independent)