diff --git a/k4EDM4hep2LcioConv/include/k4EDM4hep2LcioConv/k4EDM4hep2LcioConv.h b/k4EDM4hep2LcioConv/include/k4EDM4hep2LcioConv/k4EDM4hep2LcioConv.h
index 68a21e6..6ebef88 100644
--- a/k4EDM4hep2LcioConv/include/k4EDM4hep2LcioConv/k4EDM4hep2LcioConv.h
+++ b/k4EDM4hep2LcioConv/include/k4EDM4hep2LcioConv/k4EDM4hep2LcioConv.h
@@ -4,6 +4,7 @@
 #include "k4EDM4hep2LcioConv/MappingUtils.h"
 
 // EDM4hep
+#include "edm4hep/TrackerHit3DCollection.h"
 #include <edm4hep/CaloHitContributionCollection.h>
 #include <edm4hep/CaloHitMCParticleLinkCollection.h>
 #include <edm4hep/CaloHitSimCaloHitLinkCollection.h>
@@ -21,11 +22,10 @@
 #include <edm4hep/SimTrackerHitCollection.h>
 #include <edm4hep/TrackCollection.h>
 #include <edm4hep/TrackMCParticleLinkCollection.h>
-#include <edm4hep/TrackerHitSimTrackerHitLinkCollection.h>
-#include <edm4hep/VertexRecoParticleLinkCollection.h>
-#include "edm4hep/TrackerHit3DCollection.h"
 #include <edm4hep/TrackerHitPlaneCollection.h>
+#include <edm4hep/TrackerHitSimTrackerHitLinkCollection.h>
 #include <edm4hep/VertexCollection.h>
+#include <edm4hep/VertexRecoParticleLinkCollection.h>
 #include <edm4hep/utils/ParticleIDUtils.h>
 
 #include "podio/Frame.h"
diff --git a/k4EDM4hep2LcioConv/include/k4EDM4hep2LcioConv/k4Lcio2EDM4hepConv.h b/k4EDM4hep2LcioConv/include/k4EDM4hep2LcioConv/k4Lcio2EDM4hepConv.h
index f4fe995..c8bc622 100644
--- a/k4EDM4hep2LcioConv/include/k4EDM4hep2LcioConv/k4Lcio2EDM4hepConv.h
+++ b/k4EDM4hep2LcioConv/include/k4EDM4hep2LcioConv/k4Lcio2EDM4hepConv.h
@@ -21,11 +21,11 @@
 #include "edm4hep/SimTrackerHitCollection.h"
 #include "edm4hep/TrackCollection.h"
 #include "edm4hep/TrackMCParticleLinkCollection.h"
-#include "edm4hep/TrackerHitSimTrackerHitLinkCollection.h"
-#include "edm4hep/VertexRecoParticleLinkCollection.h"
 #include "edm4hep/TrackerHit3DCollection.h"
 #include "edm4hep/TrackerHitPlaneCollection.h"
+#include "edm4hep/TrackerHitSimTrackerHitLinkCollection.h"
 #include "edm4hep/VertexCollection.h"
+#include "edm4hep/VertexRecoParticleLinkCollection.h"
 #include "edm4hep/utils/ParticleIDUtils.h"
 
 // LCIO
diff --git a/tests/src/CompareEDM4hepLCIO.h b/tests/src/CompareEDM4hepLCIO.h
index 8738080..96a127c 100644
--- a/tests/src/CompareEDM4hepLCIO.h
+++ b/tests/src/CompareEDM4hepLCIO.h
@@ -21,13 +21,13 @@
 #include "edm4hep/SimTrackerHitCollection.h"
 #include "edm4hep/TrackCollection.h"
 #include "edm4hep/TrackMCParticleLinkCollection.h"
-#include "edm4hep/TrackerHitSimTrackerHitLinkCollection.h"
-#include "edm4hep/VertexRecoParticleLinkCollection.h"
-#include <edm4hep/VertexRecoParticleLink.h>
 #include "edm4hep/TrackerHit3DCollection.h"
 #include "edm4hep/TrackerHitPlaneCollection.h"
+#include "edm4hep/TrackerHitSimTrackerHitLinkCollection.h"
 #include "edm4hep/VertexCollection.h"
+#include "edm4hep/VertexRecoParticleLinkCollection.h"
 #include "edm4hep/utils/ParticleIDUtils.h"
+#include <edm4hep/VertexRecoParticleLink.h>
 
 #include "podio/Frame.h"
 
diff --git a/tests/src/EDM4hep2LCIOUtilities.h b/tests/src/EDM4hep2LCIOUtilities.h
index 039f7e1..f465c61 100644
--- a/tests/src/EDM4hep2LCIOUtilities.h
+++ b/tests/src/EDM4hep2LCIOUtilities.h
@@ -9,6 +9,7 @@
 #include "edm4hep/ReconstructedParticleCollection.h"
 #include "edm4hep/SimCalorimeterHitCollection.h"
 #include "edm4hep/TrackCollection.h"
+#include "edm4hep/TrackerHit3DCollection.h"
 #include <edm4hep/CaloHitMCParticleLinkCollection.h>
 #include <edm4hep/CaloHitSimCaloHitLinkCollection.h>
 #include <edm4hep/ClusterMCParticleLinkCollection.h>
@@ -20,9 +21,8 @@
 #include <edm4hep/TrackMCParticleLinkCollection.h>
 #include <edm4hep/TrackerHitPlaneCollection.h>
 #include <edm4hep/TrackerHitSimTrackerHitLinkCollection.h>
-#include <edm4hep/VertexRecoParticleLinkCollection.h>
-#include "edm4hep/TrackerHit3DCollection.h"
 #include <edm4hep/VertexCollection.h>
+#include <edm4hep/VertexRecoParticleLinkCollection.h>
 
 #include <cstddef>
 #include <tuple>
diff --git a/tests/src/ObjectMapping.cc b/tests/src/ObjectMapping.cc
index 1011222..7a695dd 100644
--- a/tests/src/ObjectMapping.cc
+++ b/tests/src/ObjectMapping.cc
@@ -18,9 +18,6 @@
 #include "UTIL/LCIterator.h"
 #include "UTIL/PIDHandler.h"
 
-#include "edm4hep/TrackCollection.h"
-#include <edm4hep/RecDqdxCollection.h>
-#include "edm4hep/TrackerHit3DCollection.h"
 #include "edm4hep/CalorimeterHitCollection.h"
 #include "edm4hep/ClusterCollection.h"
 #include "edm4hep/MCParticleCollection.h"
@@ -30,8 +27,11 @@
 #include "edm4hep/ReconstructedParticleCollection.h"
 #include "edm4hep/SimCalorimeterHitCollection.h"
 #include "edm4hep/SimTrackerHitCollection.h"
+#include "edm4hep/TrackCollection.h"
+#include "edm4hep/TrackerHit3DCollection.h"
 #include "edm4hep/TrackerHitPlaneCollection.h"
 #include "edm4hep/VertexCollection.h"
+#include <edm4hep/RecDqdxCollection.h>
 
 #include "podio/Frame.h"