diff --git a/Common/DataModel/Qvectors.h b/Common/DataModel/Qvectors.h
index dbcddf15a75..bf3d148a672 100644
--- a/Common/DataModel/Qvectors.h
+++ b/Common/DataModel/Qvectors.h
@@ -21,9 +21,10 @@
 #ifndef COMMON_DATAMODEL_QVECTORS_H_
 #define COMMON_DATAMODEL_QVECTORS_H_
 
-#include <vector>
 #include "Framework/AnalysisDataModel.h"
 
+#include <vector>
+
 namespace o2::aod
 {
 namespace qvec
@@ -123,7 +124,7 @@ DECLARE_SOA_TABLE(Qvectors, "AOD", "QVECTORDEVS", //! Table with all Qvectors.
 using Qvector = Qvectors::iterator;
 DECLARE_SOA_TABLE(QvectorsShifteds, "AOD", "QVECTORSCDEVS", //! Table with all shifted Qvectors.
                   qvec::Cent, qvec::IsCalibrated, qvec::QvecShiftedRe, qvec::QvecShiftedIm, qvec::QvecAmp);
-using QvectorShifted = QvectorsShifteds::iterator; 
+using QvectorShifted = QvectorsShifteds::iterator;
 
 DECLARE_SOA_TABLE(QvectorFT0Cs, "AOD", "QVECTORSFT0C", qvec::IsCalibrated, qvec::QvecFT0CRe, qvec::QvecFT0CIm, qvec::SumAmplFT0C);
 DECLARE_SOA_TABLE(QvectorFT0As, "AOD", "QVECTORSFT0A", qvec::IsCalibrated, qvec::QvecFT0ARe, qvec::QvecFT0AIm, qvec::SumAmplFT0A);
diff --git a/Common/TableProducer/qVectorsTable.cxx b/Common/TableProducer/qVectorsTable.cxx
index 1d073ca204e..b1dccff45e9 100644
--- a/Common/TableProducer/qVectorsTable.cxx
+++ b/Common/TableProducer/qVectorsTable.cxx
@@ -19,30 +19,29 @@
 ///
 
 // C++/ROOT includes.
-#include <chrono>
-#include <string>
-#include <vector>
-#include <unordered_map>
 #include <TComplex.h>
 #include <TH3F.h>
 #include <TProfile3D.h>
 
-// o2Physics includes.
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
+#include <chrono>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
+// o2Physics includes.
 #include "Common/Core/EventPlaneHelper.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
 #include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-
 #include "Common/DataModel/Qvectors.h"
-
-#include "Common/Core/TrackSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/RunningWorkflowInfo.h"
+#include "Framework/runDataProcessing.h"
 // o2 includes.
 #include "CCDB/BasicCCDBManager.h"
 #include "DetectorsCommonDataFormats/AlignParam.h"
diff --git a/Common/Tasks/qVectorsCorrection.cxx b/Common/Tasks/qVectorsCorrection.cxx
index 92f76e9510b..84837b59f95 100644
--- a/Common/Tasks/qVectorsCorrection.cxx
+++ b/Common/Tasks/qVectorsCorrection.cxx
@@ -18,31 +18,31 @@
 ///
 
 // C++/ROOT includes.
-#include <chrono>
-#include <string>
-#include <vector>
 #include <TComplex.h>
 #include <TH1F.h>
 #include <TH2D.h>
 #include <TMath.h>
 #include <TVector2.h>
 
+#include <chrono>
+#include <string>
+#include <vector>
+
 // o2Physics includes.
+#include "Common/Core/EventPlaneHelper.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Qvectors.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
-#include "Framework/ASoAHelpers.h"
 #include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/RunningWorkflowInfo.h"
 #include "Framework/StaticFor.h"
-
-#include "Common/DataModel/Qvectors.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/EventPlaneHelper.h"
-#include "Common/Core/TrackSelection.h"
-
-#include "CommonConstants/PhysicsConstants.h"
+#include "Framework/runDataProcessing.h"
 
 // o2 includes.
 
@@ -741,7 +741,7 @@ struct qVectorsCorrection {
         fillHistosFlow(qVec, tracks, cfgnMods->at(i));
       }
     }
-  } 
+  }
   PROCESS_SWITCH(qVectorsCorrection, process, "default process", true);
 
   void processWithSC(MyCollisionsWithSC::iterator const& qVec, MyTracks const& tracks)
@@ -751,7 +751,7 @@ struct qVectorsCorrection {
                          !qVec.selection_bit(aod::evsel::kIsGoodZvtxFT0vsPV) ||
                          !qVec.selection_bit(aod::evsel::kNoSameBunchPileup))) {
       return;
-    } 
+    }
     if (cfgAddEvtSel && (qVec.trackOccupancyInTimeRange() > cfgMaxOccupancy || qVec.trackOccupancyInTimeRange() < cfgMinOccupancy)) {
       return;
     }
@@ -760,7 +760,7 @@ struct qVectorsCorrection {
     }
 
     for (uint i = 0; i < cfgnMods->size(); i++) {
-      fillHistosQvecWithSC(qVec, cfgnMods->at(i)); 
+      fillHistosQvecWithSC(qVec, cfgnMods->at(i));
       if (cfgQAFlowStudy) {
         fillHistosFlowWithSC(qVec, tracks, cfgnMods->at(i));
       }