Cleanup mvd code

Remove path from include statements
Add missing include statements and remove unneeded ones.
Use forward declaration whenever possible.

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;

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"

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"

sim/detectors/mvd/CbmMvdPixelCharge.h

@@ -80,8 +80,4 @@ private:
   ClassDef(CbmMvdPixelCharge, 1);
 };
 
-<<<<<<< HEAD
-=======
-
->>>>>>> 85e08e45 (Create separate simulation library from mvd code)
 #endif