diff --git a/CalibMuon/DTCalibration/BuildFile.xml b/CalibMuon/DTCalibration/BuildFile.xml
index 51d4e8ddbdac6..3afccbb19aba6 100644
--- a/CalibMuon/DTCalibration/BuildFile.xml
+++ b/CalibMuon/DTCalibration/BuildFile.xml
@@ -11,12 +11,9 @@
 <use name="root"/>
 <use name="rootmath"/>
 <use name="rootcore"/>
-<use name="roofit"/>
 <export>
   <lib name="1"/>
   <use name="root"/>
   <use name="rootmath"/>
   <use name="rootcore"/>
-  <use name="rootroofit"/>
-  <use name="roofit"/>
 </export>
diff --git a/CalibMuon/DTCalibration/plugins/BuildFile.xml b/CalibMuon/DTCalibration/plugins/BuildFile.xml
index c3e30ea272499..a39780a14bb5b 100644
--- a/CalibMuon/DTCalibration/plugins/BuildFile.xml
+++ b/CalibMuon/DTCalibration/plugins/BuildFile.xml
@@ -12,7 +12,7 @@
 <use name="root"/>
 <use name="rootmath"/>
 <use name="rootcore"/>
-<use name="roofit"/>
+<use name="rootfitcore"/>
 <use name="rootgraphics"/>
 <lib name="Spectrum"/>
 <library file="*.cc" name="CalibMuonDTCalibrationPlugins">
diff --git a/DQM/MuonMonitor/plugins/BuildFile.xml b/DQM/MuonMonitor/plugins/BuildFile.xml
index 73ab5d0ce1388..f481e976b5fdd 100644
--- a/DQM/MuonMonitor/plugins/BuildFile.xml
+++ b/DQM/MuonMonitor/plugins/BuildFile.xml
@@ -9,6 +9,5 @@
   <use name="FWCore/PluginManager"/>
   <use name="FWCore/ServiceRegistry"/>
   <use name="FWCore/Utilities"/>
-  <use name="roofitcore"/>
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/HeavyFlavorAnalysis/Onia2MuMu/BuildFile.xml b/HeavyFlavorAnalysis/Onia2MuMu/BuildFile.xml
index c031a57951625..8636a23d694fa 100644
--- a/HeavyFlavorAnalysis/Onia2MuMu/BuildFile.xml
+++ b/HeavyFlavorAnalysis/Onia2MuMu/BuildFile.xml
@@ -4,7 +4,6 @@
 <use name="root"/>
 <use name="rootmath"/>
 <use name="rootcore"/>
-<use name="roofit"/>
 <use name="hepmc"/>
 <use name="DataFormats/HepMCCandidate"/>
 <use name="DataFormats/Candidate"/>
diff --git a/L1Trigger/DTTriggerPhase2/BuildFile.xml b/L1Trigger/DTTriggerPhase2/BuildFile.xml
index 123994e1aa1c1..3a70f5d1f62e5 100644
--- a/L1Trigger/DTTriggerPhase2/BuildFile.xml
+++ b/L1Trigger/DTTriggerPhase2/BuildFile.xml
@@ -9,7 +9,6 @@
 <use name="Geometry/DTGeometry"/>
 <use name="Geometry/RPCGeometry"/>
 <use name="Geometry/Records"/>
-<use name="roofitcore"/>
 <use name="vdt"/>
 <export>
   <lib name="1"/>
diff --git a/PhysicsTools/FWLite/test/BuildFile.xml b/PhysicsTools/FWLite/test/BuildFile.xml
index 7f45775f915ef..ab6db39c7f240 100644
--- a/PhysicsTools/FWLite/test/BuildFile.xml
+++ b/PhysicsTools/FWLite/test/BuildFile.xml
@@ -8,7 +8,7 @@
   <bin name="testScanner.exe" file="testScanner.cc">
     <flags NO_TESTRUN="1"/>
     <use name="root"/>
-    <use name="roofit"/>
+    <use name="roofitcore"/>
     <use name="rootgraphics"/>
     <use name="FWCore/FWLite"/>
     <use name="DataFormats/TrackReco"/>
diff --git a/PhysicsTools/TagAndProbe/BuildFile.xml b/PhysicsTools/TagAndProbe/BuildFile.xml
index 8c71fc20e1a04..647af3520d516 100644
--- a/PhysicsTools/TagAndProbe/BuildFile.xml
+++ b/PhysicsTools/TagAndProbe/BuildFile.xml
@@ -1,4 +1,4 @@
-<use name="roofit"/>
+<use name="roofitcore"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
 <use name="DataFormats/METReco"/>
diff --git a/PhysicsTools/TagAndProbe/plugins/BuildFile.xml b/PhysicsTools/TagAndProbe/plugins/BuildFile.xml
index 6e7459f93065b..c0ec42915ab3e 100644
--- a/PhysicsTools/TagAndProbe/plugins/BuildFile.xml
+++ b/PhysicsTools/TagAndProbe/plugins/BuildFile.xml
@@ -2,7 +2,6 @@
 </export>
 <library name="PhysicsToolsTagAndProbe_plugins" file="*.cc">
   <flags EDM_PLUGIN="1"/>
-  <use name="roofit"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/MessageLogger"/>
   <use name="FWCore/ParameterSet"/>
diff --git a/PhysicsTools/Utilities/BuildFile.xml b/PhysicsTools/Utilities/BuildFile.xml
index e26f95c7ef3b0..64423a3d2a45e 100644
--- a/PhysicsTools/Utilities/BuildFile.xml
+++ b/PhysicsTools/Utilities/BuildFile.xml
@@ -3,7 +3,7 @@
 <use name="FWCore/Utilities"/>
 <use name="FWCore/Common"/>
 <use name="SimDataFormats/PileupSummaryInfo"/>
-<use name="roofit"/>
+<use name="roofitcore"/>
 <use name="rootcore"/>
 <use name="root"/>
 <use name="boost"/>
diff --git a/PhysicsTools/Utilities/test/BuildFile.xml b/PhysicsTools/Utilities/test/BuildFile.xml
index 075a554d936a2..1c355e4a4a7b7 100644
--- a/PhysicsTools/Utilities/test/BuildFile.xml
+++ b/PhysicsTools/Utilities/test/BuildFile.xml
@@ -34,7 +34,7 @@
 
 <bin file="testRooFitFunction.cpp" name="testRooFitFunction">
   <use name="PhysicsTools/Utilities"/>
-  <use name="roofit"/>
+  <use name="roofitcore"/>
 </bin>
 
 <bin file="testIntegralTiming.cpp" name="testIntegralTiming">