diff --git a/include/matador/orm/session.hpp b/include/matador/orm/session.hpp
index 83b1b71..9f5903e 100644
--- a/include/matador/orm/session.hpp
+++ b/include/matador/orm/session.hpp
@@ -3,6 +3,8 @@
 
 #include "matador/orm/session_query_builder.hpp"
 
+#include "matador/query/query.hpp"
+
 #include "matador/sql/column_generator.hpp"
 #include "matador/sql/connection.hpp"
 #include "matador/sql/connection_pool.hpp"
diff --git a/test/models/flight.hpp b/test/models/flight.hpp
index b01da0c..4a8e7f5 100644
--- a/test/models/flight.hpp
+++ b/test/models/flight.hpp
@@ -21,7 +21,7 @@ struct flight
   : id(id), airplane(plane), pilot_name(std::move(name)) {}
 
   unsigned int id{};
-  object::object_ptr<airplane> airplane;
+  object::object_ptr<test::airplane> airplane;
   std::string pilot_name;
 
   template<class Operator>
diff --git a/test/models/product.hpp b/test/models/product.hpp
index 6dfd72d..c2dd794 100644
--- a/test/models/product.hpp
+++ b/test/models/product.hpp
@@ -16,8 +16,8 @@ namespace matador::test {
 
 struct product {
     std::string product_name;
-    object::object_ptr<supplier> supplier;
-    object::object_ptr<category> category;
+    object::object_ptr<test::supplier> supplier;
+    object::object_ptr<test::category> category;
     std::string quantity_per_unit;
     unsigned int unit_price;
     unsigned int units_in_stock;