Fix include errors