With this we're not longer exporting the constructor headers, which means we're not tying ourselves to a macro that might need special tweaking on a compiler-by-compiler basis.
