diff --git a/extensions/CUDA/CMakeLists.txt b/extensions/CUDA/CMakeLists.txt
index 8acc8bd..f30e8e7 100644
--- a/extensions/CUDA/CMakeLists.txt
+++ b/extensions/CUDA/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.12)
-project(SofaSphFluid.CUDA CUDA CXX)
+project(SofaSphFluid.CUDA LANGUAGES CUDA CXX)
 
 set(HEADER_FILES
     src/SofaSphFluid/CUDA/init.h
diff --git a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticleSource.cpp b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticleSource.cpp
index a7d1714..e6c251e 100644
--- a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticleSource.cpp
+++ b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticleSource.cpp
@@ -19,7 +19,7 @@
 *                                                                             *
 * Contact information: contact@sofa-framework.org                             *
 ******************************************************************************/
-#include <SofaCUDA/sofa/gpu/cuda/CudaTypes.h>
+#include <sofa/gpu/cuda/CudaTypes.h>
 #include "CudaParticleSource.inl"
 #include <sofa/core/ObjectFactory.h>
 #include <sofa/core/behavior/ProjectiveConstraintSet.h>
diff --git a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticleSource.cu b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticleSource.cu
index bca3121..de6db22 100644
--- a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticleSource.cu
+++ b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticleSource.cu
@@ -19,8 +19,8 @@
 *                                                                             *
 * Contact information: contact@sofa-framework.org                             *
 ******************************************************************************/
-#include <SofaCUDA/sofa/gpu/cuda/CudaCommon.h>
-#include <SofaCUDA/sofa/gpu/cuda/CudaMath.h>
+#include <sofa/gpu/cuda/CudaCommon.h>
+#include <sofa/gpu/cuda/CudaMath.h>
 #include "cuda.h"
 
 #if defined(__cplusplus) && CUDA_VERSION < 2000
diff --git a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticleSource.h b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticleSource.h
index 37847f0..9bd87e8 100644
--- a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticleSource.h
+++ b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticleSource.h
@@ -22,6 +22,6 @@
 #ifndef SOFA_GPU_CUDA_CUDAPARTICLESOURCE_H
 #define SOFA_GPU_CUDA_CUDAPARTICLESOURCE_H
 
-#include <SofaCUDA/sofa/gpu/cuda/CudaTypes.h>
+#include <sofa/gpu/cuda/CudaTypes.h>
 
 #endif
diff --git a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticleSource.inl b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticleSource.inl
index 9a66fdb..6ee83d7 100644
--- a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticleSource.inl
+++ b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticleSource.inl
@@ -23,7 +23,7 @@
 #define SOFA_GPU_CUDA_CUDAPARTICLESOURCE_INL
 
 #include "CudaParticleSource.h"
-#include <SofaCUDA/sofa/gpu/cuda/mycuda.h>
+#include <sofa/gpu/cuda/mycuda.h>
 
 namespace sofa
 {
diff --git a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticlesRepulsionForceField.cpp b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticlesRepulsionForceField.cpp
index 68d2d48..042d77d 100644
--- a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticlesRepulsionForceField.cpp
+++ b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticlesRepulsionForceField.cpp
@@ -19,7 +19,7 @@
 *                                                                             *
 * Contact information: contact@sofa-framework.org                             *
 ******************************************************************************/
-#include <SofaCUDA/sofa/gpu/cuda/CudaTypes.h>
+#include <sofa/gpu/cuda/CudaTypes.h>
 #include "CudaParticlesRepulsionForceField.inl"
 #include <sofa/core/ObjectFactory.h>
 #include <sofa/core/behavior/ForceField.inl>
diff --git a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticlesRepulsionForceField.cu b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticlesRepulsionForceField.cu
index cafd2e8..639ac3e 100644
--- a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticlesRepulsionForceField.cu
+++ b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticlesRepulsionForceField.cu
@@ -19,8 +19,8 @@
 *                                                                             *
 * Contact information: contact@sofa-framework.org                             *
 ******************************************************************************/
-#include <SofaCUDA/sofa/gpu/cuda/CudaCommon.h>
-#include <SofaCUDA/sofa/gpu/cuda/CudaMath.h>
+#include <sofa/gpu/cuda/CudaCommon.h>
+#include <sofa/gpu/cuda/CudaMath.h>
 #include "cuda.h"
 
 #if defined(__cplusplus) && CUDA_VERSION < 2000
diff --git a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticlesRepulsionForceField.h b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticlesRepulsionForceField.h
index 7631366..15ac9a2 100644
--- a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticlesRepulsionForceField.h
+++ b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaParticlesRepulsionForceField.h
@@ -22,7 +22,7 @@
 #ifndef SOFA_GPU_CUDA_CUDAPARTICLESREPULSIONFORCEFIELD_H
 #define SOFA_GPU_CUDA_CUDAPARTICLESREPULSIONFORCEFIELD_H
 
-#include <SofaCUDA/sofa/gpu/cuda/CudaTypes.h>
+#include <sofa/gpu/cuda/CudaTypes.h>
 #include <SofaSphFluid/ParticlesRepulsionForceField.h>
 #include <SofaSphFluid/CUDA/CudaSpatialGridContainer.h>
 
diff --git a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSPHFluidForceField.cpp b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSPHFluidForceField.cpp
index c6dd42f..68a52f5 100644
--- a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSPHFluidForceField.cpp
+++ b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSPHFluidForceField.cpp
@@ -19,7 +19,7 @@
 *                                                                             *
 * Contact information: contact@sofa-framework.org                             *
 ******************************************************************************/
-#include <SofaCUDA/sofa/gpu/cuda/CudaTypes.h>
+#include <sofa/gpu/cuda/CudaTypes.h>
 #include "CudaSPHFluidForceField.inl"
 #include <sofa/core/ObjectFactory.h>
 #include <sofa/core/behavior/ForceField.inl>
diff --git a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSPHFluidForceField.cu b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSPHFluidForceField.cu
index 1ab6b88..283ec7a 100644
--- a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSPHFluidForceField.cu
+++ b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSPHFluidForceField.cu
@@ -19,8 +19,8 @@
 *                                                                             *
 * Contact information: contact@sofa-framework.org                             *
 ******************************************************************************/
-#include <SofaCUDA/sofa/gpu/cuda/CudaCommon.h>
-#include <SofaCUDA/sofa/gpu/cuda/CudaMath.h>
+#include <sofa/gpu/cuda/CudaCommon.h>
+#include <sofa/gpu/cuda/CudaMath.h>
 #include "cuda.h"
 
 #if defined(__cplusplus) && CUDA_VERSION < 2000
diff --git a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSPHFluidForceField.h b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSPHFluidForceField.h
index 7b9ead1..9298a8a 100644
--- a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSPHFluidForceField.h
+++ b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSPHFluidForceField.h
@@ -23,7 +23,7 @@
 #define SOFA_GPU_CUDA_CUDASPHFLUIDFORCEFIELD_H
 
 #include <SofaSphFluid/CUDA/config.h>
-#include <SofaCUDA/sofa/gpu/cuda/CudaTypes.h>
+#include <sofa/gpu/cuda/CudaTypes.h>
 #include <SofaSphFluid/SPHFluidForceField.h>
 #include <SofaSphFluid/CUDA/CudaSpatialGridContainer.h>
 
diff --git a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSpatialGridContainer.cu b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSpatialGridContainer.cu
index 83af602..9f459e1 100644
--- a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSpatialGridContainer.cu
+++ b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSpatialGridContainer.cu
@@ -50,9 +50,9 @@
  */
 
 
-#include <SofaCUDA/sofa/gpu/cuda/CudaCommon.h>
-#include <SofaCUDA/sofa/gpu/cuda/CudaMath.h>
-#include <SofaCUDA/sofa/gpu/cuda/mycuda.h>
+#include <sofa/gpu/cuda/CudaCommon.h>
+#include <sofa/gpu/cuda/CudaMath.h>
+#include <sofa/gpu/cuda/mycuda.h>
 #include <cuda.h>
 
 #if defined(__cplusplus) && CUDA_VERSION < 2000
diff --git a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSpatialGridContainer.h b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSpatialGridContainer.h
index da55f21..6bad034 100644
--- a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSpatialGridContainer.h
+++ b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSpatialGridContainer.h
@@ -36,7 +36,7 @@
 
 #include <SofaSphFluid/CUDA/config.h>
 #include <SofaSphFluid/SpatialGridContainer.h>
-#include <SofaCUDA/sofa/gpu/cuda/CudaTypes.h>
+#include <sofa/gpu/cuda/CudaTypes.h>
 #include <sofa/type/Vec.h>
 
 
diff --git a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSpatialGridContainer.inl b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSpatialGridContainer.inl
index e75986a..1b45030 100644
--- a/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSpatialGridContainer.inl
+++ b/extensions/CUDA/src/SofaSphFluid/CUDA/CudaSpatialGridContainer.inl
@@ -35,7 +35,7 @@
 #define SOFA_GPU_CUDA_CUDASPATIALGRIDCONTAINER_INL
 
 #include <SofaSphFluid/CUDA/CudaSpatialGridContainer.h>
-#include <SofaCUDA/sofa/gpu/cuda/CudaSort.h>
+#include <sofa/gpu/cuda/CudaSort.h>
 #include <SofaSphFluid/SpatialGridContainer.inl>
 #include <sofa/gl/template.h>