Merge pull request #34893 from smuzaffar/CommonTools-fix-hdr

[CommonTools] Move public headers in to interface directory
cms-sw · Aug 17, 2021 · de357eb · de357eb
2 parents 574cf23 + 5d62c0c
commit de357eb
Show file tree

Hide file tree

Showing 65 changed files with 108 additions and 110 deletions.
diff --git a/...onTools/RecoAlgos/src/CandidateProducer.h → ...s/RecoAlgos/interface/CandidateProducer.h b/...onTools/RecoAlgos/src/CandidateProducer.h → ...s/RecoAlgos/interface/CandidateProducer.h
diff --git a/...RecoAlgos/src/MassiveCandidateConverter.h → ...gos/interface/MassiveCandidateConverter.h b/...RecoAlgos/src/MassiveCandidateConverter.h → ...gos/interface/MassiveCandidateConverter.h
diff --git a/CommonTools/RecoAlgos/interface/TrackToRefCandidate.h b/CommonTools/RecoAlgos/interface/TrackToRefCandidate.h
@@ -1,7 +1,7 @@
 #ifndef RecoAlgos_TrackToRefCandidate_h
 #define RecoAlgos_TrackToRefCandidate_h
-#include "CommonTools/RecoAlgos/src/MassiveCandidateConverter.h"
-#include "CommonTools/RecoAlgos/src/CandidateProducer.h"
+#include "CommonTools/RecoAlgos/interface/MassiveCandidateConverter.h"
+#include "CommonTools/RecoAlgos/interface/CandidateProducer.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/RecoCandidate/interface/RecoChargedRefCandidate.h"
 #include "DataFormats/RecoCandidate/interface/RecoChargedRefCandidateFwd.h"

diff --git a/CommonTools/RecoAlgos/plugins/RecoChargedRefCandidateToTrackRefProducer.cc b/CommonTools/RecoAlgos/plugins/RecoChargedRefCandidateToTrackRefProducer.cc
@@ -1,5 +1,5 @@
 #include "CommonTools/RecoAlgos/src/RecoChargedRefCandidateToTrackRef.h"
-#include "CommonTools/RecoAlgos/src/CandidateProducer.h"
+#include "CommonTools/RecoAlgos/interface/CandidateProducer.h"
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 

diff --git a/CommonTools/RecoAlgos/src/MassiveCandidateConverter.cc b/CommonTools/RecoAlgos/src/MassiveCandidateConverter.cc
@@ -1,4 +1,4 @@
-#include "CommonTools/RecoAlgos/src/MassiveCandidateConverter.h"
+#include "CommonTools/RecoAlgos/interface/MassiveCandidateConverter.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "HepPDT/ParticleData.hh"
 #include "FWCore/Framework/interface/ESHandle.h"

diff --git a/CommonTools/RecoAlgos/src/PFClusterToRefCandidate.h b/CommonTools/RecoAlgos/src/PFClusterToRefCandidate.h
@@ -1,7 +1,7 @@
 #ifndef RecoAlgos_PFClusterToRefCandidate_h
 #define RecoAlgos_PFClusterToRefCandidate_h
-#include "CommonTools/RecoAlgos/src/MassiveCandidateConverter.h"
-#include "CommonTools/RecoAlgos/src/CandidateProducer.h"
+#include "CommonTools/RecoAlgos/interface/MassiveCandidateConverter.h"
+#include "CommonTools/RecoAlgos/interface/CandidateProducer.h"
 #include "DataFormats/ParticleFlowReco/interface/PFCluster.h"
 #include "DataFormats/ParticleFlowReco/interface/RecoPFClusterRefCandidate.h"
 #include "DataFormats/ParticleFlowReco/interface/RecoPFClusterRefCandidateFwd.h"

diff --git a/CommonTools/RecoAlgos/src/StandAloneMuonTrackToCandidate.h b/CommonTools/RecoAlgos/src/StandAloneMuonTrackToCandidate.h
@@ -1,7 +1,7 @@
 #ifndef RecoAlgos_StandAloneMuonTrackToCandidate_h
 #define RecoAlgos_StandAloneMuonTrackToCandidate_h
