diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index d7ef20b32..c8d5a3c49 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -105,7 +105,10 @@
       "Bash(do if grep -q \"@function get-tokens\" \"$file\")",
       "Bash(then echo \"✓ $file\")",
       "Bash(else echo \"✗ $file\")",
-      "Bash(git status:*)"
+      "Bash(git status:*)",
+      "Bash(head:*)",
+      "Bash(gh api:*)",
+      "Bash(codeql:*)"
     ]
   },
   "spinnerTipsEnabled": false
diff --git a/codegen/src/components/JSONUIPage.tsx b/codegen/src/components/JSONUIPage.tsx
index 08edaadbf..c2651eb18 100644
--- a/codegen/src/components/JSONUIPage.tsx
+++ b/codegen/src/components/JSONUIPage.tsx
@@ -1,6 +1,6 @@
 import { useState, useEffect } from 'react'
 import { JSONUIRenderer } from '@/lib/json-ui/renderer'
-import { Action, UIComponent, Layout } from '@/lib/json-ui/schema'
+import { Action, UIComponent } from '@/lib/json-ui/schema'
 import { toast } from 'sonner'
 
 interface JSONUIPageProps {
diff --git a/codegen/src/components/NotFoundPage.tsx b/codegen/src/components/NotFoundPage.tsx
index 3efb852a2..97dc05787 100644
--- a/codegen/src/components/NotFoundPage.tsx
+++ b/codegen/src/components/NotFoundPage.tsx
@@ -1,5 +1,4 @@
 import { useNavigate } from 'react-router-dom'
-import { Card } from '@/components/ui/card'
 import { 
   House, 
   ArrowLeft, 
@@ -11,13 +10,11 @@ import {
   ChartBar
 } from '@phosphor-icons/react'
 import {
-  EmptyState,
   ActionButton,
   Stack,
   Heading,
   Text,
   Kbd,
-  IconWrapper,
   GlowCard,
   ResponsiveGrid,
   Container
diff --git a/codegen/src/components/ProjectManager.tsx b/codegen/src/components/ProjectManager.tsx
index 30b1d13cf..8ac5667f6 100644
--- a/codegen/src/components/ProjectManager.tsx
+++ b/codegen/src/components/ProjectManager.tsx
@@ -10,7 +10,6 @@ import { ScrollArea } from '@/components/ui/scroll-area'
 import { Badge } from '@/components/ui/badge'
 import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle } from '@/components/ui/alert-dialog'
 import { FloppyDisk, FolderOpen, Trash, Copy, DownloadSimple, UploadSimple, Plus, FolderPlus } from '@phosphor-icons/react'
-import { SavedProject } from '@/lib/project-service'
 import { Project } from '@/types/project'
 import { cn } from '@/lib/utils'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
@@ -36,7 +35,6 @@ export function ProjectManager({ currentProject, onProjectLoad }: ProjectManager
     newProjectDialogOpen,
     deleteDialogOpen,
     importDialogOpen,
-    projectToDelete,
     setSaveDialogOpen,
     setLoadDialogOpen,
     setNewProjectDialogOpen,
diff --git a/codegen/src/components/atoms/json-ui/IconRenderer.tsx b/codegen/src/components/atoms/json-ui/IconRenderer.tsx
index eac738ff4..07df70e46 100644
--- a/codegen/src/components/atoms/json-ui/IconRenderer.tsx
+++ b/codegen/src/components/atoms/json-ui/IconRenderer.tsx
@@ -1,7 +1,4 @@
-import { ReactNode } from 'react'
-import { ComponentSchema } from '@/types/json-ui'
 import * as Icons from '@phosphor-icons/react'
-import { cn } from '@/lib/utils'
 
 interface IconRendererProps {
   name: string
diff --git a/codegen/src/components/redux-integration/FilesCard.tsx b/codegen/src/components/redux-integration/FilesCard.tsx
index 41d9464c7..c0864ad2b 100644
--- a/codegen/src/components/redux-integration/FilesCard.tsx
+++ b/codegen/src/components/redux-integration/FilesCard.tsx
@@ -1,4 +1,3 @@
-import { Badge } from '@/components/ui/badge'
 import { Button } from '@/components/ui/button'
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'
 import { Database, Trash } from '@phosphor-icons/react'
diff --git a/codegen/src/hooks/data/use-local-storage.ts b/codegen/src/hooks/data/use-local-storage.ts
index 2016387c6..ac7e029d8 100644
--- a/codegen/src/hooks/data/use-local-storage.ts
+++ b/codegen/src/hooks/data/use-local-storage.ts
@@ -1,4 +1,4 @@
-import { useState, useEffect, useCallback } from 'react'
+import { useState, useCallback } from 'react'
 
 export function useLocalStorage<T>(key: string, initialValue: T) {
   const [storedValue, setStoredValue] = useState<T>(() => {
diff --git a/codegen/src/hooks/json-ui/use-data-sources.ts b/codegen/src/hooks/json-ui/use-data-sources.ts
index e15007d1c..a97ca6514 100644
--- a/codegen/src/hooks/json-ui/use-data-sources.ts
+++ b/codegen/src/hooks/json-ui/use-data-sources.ts
@@ -8,11 +8,6 @@ export function useDataSources(dataSources: DataSource[]) {
   const [data, setData] = useState<Record<string, any>>({})
   const [loading, setLoading] = useState(true)
 
-  const staticSources = useMemo(
-    () => dataSources.filter((ds) => ds.type === 'static'),
-    [dataSources]
-  )
-
   const derivedSources = useMemo(
     () => dataSources.filter((ds) => ds.expression || ds.valueTemplate),
     [dataSources]
diff --git a/codegen/src/hooks/orchestration/use-actions.ts b/codegen/src/hooks/orchestration/use-actions.ts
index c5af6c236..4c6971df7 100644
--- a/codegen/src/hooks/orchestration/use-actions.ts
+++ b/codegen/src/hooks/orchestration/use-actions.ts
@@ -1,7 +1,7 @@
 /// <reference path="../../global.d.ts" />
 
 import { useState, useCallback, useMemo } from 'react'
-import { PageSchema, ActionConfig } from '@/types/page-schema'
+import { ActionConfig } from '@/types/page-schema'
 import { toast } from 'sonner'
 
 export function useActions(actions: ActionConfig[] = [], context: Record<string, any> = {}) {
diff --git a/codegen/src/hooks/use-ai-operations.ts b/codegen/src/hooks/use-ai-operations.ts
index 4a9f7738c..12518ff6d 100644
--- a/codegen/src/hooks/use-ai-operations.ts
+++ b/codegen/src/hooks/use-ai-operations.ts
@@ -1,7 +1,6 @@
 import { useState } from 'react'
 import { AIService } from '@/lib/ai-service'
 import { toast } from 'sonner'
-import { ProjectFile, PrismaModel, ThemeConfig } from '@/types/project'
 
 export function useAIOperations() {
   const [isProcessing, setIsProcessing] = useState(false)
diff --git a/codegen/src/hooks/use-unified-storage.ts b/codegen/src/hooks/use-unified-storage.ts
index 80e6f20e6..c1b7f45b5 100644
--- a/codegen/src/hooks/use-unified-storage.ts
+++ b/codegen/src/hooks/use-unified-storage.ts
@@ -6,7 +6,6 @@ export function useUnifiedStorage<T>(
   defaultValue: T
 ): [T, (value: T | ((prev: T) => T)) => Promise<void>, () => Promise<void>] {
   const [value, setValue] = useState<T>(defaultValue)
-  const [isLoading, setIsLoading] = useState(true)
 
   useEffect(() => {
     let mounted = true
diff --git a/frontends/qt6/CMakeUserPresets.json b/frontends/qt6/CMakeUserPresets.json
new file mode 100644
index 000000000..889fff90c
--- /dev/null
+++ b/frontends/qt6/CMakeUserPresets.json
@@ -0,0 +1,9 @@
+{
+    "version": 4,
+    "vendor": {
+        "conan": {}
+    },
+    "include": [
+        "build/build/Release/generators/CMakePresets.json"
+    ]
+}
\ No newline at end of file
diff --git a/gameengine/build-codeql.sh b/gameengine/build-codeql.sh
new file mode 100755
index 000000000..99dfb58e7
--- /dev/null
+++ b/gameengine/build-codeql.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -e
+source build/build/Release/generators/conanbuild.sh
+cmake --preset conan-release -DBUILD_TESTING=OFF
+cmake --build build/build/Release --target sdl3_app
diff --git a/gameengine/conanfile.py b/gameengine/conanfile.py
index 383a7f8be..24b99ab56 100644
--- a/gameengine/conanfile.py
+++ b/gameengine/conanfile.py
@@ -44,6 +44,8 @@ class SDL3CppConan(ConanFile):
         self.requires("wayland/1.23.92", override=True)
         self.requires("libalsa/1.2.14", override=True)
         self.requires("pulseaudio/17.0", override=True)
+        # Disable 3mf exporter which uses kuba-zip to avoid duplicate symbols with libzip
+        self.options["assimp"].with_3mf_exporter = False
 
     def layout(self):
         cmake_layout(self)
diff --git a/gameengine/src/services/impl/input/sdl_input_service.hpp b/gameengine/src/services/impl/input/sdl_input_service.hpp
index 742f969b1..57588221f 100644
--- a/gameengine/src/services/impl/input/sdl_input_service.hpp
+++ b/gameengine/src/services/impl/input/sdl_input_service.hpp
@@ -3,6 +3,7 @@
 #include "services/interfaces/i_input_service.hpp"
 #include "services/interfaces/i_logger.hpp"
 #include "services/interfaces/i_config_service.hpp"
+#include "services/interfaces/gui_types.hpp"
 #include "../../../events/i_event_bus.hpp"
 #include <memory>
 #include <unordered_map>
diff --git a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_audio_play_step.hpp b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_audio_play_step.hpp
index c347906a2..496d23670 100644
--- a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_audio_play_step.hpp
+++ b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_audio_play_step.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../../interfaces/i_audio_service.hpp"
-#include "../../interfaces/i_logger.hpp"
-#include "../../interfaces/i_workflow_step.hpp"
+#include "../../../interfaces/i_audio_service.hpp"
+#include "../../../interfaces/i_logger.hpp"
+#include "../../../interfaces/i_workflow_step.hpp"
 
 #include <memory>
 
diff --git a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_audio_set_volume_step.hpp b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_audio_set_volume_step.hpp
index 3c90fe7f3..c3b892e50 100644
--- a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_audio_set_volume_step.hpp
+++ b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_audio_set_volume_step.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../../interfaces/i_audio_service.hpp"
-#include "../../interfaces/i_logger.hpp"
-#include "../../interfaces/i_workflow_step.hpp"
+#include "../../../interfaces/i_audio_service.hpp"
+#include "../../../interfaces/i_logger.hpp"
+#include "../../../interfaces/i_workflow_step.hpp"
 
 #include <memory>
 
diff --git a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_audio_stop_step.hpp b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_audio_stop_step.hpp
index ac181e7fc..db0d85398 100644
--- a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_audio_stop_step.hpp
+++ b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_audio_stop_step.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../../interfaces/i_audio_service.hpp"
-#include "../../interfaces/i_logger.hpp"
-#include "../../interfaces/i_workflow_step.hpp"
+#include "../../../interfaces/i_audio_service.hpp"
+#include "../../../interfaces/i_logger.hpp"
+#include "../../../interfaces/i_workflow_step.hpp"
 
 #include <memory>
 
diff --git a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_camera_build_view_state_step.hpp b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_camera_build_view_state_step.hpp
index ca24a3291..70e39482d 100644
--- a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_camera_build_view_state_step.hpp
+++ b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_camera_build_view_state_step.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../../interfaces/camera_types.hpp"
-#include "../../interfaces/i_config_service.hpp"
-#include "../../interfaces/i_logger.hpp"
-#include "../../interfaces/i_workflow_step.hpp"
+#include "../../../interfaces/camera_types.hpp"
+#include "../../../interfaces/i_config_service.hpp"
+#include "../../../interfaces/i_logger.hpp"
+#include "../../../interfaces/i_workflow_step.hpp"
 
 #include <memory>
 
diff --git a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_camera_set_fov_step.hpp b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_camera_set_fov_step.hpp
index 32b407976..82158de51 100644
--- a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_camera_set_fov_step.hpp
+++ b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_camera_set_fov_step.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../../interfaces/camera_types.hpp"
-#include "../../interfaces/i_logger.hpp"
-#include "../../interfaces/i_workflow_step.hpp"
+#include "../../../interfaces/camera_types.hpp"
+#include "../../../interfaces/i_logger.hpp"
+#include "../../../interfaces/i_workflow_step.hpp"
 
 #include <memory>
 
diff --git a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_mesh_load_step.hpp b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_mesh_load_step.hpp
index 5279e9672..6a9038698 100644
--- a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_mesh_load_step.hpp
+++ b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_mesh_load_step.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../../interfaces/i_logger.hpp"
-#include "../../interfaces/i_mesh_service.hpp"
-#include "../../interfaces/i_workflow_step.hpp"
+#include "../../../interfaces/i_logger.hpp"
+#include "../../../interfaces/i_mesh_service.hpp"
+#include "../../../interfaces/i_workflow_step.hpp"
 
 #include <memory>
 
diff --git a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_model_despawn_step.cpp b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_model_despawn_step.cpp
index fcc06dc56..e3682d6ad 100644
--- a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_model_despawn_step.cpp
+++ b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_model_despawn_step.cpp
@@ -2,7 +2,7 @@
 
 #include "../workflow_step_io_resolver.hpp"
 #include "../workflow_step_parameter_resolver.hpp"
-#include "../../interfaces/scene_types.hpp"
+#include "../../../interfaces/scene_types.hpp"
 
 #include <stdexcept>
 #include <utility>
diff --git a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_model_despawn_step.hpp b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_model_despawn_step.hpp
index e446e768a..2c3a8911e 100644
--- a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_model_despawn_step.hpp
+++ b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_model_despawn_step.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../interfaces/i_logger.hpp"
-#include "../../interfaces/i_workflow_step.hpp"
+#include "../../../interfaces/i_logger.hpp"
+#include "../../../interfaces/i_workflow_step.hpp"
 
 #include <memory>
 
diff --git a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_model_set_transform_step.cpp b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_model_set_transform_step.cpp
index 9aad1e01a..e40c69b7b 100644
--- a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_model_set_transform_step.cpp
+++ b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_model_set_transform_step.cpp
@@ -2,7 +2,7 @@
 
 #include "../workflow_step_io_resolver.hpp"
 #include "../workflow_step_parameter_resolver.hpp"
-#include "../../interfaces/scene_types.hpp"
+#include "../../../interfaces/scene_types.hpp"
 
 #include <stdexcept>
 #include <utility>
diff --git a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_model_set_transform_step.hpp b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_model_set_transform_step.hpp
index 8f17a92cb..500f2193a 100644
--- a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_model_set_transform_step.hpp
+++ b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_model_set_transform_step.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../interfaces/i_logger.hpp"
-#include "../../interfaces/i_workflow_step.hpp"
+#include "../../../interfaces/i_logger.hpp"
+#include "../../../interfaces/i_workflow_step.hpp"
 
 #include <memory>
 
diff --git a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_model_spawn_step.cpp b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_model_spawn_step.cpp
index 18d510c78..a8981490e 100644
--- a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_model_spawn_step.cpp
+++ b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_model_spawn_step.cpp
@@ -3,7 +3,7 @@
 #include "../workflow_mesh_payload_converter.hpp"
 #include "../workflow_step_io_resolver.hpp"
 #include "../workflow_step_parameter_resolver.hpp"
-#include "../../interfaces/scene_types.hpp"
+#include "../../../interfaces/scene_types.hpp"
 
 #include <stdexcept>
 #include <utility>
diff --git a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_model_spawn_step.hpp b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_model_spawn_step.hpp
index b84a4024e..af2c0a9b7 100644
--- a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_model_spawn_step.hpp
+++ b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_model_spawn_step.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../interfaces/i_logger.hpp"
-#include "../../interfaces/i_workflow_step.hpp"
+#include "../../../interfaces/i_logger.hpp"
+#include "../../../interfaces/i_workflow_step.hpp"
 
 #include <memory>
 
diff --git a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_scene_clear_step.hpp b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_scene_clear_step.hpp
index 961059067..5c2c67547 100644
--- a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_scene_clear_step.hpp
+++ b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_scene_clear_step.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../../interfaces/i_logger.hpp"
-#include "../../interfaces/i_scene_service.hpp"
-#include "../../interfaces/i_workflow_step.hpp"
+#include "../../../interfaces/i_logger.hpp"
+#include "../../../interfaces/i_scene_service.hpp"
+#include "../../../interfaces/i_workflow_step.hpp"
 
 #include <memory>
 
diff --git a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_scene_load_step.cpp b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_scene_load_step.cpp
index e507b8f2e..5e34fc0b1 100644
--- a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_scene_load_step.cpp
+++ b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_scene_load_step.cpp
@@ -1,7 +1,7 @@
 #include "workflow_scene_load_step.hpp"
 
 #include "../workflow_step_io_resolver.hpp"
-#include "../../interfaces/scene_types.hpp"
+#include "../../../interfaces/scene_types.hpp"
 
 #include <stdexcept>
 #include <utility>
diff --git a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_scene_load_step.hpp b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_scene_load_step.hpp
index bd7b0bc16..94ba79f22 100644
--- a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_scene_load_step.hpp
+++ b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_scene_load_step.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../../interfaces/i_logger.hpp"
-#include "../../interfaces/i_scene_service.hpp"
-#include "../../interfaces/i_workflow_step.hpp"
+#include "../../../interfaces/i_logger.hpp"
+#include "../../../interfaces/i_scene_service.hpp"
+#include "../../../interfaces/i_workflow_step.hpp"
 
 #include <memory>
 
diff --git a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_scene_set_active_step.cpp b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_scene_set_active_step.cpp
index 871217ddb..79daea09f 100644
--- a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_scene_set_active_step.cpp
+++ b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_scene_set_active_step.cpp
@@ -1,7 +1,7 @@
 #include "workflow_scene_set_active_step.hpp"
 
 #include "../workflow_step_io_resolver.hpp"
-#include "../../interfaces/scene_types.hpp"
+#include "../../../interfaces/scene_types.hpp"
 
 #include <stdexcept>
 #include <utility>
diff --git a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_scene_set_active_step.hpp b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_scene_set_active_step.hpp
index 05d83dd3f..fe8598e11 100644
--- a/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_scene_set_active_step.hpp
+++ b/gameengine/src/services/impl/workflow/workflow_generic_steps/workflow_scene_set_active_step.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../../interfaces/i_logger.hpp"
-#include "../../interfaces/i_scene_service.hpp"
-#include "../../interfaces/i_workflow_step.hpp"
+#include "../../../interfaces/i_logger.hpp"
+#include "../../../interfaces/i_scene_service.hpp"
+#include "../../../interfaces/i_workflow_step.hpp"
 
 #include <memory>
 
diff --git a/gameengine/src/services/impl/workflow/workflow_mesh_payload_converter.hpp b/gameengine/src/services/impl/workflow/workflow_mesh_payload_converter.hpp
index f5c57d4b4..4e7809fa6 100644
--- a/gameengine/src/services/impl/workflow/workflow_mesh_payload_converter.hpp
+++ b/gameengine/src/services/impl/workflow/workflow_mesh_payload_converter.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../../interfaces/mesh_types.hpp"
-#include "../../core/vertex.hpp"
+#include "../../../core/vertex.hpp"
 
 #include <cstdint>
 #include <vector>