Small header fixes for a linux build, not compiling yet.