diff --git a/reco/detectors/mvd/CbmMvdClusterfinder.cxx b/reco/detectors/mvd/CbmMvdClusterfinder.cxx
index f51ebcbd21fee869e679cf47fa082d19e4d0ed41..9a819fcda6c0358109feda09a4a64b1a9cf20a94 100644
--- a/reco/detectors/mvd/CbmMvdClusterfinder.cxx
+++ b/reco/detectors/mvd/CbmMvdClusterfinder.cxx
@@ -25,6 +25,7 @@
 #include <map>       // for allocator, __map_i...
 #include <utility>   // for pair
 
+#include <TClonesArray.h>                          // for TClonesArray
 
 using std::endl;
 using std::fixed;
diff --git a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h
index a0c80a560195e9f5b2923d7666c9f32c57a7c888..1ca9cbe9ef655af6c5cda969927c4a502896cc64 100644
--- a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h
+++ b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h
@@ -19,6 +19,7 @@
 
 #include "TArrayS.h"
 #include "TCanvas.h"
+#include <TClonesArray.h>
 #include "TH1.h"
 #include "TH1F.h"
 #include "TH2.h"
diff --git a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h
index af365c9b93454b6927c614060700a4d11c78d042..c33252c826e8bca5b54ad0b336e505b11991444a 100644
--- a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h
+++ b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h
@@ -15,12 +15,14 @@
 #include "CbmMvdDigi.h"
 #include "CbmMvdPoint.h"
 #include "CbmMvdSensor.h"
+#include "CbmMvdCluster.h"
 #include "CbmMvdSensorTask.h"
 
 #include "FairTask.h"
 
 #include "TArrayS.h"
 #include "TCanvas.h"
+#include <TClonesArray.h>
 #include "TH1.h"
 #include "TH1F.h"
 #include "TH2.h"
diff --git a/sim/detectors/mvd/CbmMvdPixelCharge.h b/sim/detectors/mvd/CbmMvdPixelCharge.h
index e05dde12a80f3a8307725acc2b42c78735ba97e7..72b92da7cbb7cffcff07fa7ef623ac4f4cf05a53 100644
--- a/sim/detectors/mvd/CbmMvdPixelCharge.h
+++ b/sim/detectors/mvd/CbmMvdPixelCharge.h
@@ -80,8 +80,4 @@ private:
   ClassDef(CbmMvdPixelCharge, 1);
 };
 
-<<<<<<< HEAD
-=======
-
->>>>>>> 85e08e45 (Create separate simulation library from mvd code)
 #endif