diff --git a/DataFormats/simulation/CMakeLists.txt b/DataFormats/simulation/CMakeLists.txt
index 0188ffe7c03c9..cb892da33b0b8 100644
--- a/DataFormats/simulation/CMakeLists.txt
+++ b/DataFormats/simulation/CMakeLists.txt
@@ -15,6 +15,7 @@ Set(HEADERS
     include/${MODULE_NAME}/MCTruthContainer.h
     include/${MODULE_NAME}/MCCompLabel.h
     include/${MODULE_NAME}/MCInteractionRecord.h
+    include/${MODULE_NAME}/TimeStamp.h
 )
 
 Set(LINKDEF src/SimulationDataLinkDef.h)
diff --git a/Detectors/TPC/reconstruction/src/TPCReconstructionLinkDef.h b/Detectors/TPC/reconstruction/src/TPCReconstructionLinkDef.h
index 36c4b0b30a6f5..985c3cbe694ef 100644
--- a/Detectors/TPC/reconstruction/src/TPCReconstructionLinkDef.h
+++ b/Detectors/TPC/reconstruction/src/TPCReconstructionLinkDef.h
@@ -26,7 +26,6 @@
 #pragma link C++ class o2::TPC::HardwareClusterDecoder;
 
 #pragma link C++ class o2::TPC::BoxClusterer+;
-#pragma link C++ class o2::TPC::ClusterTimeStamp+;
 #pragma link C++ class o2::TPC::Cluster+;
 #pragma link C++ class o2::TPC::Clusterer+;
 #pragma link C++ class o2::TPC::ClusterContainer+;
@@ -35,6 +34,7 @@
 #pragma link C++ class o2::TPC::HwClusterFinder+;
 #pragma link C++ class o2::TPC::HwFixedPoint+;
 
+#pragma link C++ class std::vector<o2::TPC::Cluster>+;
 #pragma link C++ class std::vector<o2::TPC::TrackTPC>+;
 
 #endif
diff --git a/Detectors/TPC/simulation/src/TPCSimulationLinkDef.h b/Detectors/TPC/simulation/src/TPCSimulationLinkDef.h
index d2b73265f28b5..98f59df3dc274 100644
--- a/Detectors/TPC/simulation/src/TPCSimulationLinkDef.h
+++ b/Detectors/TPC/simulation/src/TPCSimulationLinkDef.h
@@ -36,9 +36,6 @@
 #pragma link C++ class o2::TPC::HitGroup+;
 #pragma link C++ class o2::TPC::SAMPAProcessing+;
 
-#pragma link C++ class std::vector<o2::TPC::Cluster>+;
-#pragma link C++ class std::vector<o2::TPC::BoxCluster>+;
-#pragma link C++ class std::vector<o2::TPC::HwCluster>+;
 #pragma link C++ class std::vector<o2::TPC::HitGroup>+;
 
 #endif