Tweak headers to make clang 3.1 happy