diff --git a/Event/EventCommonTPCnv/CMakeLists.txt b/Event/EventCommonTPCnv/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..60813892ecf7d35ac46b4e264a7ea5dd28e9b9a4
--- /dev/null
+++ b/Event/EventCommonTPCnv/CMakeLists.txt
@@ -0,0 +1,44 @@
+################################################################################
+# Package: EventCommonTPCnv
+################################################################################
+
+# Declare the package name:
+atlas_subdir( EventCommonTPCnv )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+                          Control/DataModel
+                          Control/DataModelAthenaPool
+                          Database/AthenaPOOL/AthenaPoolCnvSvc
+                          Event/FourMom
+                          Event/NavFourMom
+                          PRIVATE
+                          Control/AthenaKernel
+                          Control/StoreGate
+                          GaudiKernel )
+
+# External dependencies:
+find_package( CLHEP )
+find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+
+# Component(s) in the package:
+atlas_add_tpcnv_library( EventCommonTPCnv
+                         src/*.cxx
+                         PUBLIC_HEADERS EventCommonTPCnv
+                         INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
+                         PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+                         DEFINITIONS ${CLHEP_DEFINITIONS}
+                         LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib FourMom NavFourMom AthenaKernel StoreGateLib SGtests GaudiKernel )
+
+atlas_add_dictionary( EventCommonTPCnvDict
+                      EventCommonTPCnv/EventCommonTPCnvDict.h
+                      EventCommonTPCnv/selection.xml
+                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib FourMom NavFourMom AthenaKernel StoreGateLib SGtests GaudiKernel EventCommonTPCnv )
+
+atlas_add_dictionary( OLD_EventCommonTPCnvDict
+                      EventCommonTPCnv/EventCommonTPCnvDict.h
+                      EventCommonTPCnv/OLD_selection.xml
+                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib FourMom NavFourMom AthenaKernel StoreGateLib SGtests GaudiKernel EventCommonTPCnv )
+
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomLinkContainer_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomLinkContainer_p1.h
index 70de7b1374285c88033218069e4a060bace7afa2..1173d5759f4de35b6d8c6c39124ccdd945565023 100644
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomLinkContainer_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomLinkContainer_p1.h
@@ -14,22 +14,15 @@
 #ifndef EVENTCOMMONTPCNV_INAV4MOMLINKCONTAINER_P1_H
 #define EVENTCOMMONTPCNV_INAV4MOMLINKCONTAINER_P1_H
 
-// STL includes
-#include <vector>
-
 // DataModel includes
-#include "DataModelAthenaPool/VectorElementLinkCnv_p1.h"
 #include "DataModelAthenaPool/VectorElementLink_p1.h"
-#include "NavFourMom/INav4MomLinkContainer.h"
 
 /** Definition of the persistent version of INav4MomLinkContainer */
-class INav4MomLinkContainer_p1 : public GeneratePersVectorELinkType_p1< INav4MomLinkContainer >::type
+// class INav4MomLinkContainer_p1 : public GeneratePersVectorELinkType_p1< INav4MomLinkContainer >::type
+// MN: avoid transient EDM in ROOT6 dicts
+class INav4MomLinkContainer_p1 : public VectorElementLinkInt_p1
 {
-  /** Declare the converter as a friend class */
-  friend class INav4MomLinkContainerCnv_p1;
-
 };
 
 
 #endif // EVENTCOMMONTPCNV_INAV4MOMLINKCONTAINER_P1_H
-
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/IParticleLinkContainer_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/IParticleLinkContainer_p1.h
index ead0477ab00b2ecb51d25a1544c314b2a8d41003..6dc358dd6cf72470e009c42003b46b041b5ff55f 100644
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/IParticleLinkContainer_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/IParticleLinkContainer_p1.h
@@ -14,22 +14,15 @@
 #ifndef EVENTCOMMONTPCNV_IPARTICLELINKCONTAINER_P1_H
 #define EVENTCOMMONTPCNV_IPARTICLELINKCONTAINER_P1_H
 
-// STL includes
-#include <vector>
-
 // DataModel includes
-#include "DataModelAthenaPool/VectorElementLinkCnv_p1.h"
 #include "DataModelAthenaPool/VectorElementLink_p1.h"
-#include "NavFourMom/IParticleLinkContainer.h"
 
 /** Definition of the persistent version of IParticleLinkContainer */
-class IParticleLinkContainer_p1 : public GeneratePersVectorELinkType_p1< IParticleLinkContainer >::type
+// class IParticleLinkContainer_p1 : public GeneratePersVectorELinkType_p1< IParticleLinkContainer >::type
+// MN: avoid transient EDM in ROOT6 dicts
+class IParticleLinkContainer_p1 : public VectorElementLinkInt_p1
 {
-  /** Declare the converter as a friend class */
-  friend class IParticleLinkContainerCnv_p1;
-
 };
 
 
 #endif // EVENTCOMMONTPCNV_IPARTICLELINKCONTAINER_P1_H
-