diff --git a/Modules/TPC/src/IDCs.cxx b/Modules/TPC/src/IDCs.cxx
index e57403663..c90f4eb20 100644
--- a/Modules/TPC/src/IDCs.cxx
+++ b/Modules/TPC/src/IDCs.cxx
@@ -19,12 +19,11 @@
 #if __has_include("TPCBase/Painter.h")
 #include "TPCBase/Painter.h"
 #include "TPCBase/CDBInterface.h"
-#include "TPCBase/CalDet.h"
 #else
 #include "TPCBaseRecSim/Painter.h"
 #include "TPCBaseRecSim/CDBInterface.h"
-#include "TPCBaseRecSim/CalDet.h"
 #endif
+#include "TPCBase/CalDet.h"
 
 // QC includes
 #include "QualityControl/QcInfoLogger.h"
diff --git a/Modules/TPC/src/IDCsVsSACs.cxx b/Modules/TPC/src/IDCsVsSACs.cxx
index 73b230be9..50fbba447 100644
--- a/Modules/TPC/src/IDCsVsSACs.cxx
+++ b/Modules/TPC/src/IDCsVsSACs.cxx
@@ -19,12 +19,11 @@
 #if __has_include("TPCBase/Painter.h")
 #include "TPCBase/Painter.h"
 #include "TPCBase/CDBInterface.h"
-#include "TPCBase/CalDet.h"
 #else
 #include "TPCBaseRecSim/Painter.h"
 #include "TPCBaseRecSim/CDBInterface.h"
-#include "TPCBaseRecSim/CalDet.h"
 #endif
+#include "TPCBase/CalDet.h"
 
 // QC includes
 #include "QualityControl/QcInfoLogger.h"
diff --git a/Modules/TPC/src/Utility.cxx b/Modules/TPC/src/Utility.cxx
index 470ff7d8a..cdf51a3fa 100644
--- a/Modules/TPC/src/Utility.cxx
+++ b/Modules/TPC/src/Utility.cxx
@@ -19,11 +19,10 @@
 #include "Framework/InputRecordWalker.h"
 #include "DataFormatsTPC/ClusterNativeHelper.h"
 #include "DataFormatsTPC/TPCSectorHeader.h"
-#if __has_include("TPCBase/CalDet.h")
 #include "TPCBase/CalDet.h"
+#if __has_include("TPCBase/Painter.h")
 #include "TPCBase/Painter.h"
 #else
-#include "TPCBaseRecSim/CalDet.h"
 #include "TPCBaseRecSim/Painter.h"
 #endif
 #include "CommonUtils/StringUtils.h"