Remove dependency on #pragma pack's in geom data
More pragma pack's removed.
Clean-up of commented-out #includes