Include my own headers
We do need to link these too
Merge pull request #662 from bjori/windows-linker-fixes

Windows linker fixes

* bjori/windows-linker-fixes:
  We do need to link these too
  Include my own headers
Merge branch 'v1.5'

* v1.5:
  We do need to link these too
  Include my own headers