diff --git a/code/nel/tools/3d/object_viewer/std_afx.h b/code/nel/tools/3d/object_viewer/std_afx.h
index 0cf664508..7bee59e2f 100644
--- a/code/nel/tools/3d/object_viewer/std_afx.h
+++ b/code/nel/tools/3d/object_viewer/std_afx.h
@@ -23,8 +23,13 @@
 #endif // _MSC_VER > 1000
 
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
-#define _WIN32_WINNT 0x0501
+#ifdef _WIN64
+#define _WIN32_WINNT 0x0600
+#else
+#define _WIN32_WINNT 0x0500
+#endif
 
 #include <afxwin.h>         // MFC core and standard components
 #include <afxext.h>         // MFC extensions
diff --git a/code/nel/tools/3d/object_viewer_exe/std_afx.h b/code/nel/tools/3d/object_viewer_exe/std_afx.h
index 953342427..f99ca7a0c 100644
--- a/code/nel/tools/3d/object_viewer_exe/std_afx.h
+++ b/code/nel/tools/3d/object_viewer_exe/std_afx.h
@@ -23,8 +23,13 @@
 #endif // _MSC_VER > 1000
 
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
-#define _WIN32_WINNT 0x0501
+#ifdef _WIN64
+#define _WIN32_WINNT 0x0600
+#else
+#define _WIN32_WINNT 0x0500
+#endif
 
 #include <windows.h>
 
diff --git a/code/nel/tools/logic/logic_editor_dll/StdAfx.h b/code/nel/tools/logic/logic_editor_dll/StdAfx.h
index 7aec1acb4..e173d7608 100644
--- a/code/nel/tools/logic/logic_editor_dll/StdAfx.h
+++ b/code/nel/tools/logic/logic_editor_dll/StdAfx.h
@@ -11,8 +11,13 @@
 #endif // _MSC_VER > 1000
 
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
-#define _WIN32_WINNT 0x0501
+#ifdef _WIN64
+#define _WIN32_WINNT 0x0600
+#else
+#define _WIN32_WINNT 0x0500
+#endif
 
 #include <afxwin.h>         // MFC core and standard components
 #include <afxext.h>         // MFC extensions
diff --git a/code/nel/tools/misc/branch_patcher/StdAfx.h b/code/nel/tools/misc/branch_patcher/StdAfx.h
index b85f337a0..3cd3005ba 100644
--- a/code/nel/tools/misc/branch_patcher/StdAfx.h
+++ b/code/nel/tools/misc/branch_patcher/StdAfx.h
@@ -22,8 +22,13 @@
 #endif // _MSC_VER > 1000
 
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
-#define _WIN32_WINNT 0x0501
+#ifdef _WIN64
+#define _WIN32_WINNT 0x0600
+#else
+#define _WIN32_WINNT 0x0500
+#endif
 
 #include <afxwin.h>         // MFC core and standard components
 #include <afxext.h>         // MFC extensions
diff --git a/code/nel/tools/misc/data_mirror/StdAfx.h b/code/nel/tools/misc/data_mirror/StdAfx.h
index 697fe2127..92105ec09 100644
--- a/code/nel/tools/misc/data_mirror/StdAfx.h
+++ b/code/nel/tools/misc/data_mirror/StdAfx.h
@@ -11,8 +11,13 @@
 #endif // _MSC_VER > 1000
 
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
-#define _WIN32_WINNT 0x0501
+#ifdef _WIN64
+#define _WIN32_WINNT 0x0600
+#else
+#define _WIN32_WINNT 0x0500
+#endif
 
 #include <afxwin.h>         // MFC core and standard components
 #include <afxext.h>         // MFC extensions
diff --git a/code/nel/tools/misc/log_analyser/StdAfx.h b/code/nel/tools/misc/log_analyser/StdAfx.h
index bd3d88df1..e7c2ae30d 100644
--- a/code/nel/tools/misc/log_analyser/StdAfx.h
+++ b/code/nel/tools/misc/log_analyser/StdAfx.h
@@ -27,8 +27,13 @@
 #endif // _MSC_VER > 1000
 
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
-#define _WIN32_WINNT 0x0501
+#ifdef _WIN64
+#define _WIN32_WINNT 0x0600
+#else
+#define _WIN32_WINNT 0x0500
+#endif
 
 #include <afxwin.h>         // MFC core and standard components
 #include <afxext.h>         // MFC extensions
diff --git a/code/nel/tools/misc/words_dic/StdAfx.h b/code/nel/tools/misc/words_dic/StdAfx.h
index 9290bdfce..7f52b209c 100644
--- a/code/nel/tools/misc/words_dic/StdAfx.h
+++ b/code/nel/tools/misc/words_dic/StdAfx.h
@@ -22,8 +22,13 @@
 #endif // _MSC_VER > 1000
 
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
-#define _WIN32_WINNT 0x0501
+#ifdef _WIN64
+#define _WIN32_WINNT 0x0600
+#else
+#define _WIN32_WINNT 0x0500
+#endif
 
 #include <afxwin.h>         // MFC core and standard components
 #include <afxext.h>         // MFC extensions
