diff --git a/Simulation/ISF/ISF_Core/ISF_Tools/CMakeLists.txt b/Simulation/ISF/ISF_Core/ISF_Tools/CMakeLists.txt
index 94b09ae8cdb5ea423bc3ba3dc5a55a94aaaf4ad2..82deeb407848eccea14a37eb3ad102490f5628a6 100644
--- a/Simulation/ISF/ISF_Core/ISF_Tools/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Core/ISF_Tools/CMakeLists.txt
@@ -11,6 +11,7 @@ atlas_depends_on_subdirs( PUBLIC
                           PRIVATE
                           Control/AthenaBaseComps
                           DetectorDescription/AtlasDetDescr
+                          Simulation/Barcode/BarcodeEvent
                           Simulation/Barcode/BarcodeInterfaces
                           Simulation/G4Sim/TrackRecord
                           Simulation/ISF/ISF_Core/ISF_Event
diff --git a/Simulation/ISF/ISF_Core/ISF_Tools/cmt/requirements b/Simulation/ISF/ISF_Core/ISF_Tools/cmt/requirements
index 9d19339e882fb7cb6a1dba235ee29062bc7f8f6b..2875067cbc5293fd545579bac91afd35c4412152 100644
--- a/Simulation/ISF/ISF_Core/ISF_Tools/cmt/requirements
+++ b/Simulation/ISF/ISF_Core/ISF_Tools/cmt/requirements
@@ -15,6 +15,7 @@ use GaudiInterface              GaudiInterface-*        External
 private
 use AthenaBaseComps             AthenaBaseComps-*       Control
 use AtlasDetDescr               AtlasDetDescr-*         DetectorDescription
+use BarcodeEvent                BarcodeEvent-*          Simulation/Barcode
 use BarcodeInterfaces           BarcodeInterfaces-*     Simulation/Barcode
 use ISF_Event                   ISF_Event-*             Simulation/ISF/ISF_Core
 use ISF_Interfaces              ISF_Interfaces-*        Simulation/ISF/ISF_Core
diff --git a/Simulation/ISF/ISF_Core/ISF_Tools/src/EntryLayerFilter.h b/Simulation/ISF/ISF_Core/ISF_Tools/src/EntryLayerFilter.h
index 3cf41625037852d45fcc06de7f1b63d16341d4a9..75f22f793e7864ccc7f1f1b4e659c615cab4d3de 100644
--- a/Simulation/ISF/ISF_Core/ISF_Tools/src/EntryLayerFilter.h
+++ b/Simulation/ISF/ISF_Core/ISF_Tools/src/EntryLayerFilter.h
@@ -14,7 +14,7 @@
 // ISF includes
 #include "ISF_Interfaces/IParticleFilter.h"
 // Barcode Includes
-#include "BarcodeInterfaces/Barcode.h"
+#include "BarcodeEvent/Barcode.h"
 
 namespace ISF {
 
diff --git a/Simulation/ISF/ISF_Core/ISF_Tools/src/GenericBarcodeFilter.h b/Simulation/ISF/ISF_Core/ISF_Tools/src/GenericBarcodeFilter.h
index c5c3d76be664a12a9b6231f83bc829c1c790c7d2..76c735418d4dbe6665a7ac2407fc4b5dd9b6212a 100644
--- a/Simulation/ISF/ISF_Core/ISF_Tools/src/GenericBarcodeFilter.h
+++ b/Simulation/ISF/ISF_Core/ISF_Tools/src/GenericBarcodeFilter.h
@@ -14,7 +14,7 @@
 // ISF includes
 #include "ISF_Interfaces/IParticleFilter.h"
 // Barcode Includes
-#include "BarcodeInterfaces/Barcode.h"
+#include "BarcodeEvent/Barcode.h"
 
 namespace ISF {
 
diff --git a/Simulation/ISF/ISF_Core/ISF_Tools/src/MemoryMonitoringTool.cxx b/Simulation/ISF/ISF_Core/ISF_Tools/src/MemoryMonitoringTool.cxx
index fa2c70814e42891378dea63454825468a6298c24..ff24320a060beb60a55bd1ad50c20a3f89f0e76a 100644
--- a/Simulation/ISF/ISF_Core/ISF_Tools/src/MemoryMonitoringTool.cxx
+++ b/Simulation/ISF/ISF_Core/ISF_Tools/src/MemoryMonitoringTool.cxx
@@ -114,7 +114,7 @@ void ISF::MemoryMonitoringTool::recordCurrent( const char *infoStr) {
 /** dump all internally stored memory monitoring information */
 void ISF::MemoryMonitoringTool::dumpSummary(const char *desc) const {
 
-  ATH_MSG_INFO("*****************************************************"<<endreq<<
+  ATH_MSG_INFO("*****************************************************"<<endmsg<<
                "*  (VmMem) MEMORY SUMMARY: (kBytes)");
 
   // loop over all (infoStr,memUsage) pairs and print them
diff --git a/Simulation/ISF/ISF_Core/ISF_Tools/src/ParticleHelper.h b/Simulation/ISF/ISF_Core/ISF_Tools/src/ParticleHelper.h
index b9c1136b57cac498a6e75bbae894eae627421c17..92ed9fea32c28268fcd8b18443b0072a15e45bfa 100644
--- a/Simulation/ISF/ISF_Core/ISF_Tools/src/ParticleHelper.h
+++ b/Simulation/ISF/ISF_Core/ISF_Tools/src/ParticleHelper.h
@@ -19,7 +19,7 @@
 // ISF includes
 #include "ISF_Interfaces/IParticleHelper.h"
 // Barcode includes
-#include "BarcodeInterfaces/Barcode.h"
+#include "BarcodeEvent/Barcode.h"
 
 // forward declarations
 namespace Barcode {