diff --git a/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC3.cxx b/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC3.cxx
index 9ce495a8826499a2256f4433ab55252118e4232f..fc34a7f05e23fffbc5cadcaef5bbe755a2c16db8 100644
--- a/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC3.cxx
+++ b/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC3.cxx
@@ -49,8 +49,6 @@
 
 #include "CxxUtils/checker_macros.h"
 
-ATLAS_NO_CHECK_FILE_THREAD_SAFETY; // std::exit is used.
-
 using eformat::helper::SourceIdentifier; 
 using namespace std;
 
@@ -81,7 +79,7 @@ const InterfaceID& TRT_FillCablingData_DC3::interfaceID( )
 
 
   // Initialisation
-StatusCode TRT_FillCablingData_DC3::initialize( )
+StatusCode TRT_FillCablingData_DC3::initialize ATLAS_NOT_THREAD_SAFE ( ) // thread unsafe TRT_FillCablingData_DC3::defineTables is used.
 {
   ATH_MSG_INFO( "TRT_FillCablingData_DC3::initialize" ); 
 
@@ -175,7 +173,7 @@ void TRT_FillCablingData_DC3::defineParameters()
 
 
   // Fill Tables with IDs for all straws
-void TRT_FillCablingData_DC3::defineTables()
+void TRT_FillCablingData_DC3::defineTables ATLAS_NOT_THREAD_SAFE () // thread unsafe std::exit is used.
 {
    ATH_MSG_INFO( "In defineTables" ); 
 
diff --git a/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC3.h b/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC3.h
index 3e31ac729bbd87567ae7965d15c9e421eeefb8a8..119bfff7999742b23606da12be6a1a769da56fee 100644
--- a/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC3.h
+++ b/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC3.h
@@ -15,8 +15,6 @@
  */
 #include "AthenaBaseComps/AthAlgTool.h"
 
-#include "CxxUtils/checker_macros.h"
-
 #include "Identifier/Identifier.h"
 #include "Identifier/IdentifierHash.h"
 #include "Identifier/IdContext.h"
@@ -32,8 +30,6 @@
 #include <vector>
 #include <stdint.h> 
 
-ATLAS_NO_CHECK_FILE_THREAD_SAFETY; // std::exit is used.
-
 class TRT_FillCablingData_DC3: public AthAlgTool {
 
  public: