diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/src/PunchThroughTool.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/src/PunchThroughTool.cxx
index 6a2e7bd0d70a66fced2fc9c265147f4bafb82738..e996f4c0ff2da0fcf1628f9ab9cd731645dd6d5b 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/src/PunchThroughTool.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/src/PunchThroughTool.cxx
@@ -26,10 +26,10 @@
 #include "GaudiKernel/IPartPropSvc.h"
 
 // HepMC
-#include "HepMC/SimpleVector.h"
-#include "HepMC/GenVertex.h"
-#include "HepMC/GenParticle.h"
-#include "HepMC/GenEvent.h"
+#include "AtlasHepMC/SimpleVector.h"
+#include "AtlasHepMC/GenVertex.h"
+#include "AtlasHepMC/GenParticle.h"
+#include "AtlasHepMC/GenEvent.h"
 #include "HepPDT/ParticleDataTable.hh"
 
 // CLHEP
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/src/PunchThroughTool.h b/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/src/PunchThroughTool.h
index 04eb29e01e29eb7dc2a49884f83bbdd3829b044a..1bb64cfd3666a8ce2926d9abd399a6c80fc7c0d6 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/src/PunchThroughTool.h
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/src/PunchThroughTool.h
@@ -15,6 +15,8 @@
 #include "BarcodeEvent/PhysicsProcessCode.h"
 #include "GeoPrimitives/GeoPrimitives.h"
 
+#include "AtlasHepMC/GenEvent_fwd.h"
+
 /*-------------------------------------------------------------------------
  *  Forward declarations
  *-------------------------------------------------------------------------*/
@@ -32,10 +34,6 @@ namespace HepPDT {
   class ParticleDataTable;
 }
 
-namespace HepMC {
-  class GenEvent;
-}
-
 namespace Barcode {
   class IBarcodeSvc;
 }