adjustments for the latest gpp conventions (in include marker syntax).
Authored by: kifer 2001-09-13
Parent: [r2666]
Child: [r2668]