diff --git a/code/nel/CMakeModules/PCHSupport.cmake b/code/nel/CMakeModules/PCHSupport.cmake
index 45c498885..58fe92223 100644
--- a/code/nel/CMakeModules/PCHSupport.cmake
+++ b/code/nel/CMakeModules/PCHSupport.cmake
@@ -5,10 +5,9 @@
 #   PCHSupport_FOUND
 #
 # Macro:
-#   ADD_PRECOMPILED_HEADER  _targetName _input  _dowarn
+#   ADD_PRECOMPILED_HEADER  _targetName _inputh _inputcpp _dowarn
 #   ADD_PRECOMPILED_HEADER_TO_TARGET _targetName _input _pch_output_to_use _dowarn
-#   ADD_NATIVE_PRECOMPILED_HEADER _targetName _input _dowarn
-#   GET_NATIVE_PRECOMPILED_HEADER _targetName _input
+#   ADD_NATIVE_PRECOMPILED_HEADER _targetName _inputh _inputcpp _dowarn
 
 IF(CMAKE_COMPILER_IS_GNUCXX)
 
@@ -40,49 +39,36 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
 MACRO(_PCH_GET_COMPILE_FLAGS _out_compile_flags)
 
-  STRING(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" _flags_var_name)
-  SET(${_out_compile_flags} ${${_flags_var_name}} )
+	STRING(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" _flags_var_name)
+	SET(${_out_compile_flags} ${${_flags_var_name}} )
 
-  IF(CMAKE_COMPILER_IS_GNUCXX)
-	GET_TARGET_PROPERTY(_targetType ${_PCH_current_target} TYPE)
-	IF(${_targetType} STREQUAL SHARED_LIBRARY AND NOT WIN32)
-	  LIST(APPEND ${_out_compile_flags} "${${_out_compile_flags}} -fPIC")
-	ENDIF(${_targetType} STREQUAL SHARED_LIBRARY AND NOT WIN32)
+	IF(CMAKE_COMPILER_IS_GNUCXX)
 
-  ELSE(CMAKE_COMPILER_IS_GNUCXX)
-	## TODO ... ? or does it work out of the box
-  ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+		GET_TARGET_PROPERTY(_targetType ${_PCH_current_target} TYPE)
+		IF(${_targetType} STREQUAL SHARED_LIBRARY AND NOT WIN32)
+			LIST(APPEND ${_out_compile_flags} "${${_out_compile_flags}} -fPIC")
+		ENDIF(${_targetType} STREQUAL SHARED_LIBRARY AND NOT WIN32)
 
-  GET_DIRECTORY_PROPERTY(DIRINC INCLUDE_DIRECTORIES )
-  FOREACH(item ${DIRINC})
-	LIST(APPEND ${_out_compile_flags} "${_PCH_include_prefix}${item}")
-  ENDFOREACH(item)
+	ELSE(CMAKE_COMPILER_IS_GNUCXX)
+		## TODO ... ? or does it work out of the box
+	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
-  GET_DIRECTORY_PROPERTY(_directory_flags DEFINITIONS)
-  GET_DIRECTORY_PROPERTY(_global_definitions DIRECTORY ${CMAKE_SOURCE_DIR} DEFINITIONS)
-  #MESSAGE("_directory_flags ${_directory_flags} ${_global_definitions}" )
-  LIST(APPEND ${_out_compile_flags} ${_directory_flags})
-  LIST(APPEND ${_out_compile_flags} ${_global_definitions})
-  LIST(APPEND ${_out_compile_flags} ${CMAKE_CXX_FLAGS} )
+	GET_DIRECTORY_PROPERTY(DIRINC INCLUDE_DIRECTORIES )
+	FOREACH(item ${DIRINC})
+		LIST(APPEND ${_out_compile_flags} "${_PCH_include_prefix}${item}")
+	ENDFOREACH(item)
 
-  SEPARATE_ARGUMENTS(${_out_compile_flags})
+	GET_DIRECTORY_PROPERTY(_directory_flags DEFINITIONS)
+	GET_DIRECTORY_PROPERTY(_global_definitions DIRECTORY ${CMAKE_SOURCE_DIR} DEFINITIONS)
+	#MESSAGE("_directory_flags ${_directory_flags} ${_global_definitions}" )
+	LIST(APPEND ${_out_compile_flags} ${_directory_flags})
+	LIST(APPEND ${_out_compile_flags} ${_global_definitions})
+	LIST(APPEND ${_out_compile_flags} ${CMAKE_CXX_FLAGS} )
+
+	SEPARATE_ARGUMENTS(${_out_compile_flags})
 
 ENDMACRO(_PCH_GET_COMPILE_FLAGS)
 
-MACRO(_PCH_WRITE_PCHDEP_CXX _targetName _include_file _dephelp)
-
-	SET(${_dephelp} ${CMAKE_CURRENT_BINARY_DIR}/${_targetName}_pch_dephelp.cxx)
-	FILE(WRITE  ${${_dephelp}}
-"#include \"${_include_file}\"
-int testfunction()
-{
-	return 0;
-}
-"
-	)
-
-ENDMACRO(_PCH_WRITE_PCHDEP_CXX )
-
 MACRO(_PCH_GET_COMPILE_COMMAND out_command _input _output)
 
 	FILE(TO_NATIVE_PATH ${_input} _native_input)
@@ -104,13 +90,7 @@ MACRO(_PCH_GET_COMPILE_COMMAND out_command _input _output)
 		ENDIF(CMAKE_CXX_COMPILER_ARG1)
 	ELSE(CMAKE_COMPILER_IS_GNUCXX)
 
-		SET(_dummy_str "#include <${_input}>")
-		FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pch_dummy.cpp ${_dummy_str})
-
-		SET(${out_command}
-			${CMAKE_CXX_COMPILER} ${_compile_FLAGS} /c /Fp${_native_output} /Yc${_native_input} pch_dummy.cpp
-		)
-		#/out:${_output}
+		# nothing to do because std*.cpp are already added to target
 
 	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
@@ -143,23 +123,23 @@ MACRO(_PCH_GET_TARGET_COMPILE_FLAGS _cflags  _header_name _pch_path _dowarn )
 ENDMACRO(_PCH_GET_TARGET_COMPILE_FLAGS )
 
 MACRO(GET_PRECOMPILED_HEADER_OUTPUT _targetName _input _output)
-  GET_FILENAME_COMPONENT(_name ${_input} NAME)
-  GET_FILENAME_COMPONENT(_path ${_input} PATH)
-  SET(_output "${CMAKE_CURRENT_BINARY_DIR}/${_name}.gch/${_targetName}_${CMAKE_BUILD_TYPE}.gch")
+	GET_FILENAME_COMPONENT(_name ${_input} NAME)
+	GET_FILENAME_COMPONENT(_path ${_input} PATH)
+	SET(_output "${CMAKE_CURRENT_BINARY_DIR}/${_name}.gch/${_targetName}_${CMAKE_BUILD_TYPE}.gch")
 ENDMACRO(GET_PRECOMPILED_HEADER_OUTPUT _targetName _input)
 
 
 MACRO(ADD_PRECOMPILED_HEADER_TO_TARGET _targetName _input _pch_output_to_use )
 
-  # to do: test whether compiler flags match between target  _targetName
-  # and _pch_output_to_use
-  GET_FILENAME_COMPONENT(_name ${_input} NAME)
+	# to do: test whether compiler flags match between target  _targetName
+	# and _pch_output_to_use
+	GET_FILENAME_COMPONENT(_name ${_input} NAME)
 
-  IF( "${ARGN}" STREQUAL "0")
-	SET(_dowarn 0)
-  ELSE( "${ARGN}" STREQUAL "0")
-	SET(_dowarn 1)
-  ENDIF("${ARGN}" STREQUAL "0")
+	IF( "${ARGN}" STREQUAL "0")
+		SET(_dowarn 0)
+	ELSE( "${ARGN}" STREQUAL "0")
+		SET(_dowarn 1)
+	ENDIF("${ARGN}" STREQUAL "0")
 
 
 	_PCH_GET_TARGET_COMPILE_FLAGS(_target_cflags ${_name} ${_pch_output_to_use} ${_dowarn})
@@ -173,96 +153,67 @@ MACRO(ADD_PRECOMPILED_HEADER_TO_TARGET _targetName _input _pch_output_to_use )
 		DEPENDS	${_pch_output_to_use}
 	)
 
