diff --git a/include/orm/tiny/concerns/buildsqueries.hpp b/include/orm/tiny/concerns/buildsqueries.hpp
index f313dcc66..b6f21f590 100644
--- a/include/orm/tiny/concerns/buildsqueries.hpp
+++ b/include/orm/tiny/concerns/buildsqueries.hpp
@@ -5,16 +5,21 @@
 #include "orm/macros/systemheader.hpp"
 TINY_SYSTEM_HEADER
 
-#include "orm/databaseconnection.hpp"
 #include "orm/exceptions/multiplerecordsfounderror.hpp"
 #include "orm/exceptions/recordsnotfounderror.hpp"
+#include "orm/ormtypes.hpp"
 #include "orm/tiny/tinyconcepts.hpp"
 #include "orm/utils/query.hpp"
 #include "orm/utils/type.hpp"
 
 TINYORM_BEGIN_COMMON_NAMESPACE
 
-namespace Orm::Tiny::Concerns
+namespace Orm::Tiny
+{
+    template<typename Model>
+    class Builder;
+
+namespace Concerns
 {
 
     /*! More complex 'Retrieving results' methods that internally build queries. */
@@ -314,7 +319,8 @@ namespace Orm::Tiny::Concerns
         return static_cast<const Builder<Model> &>(*this);
     }
 
-} // namespace Orm::Tiny::Concerns
+} // namespace Concerns
+} // namespace Orm::Tiny
 
 TINYORM_END_COMMON_NAMESPACE
 
diff --git a/include/orm/tiny/tinybuilder.hpp b/include/orm/tiny/tinybuilder.hpp
index 051e2b405..8510ae0ea 100644
--- a/include/orm/tiny/tinybuilder.hpp
+++ b/include/orm/tiny/tinybuilder.hpp
@@ -11,6 +11,7 @@ TINY_SYSTEM_HEADER
 #include <range/v3/algorithm/contains.hpp>
 #include <range/v3/view/remove_if.hpp>
 
+#include "orm/databaseconnection.hpp"
 #include "orm/tiny/concerns/buildsqueries.hpp"
 #include "orm/tiny/concerns/queriesrelationships.hpp"
 #include "orm/tiny/exceptions/modelnotfounderror.hpp"