diff --git a/JugBase/src/components/InputCopier.cpp b/JugBase/src/components/InputCopier.cpp
index 1b3e3e29..b722d18d 100644
--- a/JugBase/src/components/InputCopier.cpp
+++ b/JugBase/src/components/InputCopier.cpp
@@ -7,7 +7,7 @@
 #include "GaudiAlg/Transformer.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/GaudiTool.h"
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 
 // FCCSW
 #include "JugBase/DataHandle.h"
diff --git a/JugFast/src/components/InclusiveKinematicsTruth.cpp b/JugFast/src/components/InclusiveKinematicsTruth.cpp
index 48f7e348..67cfb1c0 100644
--- a/JugFast/src/components/InclusiveKinematicsTruth.cpp
+++ b/JugFast/src/components/InclusiveKinematicsTruth.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // Copyright (C) 2022 Wouter Deconinck
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/JugFast/src/components/MatchClusters.cpp b/JugFast/src/components/MatchClusters.cpp
index 2a888b3b..8260e446 100644
--- a/JugFast/src/components/MatchClusters.cpp
+++ b/JugFast/src/components/MatchClusters.cpp
@@ -10,7 +10,7 @@
 
 #include <fmt/format.h>
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/JugFast/src/components/ScatteredElectronFinder.cpp b/JugFast/src/components/ScatteredElectronFinder.cpp
index 8ef2794e..c38b43e9 100644
--- a/JugFast/src/components/ScatteredElectronFinder.cpp
+++ b/JugFast/src/components/ScatteredElectronFinder.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // Copyright (C) 2022 Wouter Deconinck
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/JugFast/src/components/SmearedFarForwardParticles.cpp b/JugFast/src/components/SmearedFarForwardParticles.cpp
index bdebe275..cf353128 100644
--- a/JugFast/src/components/SmearedFarForwardParticles.cpp
+++ b/JugFast/src/components/SmearedFarForwardParticles.cpp
@@ -5,7 +5,7 @@
 #include <cmath>
 #include <fmt/format.h>
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/JugReco/src/components/FarForwardParticles.cpp b/JugReco/src/components/FarForwardParticles.cpp
index 9922644c..b298591b 100644
--- a/JugReco/src/components/FarForwardParticles.cpp
+++ b/JugReco/src/components/FarForwardParticles.cpp
@@ -5,7 +5,7 @@
 #include <cmath>
 #include <fmt/format.h>
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/JugReco/src/components/FarForwardParticlesOMD.cpp b/JugReco/src/components/FarForwardParticlesOMD.cpp
index 49e5514f..41e0011b 100644
--- a/JugReco/src/components/FarForwardParticlesOMD.cpp
+++ b/JugReco/src/components/FarForwardParticlesOMD.cpp
@@ -5,7 +5,7 @@
 #include <cmath>
 #include <fmt/format.h>
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/JugReco/src/components/InclusiveKinematicsDA.cpp b/JugReco/src/components/InclusiveKinematicsDA.cpp
index 01286561..05c77344 100644
--- a/JugReco/src/components/InclusiveKinematicsDA.cpp
+++ b/JugReco/src/components/InclusiveKinematicsDA.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // Copyright (C) 2022 Wouter Deconinck
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/JugReco/src/components/InclusiveKinematicsElectron.cpp b/JugReco/src/components/InclusiveKinematicsElectron.cpp
index af36f9e2..e825f03b 100644
--- a/JugReco/src/components/InclusiveKinematicsElectron.cpp
+++ b/JugReco/src/components/InclusiveKinematicsElectron.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // Copyright (C) 2022 Wouter Deconinck
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/JugReco/src/components/InclusiveKinematicsJB.cpp b/JugReco/src/components/InclusiveKinematicsJB.cpp
index d4dd4cf2..f349e3d7 100644
--- a/JugReco/src/components/InclusiveKinematicsJB.cpp
+++ b/JugReco/src/components/InclusiveKinematicsJB.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // Copyright (C) 2022 Wouter Deconinck
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/JugReco/src/components/InclusiveKinematicsSigma.cpp b/JugReco/src/components/InclusiveKinematicsSigma.cpp
index 03c21567..d4a3afb0 100644
--- a/JugReco/src/components/InclusiveKinematicsSigma.cpp
+++ b/JugReco/src/components/InclusiveKinematicsSigma.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // Copyright (C) 2022 Wouter Deconinck, Barak Schmookler
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/JugReco/src/components/InclusiveKinematicseSigma.cpp b/JugReco/src/components/InclusiveKinematicseSigma.cpp
index f9c52852..36061092 100644
--- a/JugReco/src/components/InclusiveKinematicseSigma.cpp
+++ b/JugReco/src/components/InclusiveKinematicseSigma.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // Copyright (C) 2022 Wouter Deconinck, Barak Schmookler
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/external/algorithms/dis/include/algorithms/dis/todo/InclusiveKinematicsDA.h b/external/algorithms/dis/include/algorithms/dis/todo/InclusiveKinematicsDA.h
index 01286561..05c77344 100644
--- a/external/algorithms/dis/include/algorithms/dis/todo/InclusiveKinematicsDA.h
+++ b/external/algorithms/dis/include/algorithms/dis/todo/InclusiveKinematicsDA.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // Copyright (C) 2022 Wouter Deconinck
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/external/algorithms/dis/include/algorithms/dis/todo/InclusiveKinematicsElectron.h b/external/algorithms/dis/include/algorithms/dis/todo/InclusiveKinematicsElectron.h
index af36f9e2..e825f03b 100644
--- a/external/algorithms/dis/include/algorithms/dis/todo/InclusiveKinematicsElectron.h
+++ b/external/algorithms/dis/include/algorithms/dis/todo/InclusiveKinematicsElectron.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // Copyright (C) 2022 Wouter Deconinck
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/external/algorithms/dis/include/algorithms/dis/todo/InclusiveKinematicsJB.h b/external/algorithms/dis/include/algorithms/dis/todo/InclusiveKinematicsJB.h
index d4dd4cf2..f349e3d7 100644
--- a/external/algorithms/dis/include/algorithms/dis/todo/InclusiveKinematicsJB.h
+++ b/external/algorithms/dis/include/algorithms/dis/todo/InclusiveKinematicsJB.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // Copyright (C) 2022 Wouter Deconinck
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/external/algorithms/dis/include/algorithms/dis/todo/InclusiveKinematicsSigma.h b/external/algorithms/dis/include/algorithms/dis/todo/InclusiveKinematicsSigma.h
index 03c21567..d4a3afb0 100644
--- a/external/algorithms/dis/include/algorithms/dis/todo/InclusiveKinematicsSigma.h
+++ b/external/algorithms/dis/include/algorithms/dis/todo/InclusiveKinematicsSigma.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // Copyright (C) 2022 Wouter Deconinck, Barak Schmookler
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/external/algorithms/dis/include/algorithms/dis/todo/InclusiveKinematicseSigma.h b/external/algorithms/dis/include/algorithms/dis/todo/InclusiveKinematicseSigma.h
index f9c52852..36061092 100644
--- a/external/algorithms/dis/include/algorithms/dis/todo/InclusiveKinematicseSigma.h
+++ b/external/algorithms/dis/include/algorithms/dis/todo/InclusiveKinematicseSigma.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // Copyright (C) 2022 Wouter Deconinck, Barak Schmookler
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/external/algorithms/dis/src/todo/InclusiveKinematicsDA.cpp b/external/algorithms/dis/src/todo/InclusiveKinematicsDA.cpp
index 01286561..05c77344 100644
--- a/external/algorithms/dis/src/todo/InclusiveKinematicsDA.cpp
+++ b/external/algorithms/dis/src/todo/InclusiveKinematicsDA.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // Copyright (C) 2022 Wouter Deconinck
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/external/algorithms/dis/src/todo/InclusiveKinematicsElectron.cpp b/external/algorithms/dis/src/todo/InclusiveKinematicsElectron.cpp
index af36f9e2..e825f03b 100644
--- a/external/algorithms/dis/src/todo/InclusiveKinematicsElectron.cpp
+++ b/external/algorithms/dis/src/todo/InclusiveKinematicsElectron.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // Copyright (C) 2022 Wouter Deconinck
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/external/algorithms/dis/src/todo/InclusiveKinematicsJB.cpp b/external/algorithms/dis/src/todo/InclusiveKinematicsJB.cpp
index d4dd4cf2..f349e3d7 100644
--- a/external/algorithms/dis/src/todo/InclusiveKinematicsJB.cpp
+++ b/external/algorithms/dis/src/todo/InclusiveKinematicsJB.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // Copyright (C) 2022 Wouter Deconinck
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/external/algorithms/dis/src/todo/InclusiveKinematicsSigma.cpp b/external/algorithms/dis/src/todo/InclusiveKinematicsSigma.cpp
index 03c21567..d4a3afb0 100644
--- a/external/algorithms/dis/src/todo/InclusiveKinematicsSigma.cpp
+++ b/external/algorithms/dis/src/todo/InclusiveKinematicsSigma.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // Copyright (C) 2022 Wouter Deconinck, Barak Schmookler
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/external/algorithms/dis/src/todo/InclusiveKinematicseSigma.cpp b/external/algorithms/dis/src/todo/InclusiveKinematicseSigma.cpp
index f9c52852..36061092 100644
--- a/external/algorithms/dis/src/todo/InclusiveKinematicseSigma.cpp
+++ b/external/algorithms/dis/src/todo/InclusiveKinematicseSigma.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // Copyright (C) 2022 Wouter Deconinck, Barak Schmookler
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/external/algorithms/far_forward/include/algorithms/far_forward/todo/FarForwardParticles.h b/external/algorithms/far_forward/include/algorithms/far_forward/todo/FarForwardParticles.h
index 9922644c..b298591b 100644
--- a/external/algorithms/far_forward/include/algorithms/far_forward/todo/FarForwardParticles.h
+++ b/external/algorithms/far_forward/include/algorithms/far_forward/todo/FarForwardParticles.h
@@ -5,7 +5,7 @@
 #include <cmath>
 #include <fmt/format.h>
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/external/algorithms/far_forward/include/algorithms/far_forward/todo/FarForwardParticlesOMD.h b/external/algorithms/far_forward/include/algorithms/far_forward/todo/FarForwardParticlesOMD.h
index 49e5514f..41e0011b 100644
--- a/external/algorithms/far_forward/include/algorithms/far_forward/todo/FarForwardParticlesOMD.h
+++ b/external/algorithms/far_forward/include/algorithms/far_forward/todo/FarForwardParticlesOMD.h
@@ -5,7 +5,7 @@
 #include <cmath>
 #include <fmt/format.h>
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/external/algorithms/far_forward/src/todo/FarForwardParticles.cpp b/external/algorithms/far_forward/src/todo/FarForwardParticles.cpp
index 9922644c..b298591b 100644
--- a/external/algorithms/far_forward/src/todo/FarForwardParticles.cpp
+++ b/external/algorithms/far_forward/src/todo/FarForwardParticles.cpp
@@ -5,7 +5,7 @@
 #include <cmath>
 #include <fmt/format.h>
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/external/algorithms/far_forward/src/todo/FarForwardParticlesOMD.cpp b/external/algorithms/far_forward/src/todo/FarForwardParticlesOMD.cpp
index 49e5514f..41e0011b 100644
--- a/external/algorithms/far_forward/src/todo/FarForwardParticlesOMD.cpp
+++ b/external/algorithms/far_forward/src/todo/FarForwardParticlesOMD.cpp
@@ -5,7 +5,7 @@
 #include <cmath>
 #include <fmt/format.h>
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/external/algorithms/truth/include/algorithms/truth/todo/InclusiveKinematicsTruth.h b/external/algorithms/truth/include/algorithms/truth/todo/InclusiveKinematicsTruth.h
index 48f7e348..67cfb1c0 100644
--- a/external/algorithms/truth/include/algorithms/truth/todo/InclusiveKinematicsTruth.h
+++ b/external/algorithms/truth/include/algorithms/truth/todo/InclusiveKinematicsTruth.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // Copyright (C) 2022 Wouter Deconinck
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/external/algorithms/truth/include/algorithms/truth/todo/MatchClusters.h b/external/algorithms/truth/include/algorithms/truth/todo/MatchClusters.h
index 2a888b3b..8260e446 100644
--- a/external/algorithms/truth/include/algorithms/truth/todo/MatchClusters.h
+++ b/external/algorithms/truth/include/algorithms/truth/todo/MatchClusters.h
@@ -10,7 +10,7 @@
 
 #include <fmt/format.h>
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/external/algorithms/truth/include/algorithms/truth/todo/ScatteredElectronFinder.h b/external/algorithms/truth/include/algorithms/truth/todo/ScatteredElectronFinder.h
index 8ef2794e..c38b43e9 100644
--- a/external/algorithms/truth/include/algorithms/truth/todo/ScatteredElectronFinder.h
+++ b/external/algorithms/truth/include/algorithms/truth/todo/ScatteredElectronFinder.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // Copyright (C) 2022 Wouter Deconinck
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/external/algorithms/truth/include/algorithms/truth/todo/SmearedFarForwardParticles.h b/external/algorithms/truth/include/algorithms/truth/todo/SmearedFarForwardParticles.h
index bdebe275..cf353128 100644
--- a/external/algorithms/truth/include/algorithms/truth/todo/SmearedFarForwardParticles.h
+++ b/external/algorithms/truth/include/algorithms/truth/todo/SmearedFarForwardParticles.h
@@ -5,7 +5,7 @@
 #include <cmath>
 #include <fmt/format.h>
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/external/algorithms/truth/src/todo/InclusiveKinematicsTruth.cpp b/external/algorithms/truth/src/todo/InclusiveKinematicsTruth.cpp
index 48f7e348..67cfb1c0 100644
--- a/external/algorithms/truth/src/todo/InclusiveKinematicsTruth.cpp
+++ b/external/algorithms/truth/src/todo/InclusiveKinematicsTruth.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // Copyright (C) 2022 Wouter Deconinck
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/external/algorithms/truth/src/todo/MatchClusters.cpp b/external/algorithms/truth/src/todo/MatchClusters.cpp
index 2a888b3b..8260e446 100644
--- a/external/algorithms/truth/src/todo/MatchClusters.cpp
+++ b/external/algorithms/truth/src/todo/MatchClusters.cpp
@@ -10,7 +10,7 @@
 
 #include <fmt/format.h>
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/external/algorithms/truth/src/todo/ScatteredElectronFinder.cpp b/external/algorithms/truth/src/todo/ScatteredElectronFinder.cpp
index 8ef2794e..c38b43e9 100644
--- a/external/algorithms/truth/src/todo/ScatteredElectronFinder.cpp
+++ b/external/algorithms/truth/src/todo/ScatteredElectronFinder.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // Copyright (C) 2022 Wouter Deconinck
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"
diff --git a/external/algorithms/truth/src/todo/SmearedFarForwardParticles.cpp b/external/algorithms/truth/src/todo/SmearedFarForwardParticles.cpp
index bdebe275..cf353128 100644
--- a/external/algorithms/truth/src/todo/SmearedFarForwardParticles.cpp
+++ b/external/algorithms/truth/src/todo/SmearedFarForwardParticles.cpp
@@ -5,7 +5,7 @@
 #include <cmath>
 #include <fmt/format.h>
 
-#include "Gaudi/Algorithm.h"
+#include "GaudiAlg/GaudiAlgorithm.h"
 #include "GaudiAlg/GaudiTool.h"
 #include "GaudiAlg/Producer.h"
 #include "GaudiAlg/Transformer.h"