-  ADD_DEPENDENCIES(${_targetName} pch_Generate_${_targetName} )
+	ADD_DEPENDENCIES(${_targetName} pch_Generate_${_targetName} )
 
 ENDMACRO(ADD_PRECOMPILED_HEADER_TO_TARGET)
 
-MACRO(ADD_PRECOMPILED_HEADER _targetName _input)
+MACRO(ADD_PRECOMPILED_HEADER _targetName _inputh _inputcpp)
 
-  SET(_PCH_current_target ${_targetName})
+	SET(_PCH_current_target ${_targetName})
 
-  IF(NOT CMAKE_BUILD_TYPE)
-	MESSAGE(FATAL_ERROR
-	  "This is the ADD_PRECOMPILED_HEADER macro. "
-	  "You must set CMAKE_BUILD_TYPE!"
-	  )
-  ENDIF(NOT CMAKE_BUILD_TYPE)
+	IF(NOT CMAKE_BUILD_TYPE)
+		MESSAGE(FATAL_ERROR
+			"This is the ADD_PRECOMPILED_HEADER macro. "
+			"You must set CMAKE_BUILD_TYPE!"
+		)
+	ENDIF(NOT CMAKE_BUILD_TYPE)
 
-  IF( "${ARGN}" STREQUAL "0")
-	SET(_dowarn 0)
-  ELSE( "${ARGN}" STREQUAL "0")
-	SET(_dowarn 1)
-  ENDIF("${ARGN}" STREQUAL "0")
+	IF( "${ARGN}" STREQUAL "0")
+		SET(_dowarn 0)
+	ELSE( "${ARGN}" STREQUAL "0")
+		SET(_dowarn 1)
+	ENDIF("${ARGN}" STREQUAL "0")
 
