Fixes for moved headers in Reflect