diff --git a/Common/Core/AnalysisCoreLinkDef.h b/Common/Core/AnalysisCoreLinkDef.h
index ae4c91e9589..b376ccc7f10 100644
--- a/Common/Core/AnalysisCoreLinkDef.h
+++ b/Common/Core/AnalysisCoreLinkDef.h
@@ -26,6 +26,4 @@
 
 #pragma link C++ class OrbitRange + ;
 
-#pragma link C++ class FFitWeights + ;
-
 #endif // COMMON_CORE_ANALYSISCORELINKDEF_H_
diff --git a/Common/Core/CMakeLists.txt b/Common/Core/CMakeLists.txt
index 6bf499cd3b7..f820f20857d 100644
--- a/Common/Core/CMakeLists.txt
+++ b/Common/Core/CMakeLists.txt
@@ -21,7 +21,6 @@ o2physics_add_library(AnalysisCore
         TableHelper.cxx
         MetadataHelper.cxx
         CollisionTypeHelper.cxx
-        FFitWeights.cxx
         PUBLIC_LINK_LIBRARIES O2::Framework O2::DataFormatsParameters ROOT::EG O2::CCDB ROOT::Physics O2::FT0Base O2::FV0Base O2::DataFormatsParamTOF)
 
 o2physics_target_root_dictionary(AnalysisCore
@@ -37,7 +36,6 @@ o2physics_target_root_dictionary(AnalysisCore
         PID/TPCPIDResponse.h
         PID/PIDTOFParamService.h
         CollisionTypeHelper.h
-        FFitWeights.h
         LINKDEF AnalysisCoreLinkDef.h)
 
 o2physics_add_library(EventFilteringUtils
@@ -52,3 +50,12 @@ o2physics_target_root_dictionary(EventFilteringUtils
 o2physics_add_header_only_library(TPCDriftManager
         HEADERS TPCVDriftManager.h
         INTERFACE_LINK_LIBRARIES)
+
+o2physics_add_library(FFitWeights
+        SOURCES FFitWeights.cxx
+        PUBLIC_LINK_LIBRARIES O2::Framework O2::CCDB ROOT::Physics)
+
+o2physics_target_root_dictionary(FFitWeights
+        HEADERS FFitWeights.h
+        LINKDEF FFitWeightsLinkDef.h)
+
diff --git a/Common/Core/FFitWeightsLinkDef.h b/Common/Core/FFitWeightsLinkDef.h
new file mode 100644
index 00000000000..1960be8f4df
--- /dev/null
+++ b/Common/Core/FFitWeightsLinkDef.h
@@ -0,0 +1,22 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+/// \file FFitWeightsLinkDef.h
+/// \brief LinkDef for FFitWeights
+///
+/// \author Joachim C. K. B. Hansen
+
+#ifndef COMMON_CORE_FFITWEIGHTSLINKDEF_H_
+#define COMMON_CORE_FFITWEIGHTSLINKDEF_H_
+
+#pragma link C++ class FFitWeights + ;
+
+#endif // COMMON_CORE_FFITWEIGHTSLINKDEF_H_
diff --git a/Common/TableProducer/CMakeLists.txt b/Common/TableProducer/CMakeLists.txt
index 6526cb41772..d01f137f339 100644
--- a/Common/TableProducer/CMakeLists.txt
+++ b/Common/TableProducer/CMakeLists.txt
@@ -134,7 +134,7 @@ o2physics_add_dpl_workflow(zdc-extra-table-producer
 
 o2physics_add_dpl_workflow(ese-table-producer
                     SOURCES eseTableProducer.cxx
-                    PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
+                    PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::FFitWeights
                     COMPONENT_NAME Analysis)
 
 o2physics_add_dpl_workflow(mftmch-matching-data