diff --git a/assets/shaders/bloom_bright.nzsl b/assets/shaders/bloom_bright.nzsl
index 620ac821c..0e91b75e5 100644
--- a/assets/shaders/bloom_bright.nzsl
+++ b/assets/shaders/bloom_bright.nzsl
@@ -1,7 +1,7 @@
 [nzsl_version("1.0")]
 module;
 
-import Engine.ViewerData;
+import ViewerData from Engine.ViewerData;
 
 external
 {
diff --git a/assets/shaders/bloom_final.nzsl b/assets/shaders/bloom_final.nzsl
index 6cdd0a0ca..b173d3e0f 100644
--- a/assets/shaders/bloom_final.nzsl
+++ b/assets/shaders/bloom_final.nzsl
@@ -1,7 +1,7 @@
 [nzsl_version("1.0")]
 module;
 
-import Engine.ViewerData;
+import ViewerData from Engine.ViewerData;
 
 external
 {
diff --git a/assets/shaders/deferred_frag.nzsl b/assets/shaders/deferred_frag.nzsl
index 110788172..f3f43be7e 100644
--- a/assets/shaders/deferred_frag.nzsl
+++ b/assets/shaders/deferred_frag.nzsl
@@ -1,8 +1,8 @@
 [nzsl_version("1.0")]
 module;
 
-import Engine.InstanceData;
-import Engine.ViewerData;
+import InstanceData from Engine.InstanceData;
+import ViewerData from Engine.ViewerData;
 
 option HasDiffuseTexture: bool = false;
 option HasAlphaTexture: bool = false;
diff --git a/assets/shaders/deferred_vert.nzsl b/assets/shaders/deferred_vert.nzsl
index c9ddffe18..a05afc716 100644
--- a/assets/shaders/deferred_vert.nzsl
+++ b/assets/shaders/deferred_vert.nzsl
@@ -1,8 +1,8 @@
 [nzsl_version("1.0")]
 module;
 
-import Engine.InstanceData;
-import Engine.ViewerData;
+import InstanceData from Engine.InstanceData;
+import ViewerData from Engine.ViewerData;
 
 [layout(std140)]
 struct BasicSettings
diff --git a/assets/shaders/gaussian_blur.nzsl b/assets/shaders/gaussian_blur.nzsl
index 246f95b54..abffebec8 100644
--- a/assets/shaders/gaussian_blur.nzsl
+++ b/assets/shaders/gaussian_blur.nzsl
@@ -1,7 +1,7 @@
 [nzsl_version("1.0")]
 module;
 
-import Engine.ViewerData;
+import ViewerData from Engine.ViewerData;
 
 [layout(std140)]
 struct BlurData
diff --git a/assets/shaders/god_rays.nzsl b/assets/shaders/god_rays.nzsl
index 38d2dc2d1..2a35ca273 100644
--- a/assets/shaders/god_rays.nzsl
+++ b/assets/shaders/god_rays.nzsl
@@ -1,7 +1,7 @@
 [nzsl_version("1.0")]
 module;
 
-import Engine.ViewerData;
+import ViewerData from Engine.ViewerData;
 
 [layout(std140)]
 struct Settings
diff --git a/assets/shaders/lighting.nzsl b/assets/shaders/lighting.nzsl
index c7c898bf3..8417041fd 100644
--- a/assets/shaders/lighting.nzsl
+++ b/assets/shaders/lighting.nzsl
@@ -1,7 +1,7 @@
 [nzsl_version("1.0")]
 module;
 
-import Engine.ViewerData;
+import ViewerData from Engine.ViewerData;
 
 [layout(std140)]
 struct PointLight
diff --git a/assets/shaders/skybox.nzsl b/assets/shaders/skybox.nzsl
index 1d9919f22..4e406490e 100644
--- a/assets/shaders/skybox.nzsl
+++ b/assets/shaders/skybox.nzsl
@@ -1,7 +1,7 @@
 [nzsl_version("1.0")]
 module;
 
-import Engine.ViewerData;
+import ViewerData from Engine.ViewerData;
 
 external
 {
diff --git a/assets/shaders/tone_mapping.nzsl b/assets/shaders/tone_mapping.nzsl
index 07dd49606..2b5b83ac1 100644
--- a/assets/shaders/tone_mapping.nzsl
+++ b/assets/shaders/tone_mapping.nzsl
@@ -1,7 +1,7 @@
 [nzsl_version("1.0")]
 module;
 
-import Engine.ViewerData;
+import ViewerData from Engine.ViewerData;
 
 external
 {
diff --git a/src/Nazara/Graphics/Resources/Shaders/BasicMaterial.nzsl b/src/Nazara/Graphics/Resources/Shaders/BasicMaterial.nzsl
index fc080d7f4..f13c116fb 100644
--- a/src/Nazara/Graphics/Resources/Shaders/BasicMaterial.nzsl
+++ b/src/Nazara/Graphics/Resources/Shaders/BasicMaterial.nzsl
@@ -1,8 +1,8 @@
 [nzsl_version("1.0")]
 module BasicMaterial;
 
-import Engine.InstanceData;
-import Engine.ViewerData;
+import InstanceData from Engine.InstanceData;
+import ViewerData from Engine.ViewerData;
 
 option HasDiffuseTexture: bool = false;
 option HasAlphaTexture: bool = false;
diff --git a/src/Nazara/Graphics/Resources/Shaders/DepthMaterial.nzsl b/src/Nazara/Graphics/Resources/Shaders/DepthMaterial.nzsl
index 8575a97df..9a56b6a7a 100644
--- a/src/Nazara/Graphics/Resources/Shaders/DepthMaterial.nzsl
+++ b/src/Nazara/Graphics/Resources/Shaders/DepthMaterial.nzsl
@@ -1,8 +1,8 @@
 [nzsl_version("1.0")]
 module DepthMaterial;
 
-import Engine.InstanceData;
-import Engine.ViewerData;
+import InstanceData from Engine.InstanceData;
+import ViewerData from Engine.ViewerData;
 
 option HasDiffuseTexture: bool = false;
 option HasAlphaTexture: bool = false;
diff --git a/src/Nazara/Graphics/Resources/Shaders/PhongMaterial.nzsl b/src/Nazara/Graphics/Resources/Shaders/PhongMaterial.nzsl
index 38fd0fde9..52e6a2dc5 100644
--- a/src/Nazara/Graphics/Resources/Shaders/PhongMaterial.nzsl
+++ b/src/Nazara/Graphics/Resources/Shaders/PhongMaterial.nzsl
@@ -1,9 +1,9 @@
 [nzsl_version("1.0")]
 module PhongMaterial;
 
-import Engine.InstanceData;
-import Engine.LightData;
-import Engine.ViewerData;
+import InstanceData from Engine.InstanceData;
+import LightData from Engine.LightData;
+import ViewerData from Engine.ViewerData;
 
 // Basic material options
 option HasDiffuseTexture: bool = false;