diff --git a/reco/eventbuilder/tracks/CbmEventBuilderQa.cxx b/reco/eventbuilder/tracks/CbmEventBuilderQa.cxx
index 94e2fd4bade7a89df565d22848dd237771882be3..a5af7b979df06bcdc38ac0c1c477369e863bd4b3 100644
--- a/reco/eventbuilder/tracks/CbmEventBuilderQa.cxx
+++ b/reco/eventbuilder/tracks/CbmEventBuilderQa.cxx
@@ -10,44 +10,10 @@
 // Cbm Headers ----------------------
 #include "CbmEventBuilderQa.h"
 
-#include "CbmMCTrack.h"
-#include "CbmTrack.h"
-#include "CbmTrackMatchNew.h"
-
-#include "FairRunAna.h"
-
-//KF Particle headers
-#include "CbmEvent.h"
-#include "CbmKFVertex.h"
-#include "CbmL1PFFitter.h"
-#include "CbmStsDigi.h"
-#include "CbmStsHit.h"
-#include "CbmStsPoint.h"
-#include "CbmStsSensor.h"
-#include "CbmStsSetup.h"
-#include "CbmStsStation.h"
-#include "CbmStsTrack.h"
-
-#include "KFMCTrack.h"
-#include "KFParticleMatch.h"
-#include "KFParticleTopoReconstructor.h"
-#include "KFTopoPerformance.h"
-#include "L1Field.h"
-
-//ROOT headers
-#include "TClonesArray.h"
-#include "TDatabasePDG.h"
-#include "TDirectory.h"
-#include "TFile.h"
-#include "TH1F.h"
-#include "TH2F.h"
-#include "TMath.h"
-#include "TObject.h"
-
-//c++ and std headers
 #include "CbmEbEventEfficiencies.h"
 #include "CbmEbEventMatch.h"
 #include "CbmEbMCEvent.h"
+#include "CbmEvent.h"
 #include "CbmGlobalTrack.h"
 #include "CbmMCDataArray.h"
 #include "CbmMCDataManager.h"
@@ -55,15 +21,34 @@
 #include "CbmMCTrack.h"
 #include "CbmMuchTrack.h"
 #include "CbmRichRing.h"
+#include "CbmStsDigi.h"
+#include "CbmStsHit.h"
+#include "CbmStsPoint.h"
+#include "CbmStsSensor.h"
+#include "CbmStsSetup.h"
+#include "CbmStsStation.h"
 #include "CbmStsTrack.h"
 #include "CbmTrack.h"
 #include "CbmTrackMatchNew.h"
 
+#include <FairRunAna.h>
+
+#include <TClonesArray.h>
+#include <TDatabasePDG.h>
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <TMath.h>
+#include <TObject.h>
+
 #include <iomanip>
 #include <iostream>
 
 #include <cmath>
 
+using std::cout;
+using std::endl;
 using std::map;
 using std::vector;