-  GET_FILENAME_COMPONENT(_name ${_input} NAME)
-  GET_FILENAME_COMPONENT(_path ${_input} PATH)
-  GET_PRECOMPILED_HEADER_OUTPUT( ${_targetName} ${_input} _output)
+	GET_FILENAME_COMPONENT(_name ${_inputh} NAME)
+	GET_FILENAME_COMPONENT(_path ${_inputh} PATH)
+	GET_PRECOMPILED_HEADER_OUTPUT( ${_targetName} ${_inputh} _output)
 
-  GET_FILENAME_COMPONENT(_outdir ${_output} PATH )
+	GET_FILENAME_COMPONENT(_outdir ${_output} PATH )
 
-  GET_TARGET_PROPERTY(_targetType ${_PCH_current_target} TYPE)
-   _PCH_WRITE_PCHDEP_CXX(${_targetName} ${_input} _pch_dephelp_cxx)
+	GET_TARGET_PROPERTY(_targetType ${_PCH_current_target} TYPE)
 
-  IF(${_targetType} STREQUAL SHARED_LIBRARY)
-	ADD_LIBRARY(${_targetName}_pch_dephelp STATIC ${_pch_dephelp_cxx} )
-  ELSE(${_targetType} STREQUAL SHARED_LIBRARY)
-	ADD_LIBRARY(${_targetName}_pch_dephelp STATIC ${_pch_dephelp_cxx})
-  ENDIF(${_targetType} STREQUAL SHARED_LIBRARY)
+	# always build static library because it doesn't need linking
+	ADD_LIBRARY(${_targetName}_pch_dephelp STATIC ${_inputcpp})
 
-  FILE(MAKE_DIRECTORY ${_outdir})
+	FILE(MAKE_DIRECTORY ${_outdir})
 
-  _PCH_GET_COMPILE_FLAGS(_compile_FLAGS)
+	_PCH_GET_COMPILE_FLAGS(_compile_FLAGS)
 
-  #MESSAGE("_compile_FLAGS: ${_compile_FLAGS}")
-  #message("COMMAND ${CMAKE_CXX_COMPILER}	${_compile_FLAGS} -x c++-header -o ${_output} ${_input}")
-  SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/${_name} PROPERTIES GENERATED 1)
-  ADD_CUSTOM_COMMAND(
-   OUTPUT	${CMAKE_CURRENT_BINARY_DIR}/${_name}
-   COMMAND ${CMAKE_COMMAND} -E copy  ${_input} ${CMAKE_CURRENT_BINARY_DIR}/${_name} # ensure same directory! Required by gcc
-   DEPENDS ${_input}
-  )
+	#MESSAGE("_compile_FLAGS: ${_compile_FLAGS}")
+	#message("COMMAND ${CMAKE_CXX_COMPILER}	${_compile_FLAGS} -x c++-header -o ${_output} ${_input}")
+	SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/${_name} PROPERTIES GENERATED 1)
+	ADD_CUSTOM_COMMAND(
+		OUTPUT	${CMAKE_CURRENT_BINARY_DIR}/${_name}
+		COMMAND ${CMAKE_COMMAND} -E copy  ${_inputh} ${CMAKE_CURRENT_BINARY_DIR}/${_name} # ensure same directory! Required by gcc
+		DEPENDS ${_inputh}
+		)
 
-  #message("_command  ${_input} ${_output}")
-  _PCH_GET_COMPILE_COMMAND(_command  ${CMAKE_CURRENT_BINARY_DIR}/${_name} ${_output} )
+	#message("_command  ${_input} ${_output}")
+	_PCH_GET_COMPILE_COMMAND(_command  ${CMAKE_CURRENT_BINARY_DIR}/${_name} ${_output})
 
