diff --git a/Generators/AtlasHepMC/AtlasHepMC/GenParticle.h b/Generators/AtlasHepMC/AtlasHepMC/GenParticle.h
index f511925247ddefc340b6c153d31b8ccd76f373e6..9c8a072c8b847f42d5e115853e485292178dc958 100644
--- a/Generators/AtlasHepMC/AtlasHepMC/GenParticle.h
+++ b/Generators/AtlasHepMC/AtlasHepMC/GenParticle.h
@@ -6,15 +6,12 @@
 #include "HepMC/GenParticle.h"
 namespace HepMC {
 typedef GenParticle* GenParticlePtr;
-typedef (GenParticle* const) ConstGenParticlePtr;
+typedef GenParticle* ConstGenParticlePtr;
 inline GenParticlePtr newGenParticlePtr(const HepMC::FourVector &mom = HepMC::FourVector(0.0,0.0,0.0,0.0), int pid = 0, int status = 0) {
     return new HepMC::GenParticle(mom,pid,status);
 }
 inline int barcode(GenParticlePtr p) {
-    p->barcode();
-}
-inline int barcode(ConstGenParticlePtr p) {
-    p->barcode();
+return    p->barcode();
 }
 }
 #endif
diff --git a/Generators/AtlasHepMC/AtlasHepMC/GenVertex.h b/Generators/AtlasHepMC/AtlasHepMC/GenVertex.h
index 2e140c8ac1286d93f4702d87914bb4615ce27d11..8b7c2eb2e8d75e097aa4ca648f7c64ddef64553f 100644
--- a/Generators/AtlasHepMC/AtlasHepMC/GenVertex.h
+++ b/Generators/AtlasHepMC/AtlasHepMC/GenVertex.h
@@ -6,15 +6,9 @@
 #include "HepMC/GenVertex.h"
 namespace HepMC {
 typedef HepMC::GenVertex* GenVertexPtr;
-typedef (HepMC::GenVertex* const)  ConstGenVertexPtr;
+typedef HepMC::GenVertex* ConstGenVertexPtr;
 inline GenVertexPtr newGenVertexPtr(const HepMC::FourVector &pos = HepMC::FourVector(0.0,0.0,0.0,0.0), const int i=0) {
     return new HepMC::GenVertex(pos,i);
 }
-inline int barcode(GenVertexPtr p) {
-    p->barcode();
-}
-inline int barcode(ConstGenVertexPtr p) {
-    p->barcode();
-}
 }
 #endif
diff --git a/Generators/AtlasHepMC/CMakeLists.txt b/Generators/AtlasHepMC/CMakeLists.txt
index a20441a20c1ee4b641ac3dc3409bd9ecd95e26bc..a269ede5797684346f20a06e8a4a88b6d913c535 100644
--- a/Generators/AtlasHepMC/CMakeLists.txt
+++ b/Generators/AtlasHepMC/CMakeLists.txt
@@ -3,7 +3,7 @@
 atlas_subdir( AtlasHepMC )
 
 # External(s) needed by the package.
