moved missing imports and header enumerations back where they were in
3.4.10