diff --git a/[refs] b/[refs]
index 1ed2f649806f9..44ea0d55be5c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,3 +1,3 @@
 ---
 refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e
-"refs/heads/CMSSW_7_1_X": ec03717bfaf934dffa44c412606fb5d626fb821b
+"refs/heads/CMSSW_7_1_X": 6820be45542e7d1e49ae1e82153b8113ab41274e
diff --git a/trunk/Validation/Generator/BuildFile b/trunk/Validation/Generator/BuildFile
index aee02c8d3ab35..a0476cdd9501e 100644
--- a/trunk/Validation/Generator/BuildFile
+++ b/trunk/Validation/Generator/BuildFile
@@ -1,79 +1,41 @@
+<use name=root>
+<use name=clhep>
+<use name=rootmath>
 <use name=FWCore/Framework>
 <use name=FWCore/ParameterSet>
 <use name=FWCore/PluginManager>
 <use name=FWCore/MessageLogger>
-<use name=SimDataFormats/ValidationFormats>
-<use name=SimDataFormats/GeneratorProducts>
-<use name=DataFormats/DetId>
 <use name=FWCore/ServiceRegistry>
-<use name=PhysicsTools/UtilAlgos>
+<use name=Geometry/DTGeometry>
+<use name=Geometry/CSCGeometry>
+<use name=Geometry/RPCGeometry>
+<use name=Geometry/CommonDetUnit>
+<use name=Geometry/TrackerGeometryBuilder>
 <use name=MagneticField/Engine>
 <use name=MagneticField/Records>
-<use name=DataFormats/Common>
-<use name=rootmath>
 <use name=DataFormats/Math>
+<use name=DataFormats/DetId>
+<use name=DataFormats/MuonDetId>
 <use name=DataFormats/JetReco>
-<use name=RecoJets/JetAlgorithms>
-<use name=DataFormats/HepMCCandidate>
-<use name=DataFormats/Candidate>
-<use name=DataFormats/EgammaCandidates>
 <use name=DataFormats/MuonReco>
 <use name=DataFormats/TrackReco>
 <use name=DataFormats/VertexReco>
+<use name=DataFormats/Common>
+<use name=DataFormats/Candidate>
+<use name=DataFormats/HepMCCandidate>
+<use name=DataFormats/EgammaCandidates>
+<use name=SimDataFormats/GeneratorProducts>
+<use name=SimDataFormats/ValidationFormats>
+<use name=PhysicsTools/UtilAlgos>
+<use name=RecoJets/JetAlgorithms>
 <use name=RecoVertex/KalmanVertexFit>
 <use name=RecoVertex/VertexPrimitives>
-<use name=Geometry/CommonDetUnit>
-<use name=Geometry/TrackerGeometryBuilder>
-<use name=DataFormats/MuonDetId>
 <use name=TrackingTools/PatternTools>
 <use name=TrackingTools/Records>
 <use name=TrackingTools/TrajectoryState>
 <use name=TrackingTools/TransientTrack>
-<use name=Geometry/CSCGeometry>
-<use name=Geometry/DTGeometry>
-<use name=Geometry/RPCGeometry>
 <use name=DQMServices/Core>
-<use name=root>
-<use name=clhep>
-
-<flags EDM_PLUGIN=1>
 
 <export>
- <use name=FWCore/Framework>
-<use name=FWCore/PluginManager>
- <use name=FWCore/ParameterSet>
- <use name=FWCore/MessageLogger>
-<use name=FWCore/ServiceRegistry>
-<use name=PhysicsTools/UtilAlgos>
-<use name=DataFormats/Math>
-<use name=DataFormats/JetReco>
-<use name=RecoJets/JetAlgorithms>
-<use name=MagneticField/Engine>
-<use name=MagneticField/Records>
-<use name=TrackingTools/PatternTools>
-<use name=TrackingTools/Records>
-<use name=TrackingTools/TrajectoryState>
-<use name=TrackingTools/TransientTrack>
-<use name=DataFormats/HepMCCandidate>
-<use name=DataFormats/Candidate>
-<use name=DataFormats/EgammaCandidates>
-<use name=DataFormats/MuonReco>
-<use name=DataFormats/TrackReco>
-<use name=DataFormats/VertexReco>
-<use name=RecoVertex/KalmanVertexFit>
-<use name=RecoVertex/VertexPrimitives>
- <use name=SimDataFormats/ValidationFormats>
- <use name=SimDataFormats/GeneratorProducts>
- <use name=DataFormats/DetId>
- <use name=DataFormats/Common>
- <use name=Geometry/CommonDetUnit>
- <use name=Geometry/TrackerGeometryBuilder>
- <use name=DataFormats/MuonDetId>
- <use name=Geometry/CSCGeometry>
- <use name=Geometry/DTGeometry>
- <use name=Geometry/RPCGeometry>
- <use name=DQMServices/Core>
- <use name=root>
- <use name=clhep>
- <use name=rootmath>
+   <lib name=ValidationGenerator>
 </export>
diff --git a/trunk/Validation/Generator/plugins/BuildFile b/trunk/Validation/Generator/plugins/BuildFile
index 9fb3b060da7b5..de0d5deb572a2 100644
--- a/trunk/Validation/Generator/plugins/BuildFile
+++ b/trunk/Validation/Generator/plugins/BuildFile
@@ -2,6 +2,7 @@
 <use name=DQMOffline/RecoB>
 <use name=DQMServices/Core>
 <use name=Validation/RecoB>
-<library file="BasicGenTest.cc" name=BasicGenTest>
-     <flags EDM_PLUGIN=1>
+<use name=Validation/Generator>
+<library name=ValidationGenerator_plugins file=*.cc>
+ <flags EDM_PLUGIN=1>
 </library>