diff --git a/benchmarks/b0_tracker/scripts/gen_forward_protons.cxx b/benchmarks/b0_tracker/scripts/gen_forward_protons.cxx
index 6cb9bd50e89e21bfc9e13a12f449c6d5fc8886bc..7178d776d70c28ce10d43c3f6efed77ee3ffac9d 100644
--- a/benchmarks/b0_tracker/scripts/gen_forward_protons.cxx
+++ b/benchmarks/b0_tracker/scripts/gen_forward_protons.cxx
@@ -12,6 +12,7 @@
 #include "Math/Vector3D.h"
 #include "Math/Rotation3D.h"
 #include "Math/RotationY.h"
+#include "TRandom.h"
 
 #include "common_bench/particles.h"
 
diff --git a/benchmarks/barrel_ecal/scripts/emcal_barrel_electrons.cxx b/benchmarks/barrel_ecal/scripts/emcal_barrel_electrons.cxx
index 217b2f55af9e452112d8b720d6c47993c4dc89cf..edec1d849d04062b9a4f9cd7ba1447f6d57ff804 100644
--- a/benchmarks/barrel_ecal/scripts/emcal_barrel_electrons.cxx
+++ b/benchmarks/barrel_ecal/scripts/emcal_barrel_electrons.cxx
@@ -8,12 +8,14 @@
 #include "HepMC3/ReaderAscii.h"
 #include "HepMC3/WriterAscii.h"
 
-#include <TMath.h>
 #include <cmath>
 #include <iostream>
 #include <math.h>
 #include <random>
 
