diff --git a/bin/custom_example.cpp b/bin/custom_example.cpp
index c565f4f..026e985 100644
--- a/bin/custom_example.cpp
+++ b/bin/custom_example.cpp
@@ -126,6 +126,8 @@ struct DataEntry
 
 template<> struct cvt::DatabaseInterface<DataEntry>
 {
+    using header_type = std::string;
+
     static auto getHeaderImpl(std::istream &dbStream) -> std::string
     {
         std::string hash;
diff --git a/include/data_structures/replay_all.hpp b/include/data_structures/replay_all.hpp
index 647843c..45bd730 100644
--- a/include/data_structures/replay_all.hpp
+++ b/include/data_structures/replay_all.hpp
@@ -11,7 +11,7 @@
 #pragma once
 
 #include "../database.hpp"
-#include "instance_transform.hpp"
+#include "../instance_transform.hpp"
 #include "replay_interface.hpp"
 #include "units.hpp"
 
diff --git a/include/data_structures/units.hpp b/include/data_structures/units.hpp
index 9bd3148..0b41b76 100644
--- a/include/data_structures/units.hpp
+++ b/include/data_structures/units.hpp
@@ -14,7 +14,6 @@
 
 #include "../soa.hpp"
 #include "common.hpp"
-#include "enums.hpp"
 
 #include <ranges>
 
diff --git a/include/database.hpp b/include/database.hpp
index 504a425..373aef9 100644
--- a/include/database.hpp
+++ b/include/database.hpp
@@ -13,7 +13,6 @@
 
 #pragma once
 
-#include "data_structures/replay_interface.hpp"
 #include "serialize.hpp"
 
 #include <boost/iostreams/device/file.hpp>
@@ -202,7 +201,7 @@ template<HasDBInterface EntryType> class ReplayDatabase
      * @param index Index to read from database
      * @return ReplayInfo at index
      */
-    [[nodiscard]] auto getHeader(std::size_t index) const -> ReplayInfo
+    [[nodiscard]] auto getHeader(std::size_t index) const
     {
         return this->readFromDatabase(index, DatabaseInterface<EntryType>::getHeaderImpl);
     }