diff --git a/dbal/cpp/src/entities/user/batch/batch_users.hpp b/dbal/cpp/src/entities/user/batch/batch_users.hpp
index ad6dd65d0..1b9557d9d 100644
--- a/dbal/cpp/src/entities/user/batch/batch_users.hpp
+++ b/dbal/cpp/src/entities/user/batch/batch_users.hpp
@@ -8,9 +8,9 @@
 #include "dbal/types.hpp"
 #include "dbal/errors.hpp"
 #include "../../../store/in_memory_store.hpp"
-#include "create_user.hpp"
-#include "update_user.hpp"
-#include "delete_user.hpp"
+#include "../crud/create_user.hpp"
+#include "../crud/update_user.hpp"
+#include "../crud/delete_user.hpp"
 
 namespace dbal {
 namespace entities {
diff --git a/dbal/cpp/src/validation/lua_script_validation.hpp b/dbal/cpp/src/validation/lua_script_validation.hpp
new file mode 100644
index 000000000..1ad8f8c5e
--- /dev/null
+++ b/dbal/cpp/src/validation/lua_script_validation.hpp
@@ -0,0 +1,4 @@
+#pragma once
+
+#include "entity/lua_script_validation.hpp"
+
diff --git a/dbal/cpp/src/validation/workflow_validation.hpp b/dbal/cpp/src/validation/workflow_validation.hpp
new file mode 100644
index 000000000..781e1ad07
--- /dev/null
+++ b/dbal/cpp/src/validation/workflow_validation.hpp
@@ -0,0 +1,4 @@
+#pragma once
+
+#include "entity/workflow_validation.hpp"
+