diff --git a/applications/plugins/CMakeLists.txt b/applications/plugins/CMakeLists.txt
index bcfe5807943..4c8ab325ae9 100644
--- a/applications/plugins/CMakeLists.txt
+++ b/applications/plugins/CMakeLists.txt
@@ -7,6 +7,9 @@ if(SOFA_BUILD_TESTS OR SOFA_BUILD_RELEASE_PACKAGE)
     sofa_add_subdirectory(plugin SofaTest SofaTest)
 endif()
 
+#Should be first to enable all CUDA based modules in plugins
+sofa_add_subdirectory(plugin SofaCUDA SofaCUDA)
+
 sofa_add_subdirectory(plugin CollisionOBBCapsule CollisionOBBCapsule)
 sofa_add_subdirectory(plugin HeadlessRecorder HeadlessRecorder)
 
@@ -59,7 +62,6 @@ if((${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") AND (${CMAKE_SYSTEM_NAME} MATCHES "
     sofa_add_subdirectory(plugin SofaPardisoSolver SofaPardisoSolver) # SofaPardisoSolver is only available under linux with gcc
 endif()
 
-sofa_add_subdirectory(plugin SofaCUDA SofaCUDA)
 
 sofa_find_package(Sofa.GL QUIET)
 if(Sofa.GL_FOUND)
diff --git a/applications/plugins/SofaCUDA/CMakeLists.txt b/applications/plugins/SofaCUDA/CMakeLists.txt
index cfa9eb229b9..21b37440a39 100644
--- a/applications/plugins/SofaCUDA/CMakeLists.txt
+++ b/applications/plugins/SofaCUDA/CMakeLists.txt
@@ -283,10 +283,10 @@ if(Sofa.GUI_FOUND)
     list(APPEND SOURCE_FILES ${SOFACUDACORE_SOURCE_DIR}/sofa/gpu/gui/CudaMouseInteraction.cpp)
 endif()
 
-sofa_find_package(Sofa.GUI.Qt QUIET)
-if(Sofa.GUI.Qt_FOUND)
+sofa_find_package(Sofa.Qt QUIET)
+if(Sofa.Qt_FOUND)
     list(APPEND HEADER_FILES ${SOFACUDACORE_SOURCE_DIR}/sofa/gpu/gui/CudaDataWidget.h)
-    list(APPEND SOURCE_FILES${SOFACUDACORE_SOURCE_DIR}/ sofa/gpu/gui/CudaDataWidget.cpp)
+    list(APPEND SOURCE_FILES ${SOFACUDACORE_SOURCE_DIR}/sofa/gpu/gui/CudaDataWidget.cpp)
 endif()
 
 sofa_find_package(SofaValidation QUIET)
@@ -388,8 +388,8 @@ if(Sofa.GUI_FOUND)
 endif()
 
 
-if(Sofa.GUI.Qt_FOUND)
-    target_link_libraries(${PROJECT_NAME} Sofa.GUI.Qt)
+if(Sofa.Qt_FOUND)
+    target_link_libraries(${PROJECT_NAME} Sofa.Qt)
 endif()
 
 if(SofaValidation_FOUND)
diff --git a/applications/plugins/SofaCUDA/src/sofa/gpu/gui/CudaDataWidget.cpp b/applications/plugins/SofaCUDA/src/sofa/gpu/gui/CudaDataWidget.cpp
index e49201e3cac..7c29315c1b5 100644
--- a/applications/plugins/SofaCUDA/src/sofa/gpu/gui/CudaDataWidget.cpp
+++ b/applications/plugins/SofaCUDA/src/sofa/gpu/gui/CudaDataWidget.cpp
@@ -22,11 +22,11 @@
 #include <sofa/gpu/gui/CudaDataWidget.h>
 #include <sofa/gpu/cuda/CudaTypes.h>
 #include <sofa/helper/Factory.inl>
-#include <sofa/gui/qt/DataWidget.h>
-#include <sofa/gui/qt/SimpleDataWidget.h>
-#include <sofa/gui/qt/TableDataWidget.h>
+#include <sofa/qt/DataWidget.h>
+#include <sofa/qt/SimpleDataWidget.h>
+#include <sofa/qt/TableDataWidget.h>
 
-namespace sofa::gui::qt
+namespace sofa::qt
 {
 using sofa::helper::Creator;
 using namespace sofa::type;
diff --git a/applications/plugins/SofaCUDA/src/sofa/gpu/gui/CudaDataWidget.h b/applications/plugins/SofaCUDA/src/sofa/gpu/gui/CudaDataWidget.h
index 42ccf4b39e4..3d535a69d9b 100644
--- a/applications/plugins/SofaCUDA/src/sofa/gpu/gui/CudaDataWidget.h
+++ b/applications/plugins/SofaCUDA/src/sofa/gpu/gui/CudaDataWidget.h
@@ -21,9 +21,9 @@
 ******************************************************************************/
 #pragma once
 #include <sofa/gpu/cuda/CudaTypes.h>
-#include <sofa/gui/qt/QModelViewTableDataContainer.h>
+#include <sofa/qt/QModelViewTableDataContainer.h>
 
-namespace sofa::gui::qt
+namespace sofa::qt
 {
 ////////////////////////////////////////////////////////////////
 /// variable-sized vectors support