diff --git a/code/nel/src/3d/driver/opengl/driver_opengl.cpp b/code/nel/src/3d/driver/opengl/driver_opengl.cpp
index 3f2dca9b6..80b424cba 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl.cpp
@@ -36,6 +36,9 @@
 using namespace std;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 
 
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
index 9d9143515..91a2fcab3 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
@@ -61,6 +61,9 @@ void (*nglGetProcAddress(const char *procName))()
 }
 #endif	// NL_OS_WINDOWS
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 // ***************************************************************************
 // The exported function names
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_inputs.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_inputs.cpp
index 46804cce1..0d27166fc 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_inputs.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_inputs.cpp
@@ -33,6 +33,10 @@
 using namespace std;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NL3D {
 
 #ifdef NL_STATIC
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_light.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_light.cpp
index 7b52e3225..a9b62b6b6 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_light.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_light.cpp
@@ -19,6 +19,10 @@
 #include "driver_opengl.h"
 #include "nel/3d/light.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NL3D {
 
 #ifdef NL_STATIC
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_material.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_material.cpp
index e5375a49c..bf9845103 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_material.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_material.cpp
@@ -21,6 +21,10 @@
 #include "nel/3d/texture_bump.h"
 #include "nel/3d/material.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NL3D {
 
 #ifdef NL_STATIC
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_matrix.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_matrix.cpp
index 41575024c..392aa3f5d 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_matrix.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_matrix.cpp
@@ -17,6 +17,10 @@
 #include "stdopengl.h"
 #include "driver_opengl.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NL3D {
 
 #ifdef NL_STATIC
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_pixel_program.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_pixel_program.cpp
index dd66328e9..67af0df64 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_pixel_program.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_pixel_program.cpp
@@ -38,6 +38,10 @@
 using namespace std;
 using namespace NLMISC;
  
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NL3D
 {
 	
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp
index 8ec7a6bc8..5fd9e6416 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp
@@ -22,6 +22,10 @@
 // define it For Debug purpose only. Normal use is to hide this line
 //#define		NL3D_GLSTATE_DISABLE_CACHE
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NL3D {
 
 #ifdef NL_STATIC
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp
index a46f7ef12..95eaf8465 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp
@@ -28,6 +28,9 @@
 using	namespace NLMISC;
 using	namespace std;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 //#define NEL_DUMP_UPLOAD_TIME
 
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_uniform.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_uniform.cpp
index f981ae3ba..bd945c1a1 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_uniform.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_uniform.cpp
@@ -21,6 +21,10 @@
 using namespace std;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NL3D {
 
 #ifdef NL_STATIC
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp
index 39f71d77a..bb0cf0c9f 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp
@@ -26,6 +26,9 @@
 using namespace std;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 
 
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp
index 25c7da614..6684ad100 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_vertex_buffer_hard.cpp
@@ -24,6 +24,10 @@
 using	namespace std;
 using	namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NL3D {
 
 #ifdef NL_STATIC
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp
index c2e37ac89..e9ac4814a 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp
@@ -28,6 +28,10 @@
 using namespace std;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 //#define DEBUG_SETUP_EXT_VERTEX_SHADER
 
 namespace NL3D {
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
index 4469550b3..9fe51ea1d 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
@@ -44,6 +44,10 @@
 using namespace std;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NL3D {
 
 #ifdef NL_STATIC
diff --git a/code/nel/src/3d/driver/opengl/stdopengl.h b/code/nel/src/3d/driver/opengl/stdopengl.h
index 3066a778a..28ed25fc9 100644
--- a/code/nel/src/3d/driver/opengl/stdopengl.h
+++ b/code/nel/src/3d/driver/opengl/stdopengl.h
@@ -17,7 +17,12 @@
 #ifndef STDOPENGL_H
 #define STDOPENGL_H
 
-#include "nel/misc/types_nl.h"
+#if defined(_MSC_VER) && defined(_DEBUG)
+	#define _CRTDBG_MAP_ALLOC
+	#include <stdlib.h>
+	#include <crtdbg.h>
+	#define DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
+#endif
 
 #include <cstdlib>
 #include <cstdio>
@@ -35,6 +40,8 @@
 #include <deque>
 #include <limits>
 
+#include "nel/misc/types_nl.h"
+
 #ifdef NL_OS_WINDOWS
 #	define WIN32_LEAN_AND_MEAN
 #	ifndef NL_COMP_MINGW
diff --git a/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp b/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp
index b55ad5865..898c9f001 100644
--- a/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp
+++ b/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp
@@ -26,6 +26,9 @@
 #include <X11/XKBlib.h>
 #include "nel/misc/debug.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 typedef bool (*x11Proc)(NL3D::IDriver *drv, XEvent *e);
 
diff --git a/code/nel/src/3d/quad_grid_clip_cluster.cpp b/code/nel/src/3d/quad_grid_clip_cluster.cpp
index a6ab799c8..dd52ed111 100644
--- a/code/nel/src/3d/quad_grid_clip_cluster.cpp
+++ b/code/nel/src/3d/quad_grid_clip_cluster.cpp
@@ -25,6 +25,9 @@
 using namespace NLMISC;
 using namespace std;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 namespace NL3D
 {
diff --git a/code/nel/src/3d/quad_grid_clip_manager.cpp b/code/nel/src/3d/quad_grid_clip_manager.cpp
index 02c4fed62..0fe69e46e 100644
--- a/code/nel/src/3d/quad_grid_clip_manager.cpp
+++ b/code/nel/src/3d/quad_grid_clip_manager.cpp
@@ -28,6 +28,9 @@
 using namespace std;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 namespace NL3D
 {
diff --git a/code/nel/src/3d/std3d.h b/code/nel/src/3d/std3d.h
index e81f1ead4..d41f281ec 100644
--- a/code/nel/src/3d/std3d.h
+++ b/code/nel/src/3d/std3d.h
@@ -14,7 +14,15 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "nel/misc/types_nl.h"
+#ifndef NL_STD3D_H
+#define NL_STD3D_H
+
+#if defined(_MSC_VER) && defined(_DEBUG)
+	#define _CRTDBG_MAP_ALLOC
+	#include <stdlib.h>
+	#include <crtdbg.h>
+	#define DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
+#endif
 
 #include <map>
 #include <set>
@@ -36,6 +44,8 @@
 #include <limits>
 #include <iterator>
 
+#include "nel/misc/types_nl.h"
+
 #include "nel/misc/rgba.h"
 #include "nel/misc/debug.h"
 
@@ -45,7 +55,4 @@
 #include "nel/misc/matrix.h"
 #include "nel/misc/time_nl.h"
 
-#include "nel/3d/debug_vb.h"
-#include "nel/3d/transform.h"
-#include "nel/3d/quad_grid.h"
-
+#endif
diff --git a/code/nel/src/3d/target_anim_ctrl.cpp b/code/nel/src/3d/target_anim_ctrl.cpp
index ea1eeeca0..8145fdb93 100644
--- a/code/nel/src/3d/target_anim_ctrl.cpp
+++ b/code/nel/src/3d/target_anim_ctrl.cpp
@@ -24,6 +24,10 @@
 using namespace std;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NL3D {
 
 
diff --git a/code/nel/src/3d/track_sampled_quat.cpp b/code/nel/src/3d/track_sampled_quat.cpp
index 1ef4e35b8..d49d63aa7 100644
--- a/code/nel/src/3d/track_sampled_quat.cpp
+++ b/code/nel/src/3d/track_sampled_quat.cpp
@@ -24,6 +24,9 @@
 using namespace NLMISC;
 using namespace std;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 namespace NL3D
 {
diff --git a/code/nel/src/3d/vegetable_manager.cpp b/code/nel/src/3d/vegetable_manager.cpp
index e479a5e62..084942fea 100644
--- a/code/nel/src/3d/vegetable_manager.cpp
+++ b/code/nel/src/3d/vegetable_manager.cpp
@@ -35,6 +35,9 @@
 using namespace std;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 namespace NL3D
 {
diff --git a/code/nel/src/3d/water_env_map.cpp b/code/nel/src/3d/water_env_map.cpp
index a1b954764..9592f2948 100644
--- a/code/nel/src/3d/water_env_map.cpp
+++ b/code/nel/src/3d/water_env_map.cpp
@@ -24,6 +24,10 @@
 #include "nel/misc/common.h"
 #include "nel/3d/viewport.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NL3D
 
 {
diff --git a/code/nel/src/3d/water_pool_manager.cpp b/code/nel/src/3d/water_pool_manager.cpp
index c377ff1f3..8ca8e2bfc 100644
--- a/code/nel/src/3d/water_pool_manager.cpp
+++ b/code/nel/src/3d/water_pool_manager.cpp
@@ -23,6 +23,9 @@
 #include "nel/3d/water_height_map.h"
 
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 namespace NL3D {
 
diff --git a/code/nel/src/gui/action_handler.cpp b/code/nel/src/gui/action_handler.cpp
index d7214ef06..bbe7948cd 100644
--- a/code/nel/src/gui/action_handler.cpp
+++ b/code/nel/src/gui/action_handler.cpp
@@ -27,6 +27,10 @@
 using namespace std;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/ctrl_base.cpp b/code/nel/src/gui/ctrl_base.cpp
index 475761e89..9fdeff8c2 100644
--- a/code/nel/src/gui/ctrl_base.cpp
+++ b/code/nel/src/gui/ctrl_base.cpp
@@ -27,6 +27,10 @@
 
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 	std::map< std::string, std::map< std::string, std::string > > CCtrlBase::AHCache;
diff --git a/code/nel/src/gui/ctrl_base_button.cpp b/code/nel/src/gui/ctrl_base_button.cpp
index 673ea906d..d60824295 100644
--- a/code/nel/src/gui/ctrl_base_button.cpp
+++ b/code/nel/src/gui/ctrl_base_button.cpp
@@ -27,6 +27,10 @@
 using namespace std;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace
 {
 	const uint KEY_REPEAT_MIN = 100;
diff --git a/code/nel/src/gui/ctrl_button.cpp b/code/nel/src/gui/ctrl_button.cpp
index d689dd71c..02fd4b7d4 100644
--- a/code/nel/src/gui/ctrl_button.cpp
+++ b/code/nel/src/gui/ctrl_button.cpp
@@ -26,6 +26,10 @@ using namespace std;
 using namespace NLMISC;
 using namespace NL3D;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 NLMISC_REGISTER_OBJECT(CViewBase, CCtrlButton, std::string, "button");
 
 namespace NLGUI
diff --git a/code/nel/src/gui/ctrl_col_pick.cpp b/code/nel/src/gui/ctrl_col_pick.cpp
index 2d62b6e74..4079388c2 100644
--- a/code/nel/src/gui/ctrl_col_pick.cpp
+++ b/code/nel/src/gui/ctrl_col_pick.cpp
@@ -27,6 +27,10 @@
 using namespace NLMISC;
 using namespace std;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 NLMISC_REGISTER_OBJECT(CViewBase, CCtrlColPick, std::string, "colpick");
 
 namespace NLGUI
diff --git a/code/nel/src/gui/ctrl_draggable.cpp b/code/nel/src/gui/ctrl_draggable.cpp
index 39872ab18..781585083 100644
--- a/code/nel/src/gui/ctrl_draggable.cpp
+++ b/code/nel/src/gui/ctrl_draggable.cpp
@@ -18,6 +18,10 @@
 #include "stdpch.h"
 #include "nel/gui/ctrl_draggable.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/ctrl_polygon.cpp b/code/nel/src/gui/ctrl_polygon.cpp
index 86059087d..c7ce984d2 100644
--- a/code/nel/src/gui/ctrl_polygon.cpp
+++ b/code/nel/src/gui/ctrl_polygon.cpp
@@ -23,6 +23,10 @@
 
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/ctrl_quad.cpp b/code/nel/src/gui/ctrl_quad.cpp
index 47346692c..22f4d4ae6 100644
--- a/code/nel/src/gui/ctrl_quad.cpp
+++ b/code/nel/src/gui/ctrl_quad.cpp
@@ -23,6 +23,10 @@
 
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/ctrl_scroll.cpp b/code/nel/src/gui/ctrl_scroll.cpp
index ad2ca14f5..9c9585fcc 100644
--- a/code/nel/src/gui/ctrl_scroll.cpp
+++ b/code/nel/src/gui/ctrl_scroll.cpp
@@ -28,6 +28,10 @@
 using namespace NLMISC;
 using namespace std;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 NLMISC_REGISTER_OBJECT(CViewBase, CCtrlScroll, std::string, "scroll");
 
 namespace NLGUI
diff --git a/code/nel/src/gui/ctrl_scroll_base.cpp b/code/nel/src/gui/ctrl_scroll_base.cpp
index f95cac5d7..2813b997a 100644
--- a/code/nel/src/gui/ctrl_scroll_base.cpp
+++ b/code/nel/src/gui/ctrl_scroll_base.cpp
@@ -18,6 +18,10 @@
 #include "stdpch.h"
 #include "nel/gui/ctrl_scroll_base.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/ctrl_sheet_selection.cpp b/code/nel/src/gui/ctrl_sheet_selection.cpp
index bdbe0e73d..d0202547f 100644
--- a/code/nel/src/gui/ctrl_sheet_selection.cpp
+++ b/code/nel/src/gui/ctrl_sheet_selection.cpp
@@ -23,6 +23,10 @@
 #include "nel/gui/ctrl_sheet_selection.h"
 #include "nel/gui/view_renderer.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/ctrl_text_button.cpp b/code/nel/src/gui/ctrl_text_button.cpp
index c292d5473..81dfcc953 100644
--- a/code/nel/src/gui/ctrl_text_button.cpp
+++ b/code/nel/src/gui/ctrl_text_button.cpp
@@ -30,6 +30,9 @@ using namespace std;
 using namespace NLMISC;
 using namespace NL3D;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 NLMISC_REGISTER_OBJECT(CViewBase, CCtrlTextButton, std::string, "text_button");
 
diff --git a/code/nel/src/gui/ctrl_tooltip.cpp b/code/nel/src/gui/ctrl_tooltip.cpp
index 8a0427751..da42084ac 100644
--- a/code/nel/src/gui/ctrl_tooltip.cpp
+++ b/code/nel/src/gui/ctrl_tooltip.cpp
@@ -23,6 +23,10 @@ using namespace std;
 using namespace NLMISC;
 using namespace NL3D;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 NLMISC_REGISTER_OBJECT(CViewBase, CCtrlToolTip, std::string, "tooltip");
 
 REGISTER_UI_CLASS(CCtrlToolTip)
diff --git a/code/nel/src/gui/db_manager.cpp b/code/nel/src/gui/db_manager.cpp
index a169adf8d..7896cbde3 100644
--- a/code/nel/src/gui/db_manager.cpp
+++ b/code/nel/src/gui/db_manager.cpp
@@ -18,6 +18,10 @@
 #include "stdpch.h"
 #include "nel/gui/db_manager.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 	CDBManager* CDBManager::instance = NULL;
diff --git a/code/nel/src/gui/dbgroup_combo_box.cpp b/code/nel/src/gui/dbgroup_combo_box.cpp
index 184829e4c..2afd8c570 100644
--- a/code/nel/src/gui/dbgroup_combo_box.cpp
+++ b/code/nel/src/gui/dbgroup_combo_box.cpp
@@ -28,6 +28,10 @@
 using namespace std;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 	NLMISC_REGISTER_OBJECT(CViewBase, CDBGroupComboBox, std::string, "combo_box");
diff --git a/code/nel/src/gui/dbgroup_select_number.cpp b/code/nel/src/gui/dbgroup_select_number.cpp
index b3dc2e8f1..22afa4d0e 100644
--- a/code/nel/src/gui/dbgroup_select_number.cpp
+++ b/code/nel/src/gui/dbgroup_select_number.cpp
@@ -27,6 +27,10 @@ using namespace std;
 using namespace NL3D;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 	NLMISC_REGISTER_OBJECT(CViewBase, CDBGroupSelectNumber, std::string, "select_number");
diff --git a/code/nel/src/gui/dbview_bar.cpp b/code/nel/src/gui/dbview_bar.cpp
index f4befb389..e2256444f 100644
--- a/code/nel/src/gui/dbview_bar.cpp
+++ b/code/nel/src/gui/dbview_bar.cpp
@@ -26,6 +26,10 @@ using namespace std;
 using namespace NL3D;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 NLMISC_REGISTER_OBJECT(CViewBase, CDBViewBar, std::string, "bar");
 
 namespace NLGUI
diff --git a/code/nel/src/gui/dbview_bar3.cpp b/code/nel/src/gui/dbview_bar3.cpp
index 32d3e9eaf..187a52f99 100644
--- a/code/nel/src/gui/dbview_bar3.cpp
+++ b/code/nel/src/gui/dbview_bar3.cpp
@@ -26,6 +26,10 @@ using namespace std;
 using namespace NL3D;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 	NLMISC_REGISTER_OBJECT(CViewBase, CDBViewBar3, std::string, "bar3");
diff --git a/code/nel/src/gui/dbview_digit.cpp b/code/nel/src/gui/dbview_digit.cpp
index 318327a77..81063d519 100644
--- a/code/nel/src/gui/dbview_digit.cpp
+++ b/code/nel/src/gui/dbview_digit.cpp
@@ -24,6 +24,10 @@ using namespace std;
 using namespace NL3D;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 NLMISC_REGISTER_OBJECT(CViewBase, CDBViewDigit, std::string, "digit");
 
 namespace NLGUI
diff --git a/code/nel/src/gui/dbview_number.cpp b/code/nel/src/gui/dbview_number.cpp
index e844bf4c0..36f5523f2 100644
--- a/code/nel/src/gui/dbview_number.cpp
+++ b/code/nel/src/gui/dbview_number.cpp
@@ -24,6 +24,9 @@ using namespace std;
 using namespace NL3D;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 NLMISC_REGISTER_OBJECT(CViewBase, CDBViewNumber, std::string, "text_number");
 
diff --git a/code/nel/src/gui/dbview_quantity.cpp b/code/nel/src/gui/dbview_quantity.cpp
index 12dfce4b8..4685fc23d 100644
--- a/code/nel/src/gui/dbview_quantity.cpp
+++ b/code/nel/src/gui/dbview_quantity.cpp
@@ -24,6 +24,9 @@ using namespace std;
 using namespace NL3D;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 NLMISC_REGISTER_OBJECT(CViewBase, CDBViewQuantity, std::string, "text_quantity");
 
diff --git a/code/nel/src/gui/event_descriptor.cpp b/code/nel/src/gui/event_descriptor.cpp
index fd1856ed3..356e75aec 100644
--- a/code/nel/src/gui/event_descriptor.cpp
+++ b/code/nel/src/gui/event_descriptor.cpp
@@ -19,6 +19,10 @@
 #include "nel/misc/events.h"
 #include "nel/gui/event_descriptor.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/event_listener.cpp b/code/nel/src/gui/event_listener.cpp
index 4f4d7a17d..b1e53c374 100644
--- a/code/nel/src/gui/event_listener.cpp
+++ b/code/nel/src/gui/event_listener.cpp
@@ -21,6 +21,10 @@
 #include "nel/gui/interface_group.h"
 #include "nel/gui/widget_manager.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 	CEventListener::CEventListener()
diff --git a/code/nel/src/gui/group_container.cpp b/code/nel/src/gui/group_container.cpp
index 818c71278..1922db221 100644
--- a/code/nel/src/gui/group_container.cpp
+++ b/code/nel/src/gui/group_container.cpp
@@ -39,6 +39,10 @@ using namespace std;
 using namespace NL3D;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace
 {
 	const sint SIZE_W_LEFT = 16;
diff --git a/code/nel/src/gui/group_container_base.cpp b/code/nel/src/gui/group_container_base.cpp
index 974964955..c031cec7e 100644
--- a/code/nel/src/gui/group_container_base.cpp
+++ b/code/nel/src/gui/group_container_base.cpp
@@ -18,6 +18,10 @@
 #include "stdpch.h"
 #include "nel/gui/group_container_base.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/group_editbox.cpp b/code/nel/src/gui/group_editbox.cpp
index 4ac977803..f0a41c8a0 100644
--- a/code/nel/src/gui/group_editbox.cpp
+++ b/code/nel/src/gui/group_editbox.cpp
@@ -33,6 +33,9 @@ using namespace std;
 using namespace NLMISC;
 using namespace NL3D;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 namespace NLGUI
 {
diff --git a/code/nel/src/gui/group_editbox_base.cpp b/code/nel/src/gui/group_editbox_base.cpp
index 133af0b83..d3c001c34 100644
--- a/code/nel/src/gui/group_editbox_base.cpp
+++ b/code/nel/src/gui/group_editbox_base.cpp
@@ -18,6 +18,10 @@
 #include "stdpch.h"
 #include "nel/gui/group_editbox_base.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/group_editbox_decor.cpp b/code/nel/src/gui/group_editbox_decor.cpp
index 07e07ddf3..6d1e500ae 100644
--- a/code/nel/src/gui/group_editbox_decor.cpp
+++ b/code/nel/src/gui/group_editbox_decor.cpp
@@ -20,6 +20,10 @@
 #include "nel/gui/view_bitmap.h"
 #include "nel/gui/view_text.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 	class EBDPrivate
diff --git a/code/nel/src/gui/group_frame.cpp b/code/nel/src/gui/group_frame.cpp
index d0a652092..54412f229 100644
--- a/code/nel/src/gui/group_frame.cpp
+++ b/code/nel/src/gui/group_frame.cpp
@@ -26,6 +26,10 @@
 using namespace std;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/group_header.cpp b/code/nel/src/gui/group_header.cpp
index 908aa183e..dbc990447 100644
--- a/code/nel/src/gui/group_header.cpp
+++ b/code/nel/src/gui/group_header.cpp
@@ -24,6 +24,10 @@
 
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/group_html.cpp b/code/nel/src/gui/group_html.cpp
index eee811d02..a67c8b8e8 100644
--- a/code/nel/src/gui/group_html.cpp
+++ b/code/nel/src/gui/group_html.cpp
@@ -49,6 +49,9 @@
 using namespace std;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 // Default maximum time the request is allowed to take
 #define DEFAULT_RYZOM_CONNECTION_TIMEOUT (300.0)
diff --git a/code/nel/src/gui/group_html_parser.cpp b/code/nel/src/gui/group_html_parser.cpp
index 5f6873477..b2a61c4f9 100644
--- a/code/nel/src/gui/group_html_parser.cpp
+++ b/code/nel/src/gui/group_html_parser.cpp
@@ -28,6 +28,10 @@
 using namespace std;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 	// ***************************************************************************
diff --git a/code/nel/src/gui/group_list.cpp b/code/nel/src/gui/group_list.cpp
index 8869c4498..c0502577b 100644
--- a/code/nel/src/gui/group_list.cpp
+++ b/code/nel/src/gui/group_list.cpp
@@ -30,6 +30,10 @@
 using namespace std;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 NLMISC_REGISTER_OBJECT(CViewBase, CGroupList, std::string, "list");
 
 namespace NLGUI
diff --git a/code/nel/src/gui/group_menu.cpp b/code/nel/src/gui/group_menu.cpp
index 80117e5bd..3b0e4549d 100644
--- a/code/nel/src/gui/group_menu.cpp
+++ b/code/nel/src/gui/group_menu.cpp
@@ -32,6 +32,9 @@
 using namespace NLMISC;
 using namespace std;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 namespace
 {
diff --git a/code/nel/src/gui/group_modal.cpp b/code/nel/src/gui/group_modal.cpp
index fb4c6d129..95ca783eb 100644
--- a/code/nel/src/gui/group_modal.cpp
+++ b/code/nel/src/gui/group_modal.cpp
@@ -24,6 +24,10 @@
 
 using namespace std;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/group_paragraph.cpp b/code/nel/src/gui/group_paragraph.cpp
index 6261656aa..7eaf11841 100644
--- a/code/nel/src/gui/group_paragraph.cpp
+++ b/code/nel/src/gui/group_paragraph.cpp
@@ -31,6 +31,10 @@
 using namespace std;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 NLMISC_REGISTER_OBJECT(CViewBase, CCtrlLink, std::string, "button_link");
 
 namespace NLGUI
diff --git a/code/nel/src/gui/group_scrolltext.cpp b/code/nel/src/gui/group_scrolltext.cpp
index c82bd40bf..aff59e5c2 100644
--- a/code/nel/src/gui/group_scrolltext.cpp
+++ b/code/nel/src/gui/group_scrolltext.cpp
@@ -25,6 +25,10 @@
 #include "nel/misc/i18n.h"
 #include "nel/gui/widget_manager.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 NLMISC_REGISTER_OBJECT(CViewBase, CGroupScrollText, std::string, "scroll_text");
 
 namespace NLGUI
diff --git a/code/nel/src/gui/group_submenu_base.cpp b/code/nel/src/gui/group_submenu_base.cpp
index 1c98fe643..8b26a7d85 100644
--- a/code/nel/src/gui/group_submenu_base.cpp
+++ b/code/nel/src/gui/group_submenu_base.cpp
@@ -18,6 +18,10 @@
 #include "stdpch.h"
 #include "nel/gui/group_submenu_base.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/group_tab.cpp b/code/nel/src/gui/group_tab.cpp
index 69ccce046..d79efdad3 100644
--- a/code/nel/src/gui/group_tab.cpp
+++ b/code/nel/src/gui/group_tab.cpp
@@ -26,6 +26,10 @@
 using namespace std;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 NLMISC_REGISTER_OBJECT(CViewBase, CGroupTab, std::string, "tab");
 
 namespace NLGUI
diff --git a/code/nel/src/gui/group_table.cpp b/code/nel/src/gui/group_table.cpp
index a82ad5617..e194a70a4 100644
--- a/code/nel/src/gui/group_table.cpp
+++ b/code/nel/src/gui/group_table.cpp
@@ -29,6 +29,10 @@
 using namespace std;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/group_tree.cpp b/code/nel/src/gui/group_tree.cpp
index b8e2ae1f4..c65ceba17 100644
--- a/code/nel/src/gui/group_tree.cpp
+++ b/code/nel/src/gui/group_tree.cpp
@@ -33,6 +33,10 @@
 using namespace std;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/group_wheel.cpp b/code/nel/src/gui/group_wheel.cpp
index e242a98e7..a8d57c089 100644
--- a/code/nel/src/gui/group_wheel.cpp
+++ b/code/nel/src/gui/group_wheel.cpp
@@ -18,6 +18,9 @@
 #include "stdpch.h"
 #include "nel/gui/group_wheel.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 NLMISC_REGISTER_OBJECT(CViewBase, CInterfaceGroupWheel, std::string, "group_wheel");
 
diff --git a/code/nel/src/gui/input_handler.cpp b/code/nel/src/gui/input_handler.cpp
index 920636079..9e4864caa 100644
--- a/code/nel/src/gui/input_handler.cpp
+++ b/code/nel/src/gui/input_handler.cpp
@@ -17,6 +17,10 @@
 #include "stdpch.h"
 #include "nel/gui/input_handler.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 	CInputHandler::CInputHandler()
diff --git a/code/nel/src/gui/interface_anim.cpp b/code/nel/src/gui/interface_anim.cpp
index 4b230bb25..2fb190e85 100644
--- a/code/nel/src/gui/interface_anim.cpp
+++ b/code/nel/src/gui/interface_anim.cpp
@@ -27,6 +27,10 @@ using namespace std;
 using namespace NL3D;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/interface_element.cpp b/code/nel/src/gui/interface_element.cpp
index 66eee038e..e33d1dbd8 100644
--- a/code/nel/src/gui/interface_element.cpp
+++ b/code/nel/src/gui/interface_element.cpp
@@ -31,6 +31,10 @@
 using namespace std;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 	bool CInterfaceElement::editorMode = false;
diff --git a/code/nel/src/gui/interface_expr.cpp b/code/nel/src/gui/interface_expr.cpp
index cbf3cace3..9d13286a9 100644
--- a/code/nel/src/gui/interface_expr.cpp
+++ b/code/nel/src/gui/interface_expr.cpp
@@ -25,6 +25,10 @@
 using namespace std;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/interface_expr_node.cpp b/code/nel/src/gui/interface_expr_node.cpp
index 895cb169e..2a32c09db 100644
--- a/code/nel/src/gui/interface_expr_node.cpp
+++ b/code/nel/src/gui/interface_expr_node.cpp
@@ -24,6 +24,10 @@ using NLMISC::ICDBNode;
 using NLMISC::CCDBNodeBranch;
 using NLMISC::CCDBNodeLeaf;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/interface_expr_user_fct.cpp b/code/nel/src/gui/interface_expr_user_fct.cpp
index b60f0b01c..07e329feb 100644
--- a/code/nel/src/gui/interface_expr_user_fct.cpp
+++ b/code/nel/src/gui/interface_expr_user_fct.cpp
@@ -25,6 +25,10 @@
 using namespace std;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/interface_factory.cpp b/code/nel/src/gui/interface_factory.cpp
index ec914baa6..7f0fe76ee 100644
--- a/code/nel/src/gui/interface_factory.cpp
+++ b/code/nel/src/gui/interface_factory.cpp
@@ -18,6 +18,10 @@
 #include "nel/gui/view_base.h"
 #include "nel/misc/factory.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 	CViewBase* CInterfaceFactory::createClass( const std::string &name )
diff --git a/code/nel/src/gui/interface_group.cpp b/code/nel/src/gui/interface_group.cpp
index 623dfe5bd..c0e7f6f17 100644
--- a/code/nel/src/gui/interface_group.cpp
+++ b/code/nel/src/gui/interface_group.cpp
@@ -32,6 +32,10 @@
 using namespace std;
 using namespace NL3D;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 #define IG_UNIQUE_ID(this) ((void*)&((this)->_GroupSizeRef)) // NB nico : use some pointer *inside* CInterfaceGroup as a unique id for lua registry (any field but
 														     // the first), instead of using 'this'. 'this' is already used by
 		                                                     //  CLuaIHM::pushReflectableOnStack as unique id to CInterfaceElement's ref pointers
diff --git a/code/nel/src/gui/interface_link.cpp b/code/nel/src/gui/interface_link.cpp
index 282199ee7..612fa908e 100644
--- a/code/nel/src/gui/interface_link.cpp
+++ b/code/nel/src/gui/interface_link.cpp
@@ -33,6 +33,10 @@
 using namespace std;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/interface_options.cpp b/code/nel/src/gui/interface_options.cpp
index 1daef83cb..9a71e3709 100644
--- a/code/nel/src/gui/interface_options.cpp
+++ b/code/nel/src/gui/interface_options.cpp
@@ -26,6 +26,10 @@
 using namespace std;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/interface_parser.cpp b/code/nel/src/gui/interface_parser.cpp
index 4362b5c12..e038cb73e 100644
--- a/code/nel/src/gui/interface_parser.cpp
+++ b/code/nel/src/gui/interface_parser.cpp
@@ -42,6 +42,11 @@
 #ifdef LUA_NEVRAX_VERSION
 	#include "lua_ide_dll_nevrax/include/lua_ide_dll/ide_interface.h" // external debugger
 #endif
+
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 const uint32 UI_CACHE_SERIAL_CHECK = NELID("IUG_");
 
 using namespace NLMISC;
diff --git a/code/nel/src/gui/interface_property.cpp b/code/nel/src/gui/interface_property.cpp
index 8715b0f2f..ab375ae5e 100644
--- a/code/nel/src/gui/interface_property.cpp
+++ b/code/nel/src/gui/interface_property.cpp
@@ -24,6 +24,10 @@
 using namespace NLMISC;
 using namespace std;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 	// helper to convert double <> sint64
diff --git a/code/nel/src/gui/libwww.cpp b/code/nel/src/gui/libwww.cpp
index 53cc9e403..919d50562 100644
--- a/code/nel/src/gui/libwww.cpp
+++ b/code/nel/src/gui/libwww.cpp
@@ -21,6 +21,10 @@
 
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/libwww_types.cpp b/code/nel/src/gui/libwww_types.cpp
index 31e05f456..6eace3aa1 100644
--- a/code/nel/src/gui/libwww_types.cpp
+++ b/code/nel/src/gui/libwww_types.cpp
@@ -31,6 +31,10 @@
 
 #include "nel/gui/libwww_types.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/link_hack.cpp b/code/nel/src/gui/link_hack.cpp
index 3ecc6fb0a..9ae97910d 100644
--- a/code/nel/src/gui/link_hack.cpp
+++ b/code/nel/src/gui/link_hack.cpp
@@ -22,6 +22,10 @@
 #include "nel/gui/view_pointer.h"
 #include "nel/gui/group_editbox_decor.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 	void ifexprufct_forcelink();
diff --git a/code/nel/src/gui/lua_helper.cpp b/code/nel/src/gui/lua_helper.cpp
index 0e2b9ba71..4e776e0b9 100644
--- a/code/nel/src/gui/lua_helper.cpp
+++ b/code/nel/src/gui/lua_helper.cpp
@@ -49,6 +49,10 @@
 using namespace std;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/lua_ihm.cpp b/code/nel/src/gui/lua_ihm.cpp
index b5950ab2e..b748f3646 100644
--- a/code/nel/src/gui/lua_ihm.cpp
+++ b/code/nel/src/gui/lua_ihm.cpp
@@ -92,6 +92,10 @@ Compilation is VERY SLOW
 
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 // declare ostream << operator for ucstring -> registration of ucstring iin luabind will build a 'tostring' function from it
 std::ostream &operator<<(std::ostream &str, const ucstring &value)
 {
diff --git a/code/nel/src/gui/lua_manager.cpp b/code/nel/src/gui/lua_manager.cpp
index 2b354b0e4..d3f5dd81e 100644
--- a/code/nel/src/gui/lua_manager.cpp
+++ b/code/nel/src/gui/lua_manager.cpp
@@ -19,6 +19,10 @@
 #include "nel/gui/lua_manager.h"
 #include "nel/gui/lua_helper.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/lua_object.cpp b/code/nel/src/gui/lua_object.cpp
index 57581d6ec..c957c3f2c 100644
--- a/code/nel/src/gui/lua_object.cpp
+++ b/code/nel/src/gui/lua_object.cpp
@@ -20,6 +20,10 @@
 #include "nel/gui/lua_ihm.h"
 #include "nel/gui/lua_helper.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/parser.cpp b/code/nel/src/gui/parser.cpp
index eae7d3667..0d521b726 100644
--- a/code/nel/src/gui/parser.cpp
+++ b/code/nel/src/gui/parser.cpp
@@ -21,6 +21,10 @@
 #include "nel/gui/interface_group.h"
 #include "nel/gui/interface_parser.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 	IParser::IParser()
diff --git a/code/nel/src/gui/proc.cpp b/code/nel/src/gui/proc.cpp
index df9d6b8e9..2974a861e 100644
--- a/code/nel/src/gui/proc.cpp
+++ b/code/nel/src/gui/proc.cpp
@@ -22,6 +22,10 @@
 
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/reflect.cpp b/code/nel/src/gui/reflect.cpp
index 961c855e6..7ef321b6e 100644
--- a/code/nel/src/gui/reflect.cpp
+++ b/code/nel/src/gui/reflect.cpp
@@ -18,6 +18,10 @@
 #include "stdpch.h"
 #include "nel/gui/reflect.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 	// Yoyo: Act like a singleton, else registerClass may crash.
diff --git a/code/nel/src/gui/reflect_register.cpp b/code/nel/src/gui/reflect_register.cpp
index f7f47b1f9..86abc0cd5 100644
--- a/code/nel/src/gui/reflect_register.cpp
+++ b/code/nel/src/gui/reflect_register.cpp
@@ -49,6 +49,10 @@
 #include "nel/gui/group_html.h"
 #include "nel/gui/group_header.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 	void CReflectableRegister::registerClasses()
diff --git a/code/nel/src/gui/root_group.cpp b/code/nel/src/gui/root_group.cpp
index bffdd5579..449e18b05 100644
--- a/code/nel/src/gui/root_group.cpp
+++ b/code/nel/src/gui/root_group.cpp
@@ -18,6 +18,10 @@
 #include "nel/gui/root_group.h"
 #include <vector>
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/stdpch.h b/code/nel/src/gui/stdpch.h
index 51f1b1657..e0be5837e 100644
--- a/code/nel/src/gui/stdpch.h
+++ b/code/nel/src/gui/stdpch.h
@@ -17,6 +17,13 @@
 #ifndef NELGUI_H
 #define NELGUI_H
 
+#if defined(_MSC_VER) && defined(_DEBUG)
+	#define _CRTDBG_MAP_ALLOC
+	#include <stdlib.h>
+	#include <crtdbg.h>
+	#define DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
+#endif
+
 #include <string>
 #include <limits>
 
diff --git a/code/nel/src/gui/string_case.cpp b/code/nel/src/gui/string_case.cpp
index b678d35c9..06936b393 100644
--- a/code/nel/src/gui/string_case.cpp
+++ b/code/nel/src/gui/string_case.cpp
@@ -17,6 +17,10 @@
 #include "stdpch.h"
 #include "nel/gui/string_case.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 	inline bool isSeparator (ucchar c)
diff --git a/code/nel/src/gui/url_parser.cpp b/code/nel/src/gui/url_parser.cpp
index 5db7f6d72..7c8e70e90 100644
--- a/code/nel/src/gui/url_parser.cpp
+++ b/code/nel/src/gui/url_parser.cpp
@@ -19,6 +19,9 @@
 
 using namespace std;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 namespace NLGUI
 {
diff --git a/code/nel/src/gui/view_base.cpp b/code/nel/src/gui/view_base.cpp
index 2b09061a9..6b0201858 100644
--- a/code/nel/src/gui/view_base.cpp
+++ b/code/nel/src/gui/view_base.cpp
@@ -20,6 +20,10 @@
 #include "nel/gui/interface_group.h"
 #include "nel/gui/widget_manager.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/view_bitmap.cpp b/code/nel/src/gui/view_bitmap.cpp
index 21c0c2cd4..75a84dc77 100644
--- a/code/nel/src/gui/view_bitmap.cpp
+++ b/code/nel/src/gui/view_bitmap.cpp
@@ -26,6 +26,9 @@ using namespace std;
 using namespace NLMISC;
 using namespace NL3D;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 NLMISC_REGISTER_OBJECT(CViewBase, CViewBitmap, std::string, "bitmap");
 REGISTER_UI_CLASS(CViewBitmap)
diff --git a/code/nel/src/gui/view_bitmap_combo.cpp b/code/nel/src/gui/view_bitmap_combo.cpp
index 3fc54c89a..7ffe644b6 100644
--- a/code/nel/src/gui/view_bitmap_combo.cpp
+++ b/code/nel/src/gui/view_bitmap_combo.cpp
@@ -25,6 +25,10 @@
 
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/view_link.cpp b/code/nel/src/gui/view_link.cpp
index 1db08f583..7de4e3a01 100644
--- a/code/nel/src/gui/view_link.cpp
+++ b/code/nel/src/gui/view_link.cpp
@@ -24,6 +24,10 @@ using namespace std;
 using namespace NLMISC;
 using namespace NL3D;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/view_pointer.cpp b/code/nel/src/gui/view_pointer.cpp
index da8d730fc..aa5dff6d2 100644
--- a/code/nel/src/gui/view_pointer.cpp
+++ b/code/nel/src/gui/view_pointer.cpp
@@ -27,6 +27,10 @@
 using namespace std;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 NLMISC_REGISTER_OBJECT(CViewBase, CViewPointer, std::string, "generic_pointer");
 
 namespace NLGUI
diff --git a/code/nel/src/gui/view_pointer_base.cpp b/code/nel/src/gui/view_pointer_base.cpp
index e29af7858..f0cf3b6bb 100644
--- a/code/nel/src/gui/view_pointer_base.cpp
+++ b/code/nel/src/gui/view_pointer_base.cpp
@@ -18,6 +18,10 @@
 #include "stdpch.h"
 #include "nel/gui/view_pointer_base.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/view_polygon.cpp b/code/nel/src/gui/view_polygon.cpp
index baacf94a0..f3fd8efa2 100644
--- a/code/nel/src/gui/view_polygon.cpp
+++ b/code/nel/src/gui/view_polygon.cpp
@@ -23,6 +23,10 @@
 
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/view_quad.cpp b/code/nel/src/gui/view_quad.cpp
index 426a19f08..2724fe3b3 100644
--- a/code/nel/src/gui/view_quad.cpp
+++ b/code/nel/src/gui/view_quad.cpp
@@ -22,6 +22,10 @@
 
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/view_renderer.cpp b/code/nel/src/gui/view_renderer.cpp
index 4c5d7c501..58aceb185 100644
--- a/code/nel/src/gui/view_renderer.cpp
+++ b/code/nel/src/gui/view_renderer.cpp
@@ -26,6 +26,10 @@ using namespace NLMISC;
 using namespace std;
 using namespace NL3D;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 
diff --git a/code/nel/src/gui/view_text.cpp b/code/nel/src/gui/view_text.cpp
index a2975fc1a..06f46bf0c 100644
--- a/code/nel/src/gui/view_text.cpp
+++ b/code/nel/src/gui/view_text.cpp
@@ -32,6 +32,10 @@ using namespace std;
 using namespace NLMISC;
 using namespace NL3D;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 typedef std::string::size_type TCharPos; // index of a chracter in a string
 
 REGISTER_UI_CLASS(CViewText)
diff --git a/code/nel/src/gui/view_text_formated.cpp b/code/nel/src/gui/view_text_formated.cpp
index f0bda2add..56a0b2e74 100644
--- a/code/nel/src/gui/view_text_formated.cpp
+++ b/code/nel/src/gui/view_text_formated.cpp
@@ -20,6 +20,10 @@
 #include "nel/misc/xml_auto_ptr.h"
 #include "nel/misc/i18n.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 NLMISC_REGISTER_OBJECT(CViewBase, CViewTextFormated, std::string, "text_formated");
 
 namespace NLGUI
diff --git a/code/nel/src/gui/view_text_id.cpp b/code/nel/src/gui/view_text_id.cpp
index 23b939f91..b7e276a10 100644
--- a/code/nel/src/gui/view_text_id.cpp
+++ b/code/nel/src/gui/view_text_id.cpp
@@ -24,6 +24,10 @@
 using namespace std;
 using NLMISC::CCDBNodeLeaf;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 NLMISC_REGISTER_OBJECT(CViewBase, CViewTextID, std::string, "text_id");
 
 namespace NLGUI
diff --git a/code/nel/src/gui/view_text_id_formated.cpp b/code/nel/src/gui/view_text_id_formated.cpp
index 1c91b3c0a..848bea21b 100644
--- a/code/nel/src/gui/view_text_id_formated.cpp
+++ b/code/nel/src/gui/view_text_id_formated.cpp
@@ -21,6 +21,10 @@
 #include "nel/misc/xml_auto_ptr.h"
 #include "nel/misc/i18n.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 NLMISC_REGISTER_OBJECT(CViewBase, CViewTextIDFormated, std::string, "text_id_formated");
 
 namespace NLGUI
diff --git a/code/nel/src/gui/widget_manager.cpp b/code/nel/src/gui/widget_manager.cpp
index d3888b68c..5ef9ee622 100644
--- a/code/nel/src/gui/widget_manager.cpp
+++ b/code/nel/src/gui/widget_manager.cpp
@@ -37,6 +37,10 @@
 #include "nel/misc/events.h"
 #include "nel/gui/root_group.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLGUI
 {
 	void LinkHack();
diff --git a/code/nel/src/misc/bitmap_gif.cpp b/code/nel/src/misc/bitmap_gif.cpp
index 4ae9dd0cf..9904d8312 100644
--- a/code/nel/src/misc/bitmap_gif.cpp
+++ b/code/nel/src/misc/bitmap_gif.cpp
@@ -23,6 +23,10 @@
 
 using namespace std;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLMISC
 {
 
diff --git a/code/nel/src/misc/cdb.cpp b/code/nel/src/misc/cdb.cpp
index 0a38dc71d..60f6801bd 100644
--- a/code/nel/src/misc/cdb.cpp
+++ b/code/nel/src/misc/cdb.cpp
@@ -28,6 +28,10 @@
 ////////////////
 using namespace std;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLMISC{
 
 CStringMapper *ICDBNode::_DBSM = NULL;
diff --git a/code/nel/src/misc/cdb_bank_handler.cpp b/code/nel/src/misc/cdb_bank_handler.cpp
index 58843455d..78102498f 100644
--- a/code/nel/src/misc/cdb_bank_handler.cpp
+++ b/code/nel/src/misc/cdb_bank_handler.cpp
@@ -17,6 +17,10 @@
 #include "stdmisc.h"
 #include "nel/misc/cdb_bank_handler.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLMISC{
 	CCDBBankHandler::CCDBBankHandler(uint maxbanks) :
 _CDBBankToUnifiedIndexMapping( maxbanks, std::vector< uint >() ),
diff --git a/code/nel/src/misc/cdb_branch.cpp b/code/nel/src/misc/cdb_branch.cpp
index 55b36a645..92631280c 100644
--- a/code/nel/src/misc/cdb_branch.cpp
+++ b/code/nel/src/misc/cdb_branch.cpp
@@ -56,6 +56,9 @@ using namespace std;
 
 using namespace std;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 namespace NLMISC{
 
diff --git a/code/nel/src/misc/cdb_branch_observing_handler.cpp b/code/nel/src/misc/cdb_branch_observing_handler.cpp
index 8e6335533..b64862a18 100644
--- a/code/nel/src/misc/cdb_branch_observing_handler.cpp
+++ b/code/nel/src/misc/cdb_branch_observing_handler.cpp
@@ -17,6 +17,10 @@
 #include "stdmisc.h"
 #include "nel/misc/cdb_branch_observing_handler.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLMISC{
 	CCDBBranchObservingHandler::CCDBBranchObservingHandler()
 	{
diff --git a/code/nel/src/misc/cdb_check_sum.cpp b/code/nel/src/misc/cdb_check_sum.cpp
index d3619299d..7ec6614b2 100644
--- a/code/nel/src/misc/cdb_check_sum.cpp
+++ b/code/nel/src/misc/cdb_check_sum.cpp
@@ -17,6 +17,9 @@
 #include "stdmisc.h"
 #include "nel/misc/cdb_check_sum.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 namespace NLMISC{
 
diff --git a/code/nel/src/misc/cdb_leaf.cpp b/code/nel/src/misc/cdb_leaf.cpp
index f74fb2d3d..c996b78f3 100644
--- a/code/nel/src/misc/cdb_leaf.cpp
+++ b/code/nel/src/misc/cdb_leaf.cpp
@@ -35,6 +35,10 @@
 ////////////////
 using namespace std;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLMISC{
 
 
diff --git a/code/nel/src/misc/cdb_manager.cpp b/code/nel/src/misc/cdb_manager.cpp
index db743416d..1b19f4141 100644
--- a/code/nel/src/misc/cdb_manager.cpp
+++ b/code/nel/src/misc/cdb_manager.cpp
@@ -17,6 +17,10 @@
 #include "stdmisc.h"
 #include "nel/misc/cdb_manager.h"
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 namespace NLMISC{
 
 	CCDBManager::CCDBManager( const char *rootNodeName, uint maxBanks ) : bankHandler( maxBanks )
diff --git a/code/nel/src/misc/check_fpu.cpp b/code/nel/src/misc/check_fpu.cpp
index 0f2359eeb..0ceb3af2b 100644
--- a/code/nel/src/misc/check_fpu.cpp
+++ b/code/nel/src/misc/check_fpu.cpp
@@ -24,6 +24,9 @@
 
 #pragma optimize("", off )
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
 
 namespace NLMISC
 {
diff --git a/code/nel/src/misc/config_file/cf_gramatical.cpp b/code/nel/src/misc/config_file/cf_gramatical.cpp
index 1d8c568b7..d386b72ad 100644
--- a/code/nel/src/misc/config_file/cf_gramatical.cpp
+++ b/code/nel/src/misc/config_file/cf_gramatical.cpp
@@ -50,6 +50,10 @@
 using namespace std;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 /* Constantes */
 
 #define YYPARSE_PARAM pvararray
diff --git a/code/nel/src/misc/config_file/cf_lexical.cpp b/code/nel/src/misc/config_file/cf_lexical.cpp
index 8c39112a6..d132f4df8 100644
--- a/code/nel/src/misc/config_file/cf_lexical.cpp
+++ b/code/nel/src/misc/config_file/cf_lexical.cpp
@@ -1938,6 +1938,10 @@ char *yytext;
 using namespace std;
 using namespace NLMISC;
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 /* Constantes */
 
 // WARNING!!!! DEBUG_PRINTF are commented using // so IT MUST HAVE NO INSTRUCTION AFTER A DEBUG_PRINTF OR THEY LL BE COMMENTED
@@ -3217,7 +3221,7 @@ static void *yy_flex_alloc( size )
 yy_size_t size;
 #endif
 	{
-	return (void *) malloc( size );
+	return (void *) malloc( size ); // TODO: delete
 	}
 
 #ifdef YY_USE_PROTOS
diff --git a/code/nel/src/misc/stdmisc.h b/code/nel/src/misc/stdmisc.h
index 3ed96f900..d7a623465 100644
--- a/code/nel/src/misc/stdmisc.h
+++ b/code/nel/src/misc/stdmisc.h
@@ -17,6 +17,13 @@
 #ifndef NL_STDMISC_H
 #define NL_STDMISC_H
 
+#if defined(_MSC_VER) && defined(_DEBUG)
+	#define _CRTDBG_MAP_ALLOC
+	#include <stdlib.h>
+	#include <crtdbg.h>
+	#define DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
+#endif
+
 #include <algorithm>
 #include <cmath>
 #include <csignal>
diff --git a/code/nel/src/misc/words_dictionary.cpp b/code/nel/src/misc/words_dictionary.cpp
index 4d5057dd7..f0e7751ea 100644
--- a/code/nel/src/misc/words_dictionary.cpp
+++ b/code/nel/src/misc/words_dictionary.cpp
@@ -23,12 +23,12 @@
 
 using namespace std;
 
-const string DefaultColTitle = "name";
-
 #ifdef DEBUG_NEW
-	#define new DEBUG_NEW
+#define new DEBUG_NEW
 #endif
 
+const string DefaultColTitle = "name";
+
 namespace NLMISC {
 
 NL_INSTANCE_COUNTER_IMPL(CWordsDictionary);
diff --git a/code/nel/src/misc/xml_auto_ptr.cpp b/code/nel/src/misc/xml_auto_ptr.cpp
index fbf681e1c..2315cd52b 100644
--- a/code/nel/src/misc/xml_auto_ptr.cpp
+++ b/code/nel/src/misc/xml_auto_ptr.cpp
@@ -21,6 +21,10 @@
 
 #include <libxml/parser.h>
 
+#ifdef DEBUG_NEW
+#define new DEBUG_NEW
+#endif
+
 //=======================================
 void CXMLAutoPtr::destroy()
 {
diff --git a/code/nel/src/sound/driver/openal/stdopenal.h b/code/nel/src/sound/driver/openal/stdopenal.h
index 37b7e5e2f..f689a1e53 100644
--- a/code/nel/src/sound/driver/openal/stdopenal.h
+++ b/code/nel/src/sound/driver/openal/stdopenal.h
@@ -14,7 +14,15 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "nel/misc/types_nl.h"
+#ifndef STDOPENAL_H
+#define STDOPENAL_H
+
+#if defined(_MSC_VER) && defined(_DEBUG)
+	#define _CRTDBG_MAP_ALLOC
+	#include <stdlib.h>
+	#include <crtdbg.h>
+	#define DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
+#endif
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -35,6 +43,8 @@
 #include <algorithm>
 #include <limits>
 
+#include "nel/misc/types_nl.h"
+
 #ifdef NL_OS_MAC
 #	include <al.h>
 #	include <alc.h>
@@ -59,4 +69,5 @@
 #include "nel/sound/driver/listener.h"
 #include "nel/sound/driver/effect.h"
 
+#endif
 /* end of file */