diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/CMakeLists.txt b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/CMakeLists.txt
index 655853d4a528a23cb0ba868c3bb3dac040aadd63..64d43da464cdfaf7bafc3677fb785e8c91a0d1c3 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/CMakeLists.txt
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/CMakeLists.txt
@@ -10,7 +10,7 @@ atlas_depends_on_subdirs( PUBLIC
                           GaudiKernel
                           PRIVATE
                           Control/AthenaBaseComps
-                          Simulation/Barcode/BarcodeInterfaces
+                          Simulation/Barcode/BarcodeEvent
                           Simulation/ISF/ISF_Core/ISF_Interfaces
                           Tracking/TrkEvent/TrkEventPrimitives
                           Tracking/TrkExtrapolation/TrkExInterfaces
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/cmt/requirements b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/cmt/requirements
index 2e5265ff801f27d0170a7b9af88861aab0aa9cde..60d8e29f0f97ca950bf4aaf086f19cb9446863c0 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/cmt/requirements
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/cmt/requirements
@@ -14,7 +14,7 @@ use GaudiInterface              GaudiInterface-*        External
 # private use statements
 private
 use AthenaBaseComps             AthenaBaseComps-*           Control
-use BarcodeInterfaces           BarcodeInterfaces-*         Simulation/Barcode
+use BarcodeEvent                BarcodeEvent-*              Simulation/Barcode
 use CaloInterface               CaloInterface-*             Calorimeter
 use ISF_Interfaces              ISF_Interfaces-*            Simulation/ISF/ISF_Core
 use AtlasCLHEP                  AtlasCLHEP-*            	External
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvc.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvc.cxx
index c828e6ecddeb0ee19f1362d33fc031bbffabf9a3..81c5955b0e2109f26a1e9f96534c6a66c626dc13 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvc.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvc.cxx
@@ -28,6 +28,8 @@
 #include "CaloEvent/CaloCell.h"
 #include "CaloEvent/CaloCellContainer.h"
 #include "NavFourMom/INavigable4MomentumCollection.h"
+// Barcode
+#include "BarcodeEvent/Barcode.h"
 // use FastShowerCellBuilderTool for actual simulation
 //#include "FastSimulationEvent/GenParticleEnergyDepositMap.h"
 #include "FastCaloSim/FastShowerCellBuilderTool.h"
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvc.h b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvc.h
index 6c96951eab0dd1d40eb1c9fabddb8317e8bd8735..41ddaf2e6a3af71700cf0105d87bb307db6569b1 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvc.h
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvc.h
@@ -27,9 +27,6 @@
 #include "TrkExInterfaces/ITimedExtrapolator.h"
 #include "TrkEventPrimitives/PdgToParticleHypothesis.h"
 
-// Barcode includes
-#include "BarcodeInterfaces/Barcode.h"
-
 // forward declarations
 class ITrackingGeometrySvc;
 class CaloCellContainer;