diff --git a/code/ryzom/tools/client/client_config_qt/display_settings_advanced_widget.cpp b/code/ryzom/tools/client/client_config_qt/display_settings_advanced_widget.cpp
index 1262b3cc7..0e0293555 100644
--- a/code/ryzom/tools/client/client_config_qt/display_settings_advanced_widget.cpp
+++ b/code/ryzom/tools/client/client_config_qt/display_settings_advanced_widget.cpp
@@ -16,6 +16,7 @@
 
 #include "stdpch.h"
 #include "display_settings_advanced_widget.h"
+
 #include "system.h"
 
 CDisplaySettingsAdvancedWidget::CDisplaySettingsAdvancedWidget( QWidget *parent ) :
diff --git a/code/ryzom/tools/client/client_config_qt/display_settings_widget.cpp b/code/ryzom/tools/client/client_config_qt/display_settings_widget.cpp
index 3185ef4a0..e2e2d882e 100644
--- a/code/ryzom/tools/client/client_config_qt/display_settings_widget.cpp
+++ b/code/ryzom/tools/client/client_config_qt/display_settings_widget.cpp
@@ -16,6 +16,7 @@
 
 #include "stdpch.h"
 #include "display_settings_widget.h"
+
 #include "system.h"
 #include <QRegExpValidator>
 
diff --git a/code/ryzom/tools/client/client_config_qt/general_settings_widget.h b/code/ryzom/tools/client/client_config_qt/general_settings_widget.h
index c8d530ea5..792219751 100644
--- a/code/ryzom/tools/client/client_config_qt/general_settings_widget.h
+++ b/code/ryzom/tools/client/client_config_qt/general_settings_widget.h
@@ -19,7 +19,6 @@
 
 #include "ui_general_settings_widget.h"
 #include "widget_base.h"
-#include <nel/misc/types_nl.h>
 
 class QTranslator;
 
diff --git a/code/ryzom/tools/client/client_config_qt/sound_settings_widget.cpp b/code/ryzom/tools/client/client_config_qt/sound_settings_widget.cpp
index 39d82fe4f..be637f8d8 100644
--- a/code/ryzom/tools/client/client_config_qt/sound_settings_widget.cpp
+++ b/code/ryzom/tools/client/client_config_qt/sound_settings_widget.cpp
@@ -16,6 +16,7 @@
 
 #include "stdpch.h"
 #include "sound_settings_widget.h"
+
 #include "system.h"
 
 CSoundSettingsWidget::CSoundSettingsWidget( QWidget *parent ) :
diff --git a/code/ryzom/tools/client/client_config_qt/sound_settings_widget.h b/code/ryzom/tools/client/client_config_qt/sound_settings_widget.h
index d98a89d82..c995f1206 100644
--- a/code/ryzom/tools/client/client_config_qt/sound_settings_widget.h
+++ b/code/ryzom/tools/client/client_config_qt/sound_settings_widget.h
@@ -19,7 +19,6 @@
 
 #include "ui_sound_settings_widget.h"
 #include "widget_base.h"
-#include <nel/misc/types_nl.h>
 
 /**
  @brief The sound settings page of the configuration tool
diff --git a/code/ryzom/tools/client/client_config_qt/sys_info_d3d_widget.cpp b/code/ryzom/tools/client/client_config_qt/sys_info_d3d_widget.cpp
index a97e5a1a7..39ac4cfc6 100644
--- a/code/ryzom/tools/client/client_config_qt/sys_info_d3d_widget.cpp
+++ b/code/ryzom/tools/client/client_config_qt/sys_info_d3d_widget.cpp
@@ -16,6 +16,7 @@
 
 #include "stdpch.h"
 #include "sys_info_d3d_widget.h"
+
 #include "system.h"
 
 CSysInfoD3DWidget::CSysInfoD3DWidget( QWidget *parent ) :
diff --git a/code/ryzom/tools/client/client_config_qt/sys_info_opengl_widget.cpp b/code/ryzom/tools/client/client_config_qt/sys_info_opengl_widget.cpp
index 5d62a3bc3..55deea24e 100644
--- a/code/ryzom/tools/client/client_config_qt/sys_info_opengl_widget.cpp
+++ b/code/ryzom/tools/client/client_config_qt/sys_info_opengl_widget.cpp
@@ -16,6 +16,7 @@
 
 #include "stdpch.h"
 #include "sys_info_opengl_widget.h"
+
 #include "system.h"
 
 CSysInfoOpenGLWidget::CSysInfoOpenGLWidget( QWidget *parent ) :
diff --git a/code/ryzom/tools/client/client_config_qt/sys_info_widget.cpp b/code/ryzom/tools/client/client_config_qt/sys_info_widget.cpp
index 8e34fa3cb..fcc0940dd 100644
--- a/code/ryzom/tools/client/client_config_qt/sys_info_widget.cpp
+++ b/code/ryzom/tools/client/client_config_qt/sys_info_widget.cpp
@@ -16,6 +16,7 @@
 
 #include "stdpch.h"
 #include "sys_info_widget.h"
+
 #include "system.h"
 
 CSysInfoWidget::CSysInfoWidget( QWidget *parent ) :