Fixing cross header stuff.