-find_package( HepMC )
+find_package( HepMC COMPONENTS HepMC HepMCfio )
 
 # Component(s) in the package.
 atlas_add_library( AtlasHepMCLib
@@ -11,4 +11,11 @@ atlas_add_library( AtlasHepMCLib
    INTERFACE
    PUBLIC_HEADERS AtlasHepMC
    INCLUDE_DIRS ${HEPMC_INCLUDE_DIRS}
-   LINK_LIBRARIES ${HEPMC_LIBRARIES} )
+   LINK_LIBRARIES ${HepMC_HepMC_LIBRARY} )
+
+atlas_add_library( AtlasHepMCfioLib
+   AtlasHepMC/*.h
+   INTERFACE
+   PUBLIC_HEADERS AtlasHepMC
+   INCLUDE_DIRS ${HEPMC_INCLUDE_DIRS}
+   LINK_LIBRARIES ${HepMC_HepMCfio_LIBRARY} )
diff --git a/Generators/BeamHaloGenerator/BeamHaloGenerator/BeamHaloGenerator.h b/Generators/BeamHaloGenerator/BeamHaloGenerator/BeamHaloGenerator.h
index bd184bfa5f3c42efaece4d26bfea87dafb8def54..7310d8d9448d6380cf4a5f410076733f0698de2d 100755
--- a/Generators/BeamHaloGenerator/BeamHaloGenerator/BeamHaloGenerator.h
+++ b/Generators/BeamHaloGenerator/BeamHaloGenerator/BeamHaloGenerator.h
@@ -8,10 +8,8 @@
 #include "BeamHaloGenerator/BeamHaloParticle.h"
 #include <string>
 #include <vector>
+#include "AtlasHepMC/GenEvent.h"
 
-namespace HepMC {
-  class GenEvent;
-}
 namespace HepPDT {
   class ParticleDataTable;
 }
diff --git a/Generators/BeamHaloGenerator/CMakeLists.txt b/Generators/BeamHaloGenerator/CMakeLists.txt
index a7c3698d566f60d0ed91f0f29fb2f495c3a5fe46..cb681358ce726d5789a9776bd0c5934c57ccf5a8 100644
--- a/Generators/BeamHaloGenerator/CMakeLists.txt
+++ b/Generators/BeamHaloGenerator/CMakeLists.txt
@@ -10,6 +10,7 @@ atlas_depends_on_subdirs( PUBLIC
                           GaudiKernel
                           Generators/AtlasHepMC
                           Generators/GeneratorModules
+                          Generators/AtlasHepMC
                           PRIVATE
                           Control/AthenaKernel )
 
diff --git a/Generators/EvgenProdTools/CMakeLists.txt b/Generators/EvgenProdTools/CMakeLists.txt
index 83b7d47ade407cf7e9eafb31e8653a0ce3f406ee..be11c006ff0ba49086ec90109b7b83d5469edbb8 100644
--- a/Generators/EvgenProdTools/CMakeLists.txt
+++ b/Generators/EvgenProdTools/CMakeLists.txt
@@ -11,6 +11,7 @@ atlas_depends_on_subdirs( PUBLIC
                           Generators/GenAnalysisTools/TruthHelper
                           Generators/GenInterfaces
                           Generators/GeneratorModules
+                          Generators/AtlasHepMC
                           PRIVATE
                           Control/AthenaKernel
                           Event/EventInfo
@@ -18,21 +19,20 @@ atlas_depends_on_subdirs( PUBLIC
                           Generators/TruthUtils )
 
 # External dependencies:
-find_package( HepMC )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
 
 # Component(s) in the package:
 atlas_add_library( EvgenProdToolsLib
                    src/*.cxx
                    PUBLIC_HEADERS EvgenProdTools
-                   INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps TruthHelper GeneratorModulesLib
+                   INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} 
+                   LINK_LIBRARIES ${ROOT_LIBRARIES} AtlasHepMCLib AthenaBaseComps TruthHelper GeneratorModulesLib
                    PRIVATE_LINK_LIBRARIES AthenaKernel EventInfo GaudiKernel TruthUtils )
 
 atlas_add_component( EvgenProdTools
                      src/components/*.cxx
-                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps TruthHelper GeneratorModulesLib AthenaKernel EventInfo GaudiKernel TruthUtils EvgenProdToolsLib )
+                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} 
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} AtlasHepMCLib AthenaBaseComps TruthHelper GeneratorModulesLib AthenaKernel EventInfo GaudiKernel TruthUtils EvgenProdToolsLib )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Generators/EvgenProdTools/EvgenProdTools/TestHepMC.h b/Generators/EvgenProdTools/EvgenProdTools/TestHepMC.h
index 0594707d20b5f430be42a0858a6d8fdba5d319ad..2ed3ff9bb455c2ff8ce9cd0fca73f2205ebf890e 100644
--- a/Generators/EvgenProdTools/EvgenProdTools/TestHepMC.h
+++ b/Generators/EvgenProdTools/EvgenProdTools/TestHepMC.h
@@ -12,7 +12,7 @@
 #include "TruthHelper/IsGenNonInteracting.h"
 #include "TFile.h"
 #include "TH1.h"
-#include "HepMC/GenEvent.h"
+#include "AtlasHepMC/GenEvent.h"
 #include<cmath>
 
 #include<fstream>
diff --git a/Generators/EvgenProdTools/src/SimTimeEstimate.cxx b/Generators/EvgenProdTools/src/SimTimeEstimate.cxx
index 46e0efc5f507a207c55294fa6370970cd978ad30..c45a2aa3487bfea3a15ba1b0d6f9009e3b92184a 100644
--- a/Generators/EvgenProdTools/src/SimTimeEstimate.cxx
+++ b/Generators/EvgenProdTools/src/SimTimeEstimate.cxx
@@ -4,7 +4,7 @@
 
 #ifndef XAOD_ANALYSIS
 #include "EvgenProdTools/SimTimeEstimate.h"
-#include "HepMC/GenEvent.h"
+#include "AtlasHepMC/GenEvent.h"
 #include "TruthUtils/HepMCHelpers.h"
 
 SimTimeEstimate::SimTimeEstimate(const std::string& name, ISvcLocator* pSvcLocator)
diff --git a/Generators/EvtGen_i/CMakeLists.txt b/Generators/EvtGen_i/CMakeLists.txt
index 6fb6a8d89b8f42551e90167d750fb736d52c3029..98e9990d554c499114cfc88a389efd5a4ea2aaf1 100644
--- a/Generators/EvtGen_i/CMakeLists.txt
+++ b/Generators/EvtGen_i/CMakeLists.txt
@@ -11,6 +11,7 @@ atlas_depends_on_subdirs( PUBLIC
                           GaudiKernel
                           Generators/GeneratorModules
                           Generators/GeneratorObjects
+                          Generators/AtlasHepMC
                           PRIVATE
                           Control/AthenaKernel )
 
@@ -24,7 +25,6 @@ atlas_depends_on_subdirs( PUBLIC
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( CLHEP )
 find_package( EvtGen )
-find_package( HepMC )
 find_package( HepPDT )
 find_package( Photospp COMPONENTS Photospp PhotosppHepMC )
 find_package( Pythia8 )
@@ -50,16 +50,16 @@ atlas_add_library( EvtGen_iLib
                    src/EvtPythiaEngine.cxx
                    src/EvtInclusiveDecay.cxx
                    PUBLIC_HEADERS EvtGen_i
-                   INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS} ${PYTHIA8_INCLUDE_DIRS} ${PHOTOSPP_INCLUDE_DIRS} ${TAUOLAPP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS} ${EVTGEN_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
+                   INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS} ${PYTHIA8_INCLUDE_DIRS} ${PHOTOSPP_INCLUDE_DIRS} ${TAUOLAPP_INCLUDE_DIRS}  ${EVTGEN_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
                    PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
                    PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
-                   LINK_LIBRARIES ${Boost_LIBRARIES} ${HEPPDT_LIBRARIES} ${PYTHIA8_LIBRARIES} ${PHOTOSPP_LIBRARIES} ${TAUOLAPP_LIBRARIES} ${HEPMC_LIBRARIES} ${EVTGEN_LIBRARIES} GaudiKernel GeneratorObjects ${ROOT_LIBRARIES} StoreGateLib SGtests GeneratorModulesLib
+                   LINK_LIBRARIES ${Boost_LIBRARIES} ${HEPPDT_LIBRARIES} ${PYTHIA8_LIBRARIES} ${PHOTOSPP_LIBRARIES} ${TAUOLAPP_LIBRARIES} AtlasHepMCLib ${EVTGEN_LIBRARIES} GaudiKernel GeneratorObjects ${ROOT_LIBRARIES} StoreGateLib SGtests GeneratorModulesLib
                    PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaKernel )
 
 atlas_add_component( EvtGen_i
                      src/components/*.cxx
-                     INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${PYTHIA8_INCLUDE_DIRS} ${PHOTOSPP_INCLUDE_DIRS} ${TAUOLAPP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS} ${EVTGEN_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${HEPPDT_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${PYTHIA8_LIBRARIES} ${PHOTOSPP_LIBRARIES} ${TAUOLAPP_LIBRARIES} ${HEPMC_LIBRARIES} ${EVTGEN_LIBRARIES} StoreGateLib SGtests GaudiKernel GeneratorModulesLib GeneratorObjects AthenaKernel EvtGen_iLib )
+                     INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${PYTHIA8_INCLUDE_DIRS} ${PHOTOSPP_INCLUDE_DIRS} ${TAUOLAPP_INCLUDE_DIRS}  ${EVTGEN_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${Boost_LIBRARIES} ${HEPPDT_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${PYTHIA8_LIBRARIES} ${PHOTOSPP_LIBRARIES} ${TAUOLAPP_LIBRARIES} AtlasHepMCLib ${EVTGEN_LIBRARIES} StoreGateLib SGtests GaudiKernel GeneratorModulesLib GeneratorObjects AthenaKernel EvtGen_iLib )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
diff --git a/Generators/EvtGen_i/EvtGen_i/EvtDecay.h b/Generators/EvtGen_i/EvtGen_i/EvtDecay.h
index fbde77510ad5a3f23e9db442999948cfd5e8e7a2..017cf24ba1adb8d5fd6beae93d3de54ea7fcc61f 100644
--- a/Generators/EvtGen_i/EvtGen_i/EvtDecay.h
+++ b/Generators/EvtGen_i/EvtGen_i/EvtDecay.h
@@ -28,8 +28,8 @@
 #ifndef GENERATORMODULESEVTDECAY_H
 #define GENERATORMODULESEVTDECAY_H
 
-#include "HepMC/GenEvent.h"
-#include "HepMC/GenParticle.h"
+#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/GenParticle.h"
 
 #include "EvtGenBase/EvtParticle.hh"
 #include "EvtGen/EvtGen.hh"
diff --git a/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtPhotosEngine.hh b/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtPhotosEngine.hh
index e3cbe6946526d1fa4ba9127e7c3e7cab084cdff2..af4cc425b0cddc8c9d218b7ce169ccea4eab64ba 100644
--- a/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtPhotosEngine.hh
+++ b/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtPhotosEngine.hh
@@ -26,8 +26,8 @@
 #include "EvtGenBase/EvtId.hh"
 #include "EvtGenBase/EvtVector4R.hh"
 
-#include "HepMC/GenEvent.h"
-#include "HepMC/GenParticle.h"
+#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/GenParticle.h"
 
 #include <string>
 
diff --git a/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtTauolaEngine.hh b/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtTauolaEngine.hh
index ff266bfda99c3f6d0676593f83966b1f7f25af14..47cbae9d20784e5c3941d838c139cec1f638c167 100644
--- a/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtTauolaEngine.hh
+++ b/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtTauolaEngine.hh
@@ -27,8 +27,8 @@
 #include "EvtGenBase/EvtDecayBase.hh"
 #include "EvtGenBase/EvtVector4R.hh"
 
-#include "HepMC/GenEvent.h"
-#include "HepMC/GenParticle.h"
+#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/GenParticle.h"
 
 #include <vector>
 #include <map>
diff --git a/Generators/EvtGen_i/EvtGen_i/EvtInclusiveDecay.h b/Generators/EvtGen_i/EvtGen_i/EvtInclusiveDecay.h
index 96189f4fc3ef79aa521b2bcc3b8e29844b96df0f..42eb33b3f15abbc9c5b12f9f1eb30023df3e62dd 100644
--- a/Generators/EvtGen_i/EvtGen_i/EvtInclusiveDecay.h
+++ b/Generators/EvtGen_i/EvtGen_i/EvtInclusiveDecay.h
@@ -26,8 +26,8 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
 
-#include "HepMC/GenEvent.h"
-#include "HepMC/GenParticle.h"
+#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/GenParticle.h"
 
 #include "HepPDT/ParticleDataTable.hh"
 
diff --git a/Generators/EvtGen_i/src/EvtDecay.cxx b/Generators/EvtGen_i/src/EvtDecay.cxx
index a95032e85a0fa4c824acae769290defdfb040b3a..325cbb97c5582ce3e13b8438631d0ccad9ec1b17 100644
--- a/Generators/EvtGen_i/src/EvtDecay.cxx
+++ b/Generators/EvtGen_i/src/EvtDecay.cxx
@@ -30,9 +30,9 @@
 #include "EvtGen/EvtGen.hh"
 
 // Framework Related Headers:-
-#include "HepMC/GenEvent.h"
-#include "HepMC/GenVertex.h"
-#include "HepMC/GenParticle.h"
+#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/GenVertex.h"
+#include "AtlasHepMC/GenParticle.h"
 
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ISvcLocator.h"
diff --git a/Generators/EvtGen_i/src/EvtInclusiveDecay.cxx b/Generators/EvtGen_i/src/EvtInclusiveDecay.cxx
index 4846fd91710c2d61bfa8f18076233b6bdeb0d9ac..86eb414fb0a2f73de4159e83eacc41873ef98c24 100644
--- a/Generators/EvtGen_i/src/EvtInclusiveDecay.cxx
+++ b/Generators/EvtGen_i/src/EvtInclusiveDecay.cxx
@@ -29,9 +29,9 @@
 #include "EvtGenBase/EvtRandomEngine.hh"
 #include "EvtGenBase/EvtDecayTable.hh"
 
-#include "HepMC/GenEvent.h"
-#include "HepMC/GenVertex.h"
-#include "HepMC/GenParticle.h"
+#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/GenVertex.h"
+#include "AtlasHepMC/GenParticle.h"
 
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ISvcLocator.h"
diff --git a/Generators/EvtGen_i/src/EvtPhotosEngine.cxx b/Generators/EvtGen_i/src/EvtPhotosEngine.cxx
index 4ec8c6a3471b48a07b8a00976b663782c02c9d7f..92818f2c28843b18e81c7aaed356ff738cb046b4 100644
--- a/Generators/EvtGen_i/src/EvtPhotosEngine.cxx
+++ b/Generators/EvtGen_i/src/EvtPhotosEngine.cxx
@@ -31,9 +31,9 @@
 #include "Photos/PhotosHepMCParticle.h"
 #include "Photos/PhotosParticle.h"
 
-#include "HepMC/GenVertex.h"
-#include "HepMC/SimpleVector.h"
-#include "HepMC/Units.h"
+#include "AtlasHepMC/GenVertex.h"
+#include "AtlasHepMC/SimpleVector.h"
+#include "AtlasHepMC/Units.h"
 
 #include <iostream>
 #include <sstream>
diff --git a/Generators/EvtGen_i/src/EvtTauolaEngine.cxx b/Generators/EvtGen_i/src/EvtTauolaEngine.cxx
index 4ebd6883b8a1b09e62f97fb4912d3ca59efc45e6..cd7ae034f795504aa4ce11418423b2f4304a90dc 100644
--- a/Generators/EvtGen_i/src/EvtTauolaEngine.cxx
+++ b/Generators/EvtGen_i/src/EvtTauolaEngine.cxx
@@ -32,9 +32,9 @@
 #include "Tauola/TauolaHepMCParticle.h"
 #include "Tauola/TauolaParticle.h"
 
-#include "HepMC/GenVertex.h"
-#include "HepMC/SimpleVector.h"
-#include "HepMC/Units.h"
+#include "AtlasHepMC/GenVertex.h"
+#include "AtlasHepMC/SimpleVector.h"
+#include "AtlasHepMC/Units.h"
 
 #include <iostream>
 #include <sstream>
diff --git a/Generators/FlowAfterburner/CMakeLists.txt b/Generators/FlowAfterburner/CMakeLists.txt
index 887f75b82ee50a90387a3c617048b2761fa5f016..e02dacd8244da2cfda45ab6d2979ca3e5df520e4 100644
--- a/Generators/FlowAfterburner/CMakeLists.txt
+++ b/Generators/FlowAfterburner/CMakeLists.txt
@@ -12,6 +12,7 @@ atlas_depends_on_subdirs( PUBLIC
                           GaudiKernel
                           Generators/GenAnalysisTools/TruthHelper
                           Generators/GeneratorObjects
+                          Generators/AtlasHepMC
                           PRIVATE
                           Control/StoreGate
                           Generators/TruthUtils )
@@ -19,7 +20,6 @@ atlas_depends_on_subdirs( PUBLIC
 # External dependencies:
 find_package( CLHEP )
 find_package( GSL )
-find_package( HepMC )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
 
 # Component(s) in the package:
@@ -27,15 +27,15 @@ atlas_add_library( FlowAfterburnerLib
                    src/*.cxx
                    PUBLIC_HEADERS FlowAfterburner
                    INCLUDE_DIRS ${GSL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                   PRIVATE_INCLUDE_DIRS ${HEPMC_INCLUDE_DIRS}
+                   PRIVATE_INCLUDE_DIRS 
                    DEFINITIONS ${CLHEP_DEFINITIONS}
                    LINK_LIBRARIES ${GSL_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel TruthHelper GeneratorObjects StoreGateLib SGtests
-                   PRIVATE_LINK_LIBRARIES ${HEPMC_LIBRARIES} TruthUtils )
+                   PRIVATE_LINK_LIBRARIES AtlasHepMCLib TruthUtils )
 
 atlas_add_component( FlowAfterburner
                      src/components/*.cxx
-                     INCLUDE_DIRS ${GSL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${GSL_LIBRARIES} ${ROOT_LIBRARIES} ${HEPMC_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel TruthHelper GeneratorObjects StoreGateLib SGtests TruthUtils FlowAfterburnerLib )
+                     INCLUDE_DIRS ${GSL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}  ${CLHEP_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${GSL_LIBRARIES} ${ROOT_LIBRARIES} AtlasHepMCLib ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel TruthHelper GeneratorObjects StoreGateLib SGtests TruthUtils FlowAfterburnerLib )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
diff --git a/Generators/FlowAfterburner/src/CheckFlow.cxx b/Generators/FlowAfterburner/src/CheckFlow.cxx
index 79a0c67f9581f2503b9cb75cf08997dc0acfc4a7..16dd8354b6d69f8c69a2855f4dd99932442e5c12 100644
--- a/Generators/FlowAfterburner/src/CheckFlow.cxx
+++ b/Generators/FlowAfterburner/src/CheckFlow.cxx
@@ -20,9 +20,9 @@
 #include "TruthHelper/IsGenStable.h"
 #include "TruthHelper/GenAll.h"
 
-#include "HepMC/GenEvent.h"
-#include "HepMC/GenParticle.h"
-#include "HepMC/GenVertex.h"
+#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/GenVertex.h"
 
 #include "GeneratorObjects/HijingEventParams.h"
 
diff --git a/Generators/FlowAfterburner/src/CheckFlow_New.cxx b/Generators/FlowAfterburner/src/CheckFlow_New.cxx
index 0c054490111012fd89ac9e6be96c1516e5bffe9a..c5cc000b9b383ce9afdd51edacd5ba4049c5b078 100644
--- a/Generators/FlowAfterburner/src/CheckFlow_New.cxx
+++ b/Generators/FlowAfterburner/src/CheckFlow_New.cxx
@@ -29,9 +29,9 @@
 #include "TruthHelper/IsGenStable.h"
 #include "TruthHelper/GenAll.h"
 
-#include "HepMC/GenEvent.h"
-#include "HepMC/GenParticle.h"
-#include "HepMC/GenVertex.h"
+#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/GenVertex.h"
 
 #include "GeneratorObjects/HijingEventParams.h"
 
diff --git a/Generators/FlowAfterburner/src/CheckFlow_New_Minbias.cxx b/Generators/FlowAfterburner/src/CheckFlow_New_Minbias.cxx
index c5c514ee57fca3921d438b885170f8fb1d99c499..1d2988703aeb124e4c1505c11946aab29dff8430 100644
--- a/Generators/FlowAfterburner/src/CheckFlow_New_Minbias.cxx
+++ b/Generators/FlowAfterburner/src/CheckFlow_New_Minbias.cxx
@@ -28,9 +28,9 @@
 #include "TruthHelper/IsGenStable.h"
 #include "TruthHelper/GenAll.h"
 
-#include "HepMC/GenEvent.h"
-#include "HepMC/GenParticle.h"
-#include "HepMC/GenVertex.h"
+#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/GenVertex.h"
 
 #include "GeneratorObjects/HijingEventParams.h"
 
diff --git a/Generators/GenAnalysisTools/EventBoost/CMakeLists.txt b/Generators/GenAnalysisTools/EventBoost/CMakeLists.txt
index 6bd4fd2ac72aae5f60c810619159580b3535d7cd..414cee5c5cf79d2a95903926f391ffa1f3f04c18 100644
--- a/Generators/GenAnalysisTools/EventBoost/CMakeLists.txt
+++ b/Generators/GenAnalysisTools/EventBoost/CMakeLists.txt
@@ -11,12 +11,12 @@ atlas_depends_on_subdirs( PUBLIC
                           GaudiKernel
                           PRIVATE
                           Control/StoreGate
+                          Generators/AtlasHepMC
                           Generators/GeneratorObjects
                            )
 
 # External dependencies:
 find_package( CLHEP )
-find_package( HepMC )
 
 # Remove the --as-needed linker flags:
 atlas_disable_as_needed()
@@ -25,8 +25,8 @@ atlas_disable_as_needed()
 atlas_add_component( EventBoost
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps GaudiKernel StoreGateLib SGtests GeneratorObjects )
+                     INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps GaudiKernel StoreGateLib SGtests GeneratorObjects )
 
 # Install files from the package:
 atlas_install_headers( EventBoost )
diff --git a/Generators/GenAnalysisTools/EventBoost/EventBoost/EventBoost.h b/Generators/GenAnalysisTools/EventBoost/EventBoost/EventBoost.h
index 49fc8cf4da0e5cacb767175ee4847409c7dfec36..95623a3d13663e86f12c9fe83853801eb1c2683b 100755
--- a/Generators/GenAnalysisTools/EventBoost/EventBoost/EventBoost.h
+++ b/Generators/GenAnalysisTools/EventBoost/EventBoost/EventBoost.h
@@ -18,12 +18,10 @@
 #define EVENTBOOST_H
 
 #include "AthenaBaseComps/AthAlgorithm.h"
-#include "HepMC/GenEvent.h"
-
-
-namespace HepMC {
-  class GenParticle;
-}
+#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/GenVertex.h"
+#include "AtlasHepMC/SimpleVector.h"
 
 
 #include <string>
diff --git a/Generators/GenAnalysisTools/EventBoost/src/EventBoost.cxx b/Generators/GenAnalysisTools/EventBoost/src/EventBoost.cxx
index 1ab7778322aff43c99062003ee0552a62e20ff67..983e1aedb084b870ce67c7efa833a17904859fa8 100755
--- a/Generators/GenAnalysisTools/EventBoost/src/EventBoost.cxx
+++ b/Generators/GenAnalysisTools/EventBoost/src/EventBoost.cxx
@@ -21,9 +21,9 @@
 
 #include "StoreGate/StoreGateSvc.h"
 
-#include "HepMC/GenEvent.h"
-#include "HepMC/GenParticle.h"
-#include "HepMC/GenVertex.h"
+#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/GenVertex.h"
 
 #include "CLHEP/Vector/LorentzVector.h"
 
diff --git a/Generators/GenAnalysisTools/ReweightTools/CMakeLists.txt b/Generators/GenAnalysisTools/ReweightTools/CMakeLists.txt
index d6194240a3cb7c3c6eb1750876c043aa40c068fe..3877084fea56aafcec2c709503acdd74ba18f404 100644
--- a/Generators/GenAnalysisTools/ReweightTools/CMakeLists.txt
+++ b/Generators/GenAnalysisTools/ReweightTools/CMakeLists.txt
@@ -9,6 +9,7 @@ atlas_subdir( ReweightTools )
 atlas_depends_on_subdirs( PUBLIC
                           Control/AthenaBaseComps
                           GaudiKernel
+                          Generators/AtlasHepMC
                           Generators/GenInterfaces
                           PRIVATE
                           Control/AthContainers
@@ -16,21 +17,20 @@ atlas_depends_on_subdirs( PUBLIC
                           Generators/GeneratorObjects )
 
 # External dependencies:
-find_package( HepMC )
 find_package( Lhapdf )
 
 # Component(s) in the package:
 atlas_add_library( ReweightToolsLib
                    src/*.cxx
                    PUBLIC_HEADERS ReweightTools
-                   INCLUDE_DIRS ${LHAPDF_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${LHAPDF_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps GaudiKernel StoreGateLib SGtests
+                   INCLUDE_DIRS ${LHAPDF_INCLUDE_DIRS} 
+                   LINK_LIBRARIES ${LHAPDF_LIBRARIES} AtlasHepMCLib AthenaBaseComps GaudiKernel StoreGateLib SGtests
                    PRIVATE_LINK_LIBRARIES AthContainers GeneratorObjects )
 
 atlas_add_component( ReweightTools
                      src/components/*.cxx
-                     INCLUDE_DIRS ${LHAPDF_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${LHAPDF_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps GaudiKernel AthContainers StoreGateLib SGtests GeneratorObjects ReweightToolsLib )
+                     INCLUDE_DIRS ${LHAPDF_INCLUDE_DIRS} 
+                     LINK_LIBRARIES ${LHAPDF_LIBRARIES} AtlasHepMCLib AthenaBaseComps GaudiKernel AthContainers StoreGateLib SGtests GeneratorObjects ReweightToolsLib )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
diff --git a/Generators/GenAnalysisTools/ReweightTools/ReweightTools/PDFReweightTool.h b/Generators/GenAnalysisTools/ReweightTools/ReweightTools/PDFReweightTool.h
index e30ae28f04c50bfd5061e428149f494de108b79f..a4a1b69e555810fee529a5106e7a1227eeaea57b 100644
--- a/Generators/GenAnalysisTools/ReweightTools/ReweightTools/PDFReweightTool.h
+++ b/Generators/GenAnalysisTools/ReweightTools/ReweightTools/PDFReweightTool.h
@@ -8,7 +8,7 @@
 //#include "GaudiKernel/AlgTool.h"
 #include "AthenaBaseComps/AthAlgTool.h"
 #include "GenInterfaces/IPDFReweightTool.h"
-#include "HepMC/GenEvent.h"
+#include "AtlasHepMC/GenEvent.h"
 #include <string>
 #include <vector>
 
diff --git a/Generators/GenAnalysisTools/ReweightTools/src/PDFReweightTool.cxx b/Generators/GenAnalysisTools/ReweightTools/src/PDFReweightTool.cxx
index f2de2efbfce0dfabae2dd6626c9fed3b5fba8cf5..7d08b5b6c146366d60be2bd5c65273304056a3c4 100644
--- a/Generators/GenAnalysisTools/ReweightTools/src/PDFReweightTool.cxx
+++ b/Generators/GenAnalysisTools/ReweightTools/src/PDFReweightTool.cxx
@@ -20,8 +20,8 @@
 #include "AthContainers/DataVector.h"
 #include "GeneratorObjects/McEventCollection.h"
 
-#include "HepMC/GenEvent.h"
-#include "HepMC/PdfInfo.h"
+#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/PdfInfo.h"
 #include "ReweightTools/PDFReweightTool.h"
 
 #include <math.h>
diff --git a/Generators/GenAnalysisTools/TruthHelper/CMakeLists.txt b/Generators/GenAnalysisTools/TruthHelper/CMakeLists.txt
index bb19ccd3c1c1ad23d6b4900904bf4156e707b7b9..8edd6ffd07639d0705e61dec9319bca43fbe6d67 100644
--- a/Generators/GenAnalysisTools/TruthHelper/CMakeLists.txt
+++ b/Generators/GenAnalysisTools/TruthHelper/CMakeLists.txt
@@ -9,13 +9,13 @@ atlas_subdir( TruthHelper )
 atlas_depends_on_subdirs( PUBLIC
                           Control/StoreGate
                           GaudiKernel
+                          Generators/AtlasHepMC
                           Generators/GeneratorObjects
                           PRIVATE
                           Control/AthenaKernel
                           Generators/TruthUtils )
 
 # External dependencies:
-find_package( HepMC )
 find_package( HepPDT )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
 
@@ -25,12 +25,12 @@ atlas_add_library( TruthHelper
                    PUBLIC_HEADERS TruthHelper
                    INCLUDE_DIRS ${HEPMC_INCLUDE_DIRS}
                    PRIVATE_INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${HEPMC_LIBRARIES} GaudiKernel GeneratorObjects StoreGateLib SGtests
+                   LINK_LIBRARIES AtlasHepMCLib GaudiKernel GeneratorObjects StoreGateLib SGtests
                    PRIVATE_LINK_LIBRARIES ${HEPPDT_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel TruthUtils )
 
 atlas_add_dictionary( TruthHelperDict
                       TruthHelper/TruthHelperDict.h
                       TruthHelper/selection.xml
-                      INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${HEPPDT_LIBRARIES} ${ROOT_LIBRARIES} ${HEPMC_LIBRARIES} StoreGateLib SGtests GaudiKernel GeneratorObjects AthenaKernel TruthUtils TruthHelper )
+                      INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} 
+                      LINK_LIBRARIES ${HEPPDT_LIBRARIES} ${ROOT_LIBRARIES} AtlasHepMCLib StoreGateLib SGtests GaudiKernel GeneratorObjects AthenaKernel TruthUtils TruthHelper )
 
diff --git a/Generators/GenAnalysisTools/TruthHelper/TruthHelper/GenAccessIO.h b/Generators/GenAnalysisTools/TruthHelper/TruthHelper/GenAccessIO.h
index a59ea54f22c691681058ee5a44953bf02cff6177..f184b88cd0b926804ff90ad34f808cf7439d7602 100644
--- a/Generators/GenAnalysisTools/TruthHelper/TruthHelper/GenAccessIO.h
+++ b/Generators/GenAnalysisTools/TruthHelper/TruthHelper/GenAccessIO.h
@@ -7,7 +7,7 @@
 
 #include "GeneratorObjects/McEventCollection.h"
 #include "TruthHelper/GenIMCselector.h"
-#include "HepMC/GenParticle.h"
+#include "AtlasHepMC/GenParticle.h"
 
 #include "GaudiKernel/Bootstrap.h"
 #include "GaudiKernel/ISvcLocator.h"
diff --git a/Generators/GenAnalysisTools/TruthHelper/TruthHelper/GenIMCselector.h b/Generators/GenAnalysisTools/TruthHelper/TruthHelper/GenIMCselector.h
index 576b2579ebf0299dc94f338783c0c8c904b14dd8..61839fcb0daff336c8038a68d1eec88bcd0beb14 100644
--- a/Generators/GenAnalysisTools/TruthHelper/TruthHelper/GenIMCselector.h
+++ b/Generators/GenAnalysisTools/TruthHelper/TruthHelper/GenIMCselector.h
@@ -5,7 +5,7 @@
 #ifndef TRUTHHELPER_GENIMCSELECTOR_H
 #define TRUTHHELPER_GENIMCSELECTOR_H
 
-#include "HepMC/GenParticle.h"
+#include "AtlasHepMC/GenParticle.h"
 #include <functional>
 
 namespace TruthHelper {
diff --git a/Generators/GenAnalysisTools/TruthHelper/TruthHelper/PileUpType.h b/Generators/GenAnalysisTools/TruthHelper/TruthHelper/PileUpType.h
index 8d49b47905710df02033d0dd985ac15ffa90b8b6..a288cbb736c41071c5b41b46649457d2ca4b6100 100644
--- a/Generators/GenAnalysisTools/TruthHelper/TruthHelper/PileUpType.h
+++ b/Generators/GenAnalysisTools/TruthHelper/TruthHelper/PileUpType.h
@@ -21,8 +21,8 @@
 #define TRUTHHELPER_PILEUPTYPE_H
 
 #include "GeneratorObjects/McEventCollection.h"
-#include "HepMC/GenEvent.h"
-#include "HepMC/GenParticle.h"
+#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/GenParticle.h"
 
 #include <vector>
 
diff --git a/Generators/GenAnalysisTools/TruthHelper/src/GenAccessIO.cxx b/Generators/GenAnalysisTools/TruthHelper/src/GenAccessIO.cxx
index 39cba36804dfde463060bd515646b55c91901258..07868513e370423848f4ee4f5a486e68a804660f 100644
--- a/Generators/GenAnalysisTools/TruthHelper/src/GenAccessIO.cxx
+++ b/Generators/GenAnalysisTools/TruthHelper/src/GenAccessIO.cxx
@@ -7,8 +7,8 @@
 #include "GaudiKernel/MsgStream.h"
 #include "AthenaKernel/getMessageSvc.h"
 
-#include "HepMC/GenEvent.h"
-#include "HepMC/GenParticle.h"
+#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/GenParticle.h"
 
 #include <cmath>
 #include <algorithm>
diff --git a/Generators/GenAnalysisTools/TruthHelper/src/GenAll.cxx b/Generators/GenAnalysisTools/TruthHelper/src/GenAll.cxx
index 930f5add261922af2a90d2275840f2ec47c5766f..47d9da1c9a7155963105458da2f0b523efaa92be 100644
--- a/Generators/GenAnalysisTools/TruthHelper/src/GenAll.cxx
+++ b/Generators/GenAnalysisTools/TruthHelper/src/GenAll.cxx
@@ -3,7 +3,7 @@
 */
 
 #include "TruthHelper/GenAll.h"
-#include "HepMC/GenParticle.h"
+#include "AtlasHepMC/GenParticle.h"
 
 namespace TruthHelper {
 
diff --git a/Generators/GenAnalysisTools/TruthHelper/src/IsConversion.cxx b/Generators/GenAnalysisTools/TruthHelper/src/IsConversion.cxx
index 50e40c450cc04354d5129871c59bf8acf023b496..d6049faf65a4f86bf6874c72cb6167f967fd42ba 100644
--- a/Generators/GenAnalysisTools/TruthHelper/src/IsConversion.cxx
+++ b/Generators/GenAnalysisTools/TruthHelper/src/IsConversion.cxx
@@ -3,8 +3,8 @@
 */
 
 #include "TruthHelper/IsConversion.h"
-#include "HepMC/GenParticle.h"
-#include "HepMC/GenVertex.h"
+#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/GenVertex.h"
 #include <vector>
 
 namespace TruthHelper {
diff --git a/Generators/GenAnalysisTools/TruthHelper/src/IsGenType.cxx b/Generators/GenAnalysisTools/TruthHelper/src/IsGenType.cxx
index d3103f7846b745723f10427e3968b906d326c448..582efc8d71ba8865921ffd72c89ed7508038aea3 100644
--- a/Generators/GenAnalysisTools/TruthHelper/src/IsGenType.cxx
+++ b/Generators/GenAnalysisTools/TruthHelper/src/IsGenType.cxx
@@ -3,7 +3,7 @@
 */
 
 #include "TruthHelper/IsGenType.h"
-#include "HepMC/GenParticle.h"
+#include "AtlasHepMC/GenParticle.h"
 #include <vector>
 
 namespace TruthHelper {
diff --git a/Generators/GenAnalysisTools/TruthHelper/src/IsGenerator.cxx b/Generators/GenAnalysisTools/TruthHelper/src/IsGenerator.cxx
index 52ae8fc10dfb60d2c61ed6245956662eb8663ba7..2509412a51567139e66fe77d09aa1e82f928330c 100644
--- a/Generators/GenAnalysisTools/TruthHelper/src/IsGenerator.cxx
+++ b/Generators/GenAnalysisTools/TruthHelper/src/IsGenerator.cxx
@@ -3,7 +3,7 @@
 */
 
 #include "TruthHelper/IsGenerator.h"
-#include "HepMC/GenParticle.h"
+#include "AtlasHepMC/GenParticle.h"
 
 namespace TruthHelper {
 
diff --git a/Generators/GenAnalysisTools/TruthHelper/src/IsLastPhysicalHadron.cxx b/Generators/GenAnalysisTools/TruthHelper/src/IsLastPhysicalHadron.cxx
index d1aeda8bec3bd76df417d10cd41118275e41de34..2bbd52dcf84dcf2cc4c44aa960294b6d78f34cb1 100644
--- a/Generators/GenAnalysisTools/TruthHelper/src/IsLastPhysicalHadron.cxx
+++ b/Generators/GenAnalysisTools/TruthHelper/src/IsLastPhysicalHadron.cxx
@@ -3,7 +3,7 @@
 */
 
 #include "TruthHelper/IsLastPhysicalHadron.h"
-#include "HepMC/GenParticle.h"
+#include "AtlasHepMC/GenParticle.h"
 
 #include "TruthHelper/IsGenStable.h"
 #include "TruthHelper/IsPhysicalHadron.h"
diff --git a/Generators/GenAnalysisTools/TruthHelper/src/IsStatus.cxx b/Generators/GenAnalysisTools/TruthHelper/src/IsStatus.cxx
index 653fc20e271fafc6ed8fc169a223bbe2738dc135..0fadc7b747e46754438f1fe3523f82e8d5c7876b 100644
--- a/Generators/GenAnalysisTools/TruthHelper/src/IsStatus.cxx
+++ b/Generators/GenAnalysisTools/TruthHelper/src/IsStatus.cxx
@@ -3,7 +3,7 @@
 */
 
 #include "TruthHelper/IsStatus.h"
-#include "HepMC/GenParticle.h"
+#include "AtlasHepMC/GenParticle.h"
 
 namespace TruthHelper {
 
diff --git a/Generators/GenAnalysisTools/TruthHelper/src/NCutter.cxx b/Generators/GenAnalysisTools/TruthHelper/src/NCutter.cxx
index 4d0e9efcd4f5b898f87300ec01939aec155823b5..97dc011ba7b3d6fa8ab300c26928d7b04696b878 100644
--- a/Generators/GenAnalysisTools/TruthHelper/src/NCutter.cxx
+++ b/Generators/GenAnalysisTools/TruthHelper/src/NCutter.cxx
@@ -3,7 +3,7 @@
 */
 
 #include "TruthHelper/NCutter.h"
-#include "HepMC/GenParticle.h"
+#include "AtlasHepMC/GenParticle.h"
 #include <vector>
 
 namespace TruthHelper {
diff --git a/Generators/GenAnalysisTools/TruthTools/CMakeLists.txt b/Generators/GenAnalysisTools/TruthTools/CMakeLists.txt
index 2f5004985bd8b0358184dca5cef18331bdec27f6..f5e189cab598851055bd95be485b503e402b46d0 100644
--- a/Generators/GenAnalysisTools/TruthTools/CMakeLists.txt
+++ b/Generators/GenAnalysisTools/TruthTools/CMakeLists.txt
@@ -11,19 +11,19 @@ atlas_depends_on_subdirs( PUBLIC
                           GaudiKernel
                           PRIVATE
                           Generators/GenInterfaces
+                          Generators/AtlasHepMC
                           Generators/GeneratorObjects
                           Generators/TruthUtils )
 
 # External dependencies:
-find_package( HepMC )
 find_package( HepPDT )
 
 # Component(s) in the package:
 atlas_add_component( TruthTools
                      src/TruthSelector.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${HEPPDT_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps GaudiKernel GeneratorObjects TruthUtils )
+                     INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS} 
+                     LINK_LIBRARIES ${HEPPDT_LIBRARIES} AtlasHepMCLib AthenaBaseComps GaudiKernel GeneratorObjects TruthUtils )
 
 # Install files from the package:
 atlas_install_headers( TruthTools )
diff --git a/Generators/GenAnalysisTools/TruthTools/TruthTools/TruthSelector.h b/Generators/GenAnalysisTools/TruthTools/TruthTools/TruthSelector.h
index 5fa0d1e67f3d5da3105ca47a5cffecd52aca0eac..87dfda9aefba2cc3e110cd30a028350ef00ff90c 100644
--- a/Generators/GenAnalysisTools/TruthTools/TruthTools/TruthSelector.h
+++ b/Generators/GenAnalysisTools/TruthTools/TruthTools/TruthSelector.h
@@ -14,7 +14,7 @@
 
 #include "AthenaBaseComps/AthAlgTool.h"
 #include "HepPDT/ParticleDataTable.hh"
-#include "HepMC/GenParticle.h"
+#include "AtlasHepMC/GenParticle.h"
 #include "GenInterfaces/ITruthSelector.h"
 
 //<<<<<< CLASS DECLARATIONS                                             >>>>>>
diff --git a/Generators/GenInterfaces/GenInterfaces/GenInterfacesDict.h b/Generators/GenInterfaces/GenInterfaces/GenInterfacesDict.h
index 6aa39bf6341710a46e5837c10f5871f67764d4e7..a8a434b0192011961c29b93a529100f7aac4e493 100644
--- a/Generators/GenInterfaces/GenInterfaces/GenInterfacesDict.h
+++ b/Generators/GenInterfaces/GenInterfaces/GenInterfacesDict.h
@@ -25,4 +25,4 @@ namespace HforToolDict {
   };
 }
 
-#endif // GENINTERFACES_GENINTERFACESDICT_H
\ No newline at end of file
+#endif // GENINTERFACES_GENINTERFACESDICT_H
diff --git a/Generators/GeneratorFilters/CMakeLists.txt b/Generators/GeneratorFilters/CMakeLists.txt
index 4c4b479d04d92cb1ad8f65cd7ea488735b63bd45..8cac1c493a3bac63603497fcb53a2a69351293f7 100644
--- a/Generators/GeneratorFilters/CMakeLists.txt
+++ b/Generators/GeneratorFilters/CMakeLists.txt
@@ -10,6 +10,7 @@ atlas_depends_on_subdirs( PUBLIC
                           Control/StoreGate
                           GaudiKernel
                           Generators/GeneratorModules
+                          Generators/AtlasHepMC
                           PRIVATE
                           Control/AthenaKernel
                           Control/CxxUtils
@@ -22,7 +23,6 @@ atlas_depends_on_subdirs( PUBLIC
 
 # External dependencies:
 find_package( CLHEP )
-find_package( HepMC )
 find_package( HepPDT )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread MathMore Minuit Minuit2 Matrix Physics HistPainter Rint )
 
@@ -30,16 +30,16 @@ find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread MathMore Minui
 atlas_add_library( GeneratorFiltersLib
                    src/*.cxx
                    PUBLIC_HEADERS GeneratorFilters
-                   INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
+                   INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} 
                    PRIVATE_INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS}
                    DEFINITIONS ${CLHEP_DEFINITIONS}
-                   LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} GaudiKernel StoreGateLib SGtests GeneratorModulesLib
+                   LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib GaudiKernel StoreGateLib SGtests GeneratorModulesLib
                    PRIVATE_LINK_LIBRARIES ${HEPPDT_LIBRARIES} AthenaKernel CxxUtils EventInfo xAODJet xAODTruth TruthUtils ParticleEvent McParticleEvent )
 
 atlas_add_component( GeneratorFilters
                      src/components/*.cxx
-                     INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${HEPPDT_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} StoreGateLib SGtests GaudiKernel GeneratorModulesLib AthenaKernel CxxUtils EventInfo xAODJet xAODTruth TruthUtils ParticleEvent McParticleEvent GeneratorFiltersLib )
+                     INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} 
+                     LINK_LIBRARIES ${HEPPDT_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib StoreGateLib SGtests GaudiKernel GeneratorModulesLib AthenaKernel CxxUtils EventInfo xAODJet xAODTruth TruthUtils ParticleEvent McParticleEvent GeneratorFiltersLib )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
diff --git a/Generators/GeneratorFilters/GeneratorFilters/BSignalFilter.h b/Generators/GeneratorFilters/GeneratorFilters/BSignalFilter.h
index 92333f5dbc0a3f2447b7f8612a1892956441d57c..8f17540c16d16ac496da91d5723461317e082174 100644
--- a/Generators/GeneratorFilters/GeneratorFilters/BSignalFilter.h
+++ b/Generators/GeneratorFilters/GeneratorFilters/BSignalFilter.h
@@ -19,9 +19,9 @@
 #include "GaudiKernel/NTuple.h"
 #include <vector>
 
-#include "HepMC/GenEvent.h"
-#include "HepMC/GenParticle.h"
-#include "HepMC/GenVertex.h"
+#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/GenVertex.h"
 #include "TTree.h"
 #include "TLorentzVector.h"
 
diff --git a/Generators/GeneratorFilters/GeneratorFilters/DecayPositionFilter.h b/Generators/GeneratorFilters/GeneratorFilters/DecayPositionFilter.h
index 71d30c165f9b51aed601fb09726716baef954979..95d2f1d09461fa10e32f815d0685ca3e453d6586 100644
--- a/Generators/GeneratorFilters/GeneratorFilters/DecayPositionFilter.h
+++ b/Generators/GeneratorFilters/GeneratorFilters/DecayPositionFilter.h
@@ -8,7 +8,7 @@
 #include "StoreGate/StoreGateSvc.h"
 #include "StoreGate/DataHandle.h"
 
-#include "HepMC/GenEvent.h"
+#include "AtlasHepMC/GenEvent.h"
 
 #include "GeneratorModules/GenFilter.h"
 
diff --git a/Generators/GeneratorFilters/src/HTFilter.cxx b/Generators/GeneratorFilters/src/HTFilter.cxx
index cda6a1ac76fff6b42234a9eb15df9f9c02efc9bd..c584eed707016b2c84e19f1b31e71de1a75b30c2 100644
--- a/Generators/GeneratorFilters/src/HTFilter.cxx
+++ b/Generators/GeneratorFilters/src/HTFilter.cxx
@@ -17,7 +17,7 @@
 
 // Other classes used by this class
 #include "TruthUtils/PIDHelpers.h"
-#include "HepMC/GenEvent.h"
+#include "AtlasHepMC/GenEvent.h"
 // #include "GeneratorObjects/McEventCollection.h"
 #include "TruthUtils/HepMCHelpers.h"
 #include "CLHEP/Units/SystemOfUnits.h"
diff --git a/Generators/GeneratorFilters/src/TTbarMassFilter.cxx b/Generators/GeneratorFilters/src/TTbarMassFilter.cxx
index 3ec753653d292a638bcc18c90292561a4faa2ae8..ce7622a1f6e9fc3803180248090f8e800703d877 100644
--- a/Generators/GeneratorFilters/src/TTbarMassFilter.cxx
+++ b/Generators/GeneratorFilters/src/TTbarMassFilter.cxx
@@ -3,7 +3,7 @@
 */
 
 #include "GeneratorFilters/TTbarMassFilter.h"
-#include "HepMC/SimpleVector.h"
+#include "AtlasHepMC/SimpleVector.h"
 #include <algorithm>
 
 TTbarMassFilter::TTbarMassFilter(const std::string& name, ISvcLocator* pSvcLocator)
diff --git a/Generators/GeneratorModules/CMakeLists.txt b/Generators/GeneratorModules/CMakeLists.txt
index bfeb97b27d3ccddebddc001d0d7fe2e8a9c2f5d5..c5a14a50ebecfc969773805e2de19af3918974c0 100644
--- a/Generators/GeneratorModules/CMakeLists.txt
+++ b/Generators/GeneratorModules/CMakeLists.txt
@@ -11,11 +11,11 @@ atlas_depends_on_subdirs( PUBLIC
                           Control/AthenaKernel
                           Control/StoreGate
                           GaudiKernel
+                          Generators/AtlasHepMC
                           Generators/GeneratorObjects )
 
 # External dependencies:
 find_package( CLHEP )
-find_package( HepMC )
 find_package( HepPDT )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
 
@@ -23,14 +23,14 @@ find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
 atlas_add_library( GeneratorModulesLib
                    src/*.cxx
                    PUBLIC_HEADERS GeneratorModules
-                   INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
+                   INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} 
                    DEFINITIONS ${CLHEP_DEFINITIONS}
-                   LINK_LIBRARIES ${HEPPDT_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel GeneratorObjects StoreGateLib SGtests )
+                   LINK_LIBRARIES ${HEPPDT_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps AthenaKernel GaudiKernel GeneratorObjects StoreGateLib SGtests )
 
 atlas_add_component( GeneratorModules
                      src/components/*.cxx
-                     INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${HEPPDT_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps AthenaKernel StoreGateLib SGtests GaudiKernel GeneratorObjects GeneratorModulesLib )
+                     INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} 
+                     LINK_LIBRARIES ${HEPPDT_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps AthenaKernel StoreGateLib SGtests GaudiKernel GeneratorObjects GeneratorModulesLib )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
diff --git a/Generators/GeneratorModules/GeneratorModules/GenBase.h b/Generators/GeneratorModules/GeneratorModules/GenBase.h
index e117cb2ff514e9e2137c8302f6872928bb75c619..f10e0aa5ae8be98d71e63d39b163090a18c058f5 100644
--- a/Generators/GeneratorModules/GeneratorModules/GenBase.h
+++ b/Generators/GeneratorModules/GeneratorModules/GenBase.h
@@ -14,7 +14,7 @@
 #include "StoreGate/DataHandle.h"
 #include "GeneratorObjects/McEventCollection.h"
 
-#include "HepMC/GenEvent.h"
+#include "AtlasHepMC/GenEvent.h"
 
 #include "HepPDT/ParticleData.hh"
 #include "HepPDT/ParticleDataTable.hh"
diff --git a/Generators/HepMCAnalysis_i/CMakeLists.txt b/Generators/HepMCAnalysis_i/CMakeLists.txt
index f34c8a3ac97950f2977539f7ca0af574f3cd0bd4..65867868c356622011ff25a2950ec5f3e0684630 100644
--- a/Generators/HepMCAnalysis_i/CMakeLists.txt
+++ b/Generators/HepMCAnalysis_i/CMakeLists.txt
@@ -10,6 +10,7 @@ atlas_depends_on_subdirs(
    PUBLIC
    Control/AthenaBaseComps
    GaudiKernel
+   Generators/AtlasHepMC
    PRIVATE
    Control/StoreGate
    Event/EventInfo
@@ -19,7 +20,6 @@ atlas_depends_on_subdirs(
 # External dependencies:
 find_package( CLHEP )
 find_package( HEPUtils )
-find_package( HepMC )
 find_package( HepMCAnalysis )
 find_package( ROOT COMPONENTS Core MathCore Hist RIO )
 find_package( FastJet )
@@ -28,10 +28,10 @@ find_package( FastJet )
 atlas_add_component( HepMCAnalysis_i
    HepMCAnalysis_i/*.h src/*.cxx src/components/*.cxx
    INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${HEPMCANALYSIS_INCLUDE_DIRS}
-   ${HEPUTILS_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
+   ${HEPUTILS_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} 
    ${FASTJET_INCLUDE_DIRS}
    LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPMCANALYSIS_LIBRARIES}
-   ${HEPUTILS_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES}
+   ${HEPUTILS_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib
    ${FASTJET_LIBRARIES} AthenaBaseComps GaudiKernel StoreGateLib EventInfo
    GeneratorObjects TruthUtils )
 
diff --git a/Generators/HepMCAnalysis_i/HepMCAnalysis_i/HepMCAnalysis.h b/Generators/HepMCAnalysis_i/HepMCAnalysis_i/HepMCAnalysis.h
index a80c13af5d14e4801523adcac99e961e11b51b49..0cffce4a21afe23558dae9e40b46d3846a97f9ba 100644
--- a/Generators/HepMCAnalysis_i/HepMCAnalysis_i/HepMCAnalysis.h
+++ b/Generators/HepMCAnalysis_i/HepMCAnalysis_i/HepMCAnalysis.h
@@ -19,7 +19,7 @@
 #include "GaudiKernel/ServiceHandle.h"
 
 #include "TH1.h"
-#include "HepMC/GenEvent.h"
+#include "AtlasHepMC/GenEvent.h"
 
 // forward declarations
 class ITHistSvc;
diff --git a/Generators/HepMCAnalysis_i/src/HepMCAnalysis.cxx b/Generators/HepMCAnalysis_i/src/HepMCAnalysis.cxx
index 8296d59bbf417c76ecf30f01139bac0c14df163b..30d84aad66f36f7ff56ef5e871f77714b0791c38 100644
--- a/Generators/HepMCAnalysis_i/src/HepMCAnalysis.cxx
+++ b/Generators/HepMCAnalysis_i/src/HepMCAnalysis.cxx
@@ -17,7 +17,7 @@
 #include "EventInfo/EventID.h"
 #include "GeneratorObjects/McEventCollection.h"
 
-#include "HepMC/GenEvent.h"
+#include "AtlasHepMC/GenEvent.h"
 
 #include "TFile.h"
 #include "TH1.h"
diff --git a/Generators/HepMCAnalysis_i/src/LeptonJetAnalysis.cxx b/Generators/HepMCAnalysis_i/src/LeptonJetAnalysis.cxx
index 8d14cc24c19879b31a29d9cccdbe1a30859ab6c4..afe57c9276bfacecbc241f773ed1b35052c54c56 100644
--- a/Generators/HepMCAnalysis_i/src/LeptonJetAnalysis.cxx
+++ b/Generators/HepMCAnalysis_i/src/LeptonJetAnalysis.cxx
@@ -6,13 +6,13 @@
 
 #include <iostream>
 
-#include "HepMC/GenEvent.h"
-#include "HepMC/IO_GenEvent.h"
-#include "HepMC/GenParticle.h"
-#include "HepMC/GenVertex.h"
-#include "HepMC/IO_AsciiParticles.h"
-#include "HepMC/SimpleVector.h"
-#include "HepMC/WeightContainer.h"
+#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/IO_GenEvent.h"
+#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/GenVertex.h"
+#include "AtlasHepMC/IO_AsciiParticles.h"
+#include "AtlasHepMC/SimpleVector.h"
+#include "AtlasHepMC/WeightContainer.h"
 #include "CLHEP/Vector/LorentzVector.h"
 
 
diff --git a/Generators/HepMCAnalysis_i/src/ParticleContentAnalysis.cxx b/Generators/HepMCAnalysis_i/src/ParticleContentAnalysis.cxx
index 3efff7e2e1ae175b59395e865185d6b67a620ecd..fe44ac3d0c57029b69a3cff7b3b94d99c381a832 100644
--- a/Generators/HepMCAnalysis_i/src/ParticleContentAnalysis.cxx
+++ b/Generators/HepMCAnalysis_i/src/ParticleContentAnalysis.cxx
@@ -5,12 +5,12 @@
 #include <iostream>
 #include <sstream>
 #include <stdio.h>
-#include "HepMC/GenEvent.h"
-#include "HepMC/IO_GenEvent.h"
-#include "HepMC/GenParticle.h"
-#include "HepMC/GenVertex.h"
-#include "HepMC/IO_AsciiParticles.h"
-#include "HepMC/SimpleVector.h"
+#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/IO_GenEvent.h"
+#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/GenVertex.h"
+#include "AtlasHepMC/IO_AsciiParticles.h"
+#include "AtlasHepMC/SimpleVector.h"
 #include "CLHEP/Vector/LorentzVector.h"
 
 // ROOT headers
diff --git a/Generators/HepMCAnalysis_i/src/PdfAnalysis.cxx b/Generators/HepMCAnalysis_i/src/PdfAnalysis.cxx
index 11c2801cf43bb8e59bc59b21d98385ad35b81f4a..d74a0511d116a4414b9a4f8b8ea9970857d0f250 100644
--- a/Generators/HepMCAnalysis_i/src/PdfAnalysis.cxx
+++ b/Generators/HepMCAnalysis_i/src/PdfAnalysis.cxx
@@ -6,13 +6,13 @@
 
 #include <iostream>
 
-#include "HepMC/GenEvent.h"
-#include "HepMC/IO_GenEvent.h"
-#include "HepMC/GenParticle.h"
-#include "HepMC/GenVertex.h"
-#include "HepMC/IO_AsciiParticles.h"
-#include "HepMC/SimpleVector.h"
-#include "HepMC/WeightContainer.h"
+#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/IO_GenEvent.h"
+#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/GenVertex.h"
+#include "AtlasHepMC/IO_AsciiParticles.h"
+#include "AtlasHepMC/SimpleVector.h"
+#include "AtlasHepMC/WeightContainer.h"
 #include "CLHEP/Vector/LorentzVector.h"
 
 
diff --git a/Generators/HepMCAnalysis_i/src/UserAnalysis.cxx b/Generators/HepMCAnalysis_i/src/UserAnalysis.cxx
index a7cb091b9dd94fb22328fb6655930af5ce5e1264..64c4867b2c31a756b665d44d5dd661889455d7c7 100644
--- a/Generators/HepMCAnalysis_i/src/UserAnalysis.cxx
+++ b/Generators/HepMCAnalysis_i/src/UserAnalysis.cxx
@@ -6,12 +6,12 @@
 
 #include <iostream>
 
-#include "HepMC/GenEvent.h"
-#include "HepMC/IO_GenEvent.h"
-#include "HepMC/GenParticle.h"
-#include "HepMC/GenVertex.h"
-#include "HepMC/IO_AsciiParticles.h"
-#include "HepMC/SimpleVector.h"
+#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/IO_GenEvent.h"
+#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/GenVertex.h"
+#include "AtlasHepMC/IO_AsciiParticles.h"
+#include "AtlasHepMC/SimpleVector.h"
 #include "CLHEP/Vector/LorentzVector.h"
 
 #include "TH1.h"
diff --git a/Generators/Herwig7_i/CMakeLists.txt b/Generators/Herwig7_i/CMakeLists.txt
index 9a200b44ec8751985cf48246f40de33f67909544..2a8af7a478a60a0e26bd655e4823d59cce87240e 100644
--- a/Generators/Herwig7_i/CMakeLists.txt
+++ b/Generators/Herwig7_i/CMakeLists.txt
@@ -9,6 +9,7 @@ atlas_subdir( Herwig7_i )
 atlas_depends_on_subdirs(
    PUBLIC
    Generators/GeneratorModules
+   Generators/AtlasHepMC
    PRIVATE
    Event/EventInfo
    GaudiKernel
diff --git a/Generators/HforTool/CMakeLists.txt b/Generators/HforTool/CMakeLists.txt
index 267ec0bdf5678159f23e3599587e8ecb359ae1a2..7a875a64ba609d2a919cd9ca0c0b7dba415b9579 100644
--- a/Generators/HforTool/CMakeLists.txt
+++ b/Generators/HforTool/CMakeLists.txt
@@ -15,18 +15,18 @@ atlas_depends_on_subdirs( PUBLIC
                           Control/StoreGate
                           Generators/TruthUtils
                           Generators/GeneratorObjects
+                          Generators/AtlasHepMC
                           Generators/GenInterfaces )
 
 # External dependencies:
-find_package( HepMC )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
 
 # Component(s) in the package:
 atlas_add_component( HforTool
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps EventInfo GaudiKernel JetEvent StoreGateLib SGtests GeneratorObjects TruthUtils )
+                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} 
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} AtlasHepMCLib AthenaBaseComps EventInfo GaudiKernel JetEvent StoreGateLib SGtests GeneratorObjects TruthUtils )
 
 # Install files from the package:
 atlas_install_headers( HforTool )
diff --git a/Generators/HforTool/HforTool/HforTool.h b/Generators/HforTool/HforTool/HforTool.h
index ab45bdb7feb1d8c9eb983d940c28b0959cd9679e..c82e9af93a59efaa8a2eb8b20586be3729e949c9 100644
--- a/Generators/HforTool/HforTool/HforTool.h
+++ b/Generators/HforTool/HforTool/HforTool.h
@@ -8,7 +8,7 @@
 #include "GenInterfaces/IHforTool.h"
 #include "AthenaBaseComps/AthAlgTool.h"
 
-#include "HepMC/GenEvent.h"
+#include "AtlasHepMC/GenEvent.h"
 #include "EventInfo/EventID.h"
 #include "JetEvent/JetCollection.h"
 
diff --git a/Generators/Hijing_i/CMakeLists.txt b/Generators/Hijing_i/CMakeLists.txt
index 961c98c7cbfa80ac6d71de2aa1a3e749f2c4eaa3..9eb1adf6f6d33e26d310734f48378abeb66dc98b 100644
--- a/Generators/Hijing_i/CMakeLists.txt
+++ b/Generators/Hijing_i/CMakeLists.txt
@@ -10,6 +10,7 @@ atlas_depends_on_subdirs(
    PUBLIC
    Generators/GeneratorFortranCommon
    Generators/GeneratorModules
+   Generators/AtlasHepMC
    Control/CxxUtils
    PRIVATE
    Control/AthenaKernel
@@ -21,7 +22,6 @@ atlas_depends_on_subdirs(
 
 # External dependencies:
 find_package( CLHEP )
-find_package( HepMC )
 find_package( Hijing )
 
 # Remove the --as-needed linker flags:
@@ -32,12 +32,12 @@ atlas_add_library( Hijing_iLib
    Hijing_i/*.h src/*.cxx src/*.F src/Hijing_modified/*.f
    PUBLIC_HEADERS Hijing_i
    INCLUDE_DIRS ${HIJING_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-   PRIVATE_INCLUDE_DIRS ${HEPMC_INCLUDE_DIRS}
+   PRIVATE_INCLUDE_DIRS 
    DEFINITIONS ${CLHEP_DEFINITIONS}
    PRIVATE_DEFINITIONS -DHIJINGVERSION=\"${HIJING_VERSION}\"
    LINK_LIBRARIES ${HIJING_LIBRARIES} ${CLHEP_LIBRARIES}
    GeneratorFortranCommonLib GeneratorModulesLib StoreGateLib
-   PRIVATE_LINK_LIBRARIES ${HEPMC_LIBRARIES} AthenaKernel GaudiKernel
+   PRIVATE_LINK_LIBRARIES AtlasHepMCLib AthenaKernel GaudiKernel
    GeneratorObjects TruthUtils )
 
 atlas_add_component( Hijing_i
diff --git a/Generators/Hijing_i/src/Hijing.cxx b/Generators/Hijing_i/src/Hijing.cxx
index 58fff085aaf0f467c0422542f53976cacbc9192f..c45c5a5e6aeb6a354f0afdf36a9f1f62a7652567 100644
--- a/Generators/Hijing_i/src/Hijing.cxx
+++ b/Generators/Hijing_i/src/Hijing.cxx
@@ -26,9 +26,9 @@
 
 #include "GeneratorUtils/StringParse.h"
 
-#include "HepMC/GenEvent.h"
-#include "HepMC/GenVertex.h"
-#include "HepMC/GenParticle.h"
+#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/GenVertex.h"
+#include "AtlasHepMC/GenParticle.h"
 
 #include <stdlib.h>
 
diff --git a/Generators/Hydjet_i/CMakeLists.txt b/Generators/Hydjet_i/CMakeLists.txt
index af738683de9fc4afbc49d97cedba7e5c55ec3f57..8fa501fba7b1e96eeab5e137fb749ca109ab1409 100644
--- a/Generators/Hydjet_i/CMakeLists.txt
+++ b/Generators/Hydjet_i/CMakeLists.txt
@@ -10,6 +10,7 @@ atlas_depends_on_subdirs(
    PUBLIC
    Generators/GeneratorFortranCommon
    Generators/GeneratorModules
+   Generators/AtlasHepMC
    Control/CxxUtils
    PRIVATE
    Control/AthenaKernel
@@ -21,7 +22,6 @@ atlas_depends_on_subdirs(
 
 # External dependencies:
 find_package( CLHEP )
-find_package( HepMC )
 find_package( Hijing )
 find_package( Hydjet )
 find_package( Pyquen )
@@ -36,12 +36,12 @@ atlas_add_library( Hydjet_iLib
    PUBLIC_HEADERS Hydjet_i
    INCLUDE_DIRS ${PYQUEN_INCLUDE_DIRS} ${PYTHIA6_INCLUDE_DIRS}
    ${HYDJET_INCLUDE_DIRS} ${HIJING_INCLUDE_DIRS}
-   PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
+   PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} 
    PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
    LINK_LIBRARIES ${PYQUEN_LIBRARIES} ${PYTHIA6_LIBRARIES}
    ${HYDJET_LIBRARIES} ${HIJING_LIBRARIES} GeneratorFortranCommonLib
    GeneratorModulesLib StoreGateLib
-   PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES}
+   PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib
    AthenaKernel GaudiKernel GeneratorObjects TruthUtils )
 
 atlas_add_component( Hydjet_i
diff --git a/Generators/Hydjet_i/src/Hydjet_i.cxx b/Generators/Hydjet_i/src/Hydjet_i.cxx
index a63a11040eb32fe6b6dade0df467cffdb4bf66fc..879ceeae3a6ac6dcc7b1bec9d570166cc0f6ab55 100644
--- a/Generators/Hydjet_i/src/Hydjet_i.cxx
+++ b/Generators/Hydjet_i/src/Hydjet_i.cxx
@@ -22,9 +22,9 @@
 
 #include "GeneratorUtils/StringParse.h"
 
-#include "HepMC/GenEvent.h"
-#include "HepMC/GenVertex.h"
-#include "HepMC/GenParticle.h"
+#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/GenVertex.h"
+#include "AtlasHepMC/GenParticle.h"
 
 #include <stdlib.h>
 
diff --git a/Generators/MCTester_i/CMakeLists.txt b/Generators/MCTester_i/CMakeLists.txt
index eeb79703925143bd8715df23ba99610211106162..fa681d6d06c56ac6c595ec59ef3f6a2fabdb12b8 100644
--- a/Generators/MCTester_i/CMakeLists.txt
+++ b/Generators/MCTester_i/CMakeLists.txt
@@ -12,10 +12,10 @@ atlas_depends_on_subdirs( PUBLIC
                           PRIVATE
                           Control/StoreGate
                           Event/EventInfo
+                          Generators/AtlasHepMC
                           Generators/GeneratorObjects )
 
 # External dependencies:
-find_package( HepMC )
 find_package( MCTester )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread MathMore Minuit Minuit2 Matrix Physics HistPainter Rint Graf Graf3d Gpad Html Postscript Gui GX11TTF GX11 )
 
@@ -23,8 +23,8 @@ find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread MathMore Minui
 atlas_add_component( MCTester_i
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${MCTESTER_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${MCTESTER_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps GaudiKernel StoreGateLib SGtests EventInfo GeneratorObjects )
+                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${MCTESTER_INCLUDE_DIRS} 
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${MCTESTER_LIBRARIES} AtlasHepMCLib AthenaBaseComps GaudiKernel StoreGateLib SGtests EventInfo GeneratorObjects )
 
 # Install files from the package:
 atlas_install_headers( MCTester_i )
diff --git a/Generators/MCTester_i/src/MCTesterAlg.cxx b/Generators/MCTester_i/src/MCTesterAlg.cxx
index f87ed6faf735979e35142604ec3b880ae17d92b6..9186b82f305a31e4c6c20be29fb7d967964f2bf9 100644
--- a/Generators/MCTester_i/src/MCTesterAlg.cxx
+++ b/Generators/MCTester_i/src/MCTesterAlg.cxx
@@ -8,8 +8,8 @@
 #include "GaudiKernel/ISvcLocator.h"
  
 #include "StoreGate/StoreGateSvc.h"
-#include "HepMC/GenEvent.h"
-#include "HepMC/GenVertex.h"
+#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/GenVertex.h"
  
 #include "GaudiKernel/IPartPropSvc.h"
 #include "MCTester_i/MCTesterAlg.h"
diff --git a/Generators/ParticleDecayer/CMakeLists.txt b/Generators/ParticleDecayer/CMakeLists.txt
index 65fd0115dec3cc933da43bd5150b4892f519adaa..9eced30bb549be2eb499c5efe153ae51c8160049 100644
--- a/Generators/ParticleDecayer/CMakeLists.txt
+++ b/Generators/ParticleDecayer/CMakeLists.txt
@@ -9,13 +9,13 @@ atlas_subdir( ParticleDecayer )
 atlas_depends_on_subdirs( PUBLIC
                           Control/AthenaKernel
                           Generators/GeneratorModules
+                          Generators/AtlasHepMC
                           PRIVATE
                           GaudiKernel
                           Generators/GeneratorObjects )
 
 # External dependencies:
 find_package( CLHEP )
-find_package( HepMC )
 find_package( HepPDT )
 
 # Remove the --as-needed linker flags:
@@ -25,8 +25,8 @@ atlas_disable_as_needed()
 atlas_add_component( ParticleDecayer
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${HEPPDT_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaKernel GeneratorModulesLib GaudiKernel GeneratorObjects )
+                     INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} 
+                     LINK_LIBRARIES ${HEPPDT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaKernel GeneratorModulesLib GaudiKernel GeneratorObjects )
 
 # Install files from the package:
 atlas_install_headers( ParticleDecayer )
diff --git a/Generators/ParticleDecayer/ParticleDecayer/ParticleDecayer.h b/Generators/ParticleDecayer/ParticleDecayer/ParticleDecayer.h
index ab82d2e78883be082ecd904bc496efd18e5364b3..631cfb5c7a8c07b9dbcf60647d989176b5684344 100644
--- a/Generators/ParticleDecayer/ParticleDecayer/ParticleDecayer.h
+++ b/Generators/ParticleDecayer/ParticleDecayer/ParticleDecayer.h
@@ -7,7 +7,7 @@
 
 #include "GeneratorModules/GenModule.h"
 #include "CLHEP/Vector/LorentzVector.h"
-#include "HepMC/IO_BaseClass.h"
+#include "AtlasHepMC/IO_BaseClass.h"
 #include "HepPDT/ParticleDataTable.hh"
 
 
diff --git a/Generators/Pythia8B_i/CMakeLists.txt b/Generators/Pythia8B_i/CMakeLists.txt
index 1787221e0fc8281f544a210b9c9007984dd21d79..fa41256e694b457f022ef713e085140d503adcf1 100644
--- a/Generators/Pythia8B_i/CMakeLists.txt
+++ b/Generators/Pythia8B_i/CMakeLists.txt
@@ -10,13 +10,13 @@ atlas_depends_on_subdirs( PUBLIC
                           Control/AthenaBaseComps
                           GaudiKernel
                           Generators/Pythia8_i
+                          Generators/AtlasHepMC
                           PRIVATE
                           Generators/GeneratorObjects )
 
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( CLHEP )
-find_package( HepMC )
 find_package( Lhapdf )
 find_package( Pythia8 )
 
@@ -31,15 +31,15 @@ atlas_add_library( Pythia8B_iLib
                    src/*.cxx
                    PUBLIC_HEADERS Pythia8B_i
                    INCLUDE_DIRS ${PYTHIA8_INCLUDE_DIRS} ${LHAPDF_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                   PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
+                   PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} 
                    DEFINITIONS ${CLHEP_DEFINITIONS}
                    LINK_LIBRARIES ${PYTHIA8_LIBRARIES} ${LHAPDF_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps GaudiKernel Pythia8_iLib
-                   PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${HEPMC_LIBRARIES} GeneratorObjects )
+                   PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} AtlasHepMCLib GeneratorObjects )
 
 atlas_add_component( Pythia8B_i
                      src/components/*.cxx
-                     INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${PYTHIA8_INCLUDE_DIRS} ${LHAPDF_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${PYTHIA8_LIBRARIES} ${LHAPDF_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps GaudiKernel Pythia8_iLib GeneratorObjects Pythia8B_iLib )
+                     INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${PYTHIA8_INCLUDE_DIRS} ${LHAPDF_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} 
+                     LINK_LIBRARIES ${Boost_LIBRARIES} ${PYTHIA8_LIBRARIES} ${LHAPDF_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps GaudiKernel Pythia8_iLib GeneratorObjects Pythia8B_iLib )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
diff --git a/Generators/Pythia8B_i/src/Pythia8B_i.cxx b/Generators/Pythia8B_i/src/Pythia8B_i.cxx
index cab547a42c1563ee4b337765aa48ce1f243e86c7..82e28cedf9a3a6e5383d28dc0adf1e0742168946 100644
--- a/Generators/Pythia8B_i/src/Pythia8B_i.cxx
+++ b/Generators/Pythia8B_i/src/Pythia8B_i.cxx
@@ -14,7 +14,7 @@
 #include "Pythia8B_i/Pythia8B_i.h"
 #include "Pythia8B_i/UserSelections.h"
 #include "GeneratorObjects/McEventCollection.h"
-#include "HepMC/GenEvent.h"
+#include "AtlasHepMC/GenEvent.h"
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
 
diff --git a/Generators/Pythia8_i/CMakeLists.txt b/Generators/Pythia8_i/CMakeLists.txt
index cc9a664e23d97690f4bcad91b392b7254824e125..f192a8c97b097e980494812c5747091d78ffb9ee 100644
--- a/Generators/Pythia8_i/CMakeLists.txt
+++ b/Generators/Pythia8_i/CMakeLists.txt
@@ -9,6 +9,7 @@ atlas_subdir( Pythia8_i )
 atlas_depends_on_subdirs( PUBLIC
                           Control/AthenaKernel
                           Generators/GeneratorModules
+                          Generators/AtlasHepMC
                           PRIVATE
                           GaudiKernel
                           Generators/GeneratorObjects
diff --git a/Generators/Rivet_i/CMakeLists.txt b/Generators/Rivet_i/CMakeLists.txt
index 7bce188822b521211514c47f72db025f98b3a602..bb2dd4140e6f377fc56ac1108db8a2f71ff30a3d 100644
--- a/Generators/Rivet_i/CMakeLists.txt
+++ b/Generators/Rivet_i/CMakeLists.txt
@@ -6,7 +6,6 @@ atlas_subdir( Rivet_i )
 # External dependencies:
 find_package( FastJet )
 find_package( FastJetContrib )
-find_package( HepMC )
 find_package( ROOT COMPONENTS Core Hist )
 find_package( Rivet )
 find_package( YODA )
@@ -18,8 +17,8 @@ atlas_disable_as_needed()
 atlas_add_component( Rivet_i
    src/*.h src/*.cxx src/components/*.cxx
    INCLUDE_DIRS ${FASTJET_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-   ${HEPMC_INCLUDE_DIRS} ${RIVET_INCLUDE_DIRS} ${YODA_INCLUDE_DIRS}
-   LINK_LIBRARIES ${FASTJET_LIBRARIES} ${ROOT_LIBRARIES} ${HEPMC_LIBRARIES}
+    ${RIVET_INCLUDE_DIRS} ${YODA_INCLUDE_DIRS}
+   LINK_LIBRARIES ${FASTJET_LIBRARIES} ${ROOT_LIBRARIES} AtlasHepMCLib
    ${RIVET_LIBRARIES} ${YODA_LIBRARIES} AthenaBaseComps GaudiKernel
    AthenaKernel GeneratorObjects PathResolver EventInfo )
 
diff --git a/Generators/Rivet_i/src/Rivet_i.cxx b/Generators/Rivet_i/src/Rivet_i.cxx
index 0fe73f0a89269b881a56cb713df83371c089dc5b..09a8b26d7b8e751239cbe29714912e3bfdb431a3 100644
--- a/Generators/Rivet_i/src/Rivet_i.cxx
+++ b/Generators/Rivet_i/src/Rivet_i.cxx
@@ -7,7 +7,7 @@
 #include "Rivet_i.h"
 #include "LogLevels.h"
 
-#include "HepMC/GenEvent.h"
+#include "AtlasHepMC/GenEvent.h"
 
 #include "GeneratorObjects/McEventCollection.h"
 #include "AthenaKernel/errorcheck.h"
diff --git a/Generators/Sherpa_i/CMakeLists.txt b/Generators/Sherpa_i/CMakeLists.txt
index cb25a0e43d52120239e9ad80a17af98011211690..a86056227fb14c5d5a5b74cfccecd9533c03e51e 100644
--- a/Generators/Sherpa_i/CMakeLists.txt
+++ b/Generators/Sherpa_i/CMakeLists.txt
@@ -9,6 +9,7 @@ atlas_subdir( Sherpa_i )
 atlas_depends_on_subdirs( PUBLIC
                           GaudiKernel
                           Generators/GeneratorModules
+                          Generators/AtlasHepMC
                           Generators/TruthUtils
                           PRIVATE
                           Control/AthenaBaseComps
@@ -21,7 +22,6 @@ atlas_depends_on_subdirs( PUBLIC
 
 # External dependencies:
 find_package( CLHEP )
-find_package( HepMC )
 find_package( Sherpa COMPONENTS SherpaTools )
 
 # Remove the --as-needed linker flags:
@@ -31,8 +31,8 @@ atlas_disable_as_needed()
 atlas_add_component( Sherpa_i
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS} ${SHERPA_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} ${SHERPA_LIBRARIES} GaudiKernel GeneratorModulesLib TruthUtils AthenaBaseComps AthenaKernel )
+                     INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}  ${SHERPA_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib ${SHERPA_LIBRARIES} GaudiKernel GeneratorModulesLib TruthUtils AthenaBaseComps AthenaKernel )
 
 # Install files from the package:
 atlas_install_headers( Sherpa_i )
diff --git a/Generators/Sherpa_i/src/Sherpa_i.cxx b/Generators/Sherpa_i/src/Sherpa_i.cxx
index d6835b77c65b7f501e2f9be2c2e8cfc5720090af..0ab33fc9b338378a830e0bad434bfedc58c9e817 100644
--- a/Generators/Sherpa_i/src/Sherpa_i.cxx
+++ b/Generators/Sherpa_i/src/Sherpa_i.cxx
@@ -1,7 +1,7 @@
 /*
    Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
-#include "HepMC/GenEvent.h"
+#include "AtlasHepMC/GenEvent.h"
 #include "GaudiKernel/MsgStream.h"
 #include "AthenaBaseComps/AthMsgStreamMacros.h"
 
diff --git a/Generators/Starlight_i/CMakeLists.txt b/Generators/Starlight_i/CMakeLists.txt
index 77e71a2504d67e65f272294b2814ce9410fdc2e8..04abb290de4e318dd4868074f7fc4328c86ef936 100644
--- a/Generators/Starlight_i/CMakeLists.txt
+++ b/Generators/Starlight_i/CMakeLists.txt
@@ -10,6 +10,7 @@ atlas_subdir( Starlight_i )
 atlas_depends_on_subdirs(
    PUBLIC
    Generators/GeneratorModules
+   Generators/AtlasHepMC
    PRIVATE
    Control/AthenaKernel
    Control/StoreGate
@@ -19,7 +20,6 @@ atlas_depends_on_subdirs(
 
 # External dependencies:
 find_package( CLHEP )
-find_package( HepMC )
 find_package( Starlight )
 
 # Remove the --as-needed linker flags:
@@ -30,10 +30,10 @@ atlas_add_library( Starlight_iLib
    Starlight_i/*.h src/*.cxx
    PUBLIC_HEADERS Starlight_i
    INCLUDE_DIRS ${STARLIGHT_INCLUDE_DIRS}
-   PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
+   PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} 
    PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
    LINK_LIBRARIES ${STARLIGHT_LIBRARIES} GeneratorModulesLib StoreGateLib
-   PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaKernel
+   PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaKernel
    GaudiKernel TruthUtils )
 
 atlas_add_component( Starlight_i
diff --git a/Generators/Starlight_i/src/Starlight_i.cxx b/Generators/Starlight_i/src/Starlight_i.cxx
index 8c092b8b24f923aed4f88ba976bcd9b7ac81ebf9..2da86eaad0f4e4b8c5e347a06b1378487d7756e0 100644
--- a/Generators/Starlight_i/src/Starlight_i.cxx
+++ b/Generators/Starlight_i/src/Starlight_i.cxx
@@ -22,9 +22,9 @@
 
 #include "GeneratorUtils/StringParse.h"
 
-#include "HepMC/GenEvent.h"
-#include "HepMC/GenVertex.h"
-#include "HepMC/GenParticle.h"
+#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/GenVertex.h"
+#include "AtlasHepMC/GenParticle.h"
 
 #include <stdlib.h>
 #include <iostream>
diff --git a/Generators/Tauolapp_i/CMakeLists.txt b/Generators/Tauolapp_i/CMakeLists.txt
index d32cb0dc0cc686e6505c415bdaac0b5fe73b541e..3ed58dfd82bfd7242c9b36e7499c2bec495949c5 100644
--- a/Generators/Tauolapp_i/CMakeLists.txt
+++ b/Generators/Tauolapp_i/CMakeLists.txt
@@ -13,19 +13,19 @@ atlas_depends_on_subdirs(
    Database/AthenaPOOL/AthenaPoolUtilities
    Event/EventInfo
    GaudiKernel
+   Generators/AtlasHepMC
    Generators/GeneratorObjects )
 
 # External dependencies:
 find_package( CLHEP )
-find_package( HepMC )
 find_package( Tauolapp COMPONENTS TauolaFortran )
 
 # Component(s) in the package:
 atlas_add_component( Tauolapp_i
    Tauolapp_i/*.h src/*.cxx src/components/*.cxx
    INCLUDE_DIRS ${TAUOLAPP_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-   ${HEPMC_INCLUDE_DIRS}
-   LINK_LIBRARIES ${TAUOLAPP_LIBRARIES} ${HEPMC_LIBRARIES} ${CLHEP_LIBRARIES}
+   
+   LINK_LIBRARIES ${TAUOLAPP_LIBRARIES} AtlasHepMCLib ${CLHEP_LIBRARIES}
    AthenaBaseComps AthenaPoolUtilities EventInfo GaudiKernel GeneratorObjects )
 
 # Install files from the package:
diff --git a/Generators/Tauolapp_i/Tauolapp_i/TauolaPP.h b/Generators/Tauolapp_i/Tauolapp_i/TauolaPP.h
index 32023286aebab92376b8c8c47a235afb24840f69..7ac88b09d140f6cb3572974094e85b7205d49695 100644
--- a/Generators/Tauolapp_i/Tauolapp_i/TauolaPP.h
+++ b/Generators/Tauolapp_i/Tauolapp_i/TauolaPP.h
@@ -10,8 +10,8 @@
 #include "GaudiKernel/ServiceHandle.h"
 
 
-#include "HepMC/GenEvent.h"
-#include "HepMC/GenVertex.h"
+#include "AtlasHepMC/GenEvent.h"
+#include "AtlasHepMC/GenVertex.h"
 
 #include "GaudiKernel/IPartPropSvc.h"
 
diff --git a/Generators/TrackRecordGenerator/CMakeLists.txt b/Generators/TrackRecordGenerator/CMakeLists.txt
index 80c29cd59b8162aa6b09cd820f886d5806625220..1aa5b61bf5174e52a8042a3d90df293e83fd81ce 100644
--- a/Generators/TrackRecordGenerator/CMakeLists.txt
+++ b/Generators/TrackRecordGenerator/CMakeLists.txt
@@ -8,27 +8,27 @@ atlas_subdir( TrackRecordGenerator )
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
                           Generators/GeneratorModules
+                          Generators/AtlasHepMC
                           PRIVATE
                           GaudiKernel
                           Simulation/G4Sim/TrackRecord )
 
 # External dependencies:
 find_package( CLHEP )
-find_package( HepMC )
 
 # Component(s) in the package:
 atlas_add_library( TrackRecordGeneratorLib
                    src/TrackRecordGenerator.cxx
                    PUBLIC_HEADERS TrackRecordGenerator
-                   INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
+                   INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} 
                    DEFINITIONS ${CLHEP_DEFINITIONS}
-                   LINK_LIBRARIES ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} GeneratorModulesLib
+                   LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib GeneratorModulesLib
                    PRIVATE_LINK_LIBRARIES GaudiKernel )
 
 atlas_add_component( TrackRecordGenerator
                      src/components/*.cxx
-                     INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} GeneratorModulesLib GaudiKernel TrackRecordGeneratorLib )
+                     INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} 
+                     LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasHepMCLib GeneratorModulesLib GaudiKernel TrackRecordGeneratorLib )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
diff --git a/Generators/TrackRecordGenerator/TrackRecordGenerator/TrackRecordGenerator.h b/Generators/TrackRecordGenerator/TrackRecordGenerator/TrackRecordGenerator.h
index 7fd48ad08f157dc03ed99ee64914c2bb7dc28429..86cc8bea76f82918f75e5e56561d0a24a2dbe9a2 100644
--- a/Generators/TrackRecordGenerator/TrackRecordGenerator/TrackRecordGenerator.h
+++ b/Generators/TrackRecordGenerator/TrackRecordGenerator/TrackRecordGenerator.h
@@ -19,7 +19,7 @@
 
 // Members
 #include "CLHEP/Vector/LorentzVector.h"
-#include "HepMC/Polarization.h"
+#include "AtlasHepMC/Polarization.h"
 
 #include <vector>
 #include <string>
diff --git a/Generators/TruthUtils/CMakeLists.txt b/Generators/TruthUtils/CMakeLists.txt
index bd1c3ba5fdd13a09d71c344d96bebee70f148d22..92c4892cd90e7a12eee41df4beec69041e38baac 100644
--- a/Generators/TruthUtils/CMakeLists.txt
+++ b/Generators/TruthUtils/CMakeLists.txt
@@ -10,7 +10,6 @@ atlas_subdir( TruthUtils )
 find_package( Boost )
 find_package( HEPUtils )
 find_package( MCUtils )
-find_package( HepMC QUIET )
 
 # Extra include directories and libraries, based on which externals were found:
 set( extra_includes )
@@ -24,8 +23,8 @@ if( MCUTILS_FOUND )
    list( APPEND extra_libs ${MCUTILS_LIBRARIES} )
 endif()
 if( HEPMC_FOUND )
-   list( APPEND extra_includes ${HEPMC_INCLUDE_DIRS} )
-   list( APPEND extra_libs ${HEPMC_LIBRARIES} )
+   list( APPEND extra_includes  )
+   list( APPEND extra_libs AtlasHepMCLib )
 endif()
 
 # Component(s) in the package:
diff --git a/Generators/TruthUtils/TruthUtils/HepMCHelpers.h b/Generators/TruthUtils/TruthUtils/HepMCHelpers.h
index 53a150f4a3f2d7df8ce07d995066631a113a496c..38a8f236c34da20015ba9dd89927b0417e086692 100644
--- a/Generators/TruthUtils/TruthUtils/HepMCHelpers.h
+++ b/Generators/TruthUtils/TruthUtils/HepMCHelpers.h
@@ -12,12 +12,6 @@
 #include "TruthUtils/PIDHelpers.h"
 #include "TruthUtils/TruthParticleHelpers.h"
 #include "MCUtils/HepMCUtils.h"
-// #include "MCUtils/Clustering.h"
-
-// Common imports from external namespaces
-//using fastjet::PseudoJet;
-//using fastjet::ClusterSequence;
-
 
 namespace MC {
 
diff --git a/Projects/AthSimulation/package_filters.txt b/Projects/AthSimulation/package_filters.txt
index 0e75239391e880f1a8ee0073f3dfcd450014312a..d03fde2fd87387d75089b4acc20b6f58ccc0d57b 100644
--- a/Projects/AthSimulation/package_filters.txt
+++ b/Projects/AthSimulation/package_filters.txt
@@ -153,6 +153,7 @@
 + Event/xAOD/xAODTruthAthenaPool
 + Event/xAOD/xAODTruthCnv
 + External/AtlasDataArea
++ Generators/AtlasHepMC
 + Generators/GenInterfaces
 + Generators/GeneratorObjects
 + Generators/GeneratorObjectsAthenaPool