diff --git a/apps/openmw_test_suite/esmloader/esmdata.cpp b/apps/openmw_test_suite/esmloader/esmdata.cpp
index da78aaa3a2..7e5791561e 100644
--- a/apps/openmw_test_suite/esmloader/esmdata.cpp
+++ b/apps/openmw_test_suite/esmloader/esmdata.cpp
@@ -1,4 +1,12 @@
-#include <components/esmloader/esmdata.cpp>
+#include <components/esm/loadacti.hpp>
+#include <components/esm/loadcell.hpp>
+#include <components/esm/loadcont.hpp>
+#include <components/esm/loaddoor.hpp>
+#include <components/esm/loadgmst.hpp>
+#include <components/esm/loadland.hpp>
+#include <components/esm/loadstat.hpp>
+#include <components/esm/variant.hpp>
+#include <components/esmloader/esmdata.hpp>
 
 #include <gtest/gtest.h>
 
diff --git a/apps/openmw_test_suite/esmloader/load.cpp b/apps/openmw_test_suite/esmloader/load.cpp
index d6ed66f7a7..048657e65d 100644
--- a/apps/openmw_test_suite/esmloader/load.cpp
+++ b/apps/openmw_test_suite/esmloader/load.cpp
@@ -1,4 +1,12 @@
-#include <components/esmloader/load.cpp>
+#include <components/esm/loadacti.hpp>
+#include <components/esm/loadcell.hpp>
+#include <components/esm/loadcont.hpp>
+#include <components/esm/loaddoor.hpp>
+#include <components/esm/loadgmst.hpp>
+#include <components/esm/loadland.hpp>
+#include <components/esm/loadstat.hpp>
+#include <components/esmloader/esmdata.hpp>
+#include <components/esmloader/load.hpp>
 #include <components/files/collections.hpp>
 #include <components/files/multidircollection.hpp>
 #include <components/to_utf8/to_utf8.hpp>