Fix include issues for CartPlugin