diff --git a/Calibration/LumiAlCaRecoProducers/plugins/AlcaPCCEventProducer.cc b/Calibration/LumiAlCaRecoProducers/plugins/AlcaPCCEventProducer.cc
index 5449bd2a00d81..e644b38ae45f7 100644
--- a/Calibration/LumiAlCaRecoProducers/plugins/AlcaPCCEventProducer.cc
+++ b/Calibration/LumiAlCaRecoProducers/plugins/AlcaPCCEventProducer.cc
@@ -11,8 +11,7 @@ ________________________________________________________________**/
 #include <string>
 // CMS
 #include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"
-#include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h"
-
+#include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/Luminosity/interface/PixelClusterCountsInEvent.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
diff --git a/Calibration/LumiAlCaRecoProducers/plugins/AlcaPCCProducer.cc b/Calibration/LumiAlCaRecoProducers/plugins/AlcaPCCProducer.cc
index bf1c1e029f970..6a6bda913de6e 100644
--- a/Calibration/LumiAlCaRecoProducers/plugins/AlcaPCCProducer.cc
+++ b/Calibration/LumiAlCaRecoProducers/plugins/AlcaPCCProducer.cc
@@ -11,9 +11,8 @@ ________________________________________________________________**/
 #include <string>
 // CMS
 #include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"
-#include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h"
 #include "DataFormats/Luminosity/interface/PixelClusterCounts.h"
-
+#include "DataFormats/DetId/interface/DetId.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
diff --git a/CondFormats/EcalObjects/BuildFile.xml b/CondFormats/EcalObjects/BuildFile.xml
index 1ac659f8abdd1..a971d09599b4f 100644
--- a/CondFormats/EcalObjects/BuildFile.xml
+++ b/CondFormats/EcalObjects/BuildFile.xml
@@ -1,7 +1,6 @@
 <use   name="FWCore/Utilities"/>
 <use   name="CondFormats/Common"/>
 <use   name="CondFormats/Serialization"/>
-<use   name="CondFormats/Alignment"/>
 <use   name="DataFormats/StdDictionaries"/>
 <use   name="DataFormats/EcalDetId"/>
 <use   name="DataFormats/Math"/>
diff --git a/CondTools/Ecal/BuildFile.xml b/CondTools/Ecal/BuildFile.xml
index b96a7e840e109..651fc2676b64b 100644
--- a/CondTools/Ecal/BuildFile.xml
+++ b/CondTools/Ecal/BuildFile.xml
@@ -1,5 +1,6 @@
 <use   name="CondCore/DBOutputService"/>
 <use   name="CondCore/PopCon"/>
+<use   name="CondFormats/Alignment"/>
 <use   name="CondFormats/DataRecord"/>
 <use   name="CondFormats/EcalObjects"/>
 <use   name="CondFormats/ESObjects"/>
diff --git a/DataFormats/L1TMuon/BuildFile.xml b/DataFormats/L1TMuon/BuildFile.xml
index 1839621182a56..e852134332933 100644
--- a/DataFormats/L1TMuon/BuildFile.xml
+++ b/DataFormats/L1TMuon/BuildFile.xml
@@ -4,7 +4,6 @@
 
 <use name="DataFormats/CSCDigi"/>
 <use name="DataFormats/L1DTTrackFinder"/>
-<use name="DataFormats/RPCDigi"/>
 <use name="DataFormats/GEMDigi"/>
 <use name="DataFormats/MuonDetId"/>
 <use name="DataFormats/L1CSCTrackFinder"/>
diff --git a/DataFormats/L1TMuon/interface/EMTFHit.h b/DataFormats/L1TMuon/interface/EMTFHit.h
index 33ba156e53469..2d3c2c0560b3c 100644
--- a/DataFormats/L1TMuon/interface/EMTFHit.h
+++ b/DataFormats/L1TMuon/interface/EMTFHit.h
@@ -13,7 +13,6 @@
 #include "DataFormats/MuonDetId/interface/GEMDetId.h"
 #include "DataFormats/MuonDetId/interface/ME0DetId.h"
 #include "DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigi.h"
-#include "DataFormats/RPCDigi/interface/RPCDigi.h"
 #include "DataFormats/GEMDigi/interface/GEMPadDigi.h"
 #include "DataFormats/GEMDigi/interface/ME0PadDigi.h"
 #include "DataFormats/L1TMuon/interface/CPPFDigi.h"
diff --git a/DataFormats/Luminosity/BuildFile.xml b/DataFormats/Luminosity/BuildFile.xml
index 19a70f2cc3e82..493be5ecf01c7 100644
--- a/DataFormats/Luminosity/BuildFile.xml
+++ b/DataFormats/Luminosity/BuildFile.xml
@@ -1,7 +1,6 @@
-
+<use name="DataFormats/Math"/>
 <use name="DataFormats/Common"/>
 <use name="FWCore/Utilities"/>
-<use name="DataFormats/PatCandidates"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/L1Trigger/L1TTwinMux/src/BuildFile.xml b/L1Trigger/L1TTwinMux/BuildFile.xml
similarity index 90%
rename from L1Trigger/L1TTwinMux/src/BuildFile.xml
rename to L1Trigger/L1TTwinMux/BuildFile.xml
index b6ea4da17dd41..2514dc47a6f1a 100644
--- a/L1Trigger/L1TTwinMux/src/BuildFile.xml
+++ b/L1Trigger/L1TTwinMux/BuildFile.xml
@@ -5,7 +5,7 @@
 <use name="DataFormats/L1TMuon"/>
 <use name="CondFormats/L1TObjects"/>
 <use name="CondFormats/DataRecord"/>
-
+<use name="DataFormats/RPCDigi"/>
 
 <export>
   <lib name="1"/>
diff --git a/SimDataFormats/PileupSummaryInfo/BuildFile.xml b/SimDataFormats/PileupSummaryInfo/BuildFile.xml
index 10c3fb4f67b13..c94da2db1ed5f 100644
--- a/SimDataFormats/PileupSummaryInfo/BuildFile.xml
+++ b/SimDataFormats/PileupSummaryInfo/BuildFile.xml
@@ -1,7 +1,6 @@
 <use   name="DataFormats/Math"/>
 <use   name="DataFormats/Common"/>
 <use   name="DataFormats/Provenance"/>
-<use   name="SimDataFormats/GeneratorProducts"/>
 <use   name="hepmc"/>
 <export>
   <lib   name="1"/>
diff --git a/SimDataFormats/PileupSummaryInfo/interface/PileupVertexContent.h b/SimDataFormats/PileupSummaryInfo/interface/PileupVertexContent.h
index 239bf1f1d738c..e783720a4905a 100644
--- a/SimDataFormats/PileupSummaryInfo/interface/PileupVertexContent.h
+++ b/SimDataFormats/PileupSummaryInfo/interface/PileupVertexContent.h
@@ -19,8 +19,6 @@ Usage: purely descriptive
 #include <vector>
 #include <string>
 #include <iostream>
-#include "SimDataFormats/GeneratorProducts/interface/GenEventInfoProduct.h"
-#include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 #include "DataFormats/Math/interface/LorentzVector.h"
 
 class PileupVertexContent {