+#include "TMath.h"
+#include "TRandom.h"
+
 using namespace HepMC3;
 
 void emcal_barrel_electrons(int n_events = 1e6, double e_start = 0.0, double e_end = 30.0, const char* out_fname = "./data/emcal_barrel_electrons.hepmc") {
diff --git a/benchmarks/barrel_ecal/scripts/emcal_barrel_electrons_reader.cxx b/benchmarks/barrel_ecal/scripts/emcal_barrel_electrons_reader.cxx
index 90622139975845b45f359fada3d2debf79145254..a1330970200dc162ca5f1a09cffc9161c084bd89 100644
--- a/benchmarks/barrel_ecal/scripts/emcal_barrel_electrons_reader.cxx
+++ b/benchmarks/barrel_ecal/scripts/emcal_barrel_electrons_reader.cxx
@@ -8,9 +8,15 @@
 #include "HepMC3/ReaderAscii.h"
 #include "HepMC3/WriterAscii.h"
 
+#include <iostream>
+
+#include "TROOT.h"
 #include "TH1F.h"
+#include "TH2F.h"
+#include "TH3F.h"
+#include "TMath.h"
 #include "TStyle.h"
-#include <iostream>
+#include "TCanvas.h"
 
 using namespace HepMC3;
 
diff --git a/benchmarks/barrel_ecal/scripts/emcal_barrel_pi0.cxx b/benchmarks/barrel_ecal/scripts/emcal_barrel_pi0.cxx
index bd5211ab02664cef9a3bca071a9d0fa09c6a14f3..2dfaea157ccdcce395f2a1a5ceef6f005738cd48 100644
--- a/benchmarks/barrel_ecal/scripts/emcal_barrel_pi0.cxx
+++ b/benchmarks/barrel_ecal/scripts/emcal_barrel_pi0.cxx
@@ -8,12 +8,14 @@
 #include "HepMC3/ReaderAscii.h"
 #include "HepMC3/WriterAscii.h"
 
-#include <TMath.h>
 #include <cmath>
 #include <iostream>
 #include <math.h>
 #include <random>
 
+#include "TMath.h"
+#include "TRandom.h"
+
 using namespace HepMC3;
 
 void emcal_barrel_pi0(int n_events = 1e6, double e_start = 0.0, double e_end = 30.0, const char* out_fname = "./data/emcal_barrel_pi0.hepmc") {
diff --git a/benchmarks/barrel_ecal/scripts/emcal_barrel_pi0_reader.cxx b/benchmarks/barrel_ecal/scripts/emcal_barrel_pi0_reader.cxx
index 597f090fa1927ddd52c0a3b9e509ade997bfc272..42c0769957bef71dce8c9d587a6ae756a0f4bcd2 100644
--- a/benchmarks/barrel_ecal/scripts/emcal_barrel_pi0_reader.cxx
+++ b/benchmarks/barrel_ecal/scripts/emcal_barrel_pi0_reader.cxx
@@ -8,9 +8,15 @@
 #include "HepMC3/ReaderAscii.h"
 #include "HepMC3/WriterAscii.h"
 
+#include <iostream>
+
+#include "TROOT.h"
 #include "TH1F.h"
+#include "TH2F.h"
+#include "TH3F.h"
+#include "TMath.h"
 #include "TStyle.h"
-#include <iostream>
+#include "TCanvas.h"
 
 using namespace HepMC3;
 
diff --git a/benchmarks/barrel_ecal/scripts/emcal_barrel_pions.cxx b/benchmarks/barrel_ecal/scripts/emcal_barrel_pions.cxx
index 5d7963e28e822aaa198c57992c0b57f76b77d63a..5e6f034643218a580c983a22828352aa4a2811dd 100644
--- a/benchmarks/barrel_ecal/scripts/emcal_barrel_pions.cxx
+++ b/benchmarks/barrel_ecal/scripts/emcal_barrel_pions.cxx
@@ -8,12 +8,14 @@
 #include "HepMC3/ReaderAscii.h"
 #include "HepMC3/WriterAscii.h"
 
-#include <TMath.h>
 #include <cmath>
 #include <iostream>
 #include <math.h>
 #include <random>
 
+#include "TMath.h"
+#include "TRandom.h"
+
 using namespace HepMC3;
 
 void emcal_barrel_pions(int n_events = 1e6, double e_start = 0.0, double e_end = 30.0, const char* out_fname = "./data/emcal_barrel_pions.hepmc") {
diff --git a/benchmarks/barrel_ecal/scripts/emcal_barrel_pions_reader.cxx b/benchmarks/barrel_ecal/scripts/emcal_barrel_pions_reader.cxx
index e03771482f146313dedab1c5d4391d80e751392a..feb3230c28122bd764c77c320204be8c17ecfb87 100644
--- a/benchmarks/barrel_ecal/scripts/emcal_barrel_pions_reader.cxx
+++ b/benchmarks/barrel_ecal/scripts/emcal_barrel_pions_reader.cxx
@@ -8,9 +8,15 @@
 #include "HepMC3/ReaderAscii.h"
 #include "HepMC3/WriterAscii.h"
 
+#include <iostream>
+
+#include "TROOT.h"
 #include "TH1F.h"
+#include "TH2F.h"
+#include "TH3F.h"
+#include "TMath.h"
 #include "TStyle.h"
-#include <iostream>
+#include "TCanvas.h"
 
 using namespace HepMC3;
 
diff --git a/benchmarks/tracking_detectors/scripts/gen_track_hits.cxx b/benchmarks/tracking_detectors/scripts/gen_track_hits.cxx
index 76bde08492cec5567144163aaa00e7c9c29e0774..737286e004530a625b95d8f600ddc9b1cb162898 100644
--- a/benchmarks/tracking_detectors/scripts/gen_track_hits.cxx
+++ b/benchmarks/tracking_detectors/scripts/gen_track_hits.cxx
@@ -4,10 +4,12 @@
 #include "HepMC3/Print.h"
 
 #include <iostream>
-#include<random>
-#include<cmath>
+#include <random>
+#include <cmath>
 #include <math.h>
-#include <TMath.h>
+
+#include "TMath.h"
+#include "TRandom.h"
 
 using namespace HepMC3;
 
diff --git a/benchmarks/zdc/scripts/zdc_neutrons.cxx b/benchmarks/zdc/scripts/zdc_neutrons.cxx
index 911d76742f714ebbe0626f436a4368f8396ad20e..4c1f90032e964d9201412e336613f3c0f8c6bbc6 100644
--- a/benchmarks/zdc/scripts/zdc_neutrons.cxx
+++ b/benchmarks/zdc/scripts/zdc_neutrons.cxx
@@ -8,12 +8,14 @@
 #include "HepMC3/ReaderAscii.h"
 #include "HepMC3/WriterAscii.h"
 
-#include <TMath.h>
 #include <cmath>
 #include <iostream>
 #include <math.h>
 #include <random>
 
+#include "TMath.h"
+#include "TRandom.h"
+
 using namespace HepMC3;
 
 void zdc_neutrons(int n_events = 1e6, double e_start = 0.0, double e_end = 30.0, const char* out_fname = "./data/zdc_neutrons.hepmc") {