diff --git a/code/ryzom/tools/leveldesign/georges_dll/stdafx.h b/code/ryzom/tools/leveldesign/georges_dll/stdafx.h
index 91a0d1f9a..cd230a597 100644
--- a/code/ryzom/tools/leveldesign/georges_dll/stdafx.h
+++ b/code/ryzom/tools/leveldesign/georges_dll/stdafx.h
@@ -26,8 +26,13 @@
 #endif // _MSC_VER > 1000
 
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
-#define _WIN32_WINNT 0x0501
+#ifdef _WIN64
+#define _WIN32_WINNT 0x0600
+#else
+#define _WIN32_WINNT 0x0500
+#endif
 
 #include <afxwin.h>         // MFC core and standard components
 #include <afxext.h>         // MFC extensions
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/std_sound_plugin.h b/code/ryzom/tools/leveldesign/georges_plugin_sound/std_sound_plugin.h
index 8fb65c948..f03a63bdc 100644
--- a/code/ryzom/tools/leveldesign/georges_plugin_sound/std_sound_plugin.h
+++ b/code/ryzom/tools/leveldesign/georges_plugin_sound/std_sound_plugin.h
@@ -18,8 +18,13 @@
 #define STDAFX_H
 
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
-#define _WIN32_WINNT 0x0501
+#ifdef _WIN64
+#define _WIN32_WINNT 0x0600
+#else
+#define _WIN32_WINNT 0x0500
+#endif
 
 #include <afxwin.h>         // MFC core and standard components
 #include <afxext.h>         // MFC extensions
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_fe/StdAfx.h b/code/ryzom/tools/leveldesign/mission_compiler_fe/StdAfx.h
index b8693c571..1d127a59b 100644
--- a/code/ryzom/tools/leveldesign/mission_compiler_fe/StdAfx.h
+++ b/code/ryzom/tools/leveldesign/mission_compiler_fe/StdAfx.h
@@ -27,8 +27,13 @@
 #endif // _MSC_VER > 1000
 
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
-#define _WIN32_WINNT 0x0501
+#ifdef _WIN64
+#define _WIN32_WINNT 0x0600
+#else
+#define _WIN32_WINNT 0x0500
+#endif
 
 #include <afxwin.h>         // MFC core and standard components
 #include <afxext.h>         // MFC extensions
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/stdafx.h b/code/ryzom/tools/leveldesign/world_editor/world_editor/stdafx.h
index d8fe8ec31..37dc0bb78 100644
--- a/code/ryzom/tools/leveldesign/world_editor/world_editor/stdafx.h
+++ b/code/ryzom/tools/leveldesign/world_editor/world_editor/stdafx.h
@@ -25,8 +25,13 @@
 #pragma once
 
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
-#define _WIN32_WINNT 0x0501
+#ifdef _WIN64
+#define _WIN32_WINNT 0x0600
+#else
+#define _WIN32_WINNT 0x0500
+#endif
 
 #include <afxwin.h>         // MFC core and standard components
 #include <afxext.h>         // MFC extensions
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/StdAfx.h b/code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/StdAfx.h
index 58043f752..54dba15f8 100644
--- a/code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/StdAfx.h
+++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/StdAfx.h
@@ -27,8 +27,13 @@
 #endif // _MSC_VER > 1000
 
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
-#define _WIN32_WINNT 0x0501
+#ifdef _WIN64
+#define _WIN32_WINNT 0x0600
+#else
+#define _WIN32_WINNT 0x0500
+#endif
 
 #include <cerrno>
 
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/StdAfx.h b/code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/StdAfx.h
index 9beea91c6..dc1d86459 100644
--- a/code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/StdAfx.h
+++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/StdAfx.h
@@ -27,8 +27,13 @@
 #endif // _MSC_VER > 1000
 
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
-#define _WIN32_WINNT 0x0501
+#ifdef _WIN64
+#define _WIN32_WINNT 0x0600
+#else
+#define _WIN32_WINNT 0x0500
+#endif
 
 #include <cerrno>
 
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/primitive_plugin.h b/code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/primitive_plugin.h
index 8b452cd80..d7a19dc10 100644
--- a/code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/primitive_plugin.h
+++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/primitive_plugin.h
@@ -18,8 +18,13 @@
 #define PRIMITIVE_PLUGIN_H
 
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
-#define _WIN32_WINNT 0x0501
+#ifdef _WIN64
+#define _WIN32_WINNT 0x0600
+#else
+#define _WIN32_WINNT 0x0500
+#endif
 
 #include <afxwin.h>         // MFC core and standard components
 #include <afxext.h>         // MFC extensions
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/StdAfx.h b/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/StdAfx.h
index c62c05e5b..13e74ec50 100644
--- a/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/StdAfx.h
+++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/StdAfx.h
@@ -29,8 +29,13 @@
 #endif // _MSC_VER > 1000
 
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
-#define _WIN32_WINNT 0x0501
+#ifdef _WIN64
+#define _WIN32_WINNT 0x0600
+#else
+#define _WIN32_WINNT 0x0500
+#endif
 
 #include <afxwin.h>         // MFC core and standard components
 #include <afxext.h>         // MFC extensions
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/StdAfx.h b/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/StdAfx.h
index 33e78a8b1..04ebecac8 100644
--- a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/StdAfx.h
+++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/StdAfx.h
@@ -29,8 +29,13 @@
 #endif // _MSC_VER > 1000
 
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
-#define _WIN32_WINNT 0x0501
+#ifdef _WIN64
+#define _WIN32_WINNT 0x0600
+#else
+#define _WIN32_WINNT 0x0500
+#endif
 
 #include <afxwin.h>         // MFC core and standard components
 #include <afxext.h>         // MFC extensions