diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventTPCnv/AnalysisTriggerEventTPCnv/AnalysisTriggerEventTPCnvDict.h b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventTPCnv/AnalysisTriggerEventTPCnv/AnalysisTriggerEventTPCnvDict.h
index b99055fb48903c6599dd0f3ef35779c272dec7b4..970d1803fd21b7ea592c530d1fdfe678cd2702e4 100755
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventTPCnv/AnalysisTriggerEventTPCnv/AnalysisTriggerEventTPCnvDict.h
+++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventTPCnv/AnalysisTriggerEventTPCnv/AnalysisTriggerEventTPCnvDict.h
@@ -7,7 +7,6 @@
 
 // Persistent representation of the LVL1 RoIs (version 1):
 #include "AnalysisTriggerEventTPCnv/LVL1_ROI_p1.h"
-#include "AnalysisTriggerEventTPCnv/LVL1_ROICnv_p1.h"
 #include "AnalysisTriggerEventTPCnv/Muon_ROI_p1.h"
 #include "AnalysisTriggerEventTPCnv/Jet_ROI_p1.h"
 #include "AnalysisTriggerEventTPCnv/JetET_ROI_p1.h"
@@ -16,15 +15,7 @@
 
 // Persistent representation of CTP_Decision (version 1):
 #include "AnalysisTriggerEventTPCnv/CTP_Decision_p1.h"
-#include "AnalysisTriggerEventTPCnv/CTP_DecisionCnv_p1.h"
 // Persistent representation of CTP_Decision (version 2):
 #include "AnalysisTriggerEventTPCnv/CTP_Decision_p2.h"
-#include "AnalysisTriggerEventTPCnv/CTP_DecisionCnv_p2.h"
-
-struct GCCXML_DUMMY_INSTANTIATION_ANALYSISTRIGGEREVENTTPCNV {
-  T_TPCnv<CTP_Decision, CTP_Decision_p1> m_ctpcnv1;
-  T_TPCnv<CTP_Decision, CTP_Decision_p2> m_ctpcnv2;
-  T_TPCnv<LVL1_ROI, LVL1_ROI_p1> m_lvl1roicnv1;
-};
 
 #endif // ANALYSISTRIGGEREVENTTPCNV_ANALYSISTRIGGERCNVDICT_H
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventTPCnv/AnalysisTriggerEventTPCnv/selection.xml b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventTPCnv/AnalysisTriggerEventTPCnv/selection.xml
index 33db53cb500bbffb8cade277ce8f2d1ef6db3901..25f5c954265c56cd351d9032f732806b76581a63 100755
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventTPCnv/AnalysisTriggerEventTPCnv/selection.xml
+++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventTPCnv/AnalysisTriggerEventTPCnv/selection.xml
@@ -17,23 +17,4 @@
   <class name="CTP_Decision_p1" id="1F421F32-8FBD-47B7-82ED-5354B9BE96D8" />
   <class name="CTP_Decision_p2" id="08922DA9-6E47-4D3A-9FEC-0B4440644B50" />
 
-  <class name="T_TPCnv<CTP_Decision,CTP_Decision_p1>"/>
-  <class name="CTP_DecisionCnv_p1"/>
-  <class name="T_AthenaPoolTPCnvBase<CTP_Decision,CTP_Decision_p1>"/>
-  <class name="T_AthenaPoolTPPolyCnvBase<CTP_Decision,CTP_Decision,CTP_Decision_p1>"/>
-  <class name="T_AthenaPoolTPAbstractPolyCnvBase<CTP_Decision,CTP_Decision,CTP_Decision_p1>"/>
-  <class name="T_TPCnv<CTP_Decision,CTP_Decision_p2>"/>
-  <class name="CTP_DecisionCnv_p2"/>
-  <class name="T_AthenaPoolTPCnvBase<CTP_Decision,CTP_Decision_p2>"/>
-  <class name="T_AthenaPoolTPPolyCnvBase<CTP_Decision,CTP_Decision,CTP_Decision_p2>"/>
-  <class name="T_AthenaPoolTPAbstractPolyCnvBase<CTP_Decision,CTP_Decision,CTP_Decision_p2>"/>
-  <class name="ITPConverterFor<CTP_Decision>"/>
-
-  <class name="T_TPCnv<LVL1_ROI,LVL1_ROI_p1>"/>
-  <class name="LVL1_ROICnv_p1"/>
-  <class name="T_AthenaPoolTPCnvBase<LVL1_ROI,LVL1_ROI_p1>"/>
-  <class name="T_AthenaPoolTPPolyCnvBase<LVL1_ROI,LVL1_ROI,LVL1_ROI_p1>"/>
-  <class name="T_AthenaPoolTPAbstractPolyCnvBase<LVL1_ROI,LVL1_ROI,LVL1_ROI_p1>"/>
-  <class name="ITPConverterFor<LVL1_ROI>"/>
-
 </lcgdict>
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventTPCnv/CMakeLists.txt b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventTPCnv/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ed78325ff00c3da4fcdc4e5a1408f877e96a4e58
--- /dev/null
+++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEventTPCnv/CMakeLists.txt
@@ -0,0 +1,32 @@
+################################################################################
+# Package: AnalysisTriggerEventTPCnv
+################################################################################
+
+# Declare the package name:
+atlas_subdir( AnalysisTriggerEventTPCnv )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+                          Database/AthenaPOOL/AthenaPoolCnvSvc
+                          GaudiKernel
+                          PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent
+                          PRIVATE
+                          Control/AthenaKernel
+                          Trigger/TrigT1/TrigT1Interfaces )
+
+# External dependencies:
+find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+
+# Component(s) in the package:
+atlas_add_tpcnv_library( AnalysisTriggerEventTPCnv
+                         src/*.cxx
+                         PUBLIC_HEADERS AnalysisTriggerEventTPCnv
+                         PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+                         LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib GaudiKernel AnalysisTriggerEvent AthenaKernel TrigT1Interfaces )
+
+atlas_add_dictionary( AnalysisTriggerEventTPCnvDict
+                      AnalysisTriggerEventTPCnv/AnalysisTriggerEventTPCnvDict.h
+                      AnalysisTriggerEventTPCnv/selection.xml
+                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib GaudiKernel AnalysisTriggerEvent AthenaKernel TrigT1Interfaces AnalysisTriggerEventTPCnv )
+