Include my own headers

Hopefully this is enough to fix the Windows builds. I can't see anything else that would cause it.