port over extended include fixes