diff --git a/dbal/cpp/include/dbal/client.hpp b/dbal/cpp/include/dbal/client.hpp
index 8628daab0..a52612059 100644
--- a/dbal/cpp/include/dbal/client.hpp
+++ b/dbal/cpp/include/dbal/client.hpp
@@ -1,3 +1,6 @@
-#pragma once
+#ifndef DBAL_CLIENT_WRAPPER_HPP
+#define DBAL_CLIENT_WRAPPER_HPP
 
 #include "dbal/core/client.hpp"
+
+#endif // DBAL_CLIENT_WRAPPER_HPP
diff --git a/dbal/cpp/include/dbal/errors.hpp b/dbal/cpp/include/dbal/errors.hpp
new file mode 100644
index 000000000..682504ee7
--- /dev/null
+++ b/dbal/cpp/include/dbal/errors.hpp
@@ -0,0 +1,6 @@
+#ifndef DBAL_ERRORS_WRAPPER_HPP
+#define DBAL_ERRORS_WRAPPER_HPP
+
+#include "dbal/core/errors.hpp"
+
+#endif // DBAL_ERRORS_WRAPPER_HPP
diff --git a/frontends/nextjs/src/lib/db/sessions/crud/delete/delete-session-by-token.ts b/frontends/nextjs/src/lib/db/sessions/crud/delete/delete-session-by-token.ts
index 3f6a858fd..4a3481cab 100644
--- a/frontends/nextjs/src/lib/db/sessions/crud/delete/delete-session-by-token.ts
+++ b/frontends/nextjs/src/lib/db/sessions/crud/delete/delete-session-by-token.ts
@@ -1,4 +1,4 @@
-import { getAdapter } from '../../core/dbal-client'
+import { getAdapter } from '../../../core/dbal-client'
 
 export async function deleteSessionByToken(token: string): Promise<boolean> {
   const adapter = getAdapter()
diff --git a/frontends/nextjs/src/lib/db/sessions/crud/delete/delete-session.ts b/frontends/nextjs/src/lib/db/sessions/crud/delete/delete-session.ts
index 8bad5087e..dea64f420 100644
--- a/frontends/nextjs/src/lib/db/sessions/crud/delete/delete-session.ts
+++ b/frontends/nextjs/src/lib/db/sessions/crud/delete/delete-session.ts
@@ -1,4 +1,4 @@
-import { getAdapter } from '../../core/dbal-client'
+import { getAdapter } from '../../../core/dbal-client'
 
 export async function deleteSession(sessionId: string): Promise<boolean> {
   const adapter = getAdapter()
diff --git a/frontends/nextjs/src/lib/db/sessions/crud/update-session.ts b/frontends/nextjs/src/lib/db/sessions/crud/update-session.ts
index 3db49ffc8..0b8bb0908 100644
--- a/frontends/nextjs/src/lib/db/sessions/crud/update-session.ts
+++ b/frontends/nextjs/src/lib/db/sessions/crud/update-session.ts
@@ -1,6 +1,6 @@
 import { getAdapter } from '../../core/dbal-client'
 import type { Session, UpdateSessionInput } from './types'
-import { mapSessionRecord } from './map-session-record'
+import { mapSessionRecord } from '../map-session-record'
 
 export async function updateSession(sessionId: string, input: UpdateSessionInput): Promise<Session> {
   const adapter = getAdapter()