-#include "CommonTools/RecoAlgos/src/MassiveCandidateConverter.h"
-#include "CommonTools/RecoAlgos/src/CandidateProducer.h"
+#include "CommonTools/RecoAlgos/interface/MassiveCandidateConverter.h"
+#include "CommonTools/RecoAlgos/interface/CandidateProducer.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/RecoCandidate/interface/RecoStandAloneMuonCandidate.h"
 #include "DataFormats/RecoCandidate/interface/RecoStandAloneMuonCandidateFwd.h"

diff --git a/CommonTools/RecoAlgos/src/SuperClusterToCandidate.h b/CommonTools/RecoAlgos/src/SuperClusterToCandidate.h
@@ -1,7 +1,7 @@
 #ifndef RecoAlgos_SuperClusterToCandidate_h
 #define RecoAlgos_SuperClusterToCandidate_h
-#include "CommonTools/RecoAlgos/src/MassiveCandidateConverter.h"
-#include "CommonTools/RecoAlgos/src/CandidateProducer.h"
+#include "CommonTools/RecoAlgos/interface/MassiveCandidateConverter.h"
+#include "CommonTools/RecoAlgos/interface/CandidateProducer.h"
 #include "DataFormats/EgammaReco/interface/SuperCluster.h"
 #include "DataFormats/RecoCandidate/interface/RecoEcalCandidate.h"
 #include "DataFormats/RecoCandidate/interface/RecoEcalCandidateFwd.h"

diff --git a/CommonTools/RecoAlgos/src/TrackToCandidate.h b/CommonTools/RecoAlgos/src/TrackToCandidate.h
@@ -1,7 +1,7 @@
 #ifndef RecoAlgos_TrackToCandidate_h
 #define RecoAlgos_TrackToCandidate_h
-#include "CommonTools/RecoAlgos/src/MassiveCandidateConverter.h"
-#include "CommonTools/RecoAlgos/src/CandidateProducer.h"
+#include "CommonTools/RecoAlgos/interface/MassiveCandidateConverter.h"
+#include "CommonTools/RecoAlgos/interface/CandidateProducer.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/RecoCandidate/interface/RecoChargedCandidate.h"
 #include "DataFormats/RecoCandidate/interface/RecoChargedCandidateFwd.h"

diff --git a/CommonTools/Utils/src/AnyMethodArgument.h → ...Tools/Utils/interface/AnyMethodArgument.h b/CommonTools/Utils/src/AnyMethodArgument.h → ...Tools/Utils/interface/AnyMethodArgument.h
diff --git a/CommonTools/Utils/src/BinaryCutSetter.h → ...onTools/Utils/interface/BinaryCutSetter.h b/CommonTools/Utils/src/BinaryCutSetter.h → ...onTools/Utils/interface/BinaryCutSetter.h
@@ -10,8 +10,8 @@
  * \version $Revision: 1.2 $
  *
  */
