diff --git a/tree/ntupleutil/v7/test/ntuple_importer.cxx b/tree/ntupleutil/v7/test/ntuple_importer.cxx
index f12649fc3280a93388805333af8289b45195e0dd..1ad1287df56b3991741c51c90db1694531f3738b 100644
--- a/tree/ntupleutil/v7/test/ntuple_importer.cxx
+++ b/tree/ntupleutil/v7/test/ntuple_importer.cxx
@@ -1,5 +1,20 @@
+#include <ROOT/RNTupleImporter.hxx>
+
+#include <TFile.h>
+#include <TTree.h>
+
+#include <cstdio>
+#include <string>
+#include <tuple>
+#include <utility>
+#include <vector>
+
+#include "CustomStructUtil.hxx"
 #include "ntupleutil_test.hxx"
 
+using ROOT::Experimental::RNTupleImporter;
+using ROOT::Experimental::RNTupleReader;
+
 TEST(RNTupleImporter, Empty)
 {
    FileRaii fileGuard("test_ntuple_importer_empty.root");
diff --git a/tree/ntupleutil/v7/test/ntuple_inspector.cxx b/tree/ntupleutil/v7/test/ntuple_inspector.cxx
index 35cbc5329c1f03b77b548b57946c8bc939e68708..c286108664175456f8666dbc88563b314cb324a5 100644
--- a/tree/ntupleutil/v7/test/ntuple_inspector.cxx
+++ b/tree/ntupleutil/v7/test/ntuple_inspector.cxx
@@ -1,5 +1,23 @@
+#include <ROOT/RNTupleInspector.hxx>
+#include <ROOT/RNTupleOptions.hxx>
+
+#include <TFile.h>
+#include <TTree.h>
+
+#include <cstdio>
+#include <string>
+#include <tuple>
+#include <utility>
+#include <vector>
+
 #include "ntupleutil_test.hxx"
 
+using ROOT::Experimental::RNTupleInspector;
+using ROOT::Experimental::RNTupleModel;
+using ROOT::Experimental::RNTupleReader;
+using ROOT::Experimental::RNTupleWriteOptions;
+using ROOT::Experimental::RNTupleWriter;
+
 TEST(RNTupleInspector, Name)
 {
    FileRaii fileGuard("test_ntuple_inspector_name.root");
diff --git a/tree/ntupleutil/v7/test/ntupleutil_test.hxx b/tree/ntupleutil/v7/test/ntupleutil_test.hxx
index 70e48784332ee14d58a2b0b6558401402b92eccc..51b78f264282d3e9be83a2d281972132748733de 100644
--- a/tree/ntupleutil/v7/test/ntupleutil_test.hxx
+++ b/tree/ntupleutil/v7/test/ntupleutil_test.hxx
@@ -4,29 +4,9 @@
 #include "gtest/gtest.h"
 
 #include <ROOT/RNTuple.hxx>
-#include <ROOT/RNTupleImporter.hxx>
-#include <ROOT/RNTupleInspector.hxx>
 #include <ROOT/RNTupleModel.hxx>
 #include <ROOT/RNTupleOptions.hxx>
 
-#include <TFile.h>
-#include <TTree.h>
-
-#include <cstdio>
-#include <string>
-#include <tuple>
-#include <utility>
-#include <vector>
-
-#include "CustomStructUtil.hxx"
-
-using ROOT::Experimental::RNTupleImporter;
-using ROOT::Experimental::RNTupleInspector;
-using ROOT::Experimental::RNTupleModel;
-using ROOT::Experimental::RNTupleReader;
-using ROOT::Experimental::RNTupleWriteOptions;
-using ROOT::Experimental::RNTupleWriter;
-
 /**
  * An RAII wrapper around an open temporary file on disk. It cleans up the
  * guarded file when the wrapper object goes out of scope.