-  #message(${_input} )
-  #message("_output ${_output}")
+	#message(${_input} )
+	#message("_output ${_output}")
 
   ADD_CUSTOM_COMMAND(
 	OUTPUT ${_output}
 	COMMAND ${_command}
-	DEPENDS ${_input}   ${CMAKE_CURRENT_BINARY_DIR}/${_name} ${_targetName}_pch_dephelp
+	DEPENDS ${_inputh}   ${CMAKE_CURRENT_BINARY_DIR}/${_name} ${_targetName}_pch_dephelp
   )
 
-  ADD_PRECOMPILED_HEADER_TO_TARGET(${_targetName} ${_input}  ${_output} ${_dowarn})
+  ADD_PRECOMPILED_HEADER_TO_TARGET(${_targetName} ${_inputh}  ${_output} ${_dowarn})
 ENDMACRO(ADD_PRECOMPILED_HEADER)
 
-# Generates the use of precompiled in a target,
-# without using depency targets (2 extra for each target)
-# Using Visual, must also add ${_targetName}_pch to sources
-# Not needed by Xcode
-
-MACRO(GET_NATIVE_PRECOMPILED_HEADER _targetName _input)
-
-	if(CMAKE_GENERATOR MATCHES Visual*)
-
-		SET(_dummy_str "#include \"${_input}\"\n"
-			"// This is required to suppress LNK4221.  Very annoying.\n"
-			"void *g_${_targetName}Dummy = 0\;\n")
-
-		# Use of cxx extension for generated files (as Qt does)
-		SET(${_targetName}_pch ${CMAKE_CURRENT_BINARY_DIR}/${_targetName}_pch.cxx)
-		if(EXISTS ${${_targetName}_pch})
-			# Check if contents is the same, if not rewrite
-			# todo
-		else(EXISTS ${${_targetName}_pch})
-			FILE(WRITE ${${_targetName}_pch} ${_dummy_str})
-		endif(EXISTS ${${_targetName}_pch})
-	endif(CMAKE_GENERATOR MATCHES Visual*)
-
-ENDMACRO(GET_NATIVE_PRECOMPILED_HEADER)
-
-MACRO(ADD_NATIVE_PRECOMPILED_HEADER _targetName _input)
+MACRO(ADD_NATIVE_PRECOMPILED_HEADER _targetName _inputh _inputcpp)
 
 	IF( "${ARGN}" STREQUAL "0")
 		SET(_dowarn 0)
@@ -280,11 +231,11 @@ MACRO(ADD_NATIVE_PRECOMPILED_HEADER _targetName _input)
 			SET(oldProps "")
 		endif(${oldProps} MATCHES NOTFOUND)
 
-		SET(newProperties "${oldProps} /Yu\"${_input}\" /FI\"${_input}\"")
+		SET(newProperties "${oldProps} /Yu\"${_inputh}\" /FI\"${_inputh}\"")
 		SET_TARGET_PROPERTIES(${_targetName} PROPERTIES COMPILE_FLAGS "${newProperties}")
 
 		#also inlude ${oldProps} to have the same compile options
-		SET_SOURCE_FILES_PROPERTIES(${${_targetName}_pch} PROPERTIES COMPILE_FLAGS "${oldProps} /Yc\"${_input}\"")
+		SET_SOURCE_FILES_PROPERTIES(${_inputcpp} PROPERTIES COMPILE_FLAGS "${oldProps} /Yc\"${_inputh}\"")
 
 	else(CMAKE_GENERATOR MATCHES Visual*)
 
@@ -299,7 +250,7 @@ MACRO(ADD_NATIVE_PRECOMPILED_HEADER _targetName _input)
 
 			# When buiding out of the tree, precompiled may not be located
 			# Use full path instead.
