diff --git a/src/ShaderNode/DataModels/Cast.hpp b/src/ShaderNode/DataModels/Cast.hpp
index 3c90f7e99..c1b63e8e0 100644
--- a/src/ShaderNode/DataModels/Cast.hpp
+++ b/src/ShaderNode/DataModels/Cast.hpp
@@ -8,8 +8,7 @@
 #include <QtWidgets/QLabel>
 #include <ShaderNode/ShaderGraph.hpp>
 #include <ShaderNode/DataModels/ShaderNode.hpp>
-#include <ShaderNode/DataModels/VecValue.hpp>
-#include <array>
+#include <ShaderNode/DataTypes/VecData.hpp>
 
 template<typename From, typename To>
 class CastVec : public ShaderNode
diff --git a/src/ShaderNode/DataModels/Cast.inl b/src/ShaderNode/DataModels/Cast.inl
index bf852a5c0..56866aa3e 100644
--- a/src/ShaderNode/DataModels/Cast.inl
+++ b/src/ShaderNode/DataModels/Cast.inl
@@ -1,5 +1,7 @@
 #include <ShaderNode/DataModels/Cast.hpp>
 #include <Nazara/Renderer/ShaderBuilder.hpp>
+#include <QtWidgets/QDoubleSpinBox>
+#include <QtWidgets/QFormLayout>
 #include <stdexcept>
 
 template<typename From, typename To>
diff --git a/src/ShaderNode/DataModels/FragmentOutput.cpp b/src/ShaderNode/DataModels/FragmentOutput.cpp
index bfac47bee..b3938151b 100644
--- a/src/ShaderNode/DataModels/FragmentOutput.cpp
+++ b/src/ShaderNode/DataModels/FragmentOutput.cpp
@@ -1,6 +1,6 @@
 #include <ShaderNode/DataModels/FragmentOutput.hpp>
 #include <Nazara/Renderer/ShaderBuilder.hpp>