-#include "CommonTools/Utils/src/SelectorStack.h"
-#include "CommonTools/Utils/src/LogicalBinaryOperator.h"
+#include "CommonTools/Utils/interface/SelectorStack.h"
+#include "CommonTools/Utils/interface/LogicalBinaryOperator.h"
 
 namespace reco {
   namespace parser {

diff --git a/CommonTools/Utils/src/BinarySelector.h → CommonTools/Utils/interface/BinarySelector.h b/CommonTools/Utils/src/BinarySelector.h → CommonTools/Utils/interface/BinarySelector.h
@@ -12,7 +12,7 @@
  */
 #include "CommonTools/Utils/interface/SelectorBase.h"
 #include "CommonTools/Utils/interface/ExpressionBase.h"
-#include "CommonTools/Utils/src/ComparisonBase.h"
+#include "CommonTools/Utils/interface/ComparisonBase.h"
 
 namespace reco {
   namespace parser {

diff --git a/CommonTools/Utils/src/BinarySelectorSetter.h → ...ls/Utils/interface/BinarySelectorSetter.h b/CommonTools/Utils/src/BinarySelectorSetter.h → ...ls/Utils/interface/BinarySelectorSetter.h
@@ -10,10 +10,10 @@
  * \version $Revision: 1.2 $
  *
  */
-#include "CommonTools/Utils/src/SelectorStack.h"
-#include "CommonTools/Utils/src/ComparisonStack.h"
-#include "CommonTools/Utils/src/ExpressionStack.h"
-#include "CommonTools/Utils/src/BinarySelector.h"
+#include "CommonTools/Utils/interface/SelectorStack.h"
+#include "CommonTools/Utils/interface/ComparisonStack.h"
+#include "CommonTools/Utils/interface/ExpressionStack.h"
+#include "CommonTools/Utils/interface/BinarySelector.h"
 #include "CommonTools/Utils/interface/Exception.h"
 
 namespace reco {

diff --git a/CommonTools/Utils/src/Comparison.h → CommonTools/Utils/interface/Comparison.h b/CommonTools/Utils/src/Comparison.h → CommonTools/Utils/interface/Comparison.h
@@ -10,7 +10,7 @@
  * \version $Revision: 1.2 $
  *
  */
-#include "CommonTools/Utils/src/ComparisonBase.h"
+#include "CommonTools/Utils/interface/ComparisonBase.h"
 
 namespace reco {
   namespace parser {

diff --git a/CommonTools/Utils/src/ComparisonBase.h → CommonTools/Utils/interface/ComparisonBase.h b/CommonTools/Utils/src/ComparisonBase.h → CommonTools/Utils/interface/ComparisonBase.h
diff --git a/CommonTools/Utils/src/ComparisonSetter.h → ...nTools/Utils/interface/ComparisonSetter.h b/CommonTools/Utils/src/ComparisonSetter.h → ...nTools/Utils/interface/ComparisonSetter.h
@@ -10,8 +10,8 @@
  * \version $Revision: 1.2 $
  *
  */
-#include "CommonTools/Utils/src/ComparisonStack.h"
-#include "CommonTools/Utils/src/Comparison.h"
+#include "CommonTools/Utils/interface/ComparisonStack.h"
+#include "CommonTools/Utils/interface/Comparison.h"
 #ifdef BOOST_SPIRIT_DEBUG
 #include <iostream>
 #include <string>

diff --git a/CommonTools/Utils/src/ComparisonStack.h → ...onTools/Utils/interface/ComparisonStack.h b/CommonTools/Utils/src/ComparisonStack.h → ...onTools/Utils/interface/ComparisonStack.h
diff --git a/CommonTools/Utils/src/CutSetter.h → CommonTools/Utils/interface/CutSetter.h b/CommonTools/Utils/src/CutSetter.h → CommonTools/Utils/interface/CutSetter.h
@@ -11,7 +11,7 @@
  *
  */
 #include "CommonTools/Utils/interface/SelectorPtr.h"
-#include "CommonTools/Utils/src/SelectorStack.h"
+#include "CommonTools/Utils/interface/SelectorStack.h"
 #include <cassert>
 
 namespace reco {

diff --git a/...ools/Utils/src/ExpressionBinaryOperator.h → ...tils/interface/ExpressionBinaryOperator.h b/...ools/Utils/src/ExpressionBinaryOperator.h → ...tils/interface/ExpressionBinaryOperator.h
@@ -11,7 +11,7 @@
  *
  */
 #include "CommonTools/Utils/interface/ExpressionBase.h"
-#include "CommonTools/Utils/src/ExpressionStack.h"
+#include "CommonTools/Utils/interface/ExpressionStack.h"
 
 namespace reco {
   namespace parser {

diff --git a/...tils/src/ExpressionBinaryOperatorSetter.h → ...nterface/ExpressionBinaryOperatorSetter.h b/...tils/src/ExpressionBinaryOperatorSetter.h → ...nterface/ExpressionBinaryOperatorSetter.h
@@ -10,8 +10,8 @@
  * \version $Revision: 1.2 $
  *
  */
-#include "CommonTools/Utils/src/ExpressionBinaryOperator.h"
-#include "CommonTools/Utils/src/ExpressionStack.h"
+#include "CommonTools/Utils/interface/ExpressionBinaryOperator.h"
+#include "CommonTools/Utils/interface/ExpressionStack.h"
 #include <cmath>
 
 namespace reco {

diff --git a/...ols/Utils/src/ExpressionConditionSetter.h → ...ils/interface/ExpressionConditionSetter.h b/...ols/Utils/src/ExpressionConditionSetter.h → ...ils/interface/ExpressionConditionSetter.h
@@ -9,8 +9,8 @@
  * \version $Revision: 1.1 $
  *
  */
-#include "CommonTools/Utils/src/ExpressionStack.h"
-#include "CommonTools/Utils/src/SelectorStack.h"
+#include "CommonTools/Utils/interface/ExpressionStack.h"
+#include "CommonTools/Utils/interface/SelectorStack.h"
 
 namespace reco {
   namespace parser {

diff --git a/...ools/Utils/src/ExpressionFunctionSetter.h → ...tils/interface/ExpressionFunctionSetter.h b/...ools/Utils/src/ExpressionFunctionSetter.h → ...tils/interface/ExpressionFunctionSetter.h
@@ -9,8 +9,8 @@
  * \version $Revision: 1.1 $
  *
  */
-#include "CommonTools/Utils/src/ExpressionStack.h"
-#include "CommonTools/Utils/src/FunctionStack.h"
+#include "CommonTools/Utils/interface/ExpressionStack.h"
+#include "CommonTools/Utils/interface/FunctionStack.h"
 
 namespace reco {
   namespace parser {

diff --git a/CommonTools/Utils/src/ExpressionNumber.h → ...nTools/Utils/interface/ExpressionNumber.h b/CommonTools/Utils/src/ExpressionNumber.h → ...nTools/Utils/interface/ExpressionNumber.h
diff --git a/...nTools/Utils/src/ExpressionNumberSetter.h → .../Utils/interface/ExpressionNumberSetter.h b/...nTools/Utils/src/ExpressionNumberSetter.h → .../Utils/interface/ExpressionNumberSetter.h
@@ -10,8 +10,8 @@
  * \version $Revision: 1.3 $
  *
  */
-#include "CommonTools/Utils/src/ExpressionNumber.h"
-#include "CommonTools/Utils/src/ExpressionStack.h"
+#include "CommonTools/Utils/interface/ExpressionNumber.h"
+#include "CommonTools/Utils/interface/ExpressionStack.h"
 
 namespace reco {
   namespace parser {

diff --git a/...ools/Utils/src/ExpressionSelectorSetter.h → ...tils/interface/ExpressionSelectorSetter.h b/...ools/Utils/src/ExpressionSelectorSetter.h → ...tils/interface/ExpressionSelectorSetter.h
@@ -10,11 +10,11 @@
  * \version $Revision: 1.2 $
  *
  */
-#include "CommonTools/Utils/src/SelectorStack.h"
-#include "CommonTools/Utils/src/ExpressionStack.h"
-#include "CommonTools/Utils/src/BinarySelector.h"
-#include "CommonTools/Utils/src/ExpressionNumber.h"
-#include "CommonTools/Utils/src/Comparison.h"
+#include "CommonTools/Utils/interface/SelectorStack.h"
+#include "CommonTools/Utils/interface/ExpressionStack.h"
+#include "CommonTools/Utils/interface/BinarySelector.h"
+#include "CommonTools/Utils/interface/ExpressionNumber.h"
+#include "CommonTools/Utils/interface/Comparison.h"
 #include "CommonTools/Utils/interface/Exception.h"
 
 #include <functional>

diff --git a/CommonTools/Utils/src/ExpressionSetter.h → ...nTools/Utils/interface/ExpressionSetter.h b/CommonTools/Utils/src/ExpressionSetter.h → ...nTools/Utils/interface/ExpressionSetter.h
@@ -11,7 +11,7 @@
  *
  */
 #include "CommonTools/Utils/interface/ExpressionPtr.h"
-#include "CommonTools/Utils/src/ExpressionStack.h"
+#include "CommonTools/Utils/interface/ExpressionStack.h"
 
 namespace reco {
   namespace parser {

diff --git a/CommonTools/Utils/src/ExpressionStack.h → ...onTools/Utils/interface/ExpressionStack.h b/CommonTools/Utils/src/ExpressionStack.h → ...onTools/Utils/interface/ExpressionStack.h
diff --git a/...Tools/Utils/src/ExpressionUnaryOperator.h → ...Utils/interface/ExpressionUnaryOperator.h b/...Tools/Utils/src/ExpressionUnaryOperator.h → ...Utils/interface/ExpressionUnaryOperator.h
@@ -11,7 +11,7 @@
  *
  */
 #include "CommonTools/Utils/interface/ExpressionBase.h"
-#include "CommonTools/Utils/src/ExpressionStack.h"
+#include "CommonTools/Utils/interface/ExpressionStack.h"
 
 namespace reco {
   namespace parser {

diff --git a/...Utils/src/ExpressionUnaryOperatorSetter.h → ...interface/ExpressionUnaryOperatorSetter.h b/...Utils/src/ExpressionUnaryOperatorSetter.h → ...interface/ExpressionUnaryOperatorSetter.h
@@ -10,8 +10,8 @@
  * \version $Revision: 1.2 $
  *
  */
-#include "CommonTools/Utils/src/ExpressionUnaryOperator.h"
-#include "CommonTools/Utils/src/ExpressionStack.h"
+#include "CommonTools/Utils/interface/ExpressionUnaryOperator.h"
+#include "CommonTools/Utils/interface/ExpressionStack.h"
 #ifdef BOOST_SPIRIT_DEBUG
 #include <string>
 #include <iostream>

diff --git a/CommonTools/Utils/src/ExpressionVarSetter.h → ...ols/Utils/interface/ExpressionVarSetter.h b/CommonTools/Utils/src/ExpressionVarSetter.h → ...ols/Utils/interface/ExpressionVarSetter.h
@@ -10,9 +10,9 @@
  * \version $Revision: 1.3 $
  *
  */
-#include "CommonTools/Utils/src/ExpressionStack.h"
-#include "CommonTools/Utils/src/MethodStack.h"
-#include "CommonTools/Utils/src/TypeStack.h"
+#include "CommonTools/Utils/interface/ExpressionStack.h"
+#include "CommonTools/Utils/interface/MethodStack.h"
+#include "CommonTools/Utils/interface/TypeStack.h"
 
 namespace reco {
   namespace parser {

diff --git a/CommonTools/Utils/src/Function.h → CommonTools/Utils/interface/Function.h b/CommonTools/Utils/src/Function.h → CommonTools/Utils/interface/Function.h
diff --git a/CommonTools/Utils/src/FunctionSetter.h → CommonTools/Utils/interface/FunctionSetter.h b/CommonTools/Utils/src/FunctionSetter.h → CommonTools/Utils/interface/FunctionSetter.h
@@ -9,8 +9,8 @@
  * \version $Revision: 1.2 $
  *
  */
-#include "CommonTools/Utils/src/Function.h"
-#include "CommonTools/Utils/src/FunctionStack.h"
+#include "CommonTools/Utils/interface/Function.h"
+#include "CommonTools/Utils/interface/FunctionStack.h"
 
 namespace reco {
   namespace parser {

diff --git a/CommonTools/Utils/src/FunctionStack.h → CommonTools/Utils/interface/FunctionStack.h b/CommonTools/Utils/src/FunctionStack.h → CommonTools/Utils/interface/FunctionStack.h
@@ -9,7 +9,7 @@
  * \version $Revision: 1.1 $
  *
  */
-#include "CommonTools/Utils/src/Function.h"
+#include "CommonTools/Utils/interface/Function.h"
 #include <vector>
 
 namespace reco {

diff --git a/CommonTools/Utils/interface/Grammar.h b/CommonTools/Utils/interface/Grammar.h
@@ -14,31 +14,30 @@
 #include "boost/spirit/include/classic_grammar_def.hpp"
 #include "boost/spirit/include/classic_chset.hpp"
 #include <functional>
-#include "CommonTools/Utils/src/ExpressionNumberSetter.h"
-#include "CommonTools/Utils/src/ExpressionVarSetter.h"
-#include "CommonTools/Utils/src/ExpressionFunctionSetter.h"
-#include "CommonTools/Utils/src/ExpressionConditionSetter.h"
-#include "CommonTools/Utils/src/ComparisonSetter.h"
-#include "CommonTools/Utils/src/BinarySelectorSetter.h"
-#include "CommonTools/Utils/src/TrinarySelectorSetter.h"
-#include "CommonTools/Utils/src/IntSetter.h"
-#include "CommonTools/Utils/src/MethodStack.h"
-#include "CommonTools/Utils/src/MethodArgumentStack.h"
-#include "CommonTools/Utils/src/TypeStack.h"
-#include "CommonTools/Utils/src/IntStack.h"
-#include "CommonTools/Utils/src/FunctionSetter.h"
-#include "CommonTools/Utils/src/CutSetter.h"
-#include "CommonTools/Utils/src/BinaryCutSetter.h"
-#include "CommonTools/Utils/src/UnaryCutSetter.h"
-#include "CommonTools/Utils/src/ExpressionSetter.h"
-#include "CommonTools/Utils/src/ExpressionBinaryOperatorSetter.h"
-#include "CommonTools/Utils/src/ExpressionUnaryOperatorSetter.h"
-#include "CommonTools/Utils/src/ExpressionSelectorSetter.h"
-#include "CommonTools/Utils/src/MethodSetter.h"
-#include "CommonTools/Utils/src/MethodArgumentSetter.h"
+#include "CommonTools/Utils/interface/ExpressionNumberSetter.h"
+#include "CommonTools/Utils/interface/ExpressionVarSetter.h"
+#include "CommonTools/Utils/interface/ExpressionFunctionSetter.h"
+#include "CommonTools/Utils/interface/ExpressionConditionSetter.h"
+#include "CommonTools/Utils/interface/ComparisonSetter.h"
+#include "CommonTools/Utils/interface/BinarySelectorSetter.h"
+#include "CommonTools/Utils/interface/TrinarySelectorSetter.h"
+#include "CommonTools/Utils/interface/IntSetter.h"
+#include "CommonTools/Utils/interface/MethodStack.h"
+#include "CommonTools/Utils/interface/MethodArgumentStack.h"
+#include "CommonTools/Utils/interface/TypeStack.h"
+#include "CommonTools/Utils/interface/IntStack.h"
+#include "CommonTools/Utils/interface/FunctionSetter.h"
+#include "CommonTools/Utils/interface/CutSetter.h"
+#include "CommonTools/Utils/interface/BinaryCutSetter.h"
+#include "CommonTools/Utils/interface/UnaryCutSetter.h"
+#include "CommonTools/Utils/interface/ExpressionSetter.h"
+#include "CommonTools/Utils/interface/ExpressionBinaryOperatorSetter.h"
+#include "CommonTools/Utils/interface/ExpressionUnaryOperatorSetter.h"
+#include "CommonTools/Utils/interface/ExpressionSelectorSetter.h"
+#include "CommonTools/Utils/interface/MethodSetter.h"
+#include "CommonTools/Utils/interface/MethodArgumentSetter.h"
 #include "CommonTools/Utils/interface/Exception.h"
 #include "FWCore/Reflection/interface/TypeWithDict.h"
-// #include "CommonTools/Utils/src/Abort.h"
 
 namespace reco {
   namespace parser {

diff --git a/CommonTools/Utils/src/IntSetter.h → CommonTools/Utils/interface/IntSetter.h b/CommonTools/Utils/src/IntSetter.h → CommonTools/Utils/interface/IntSetter.h
@@ -9,7 +9,7 @@
  * \version $Revision: 1.1 $
  *
  */
-#include "CommonTools/Utils/src/IntStack.h"
+#include "CommonTools/Utils/interface/IntStack.h"
 
 namespace reco {
   namespace parser {

diff --git a/CommonTools/Utils/src/IntStack.h → CommonTools/Utils/interface/IntStack.h b/CommonTools/Utils/src/IntStack.h → CommonTools/Utils/interface/IntStack.h
diff --git a/...onTools/Utils/src/LogicalBinaryOperator.h → ...s/Utils/interface/LogicalBinaryOperator.h b/...onTools/Utils/src/LogicalBinaryOperator.h → ...s/Utils/interface/LogicalBinaryOperator.h
@@ -11,7 +11,7 @@
  *
  */
 #include "CommonTools/Utils/interface/SelectorBase.h"
-#include "CommonTools/Utils/src/SelectorStack.h"
+#include "CommonTools/Utils/interface/SelectorStack.h"
 
 namespace reco {
   namespace parser {

diff --git a/CommonTools/Utils/src/LogicalUnaryOperator.h → ...ls/Utils/interface/LogicalUnaryOperator.h b/CommonTools/Utils/src/LogicalUnaryOperator.h → ...ls/Utils/interface/LogicalUnaryOperator.h
@@ -11,7 +11,7 @@
  *
  */
 #include "CommonTools/Utils/interface/SelectorBase.h"
-#include "CommonTools/Utils/src/SelectorStack.h"
+#include "CommonTools/Utils/interface/SelectorStack.h"
 
 namespace reco {
   namespace parser {

diff --git a/CommonTools/Utils/src/MethodArgumentSetter.h → ...ls/Utils/interface/MethodArgumentSetter.h b/CommonTools/Utils/src/MethodArgumentSetter.h → ...ls/Utils/interface/MethodArgumentSetter.h
@@ -9,7 +9,7 @@
  * \version $Revision: 1.1 $
  *
  */
-#include "CommonTools/Utils/src/MethodArgumentStack.h"
+#include "CommonTools/Utils/interface/MethodArgumentStack.h"
 #include <cassert>
 
 namespace reco {

diff --git a/CommonTools/Utils/src/MethodArgumentStack.h → ...ols/Utils/interface/MethodArgumentStack.h b/CommonTools/Utils/src/MethodArgumentStack.h → ...ols/Utils/interface/MethodArgumentStack.h
@@ -9,7 +9,7 @@
  *
  */
 
-#include "CommonTools/Utils/src/MethodInvoker.h"
+#include "CommonTools/Utils/interface/MethodInvoker.h"
 #include <vector>
 
 namespace reco {

diff --git a/CommonTools/Utils/src/MethodInvoker.h → CommonTools/Utils/interface/MethodInvoker.h b/CommonTools/Utils/src/MethodInvoker.h → CommonTools/Utils/interface/MethodInvoker.h
@@ -1,8 +1,8 @@
 #ifndef CommonTools_Utils_MethodInvoker_h
 #define CommonTools_Utils_MethodInvoker_h
 
-#include "CommonTools/Utils/src/AnyMethodArgument.h"
-#include "CommonTools/Utils/src/TypeCode.h"
+#include "CommonTools/Utils/interface/AnyMethodArgument.h"
+#include "CommonTools/Utils/interface/TypeCode.h"
 #include "FWCore/Reflection/interface/FunctionWithDict.h"
 #include "FWCore/Reflection/interface/MemberWithDict.h"
 #include "FWCore/Reflection/interface/ObjectWithDict.h"

diff --git a/CommonTools/Utils/src/MethodSetter.h → CommonTools/Utils/interface/MethodSetter.h b/CommonTools/Utils/src/MethodSetter.h → CommonTools/Utils/interface/MethodSetter.h
@@ -7,9 +7,9 @@
  *
  */
 
-#include "CommonTools/Utils/src/MethodStack.h"
-#include "CommonTools/Utils/src/TypeStack.h"
-#include "CommonTools/Utils/src/MethodArgumentStack.h"
+#include "CommonTools/Utils/interface/MethodStack.h"
+#include "CommonTools/Utils/interface/TypeStack.h"
+#include "CommonTools/Utils/interface/MethodArgumentStack.h"
 
 namespace reco {
   namespace parser {

diff --git a/CommonTools/Utils/src/MethodStack.h → CommonTools/Utils/interface/MethodStack.h b/CommonTools/Utils/src/MethodStack.h → CommonTools/Utils/interface/MethodStack.h
@@ -9,7 +9,7 @@
  *
  */
 
-#include "CommonTools/Utils/src/MethodInvoker.h"
+#include "CommonTools/Utils/interface/MethodInvoker.h"
 #include <vector>
 
 namespace reco {

diff --git a/CommonTools/Utils/src/SelectorStack.h → CommonTools/Utils/interface/SelectorStack.h b/CommonTools/Utils/src/SelectorStack.h → CommonTools/Utils/interface/SelectorStack.h
diff --git a/CommonTools/Utils/src/TrinarySelector.h → ...onTools/Utils/interface/TrinarySelector.h b/CommonTools/Utils/src/TrinarySelector.h → ...onTools/Utils/interface/TrinarySelector.h
@@ -12,7 +12,7 @@
  */
 #include "CommonTools/Utils/interface/SelectorBase.h"
 #include "CommonTools/Utils/interface/ExpressionBase.h"
-#include "CommonTools/Utils/src/ComparisonBase.h"
+#include "CommonTools/Utils/interface/ComparisonBase.h"
 
 namespace reco {
   namespace parser {