-			GET_FILENAME_COMPONENT(fullPath ${_input} ABSOLUTE)
+			GET_FILENAME_COMPONENT(fullPath ${_inputh} ABSOLUTE)
 
 			SET_TARGET_PROPERTIES(${_targetName} PROPERTIES XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${fullPath}")
 			SET_TARGET_PROPERTIES(${_targetName} PROPERTIES XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER "YES")
@@ -307,7 +258,7 @@ MACRO(ADD_NATIVE_PRECOMPILED_HEADER _targetName _input)
 		else (CMAKE_GENERATOR MATCHES Xcode)
 
 			#Fallback to the "old" precompiled suppport
-			#ADD_PRECOMPILED_HEADER(${_targetName} ${_input} ${_dowarn})
+			ADD_PRECOMPILED_HEADER(${_targetName} ${_inputh} ${_inputcpp} ${_dowarn})
 		endif(CMAKE_GENERATOR MATCHES Xcode)
 	endif(CMAKE_GENERATOR MATCHES Visual*)
 
diff --git a/code/nel/src/3d/CMakeLists.txt b/code/nel/src/3d/CMakeLists.txt
index 7ad2acffa..9037738fe 100644
--- a/code/nel/src/3d/CMakeLists.txt
+++ b/code/nel/src/3d/CMakeLists.txt
@@ -678,8 +678,6 @@ SET_TARGET_PROPERTIES(nel3d PROPERTIES
   PROJECT_LABEL "Library: NeL 3D")
 
 IF(WIN32)
-  SET_TARGET_PROPERTIES(nel3d PROPERTIES COMPILE_FLAGS "/Yustd3d.h")
-  SET_SOURCE_FILES_PROPERTIES(std3d.cpp PROPERTIES COMPILE_FLAGS "/Ycstd3d.h")
   SET_TARGET_PROPERTIES(nel3d PROPERTIES 
     DEBUG_POSTFIX "_d"
     RELEASE_POSTFIX "_r")
@@ -695,7 +693,7 @@ ENDIF(WIN32)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
-ADD_PRECOMPILED_HEADER(nel3d ${CMAKE_CURRENT_SOURCE_DIR}/std3d.h)
+ADD_NATIVE_PRECOMPILED_HEADER(nel3d ${CMAKE_CURRENT_SOURCE_DIR}/std3d.h ${CMAKE_CURRENT_SOURCE_DIR}/std3d.cpp)
 
 INSTALL(TARGETS nel3d LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
 
diff --git a/code/nel/src/3d/driver/direct3d/CMakeLists.txt b/code/nel/src/3d/driver/direct3d/CMakeLists.txt
index 80b713c00..464a81ee6 100644
--- a/code/nel/src/3d/driver/direct3d/CMakeLists.txt
+++ b/code/nel/src/3d/driver/direct3d/CMakeLists.txt
@@ -15,16 +15,14 @@ SET_TARGET_PROPERTIES(nel_drv_direct3d_win PROPERTIES
   SOVERSION ${NL_VERSION_MAJOR}
   LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
   LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-  COMPILE_FLAGS "/Yustddirect3d.h"
   DEBUG_POSTFIX "_d"
   RELEASE_POSTFIX "_r"
   PROJECT_LABEL "Driver, Video: Direct3D")
-SET_SOURCE_FILES_PROPERTIES(stddirect3d.cpp PROPERTIES COMPILE_FLAGS "/Ycstddirect3d.h")
 ADD_DEFINITIONS(/Ddriver_direct3d_EXPORTS)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
-ADD_PRECOMPILED_HEADER(nel_drv_direct3d_win ${CMAKE_CURRENT_SOURCE_DIR}/stddirect3d.h)
+ADD_NATIVE_PRECOMPILED_HEADER(nel_drv_direct3d_win ${CMAKE_CURRENT_SOURCE_DIR}/stddirect3d.h ${CMAKE_CURRENT_SOURCE_DIR}/stddirect3d.cpp)
 
 INSTALL(TARGETS nel_drv_direct3d_win LIBRARY DESTINATION lib RUNTIME DESTINATION bin COMPONENT drivers3d)
 IF(WITH_MAXPLUGIN)
diff --git a/code/nel/src/3d/driver/opengl/CMakeLists.txt b/code/nel/src/3d/driver/opengl/CMakeLists.txt
index 73a196c7f..ee12de851 100644
--- a/code/nel/src/3d/driver/opengl/CMakeLists.txt
+++ b/code/nel/src/3d/driver/opengl/CMakeLists.txt
@@ -22,8 +22,6 @@ SET_TARGET_PROPERTIES(${NLDRV_OGL_LIB} PROPERTIES
 IF(WIN32)
   INCLUDE_DIRECTORIES(${DXSDK_INCLUDE_DIR})
   TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} ${DXSDK_DINPUT_LIBRARY} ${DXSDK_GUID_LIBRARY})
-  SET_TARGET_PROPERTIES(${NLDRV_OGL_LIB} PROPERTIES COMPILE_FLAGS "/Yustdopengl.h")
-  SET_SOURCE_FILES_PROPERTIES(stdopengl.cpp PROPERTIES COMPILE_FLAGS "/Ycstdopengl.h")
   SET_TARGET_PROPERTIES(${NLDRV_OGL_LIB} PROPERTIES 
     DEBUG_POSTFIX "_d"
     RELEASE_POSTFIX "_r"
@@ -54,7 +52,7 @@ ENDIF(WIN32)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
-ADD_PRECOMPILED_HEADER(${NLDRV_OGL_LIB} ${CMAKE_CURRENT_SOURCE_DIR}/stdopengl.h)
+ADD_NATIVE_PRECOMPILED_HEADER(${NLDRV_OGL_LIB} ${CMAKE_CURRENT_SOURCE_DIR}/stdopengl.h ${CMAKE_CURRENT_SOURCE_DIR}/stdopengl.cpp)
 
 INSTALL(TARGETS ${NLDRV_OGL_LIB} LIBRARY DESTINATION lib RUNTIME DESTINATION bin COMPONENT drivers3d)
 IF(WITH_MAXPLUGIN)
diff --git a/code/nel/src/georges/CMakeLists.txt b/code/nel/src/georges/CMakeLists.txt
index a454b6555..223fee488 100644
--- a/code/nel/src/georges/CMakeLists.txt
+++ b/code/nel/src/georges/CMakeLists.txt
@@ -20,8 +20,6 @@ SET_TARGET_PROPERTIES(nelgeorges PROPERTIES
   PROJECT_LABEL "Library: NeL Georges")
 
 IF(WIN32)
-  SET_TARGET_PROPERTIES(nelgeorges PROPERTIES COMPILE_FLAGS "/Yustdgeorges.h")
-  SET_SOURCE_FILES_PROPERTIES(stdgeorges.cpp PROPERTIES COMPILE_FLAGS "/Ycstdgeorges.h")
   SET_TARGET_PROPERTIES(nelgeorges PROPERTIES 
     DEBUG_POSTFIX "_d"
     RELEASE_POSTFIX "_r")
@@ -29,6 +27,6 @@ ENDIF(WIN32)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
-ADD_PRECOMPILED_HEADER(nelgeorges ${CMAKE_CURRENT_SOURCE_DIR}/stdgeorges.h)
+ADD_NATIVE_PRECOMPILED_HEADER(nelgeorges ${CMAKE_CURRENT_SOURCE_DIR}/stdgeorges.h ${CMAKE_CURRENT_SOURCE_DIR}/stdgeorges.cpp)
 
 INSTALL(TARGETS nelgeorges LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
diff --git a/code/nel/src/misc/CMakeLists.txt b/code/nel/src/misc/CMakeLists.txt
index 15d069036..cdf72d544 100644
--- a/code/nel/src/misc/CMakeLists.txt
+++ b/code/nel/src/misc/CMakeLists.txt
@@ -29,6 +29,8 @@ SET_TARGET_PROPERTIES(nelmisc PROPERTIES
   SOVERSION ${NL_VERSION_MAJOR}
   PROJECT_LABEL "Library: NeL Misc")
 
+ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
+  
 IF(WIN32)
   FOREACH(FILENAME ${SRC})
     IF("${FILENAME}" MATCHES "stdmisc.cpp")
@@ -46,10 +48,8 @@ IF(WIN32)
     DEBUG_POSTFIX "_d"
     RELEASE_POSTFIX "_r")
   INCLUDE_DIRECTORIES(${DXSDK_INCLUDE_DIR})
+ELSE(WIN32)
+  ADD_NATIVE_PRECOMPILED_HEADER(nelmisc ${CMAKE_CURRENT_SOURCE_DIR}/stdmisc.h ${CMAKE_CURRENT_SOURCE_DIR}/stdmisc.cpp)
 ENDIF(WIN32)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
-ADD_PRECOMPILED_HEADER(nelmisc ${CMAKE_CURRENT_SOURCE_DIR}/stdmisc.h)
-
 INSTALL(TARGETS nelmisc LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
diff --git a/code/nel/src/net/CMakeLists.txt b/code/nel/src/net/CMakeLists.txt
index 9bf83694c..bfa6da5d4 100644
--- a/code/nel/src/net/CMakeLists.txt
+++ b/code/nel/src/net/CMakeLists.txt
@@ -31,8 +31,6 @@ SET_TARGET_PROPERTIES(nelnet PROPERTIES
   PROJECT_LABEL "Library: NeL Net")
 
 IF(WIN32)
-  SET_TARGET_PROPERTIES(${NLNET_LIB} PROPERTIES COMPILE_FLAGS "/Yustdnet.h")
-  SET_SOURCE_FILES_PROPERTIES(stdnet.cpp PROPERTIES COMPILE_FLAGS "/Ycstdnet.h")
   SET_TARGET_PROPERTIES(${NLNET_LIB} PROPERTIES 
     DEBUG_POSTFIX "_d"
     RELEASE_POSTFIX "_r")
@@ -40,6 +38,6 @@ ENDIF(WIN32)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
-ADD_PRECOMPILED_HEADER(${NLNET_LIB} ${CMAKE_CURRENT_SOURCE_DIR}/stdnet.h)
+ADD_NATIVE_PRECOMPILED_HEADER(${NLNET_LIB} ${CMAKE_CURRENT_SOURCE_DIR}/stdnet.h ${CMAKE_CURRENT_SOURCE_DIR}/stdnet.cpp)
 
 INSTALL(TARGETS ${NLNET_LIB} LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
diff --git a/code/nel/src/pacs/CMakeLists.txt b/code/nel/src/pacs/CMakeLists.txt
index 5cabeb558..4072a90a7 100644
--- a/code/nel/src/pacs/CMakeLists.txt
+++ b/code/nel/src/pacs/CMakeLists.txt
@@ -20,6 +20,6 @@ IF(WIN32)
   SET_TARGET_PROPERTIES(nelpacs PROPERTIES DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r")
 ENDIF(WIN32)
 
-ADD_PRECOMPILED_HEADER(nelpacs ${CMAKE_CURRENT_SOURCE_DIR}/stdpacs.h)
+ADD_NATIVE_PRECOMPILED_HEADER(nelpacs ${CMAKE_CURRENT_SOURCE_DIR}/stdpacs.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpacs.cpp)
 
 INSTALL(TARGETS nelpacs LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
diff --git a/code/nel/src/sound/CMakeLists.txt b/code/nel/src/sound/CMakeLists.txt
index 3ab360976..103c9606b 100644
--- a/code/nel/src/sound/CMakeLists.txt
+++ b/code/nel/src/sound/CMakeLists.txt
@@ -23,14 +23,12 @@ SET_TARGET_PROPERTIES(nelsound PROPERTIES
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 IF(WIN32)
-  SET_TARGET_PROPERTIES(nelsound PROPERTIES COMPILE_FLAGS "/Yustdsound.h")
-  SET_SOURCE_FILES_PROPERTIES(stdsound.cpp PROPERTIES COMPILE_FLAGS "/Ycstdsound.h")
   SET_TARGET_PROPERTIES(nelsound PROPERTIES 
     DEBUG_POSTFIX "_d"
     RELEASE_POSTFIX "_r")
 ENDIF(WIN32)
 
-ADD_PRECOMPILED_HEADER(nelsound ${CMAKE_CURRENT_SOURCE_DIR}/stdsound.h)
+ADD_NATIVE_PRECOMPILED_HEADER(nelsound ${CMAKE_CURRENT_SOURCE_DIR}/stdsound.h ${CMAKE_CURRENT_SOURCE_DIR}/stdsound.cpp)
 
 INSTALL(TARGETS nelsound LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
 
diff --git a/code/nel/src/sound/driver/dsound/CMakeLists.txt b/code/nel/src/sound/driver/dsound/CMakeLists.txt
index 53e2ebfe5..48c0506d6 100644
--- a/code/nel/src/sound/driver/dsound/CMakeLists.txt
+++ b/code/nel/src/sound/driver/dsound/CMakeLists.txt
@@ -9,14 +9,12 @@ SET_TARGET_PROPERTIES(nel_drv_dsound PROPERTIES
   SOVERSION ${NL_VERSION_MAJOR}
   LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
   LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
-  COMPILE_FLAGS "/Yustddsound.h"
   DEBUG_POSTFIX "_d"
   RELEASE_POSTFIX "_r"
   PROJECT_LABEL "Driver, Sound: DirectSound")
-SET_SOURCE_FILES_PROPERTIES(stddsound.cpp PROPERTIES COMPILE_FLAGS "/Ycstddsound.h")
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
-ADD_PRECOMPILED_HEADER(nel_drv_dsound ${CMAKE_CURRENT_SOURCE_DIR}/stddsound.h)
+ADD_NATIVE_PRECOMPILED_HEADER(nel_drv_dsound ${CMAKE_CURRENT_SOURCE_DIR}/stddsound.h ${CMAKE_CURRENT_SOURCE_DIR}/stddsound.cpp)
 
 INSTALL(TARGETS nel_drv_dsound RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT driverssound)
 IF(WITH_MAXPLUGIN)
diff --git a/code/nel/src/sound/driver/fmod/CMakeLists.txt b/code/nel/src/sound/driver/fmod/CMakeLists.txt
index 193100737..3682a3fd6 100644
--- a/code/nel/src/sound/driver/fmod/CMakeLists.txt
+++ b/code/nel/src/sound/driver/fmod/CMakeLists.txt
@@ -11,8 +11,6 @@ SET_TARGET_PROPERTIES(nel_drv_fmod PROPERTIES
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 IF(WIN32)
-  SET_TARGET_PROPERTIES(nel_drv_fmod PROPERTIES COMPILE_FLAGS "/Yustdfmod.h")
-  SET_SOURCE_FILES_PROPERTIES(stdfmod.cpp PROPERTIES COMPILE_FLAGS "/Ycstdfmod.h")
   SET_TARGET_PROPERTIES(nel_drv_fmod PROPERTIES 
     LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
     LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
@@ -20,7 +18,7 @@ IF(WIN32)
     RELEASE_POSTFIX "_r")
 ENDIF(WIN32)
 
-ADD_PRECOMPILED_HEADER(nel_drv_fmod ${CMAKE_CURRENT_SOURCE_DIR}/stdfmod.h)
+ADD_NATIVE_PRECOMPILED_HEADER(nel_drv_fmod ${CMAKE_CURRENT_SOURCE_DIR}/stdfmod.h ${CMAKE_CURRENT_SOURCE_DIR}/stdfmod.cpp)
 
 INSTALL(TARGETS nel_drv_fmod RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT driverssound)
 IF(WITH_MAXPLUGIN)
diff --git a/code/nel/src/sound/driver/openal/CMakeLists.txt b/code/nel/src/sound/driver/openal/CMakeLists.txt
index 8bacc79fc..9b1a26967 100644
--- a/code/nel/src/sound/driver/openal/CMakeLists.txt
+++ b/code/nel/src/sound/driver/openal/CMakeLists.txt
@@ -15,8 +15,6 @@ IF(WIN32)
   INCLUDE_DIRECTORIES(${EFXUTIL_INCLUDE_DIR})
   TARGET_LINK_LIBRARIES(nel_drv_openal ${EFXUTIL_LIBRARY})
   
-  SET_TARGET_PROPERTIES(nel_drv_openal PROPERTIES COMPILE_FLAGS "/Yustdopenal.h")
-  SET_SOURCE_FILES_PROPERTIES(stdopenal.cpp PROPERTIES COMPILE_FLAGS "/Ycstdopenal.h")
   SET_TARGET_PROPERTIES(nel_drv_openal PROPERTIES 
     LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
     LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
@@ -25,7 +23,7 @@ IF(WIN32)
     PROJECT_LABEL "Driver, Sound: OpenAL")
 ENDIF(WIN32)
 
-ADD_PRECOMPILED_HEADER(nel_drv_openal ${CMAKE_CURRENT_SOURCE_DIR}/stdopenal.h)
+ADD_NATIVE_PRECOMPILED_HEADER(nel_drv_openal ${CMAKE_CURRENT_SOURCE_DIR}/stdopenal.h ${CMAKE_CURRENT_SOURCE_DIR}/stdopenal.cpp)
 
 INSTALL(TARGETS nel_drv_openal RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT driverssound)
 IF(WITH_MAXPLUGIN)
diff --git a/code/nel/src/sound/driver/xaudio2/CMakeLists.txt b/code/nel/src/sound/driver/xaudio2/CMakeLists.txt
index c1c6b2367..6363e9457 100644
--- a/code/nel/src/sound/driver/xaudio2/CMakeLists.txt
+++ b/code/nel/src/sound/driver/xaudio2/CMakeLists.txt
@@ -10,8 +10,6 @@ SET_TARGET_PROPERTIES(nel_drv_xaudio2 PROPERTIES
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 IF(WIN32)
-  SET_TARGET_PROPERTIES(nel_drv_xaudio2 PROPERTIES COMPILE_FLAGS "/Yustdxaudio2.h")
-  SET_SOURCE_FILES_PROPERTIES(stdxaudio2.cpp PROPERTIES COMPILE_FLAGS "/Ycstdxaudio2.h")
   SET_TARGET_PROPERTIES(nel_drv_xaudio2 PROPERTIES 
     LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
     LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}"
@@ -20,7 +18,7 @@ IF(WIN32)
     PROJECT_LABEL "Driver, Sound: XAudio2")
 ENDIF(WIN32)
 
-ADD_PRECOMPILED_HEADER(nel_drv_xaudio2 ${CMAKE_CURRENT_SOURCE_DIR}/stdxaudio2.h)
+ADD_NATIVE_PRECOMPILED_HEADER(nel_drv_xaudio2 ${CMAKE_CURRENT_SOURCE_DIR}/stdxaudio2.h ${CMAKE_CURRENT_SOURCE_DIR}/stdxaudio2.cpp)
 
 INSTALL(TARGETS nel_drv_xaudio2 RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT driverssound)
 IF(WITH_MAXPLUGIN)