-#include <ShaderNode/DataModels/VecValue.hpp>
+#include <ShaderNode/DataTypes/VecData.hpp>
 
 Nz::ShaderAst::ExpressionPtr FragmentOutput::GetExpression(Nz::ShaderAst::ExpressionPtr* expressions, std::size_t count) const
 {
diff --git a/src/ShaderNode/DataModels/FragmentOutput.hpp b/src/ShaderNode/DataModels/FragmentOutput.hpp
index c70f39ff6..eb9b18bf9 100644
--- a/src/ShaderNode/DataModels/FragmentOutput.hpp
+++ b/src/ShaderNode/DataModels/FragmentOutput.hpp
@@ -4,7 +4,7 @@
 #define NAZARA_SHADERNODES_FRAGMENTOUTPUT_HPP
 
 #include <ShaderNode/DataModels/ShaderNode.hpp>
-#include <ShaderNode/DataModels/VecValue.hpp>
+#include <ShaderNode/DataTypes/VecData.hpp>
 #include <QtWidgets/QDoubleSpinBox>
 #include <QtWidgets/QFormLayout>
 
diff --git a/src/ShaderNode/DataModels/InputValue.cpp b/src/ShaderNode/DataModels/InputValue.cpp
index 9962a101b..c36c4a256 100644
--- a/src/ShaderNode/DataModels/InputValue.cpp
+++ b/src/ShaderNode/DataModels/InputValue.cpp
@@ -1,7 +1,8 @@
 #include <ShaderNode/ShaderGraph.hpp>
 #include <ShaderNode/DataModels/InputValue.hpp>
-#include <ShaderNode/DataModels/VecValue.hpp>
+#include <ShaderNode/DataTypes/VecData.hpp>
 #include <Nazara/Renderer/ShaderBuilder.hpp>
+#include <QtWidgets/QFormLayout>
 
 InputValue::InputValue(ShaderGraph& graph) :
 ShaderNode(graph)
diff --git a/src/ShaderNode/DataModels/SampleTexture.cpp b/src/ShaderNode/DataModels/SampleTexture.cpp
index 2ec25b2be..aa2b9d858 100644
--- a/src/ShaderNode/DataModels/SampleTexture.cpp
+++ b/src/ShaderNode/DataModels/SampleTexture.cpp
@@ -1,6 +1,5 @@
 #include <ShaderNode/ShaderGraph.hpp>
 #include <ShaderNode/DataModels/SampleTexture.hpp>
-#include <ShaderNode/DataModels/VecValue.hpp>
 #include <Nazara/Renderer/ShaderBuilder.hpp>
 
 SampleTexture::SampleTexture(ShaderGraph& graph) :
diff --git a/src/ShaderNode/DataModels/SampleTexture.hpp b/src/ShaderNode/DataModels/SampleTexture.hpp
index fc2550f80..3b463bb3b 100644
--- a/src/ShaderNode/DataModels/SampleTexture.hpp
+++ b/src/ShaderNode/DataModels/SampleTexture.hpp
@@ -8,8 +8,7 @@
 #include <QtWidgets/QLabel>
 #include <ShaderNode/ShaderGraph.hpp>
 #include <ShaderNode/DataModels/ShaderNode.hpp>
-#include <ShaderNode/DataModels/VecValue.hpp>
-#include <array>
+#include <ShaderNode/DataTypes/VecData.hpp>
 
 class SampleTexture : public ShaderNode
 {
diff --git a/src/ShaderNode/DataModels/VecBinOp.hpp b/src/ShaderNode/DataModels/VecBinOp.hpp
index e56c13461..6fa8fe875 100644
--- a/src/ShaderNode/DataModels/VecBinOp.hpp
+++ b/src/ShaderNode/DataModels/VecBinOp.hpp
@@ -4,7 +4,7 @@
 #define NAZARA_SHADERNODES_VECBINOP_HPP
 
 #include <ShaderNode/DataModels/ShaderNode.hpp>
-#include <ShaderNode/DataModels/VecValue.hpp>
+#include <ShaderNode/DataTypes/VecData.hpp>
 
 template<typename Data, Nz::ShaderAst::BinaryType BinOp>
 class VecBinOp : public ShaderNode
diff --git a/src/ShaderNode/DataModels/VecData.cpp b/src/ShaderNode/DataModels/VecData.cpp
deleted file mode 100644
index 376c8ea5c..000000000
--- a/src/ShaderNode/DataModels/VecData.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <ShaderNode/DataModels/VecData.hpp>
diff --git a/src/ShaderNode/DataModels/VecValue.hpp b/src/ShaderNode/DataModels/VecValue.hpp
index ad190f8b1..50ff1f4e1 100644
--- a/src/ShaderNode/DataModels/VecValue.hpp
+++ b/src/ShaderNode/DataModels/VecValue.hpp
@@ -8,7 +8,7 @@
 #include <QtWidgets/QFormLayout>
 #include <QtWidgets/QLabel>
 #include <ShaderNode/DataModels/ShaderNode.hpp>
-#include <ShaderNode/DataModels/VecData.hpp>
+#include <ShaderNode/DataTypes/VecData.hpp>
 #include <array>
 
 template<typename Data>
diff --git a/src/ShaderNode/DataModels/VecValue.inl b/src/ShaderNode/DataModels/VecValue.inl
index f576bbb4e..7f3a9dc5e 100644
--- a/src/ShaderNode/DataModels/VecValue.inl
+++ b/src/ShaderNode/DataModels/VecValue.inl
@@ -1,6 +1,7 @@
+#include <ShaderNode/DataModels/VecValue.hpp>
 #include <Nazara/Core/Algorithm.hpp>
 #include <Nazara/Renderer/ShaderBuilder.hpp>
-#include <ShaderNode/DataModels/VecValue.hpp>
+#include <ShaderNode/DataTypes/VecData.hpp>
 #include <array>
 #include <tuple>
 
diff --git a/src/ShaderNode/DataTypes/VecData.cpp b/src/ShaderNode/DataTypes/VecData.cpp
new file mode 100644
index 000000000..0b1f99d61
--- /dev/null
+++ b/src/ShaderNode/DataTypes/VecData.cpp
@@ -0,0 +1 @@
+#include <ShaderNode/DataTypes/VecData.hpp>
diff --git a/src/ShaderNode/DataModels/VecData.hpp b/src/ShaderNode/DataTypes/VecData.hpp
similarity index 97%
rename from src/ShaderNode/DataModels/VecData.hpp
rename to src/ShaderNode/DataTypes/VecData.hpp
index 3882f20f1..447d37686 100644
--- a/src/ShaderNode/DataModels/VecData.hpp
+++ b/src/ShaderNode/DataTypes/VecData.hpp
@@ -101,6 +101,6 @@ template<std::size_t N> using VecType = typename VecTypeHelper<N>::template Type
 
 constexpr std::array<char, 4> s_vectorComponents = { 'X', 'Y', 'Z', 'W' };
 
-#include <ShaderNode/DataModels/VecData.inl>
+#include <ShaderNode/DataTypes/VecData.inl>
 
 #endif
diff --git a/src/ShaderNode/DataModels/VecData.inl b/src/ShaderNode/DataTypes/VecData.inl
similarity index 73%
rename from src/ShaderNode/DataModels/VecData.inl
rename to src/ShaderNode/DataTypes/VecData.inl
index 6c2d0379e..255fbd9ab 100644
--- a/src/ShaderNode/DataModels/VecData.inl
+++ b/src/ShaderNode/DataTypes/VecData.inl
@@ -1,4 +1,4 @@
-#include <ShaderNode/DataModels/VecData.hpp>
+#include <ShaderNode/DataTypes/VecData.hpp>
 
 inline VecData::VecData() :
 preview(64, 64, QImage::Format_RGBA8888)