diff --git a/analysis/PWGDIL/dielectron/lmvm/CbmLmvmUtils.h b/analysis/PWGDIL/dielectron/lmvm/CbmLmvmUtils.h
index 4ffe77f0f8a2c86444774eb55429aed56c2a530b..beb8d7cfedb4d84ff4fc32f6f8ab447441b69894 100644
--- a/analysis/PWGDIL/dielectron/lmvm/CbmLmvmUtils.h
+++ b/analysis/PWGDIL/dielectron/lmvm/CbmLmvmUtils.h
@@ -14,6 +14,8 @@
 #include "CbmMCTrack.h"
 #include "CbmStsTrack.h"
 
+#include "TClonesArray.h"
+#include "TDatabasePDG.h"
 #include "TMCProcess.h"
 
 class CbmLmvmUtils {
diff --git a/core/data/test/compareCluster.h b/core/data/test/compareCluster.h
index 85e1c2470e7516d12590cd62ca0153ce4d4eedf8..94b1524e3b56cc08c5247e42572be8de6eafb931 100644
--- a/core/data/test/compareCluster.h
+++ b/core/data/test/compareCluster.h
@@ -5,6 +5,7 @@
 #include "CbmMatch.h"
 
 #include "compareMatch.h"
+#include "gtest/gtest.h"
 
 void compareClusterDataMembers(CbmCluster& test, Int_t vectorsize, std::vector<Int_t> indices, Int_t address,
                                CbmMatch* match)
diff --git a/core/data/test/compareDigi.h b/core/data/test/compareDigi.h
index 3fc955c9713ce5dc51061d8f75711b0baae36b55..59020e0060fdfe150ccaddec015a48177e559bd9 100644
--- a/core/data/test/compareDigi.h
+++ b/core/data/test/compareDigi.h
@@ -1,6 +1,8 @@
 #ifndef COMPAREDIGI_H
 #define COMPAREDIGI_H 1
 
+#include "gtest/gtest.h"
+
 void compareDigiDataMembers(CbmTestDigi& test, Int_t address, Double_t charge, Int_t systemid, Double_t time)
 {
   Int_t retValInt {-222};
diff --git a/core/data/test/compareErrorMessage.h b/core/data/test/compareErrorMessage.h
index 4a19ab2076c885400ef644fe0fa316c277d256b8..9bf4d9062a29af38747a41b58876acd49076272f 100644
--- a/core/data/test/compareErrorMessage.h
+++ b/core/data/test/compareErrorMessage.h
@@ -3,6 +3,8 @@
 
 #include "CbmErrorMessage.h"
 
+#include "gtest/gtest.h"
+
 void compareErrorMessageDataMembers(CbmErrorMessage& test, ECbmModuleId sysId, Double_t dTime, UInt_t uAddress,
                                     UInt_t uFlags, UInt_t uPayload)
 {
diff --git a/core/data/test/compareFairMCPoint.h b/core/data/test/compareFairMCPoint.h
index fd09bafb8a62e699700e2a2d1869638836a9fa4a..dd96069d660a892a049787e4040350681689631c 100644
--- a/core/data/test/compareFairMCPoint.h
+++ b/core/data/test/compareFairMCPoint.h
@@ -5,6 +5,8 @@
 
 #include <TVector3.h>
 
+#include "gtest/gtest.h"
+
 void compareFairMCPointDataMembers(FairMCPoint& test, Int_t trackID, Int_t detID, TVector3 pos, TVector3 mom,
                                    Double_t tof, Double_t length, Double_t eloss, Int_t eventid)
 {
diff --git a/core/data/test/compareHit.h b/core/data/test/compareHit.h
index 5bc911564fd39191a8cdd21da86fe6e4c4c80bb1..017d56deb855c41f0a82d729cf4dd9b445453749 100644
--- a/core/data/test/compareHit.h
+++ b/core/data/test/compareHit.h
@@ -5,6 +5,7 @@
 #include "CbmMatch.h"
 
 #include "compareMatch.h"
+#include "gtest/gtest.h"
 
 void compareHitDataMembers(CbmHit& test, HitType type, Double_t z, Double_t dz, Int_t refid, Int_t address,
                            CbmMatch* match, Double_t time, Double_t errortime)
diff --git a/core/data/test/compareLink.h b/core/data/test/compareLink.h
index 3df28b076d93cc0289a0faf0d5d068408a747a63..3b41d138d3db30ee182eab36d5e12616484db445 100644
--- a/core/data/test/compareLink.h
+++ b/core/data/test/compareLink.h
@@ -3,6 +3,8 @@
 
 #include "CbmLink.h"
 
+#include "gtest/gtest.h"
+
 void compareLinkDataMembers(CbmLink& test, Int_t file, Int_t entry, Int_t index, Double_t weight)
 {
   Int_t intRetVal {-111};
diff --git a/core/data/test/compareMatch.h b/core/data/test/compareMatch.h
index 67422eb5ee936735792d9e860db6620175160d67..6d34d2466741aef8006b4753325d2b9472e510b2 100644
--- a/core/data/test/compareMatch.h
+++ b/core/data/test/compareMatch.h
@@ -4,6 +4,8 @@
 #include "CbmLink.h"
 #include "CbmMatch.h"
 
+#include "gtest/gtest.h"
+
 void compareMatchDataMembers(CbmMatch& testMatch, Int_t noflinks, Double_t weight)
 {
   Int_t linkLength {-111};
diff --git a/core/data/test/comparePixelHit.h b/core/data/test/comparePixelHit.h
index fb4c30437e762c5ab84299c120651dfca5efb746..c900b354bc3002b3bebdaf4a0ce45d0b80b68396 100644
--- a/core/data/test/comparePixelHit.h
+++ b/core/data/test/comparePixelHit.h
@@ -5,6 +5,7 @@
 #include "CbmPixelHit.h"
 
 #include "compareHit.h"
+#include "gtest/gtest.h"
 
 void comparePixelHitDataMembers(CbmPixelHit& test, HitType type, Double_t z, Double_t dz, Int_t refid, Int_t address,
                                 CbmMatch* match, Double_t time, Double_t errortime, Double_t x, Double_t dx, Double_t y,
diff --git a/core/data/test/compareStripHit.h b/core/data/test/compareStripHit.h
index d292b33ad578401217fd77b9deb5b0fbc5bca9c6..b63f203d06841a809c045228c949a4758d8b98dd 100644
--- a/core/data/test/compareStripHit.h
+++ b/core/data/test/compareStripHit.h
@@ -5,6 +5,7 @@
 #include "CbmStripHit.h"
 
 #include "compareHit.h"
+#include "gtest/gtest.h"
 
 void compareStripHitDataMembers(CbmStripHit& test, HitType type, Double_t z, Double_t dz, Int_t refid, Int_t address,
                                 CbmMatch* match, Double_t time, Double_t errortime, Double_t u, Double_t du,
diff --git a/core/data/test/compareVertex.h b/core/data/test/compareVertex.h
index af5fed36d637cf7c0a4ed8ad3f4a8d07e7333a1b..fe9d96d36f0240478815ed46724fc6a9aa89a1e9 100644
--- a/core/data/test/compareVertex.h
+++ b/core/data/test/compareVertex.h
@@ -1,3 +1,5 @@
+#include "gtest/gtest.h"
+
 void compareVertexDataMembers(CbmVertex& test, Double_t x, Double_t y, Double_t z, Double_t chi2, Int_t ndf,
                               Int_t ntracks, Double_t* cov)
 {
diff --git a/core/data/test/much/compareMuchBeamTimeDigi.h b/core/data/test/much/compareMuchBeamTimeDigi.h
index 9d8933b0955f28af87aa0138f8975916b584eefa..d786d968dccfe1625488af3dd63c969ab62168cb 100644
--- a/core/data/test/much/compareMuchBeamTimeDigi.h
+++ b/core/data/test/much/compareMuchBeamTimeDigi.h
@@ -2,6 +2,7 @@
 #define COMPAREMUCHBEAMTIMEDIGI_H 1
 
 #include "compareMuchDigi.h"
+#include "gtest/gtest.h"
 
 void compareMuchBeamTimeDigiDataMembers(CbmMuchBeamTimeDigi& test, Int_t address, ECbmModuleId systemid, ULong64_t time,
                                         Int_t charge, Int_t padx, Int_t pady, Int_t rocid, Int_t nxid, Int_t nxch,
diff --git a/core/data/test/much/compareMuchDigi.h b/core/data/test/much/compareMuchDigi.h
index 293361cc28e503c940a6429bb53c8600702a8c13..829d59e4b2764bf4941c6d20a92bfc037c94a866 100644
--- a/core/data/test/much/compareMuchDigi.h
+++ b/core/data/test/much/compareMuchDigi.h
@@ -1,6 +1,8 @@
 #ifndef COMPAREMUCHDIGI_H
 #define COMPAREMUCHDIGI_H 1
 
+#include "gtest/gtest.h"
+
 void compareMuchDigiDataMembers(CbmMuchDigi& test, Int_t address, ECbmModuleId systemid, ULong64_t time, Int_t charge)
 {
   Int_t retValInt {-222};
diff --git a/core/data/test/psd/comparePsdAddress.h b/core/data/test/psd/comparePsdAddress.h
index 5664b9d55e9c1dda6bef064b489acc88db5faec0..b060582b17caaf9491a2e510acaa2d3d0c1feb9a 100644
--- a/core/data/test/psd/comparePsdAddress.h
+++ b/core/data/test/psd/comparePsdAddress.h
@@ -1,6 +1,8 @@
 #ifndef COMPAREPSDDIGI_H
 #define COMPAREPSDDIGI_H 1
 
+#include "gtest/gtest.h"
+
 void comparePsdAddressDataMembers(Int_t address, ECbmModuleId systemid, Int_t moduleid, Int_t sectionid)
 {
   Int_t retValInt {-222};
diff --git a/core/data/test/psd/comparePsdDigi.h b/core/data/test/psd/comparePsdDigi.h
index ea43cc00e799755f2e7f5dfddfc3c1f39971759a..69ca34bd7dda19c9e12c7fcb36628649638a4c85 100644
--- a/core/data/test/psd/comparePsdDigi.h
+++ b/core/data/test/psd/comparePsdDigi.h
@@ -1,6 +1,8 @@
 #ifndef COMPAREPSDDIGI_H
 #define COMPAREPSDDIGI_H 1
 
+#include "gtest/gtest.h"
+
 void comparePsdDigiDataMembers(CbmPsdDigi& test, Int_t address, ECbmModuleId systemid, Double_t time, Double_t edep)
 {
   Int_t retValInt {-222};
diff --git a/core/data/test/psd/comparePsdHit.h b/core/data/test/psd/comparePsdHit.h
index 4fae23cc7ca164f206a5f9cce8cfd98fa59adf97..cc916811f177a0fd498a6b5f287d63d6caebc71d 100644
--- a/core/data/test/psd/comparePsdHit.h
+++ b/core/data/test/psd/comparePsdHit.h
@@ -1,6 +1,8 @@
 #ifndef COMPAREPSDHIT_H
 #define COMPAREPSDHIT_H 1
 
+#include "gtest/gtest.h"
+
 void comparePsdHitDataMembers(CbmPsdHit& test, Int_t moduleid, Double_t edep)
 {
   Int_t retValInt {-222};
diff --git a/core/data/test/psd/comparePsdPoint.h b/core/data/test/psd/comparePsdPoint.h
index b80d43ca9b0b1830d48bdf8229e33419115dc070..5ddb47214af32ecc8f47532e5f2b865a24bb72ee 100644
--- a/core/data/test/psd/comparePsdPoint.h
+++ b/core/data/test/psd/comparePsdPoint.h
@@ -2,6 +2,7 @@
 #define COMPAREPSDPOINT_H 1
 
 #include "compareFairMCPoint.h"
+#include "gtest/gtest.h"
 
 void comparePsdPointDataMembers(CbmPsdPoint& test, Int_t trackID, Int_t detID, TVector3 pos, TVector3 mom, Double_t tof,
                                 Double_t length, Double_t eLoss, Int_t moduleid, Int_t eventid)
diff --git a/core/data/test/rich/compareRichDigi.h b/core/data/test/rich/compareRichDigi.h
index 6003065abe4768d420a0b594b9fec06f4def4c32..c57a25d8390ab542288a0d87001a2065613dfa03 100644
--- a/core/data/test/rich/compareRichDigi.h
+++ b/core/data/test/rich/compareRichDigi.h
@@ -1,6 +1,8 @@
 #ifndef COMPARERICHDIGI_H
 #define COMPARERICHDIGI_H 1
 
+#include "gtest/gtest.h"
+
 void compareRichDigiDataMembers(CbmRichDigi& test, Int_t address, ECbmModuleId systemid, Double_t time, Double_t tot)
 {
   Int_t retValInt {-222};
diff --git a/core/data/test/sts/compareStsDigi.h b/core/data/test/sts/compareStsDigi.h
index 7276b18da965225630d802c32d824f2d8eda8b81..00896c31219c115b0e4f953c863096576a8ef704 100644
--- a/core/data/test/sts/compareStsDigi.h
+++ b/core/data/test/sts/compareStsDigi.h
@@ -1,6 +1,8 @@
 #ifndef COMPARESTSDIGI_H
 #define COMPARESTSDIGI_H 1
 
+#include "gtest/gtest.h"
+
 void compareStsDigiDataMembers(CbmStsDigi& test, Int_t address, UShort_t charge, UShort_t channel,
                                ECbmModuleId systemid, Long64_t time)
 {
diff --git a/core/data/test/tof/compareTofDigi.h b/core/data/test/tof/compareTofDigi.h
index b193296d79dc3e3736af722d6a6a9445acf5d6ed..6c4e8a63de8cb0748214e4a48a229cbc07645dce 100644
--- a/core/data/test/tof/compareTofDigi.h
+++ b/core/data/test/tof/compareTofDigi.h
@@ -1,6 +1,8 @@
 #ifndef COMPARETOFDIGI_H
 #define COMPARETOFDIGI_H 1
 
+#include "gtest/gtest.h"
+
 void compareTofDigiDataMembers(CbmTofDigi& test, Int_t address, ECbmModuleId systemid, Double_t time, Double_t tot)
 {
   Int_t retValInt {-222};
diff --git a/core/data/test/trd/compareTrdDigi.h b/core/data/test/trd/compareTrdDigi.h
index 7642bc2365890a40444946d58e568c9e8331920c..847a87becab8f401d9bd820acf5be41b228342be 100644
--- a/core/data/test/trd/compareTrdDigi.h
+++ b/core/data/test/trd/compareTrdDigi.h
@@ -1,6 +1,8 @@
 #ifndef COMPARETRDDIGI_H
 #define COMPARETRDDIGI_H 1
 
+#include "gtest/gtest.h"
+
 void compareTrdDigiDataMembers(CbmTrdDigi& test, Int_t padChNr, ECbmModuleId systemid, ULong64_t time, Double_t charge)
 {
   Int_t retValInt {-222};
diff --git a/core/data/test/trd/compareTrdHit.h b/core/data/test/trd/compareTrdHit.h
index a1fc6b5aa0030f7a2a426744a393d9d6badbfa22..043ec3eb6575aca0df9359d4708323f792d8fbd3 100644
--- a/core/data/test/trd/compareTrdHit.h
+++ b/core/data/test/trd/compareTrdHit.h
@@ -2,7 +2,7 @@
 #define COMPARETRDHIT_H 1
 
 #include "comparePixelHit.h"
-
+#include "gtest/gtest.h"
 
 void compareTrdHitDataMembers(CbmTrdHit& test, HitType type, Double_t z, Double_t dz, Int_t refid, Int_t address,
                               CbmMatch* match, Double_t time, Double_t errortime, Double_t x, Double_t dx, Double_t y,
diff --git a/core/data/test/trd/compareTrdPoint.h b/core/data/test/trd/compareTrdPoint.h
index 2bfed4226d50c7f979ce9f8b4bd588f0888c63ca..3ec39612bcfc34c84f8afa177779b471dfe53a13 100644
--- a/core/data/test/trd/compareTrdPoint.h
+++ b/core/data/test/trd/compareTrdPoint.h
@@ -2,6 +2,7 @@
 #define COMPARETRDPOINT_H 1
 
 #include "compareFairMCPoint.h"
+#include "gtest/gtest.h"
 
 void compareTrdPointDataMembers(CbmTrdPoint& test, Int_t trackID, Int_t detID, TVector3 posin, TVector3 momin,
                                 TVector3 posout, TVector3 momout, Double_t tof, Double_t length, Double_t eLoss,