Two more cases of GUSI2 include access paths not being correct (reveiled by the new pyport.h).