xAODTruthCnv: Fix compilation with hepmc2.
Update #include ordering so that the #define private hack needed to compile against hepmc2 will work. Remove unneeded extra #define private.
Update #include ordering so that the #define private hack needed to compile against hepmc2 will work. Remove unneeded extra #define private.