Headers without Reflection fix, new namespace.