diff --git a/Calorimeter/CaloCnv/CaloSimEventTPCnv/CaloSimEventTPCnv/CaloCalibrationHitContainerCnv_p2.h b/Calorimeter/CaloCnv/CaloSimEventTPCnv/CaloSimEventTPCnv/CaloCalibrationHitContainerCnv_p2.h
index 7aaf193936a9e7f5441f0f8dc34bdad16dd3094d..381815ee0d9813180de1c42a24d5794cff9783b9 100644
--- a/Calorimeter/CaloCnv/CaloSimEventTPCnv/CaloSimEventTPCnv/CaloCalibrationHitContainerCnv_p2.h
+++ b/Calorimeter/CaloCnv/CaloSimEventTPCnv/CaloSimEventTPCnv/CaloCalibrationHitContainerCnv_p2.h
@@ -5,9 +5,7 @@
 #ifndef CALOSIMEVENTTPCNV_CALOCALIBRATIONHITCONTAINERCNV_P2_H
 #define CALOSIMEVENTTPCNV_CALOCALIBRATIONHITCONTAINERCNV_P2_H
 
-#define private public
 #include "CaloSimEventTPCnv/CaloCalibrationHitContainer_p2.h"
-#undef private 
 #include "CaloSimEvent/CaloCalibrationHitContainer.h"
 #include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
 
diff --git a/Calorimeter/CaloCnv/CaloSimEventTPCnv/CaloSimEventTPCnv/CaloCalibrationHitContainerCnv_p3.h b/Calorimeter/CaloCnv/CaloSimEventTPCnv/CaloSimEventTPCnv/CaloCalibrationHitContainerCnv_p3.h
index 98b97aee97c6ebd0c55586d730ffd2d3ad26a4cb..99606b53b022357a58b7470f4e9a4d495650730f 100644
--- a/Calorimeter/CaloCnv/CaloSimEventTPCnv/CaloSimEventTPCnv/CaloCalibrationHitContainerCnv_p3.h
+++ b/Calorimeter/CaloCnv/CaloSimEventTPCnv/CaloSimEventTPCnv/CaloCalibrationHitContainerCnv_p3.h
@@ -1,13 +1,11 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef CALOSIMEVENTTPCNV_CALOCALIBRATIONHITCONTAINERCNV_P3_H
 #define CALOSIMEVENTTPCNV_CALOCALIBRATIONHITCONTAINERCNV_P3_H
 
-#define private public
 #include "CaloSimEventTPCnv/CaloCalibrationHitContainer_p3.h"
-#undef private 
 #include "CaloSimEvent/CaloCalibrationHitContainer.h"
 #include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h"
 
diff --git a/Calorimeter/CaloCnv/CaloSimEventTPCnv/CaloSimEventTPCnv/CaloCalibrationHitContainer_p2.h b/Calorimeter/CaloCnv/CaloSimEventTPCnv/CaloSimEventTPCnv/CaloCalibrationHitContainer_p2.h
index f1d8bcb76478cf44adb7df378ec39eafb1241d9d..2ab21c294b68602ab17a9ff17ae75f3300e1be0f 100644
--- a/Calorimeter/CaloCnv/CaloSimEventTPCnv/CaloSimEventTPCnv/CaloCalibrationHitContainer_p2.h
+++ b/Calorimeter/CaloCnv/CaloSimEventTPCnv/CaloSimEventTPCnv/CaloCalibrationHitContainer_p2.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef CALOSIMEVENTTPCNV_CALOCALIBRATIONHITCONTAINER_P2_H
@@ -22,7 +22,6 @@ class CaloCalibrationHitContainer_p2
   // Accessors
   const std::string&  name() const;
   
- private:
 	std::vector<unsigned int>   m_channelHash; 
 	std::vector<unsigned int>       m_energy; // 18 bits compressed - all four of them in the same array 
 //	std::vector<unsigned int>       m_energy1; // 18 bits compressed
diff --git a/Calorimeter/CaloCnv/CaloSimEventTPCnv/CaloSimEventTPCnv/CaloCalibrationHitContainer_p3.h b/Calorimeter/CaloCnv/CaloSimEventTPCnv/CaloSimEventTPCnv/CaloCalibrationHitContainer_p3.h
index 44fe7ed533d05bcee0f1401591a0756a77fe6855..1bacd956e81429d10824788ace675908a77e785e 100644
--- a/Calorimeter/CaloCnv/CaloSimEventTPCnv/CaloSimEventTPCnv/CaloCalibrationHitContainer_p3.h
+++ b/Calorimeter/CaloCnv/CaloSimEventTPCnv/CaloSimEventTPCnv/CaloCalibrationHitContainer_p3.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef CALOSIMEVENTTPCNV_CALOCALIBRATIONHITCONTAINER_P3_H
@@ -22,7 +22,6 @@ class CaloCalibrationHitContainer_p3
   // Accessors
   const std::string&  name() const;
   
- private:
 	std::vector<unsigned int>   m_channelHash; 
 	std::vector<unsigned int>       m_energy; // 18 bits compressed - all four of them in the same array 
 //	std::vector<unsigned int>       m_energy1; // 18 bits compressed