Fixed compilation for non-PCH