more path and c header fixes for GSW 3.03

the current infrastructure is a bit of a hack, so swapping in the new GSW
version requires a lot of hard-coded changes