diff --git a/code/nel/include/nel/3d/event_mouse_listener.h b/code/nel/include/nel/3d/event_mouse_listener.h
index 226ba9590..1543e0c15 100644
--- a/code/nel/include/nel/3d/event_mouse_listener.h
+++ b/code/nel/include/nel/3d/event_mouse_listener.h
@@ -24,6 +24,9 @@
 #include "nel/3d/frustum.h"
 #include "nel/3d/u_3d_mouse_listener.h"
 
+#ifdef _X
+#	undef _X
+#endif
 
 namespace NL3D
 {
diff --git a/code/nel/include/nel/3d/motion_blur.h b/code/nel/include/nel/3d/motion_blur.h
index 3a5b6f3d0..194c28a36 100644
--- a/code/nel/include/nel/3d/motion_blur.h
+++ b/code/nel/include/nel/3d/motion_blur.h
@@ -20,6 +20,9 @@
 #include "nel/misc/types_nl.h"
 #include "nel/misc/smart_ptr.h"
 
+#ifdef _X
+#	undef _X
+#endif
 
 namespace NL3D {
 
diff --git a/code/nel/include/nel/3d/quad_grid_clip_manager.h b/code/nel/include/nel/3d/quad_grid_clip_manager.h
index 60f1a784b..71f4a0193 100644
--- a/code/nel/include/nel/3d/quad_grid_clip_manager.h
+++ b/code/nel/include/nel/3d/quad_grid_clip_manager.h
@@ -24,6 +24,9 @@
 #include "nel/3d/fast_ptr_list.h"
 #include "nel/3d/transform.h"
 
+#ifdef _X
+#	undef _X
+#endif
 
 namespace NL3D
 {
diff --git a/code/nel/include/nel/3d/viewport.h b/code/nel/include/nel/3d/viewport.h
index 8a258841c..b98adada4 100644
--- a/code/nel/include/nel/3d/viewport.h
+++ b/code/nel/include/nel/3d/viewport.h
@@ -22,6 +22,9 @@
 #include "nel/misc/matrix.h"
 #include "nel/3d/frustum.h"
 
+#ifdef _X
+#	undef _X
+#endif
 
 namespace NL3D
 {
diff --git a/code/nel/include/nel/3d/water_height_map.h b/code/nel/include/nel/3d/water_height_map.h
index 896f39abb..8f416331b 100644
--- a/code/nel/include/nel/3d/water_height_map.h
+++ b/code/nel/include/nel/3d/water_height_map.h
@@ -29,6 +29,9 @@
 #include <string>
 
 
+#ifdef _X
+#	undef _X
+#endif
 
 
 namespace NL3D
diff --git a/code/nel/src/pacs/edge_quad.h b/code/nel/src/pacs/edge_quad.h
index 2ae4c2789..666fc5a57 100644
--- a/code/nel/src/pacs/edge_quad.h
+++ b/code/nel/src/pacs/edge_quad.h
@@ -23,6 +23,10 @@
 #include "collision_surface_temp.h"
 #include <vector>
 
+#ifdef _X
+#	undef _X
+#endif
+
 namespace NLMISC
 {
 	class	IStream;