From fabef15e80768cfb29bf24b2d116be43f776112b Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Wed, 27 Jan 2016 13:30:49 +0100
Subject: [PATCH] Merge with develop

---
 code/nel/samples/sound/sound_sources/CMakeLists.txt       | 4 +---
 code/nel/samples/sound/stream_file/CMakeLists.txt         | 2 --
 code/nel/samples/sound/stream_ogg_vorbis/CMakeLists.txt   | 2 --
 code/nel/src/3d/CMakeLists.txt                            | 4 +---
 code/nel/tools/3d/ligo/plugin_max/CMakeLists.txt          | 4 +---
 code/nel/tools/3d/object_viewer/CMakeLists.txt            | 4 +---
 code/nel/tools/3d/plugin_max/nel_export/CMakeLists.txt    | 4 +---
 .../tools/3d/plugin_max/nel_patch_paint/CMakeLists.txt    | 4 +---
 code/nelns/admin_executor_service/CMakeLists.txt          | 4 ----
 code/nelns/admin_service/CMakeLists.txt                   | 5 +----
 code/nelns/login_service/CMakeLists.txt                   | 5 +----
 code/nelns/login_system/nel_launcher_qt/CMakeLists.txt    | 6 ++----
 code/nelns/naming_service/CMakeLists.txt                  | 5 -----
 code/nelns/welcome_service/CMakeLists.txt                 | 5 +----
 code/ryzom/server/src/admin_modules/CMakeLists.txt        | 4 +---
 code/ryzom/server/src/ai_data_service/CMakeLists.txt      | 4 +---
 code/ryzom/server/src/ai_service/CMakeLists.txt           | 4 +---
 code/ryzom/server/src/backup_service/CMakeLists.txt       | 4 +---
 .../server/src/dynamic_scenario_service/CMakeLists.txt    | 4 +---
 code/ryzom/server/src/entity_view_service/CMakeLists.txt  | 4 +---
 code/ryzom/server/src/frontend_service/CMakeLists.txt     | 4 +---
 code/ryzom/server/src/gameplay_module_lib/CMakeLists.txt  | 4 ----
 .../server/src/general_utilities_service/CMakeLists.txt   | 4 +---
 code/ryzom/server/src/gpm_service/CMakeLists.txt          | 4 +---
 code/ryzom/server/src/input_output_service/CMakeLists.txt | 5 ++---
 code/ryzom/server/src/logger_service/CMakeLists.txt       | 4 +---
 code/ryzom/server/src/mail_forum_service/CMakeLists.txt   | 4 +---
 code/ryzom/server/src/mirror_service/CMakeLists.txt       | 4 +---
 code/ryzom/server/src/monitor_service/CMakeLists.txt      | 4 +---
 code/ryzom/server/src/patchman_service/CMakeLists.txt     | 4 +---
 code/ryzom/server/src/pd_lib/CMakeLists.txt               | 4 ----
 code/ryzom/server/src/pd_reference_builder/CMakeLists.txt | 4 +---
 code/ryzom/server/src/pd_support_service/CMakeLists.txt   | 4 +---
 .../server/src/persistant_data_service/CMakeLists.txt     | 4 +---
 code/ryzom/server/src/ryzom_admin_service/CMakeLists.txt  | 4 +---
 code/ryzom/server/src/ryzom_naming_service/CMakeLists.txt | 4 +---
 .../ryzom/server/src/ryzom_welcome_service/CMakeLists.txt | 4 +---
 .../server/src/session_browser_server/CMakeLists.txt      | 4 +---
 code/ryzom/server/src/tick_service/CMakeLists.txt         | 4 +---
 .../leveldesign/georges_editor_qt/src/CMakeLists.txt      | 3 +--
 .../leveldesign/world_editor/world_editor/CMakeLists.txt  | 5 +----
 .../world_editor_fauna_graph_plugin/CMakeLists.txt        | 4 +---
 .../world_editor/world_editor_graph_plugin/CMakeLists.txt | 4 +---
 .../world_editor/world_editor_plugin/CMakeLists.txt       | 4 +---
 .../world_editor_primitive_plugin/CMakeLists.txt          | 4 +---
 .../world_editor_shard_monitor_plugin/CMakeLists.txt      | 4 +---
 .../world_editor/world_editor_sound_plugin/CMakeLists.txt | 4 +---
 code/ryzom/tools/occ2huff/CMakeLists.txt                  | 8 +-------
 code/ryzom/tools/phrase_generator/CMakeLists.txt          | 5 -----
 .../tools/server/build_world_packed_col/CMakeLists.txt    | 5 ++---
 code/ryzom/tools/sheet_random_generator/CMakeLists.txt    | 5 -----
 code/snowballs2/server/chat/src/CMakeLists.txt            | 5 -----
 code/snowballs2/server/collision/src/CMakeLists.txt       | 5 -----
 code/snowballs2/server/frontend/src/CMakeLists.txt        | 5 -----
 code/studio/src/CMakeLists.txt                            | 4 ++--
 code/studio/src/plugins/bnp_manager/CMakeLists.txt        | 3 +--
 code/studio/src/plugins/core/CMakeLists.txt               | 3 +--
 code/studio/src/plugins/disp_sheet_id/CMakeLists.txt      | 3 +--
 code/studio/src/plugins/example/CMakeLists.txt            | 3 +--
 code/studio/src/plugins/georges_editor/CMakeLists.txt     | 3 +--
 code/studio/src/plugins/gui_editor/CMakeLists.txt         | 1 -
 code/studio/src/plugins/landscape_editor/CMakeLists.txt   | 3 +--
 code/studio/src/plugins/log/CMakeLists.txt                | 7 ++-----
 code/studio/src/plugins/mission_compiler/CMakeLists.txt   | 3 +--
 code/studio/src/plugins/object_viewer/CMakeLists.txt      | 3 +--
 code/studio/src/plugins/ovqt_sheet_builder/CMakeLists.txt | 3 +--
 code/studio/src/plugins/tile_editor/CMakeLists.txt        | 3 +--
 .../studio/src/plugins/translation_manager/CMakeLists.txt | 3 +--
 code/studio/src/plugins/world_editor/CMakeLists.txt       | 4 +---
 code/studio/src/plugins/zone_painter/CMakeLists.txt       | 3 +--
 70 files changed, 63 insertions(+), 218 deletions(-)

diff --git a/code/nel/samples/sound/sound_sources/CMakeLists.txt b/code/nel/samples/sound/sound_sources/CMakeLists.txt
index f484c1b76..4c7c3d9cf 100644
--- a/code/nel/samples/sound/sound_sources/CMakeLists.txt
+++ b/code/nel/samples/sound/sound_sources/CMakeLists.txt
@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(nl_sample_sound_sources ${SRC})
 
-ADD_DEFINITIONS(-DNL_SOUND_DATA="\\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_sound/\\"" ${LIBXML2_DEFINITIONS})
-
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+ADD_DEFINITIONS(-DNL_SOUND_DATA="\\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_sound/\\"")
 
 TARGET_LINK_LIBRARIES(nl_sample_sound_sources nelmisc nelsound)
 NL_DEFAULT_PROPS(nl_sample_sound_sources "NeL, Samples: Sound: Sound Sources")
diff --git a/code/nel/samples/sound/stream_file/CMakeLists.txt b/code/nel/samples/sound/stream_file/CMakeLists.txt
index e3afd814d..54f09a2e1 100644
--- a/code/nel/samples/sound/stream_file/CMakeLists.txt
+++ b/code/nel/samples/sound/stream_file/CMakeLists.txt
@@ -2,8 +2,6 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(nl_sample_stream_file ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(nl_sample_stream_file nelmisc nelsound)
 NL_DEFAULT_PROPS(nl_sample_stream_file "NeL, Samples: Sound: Stream File")
 NL_ADD_RUNTIME_FLAGS(nl_sample_stream_file)
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/CMakeLists.txt b/code/nel/samples/sound/stream_ogg_vorbis/CMakeLists.txt
index 62f446290..691d0fbe3 100644
--- a/code/nel/samples/sound/stream_ogg_vorbis/CMakeLists.txt
+++ b/code/nel/samples/sound/stream_ogg_vorbis/CMakeLists.txt
@@ -2,8 +2,6 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(nl_sample_stream_ogg_vorbis ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(nl_sample_stream_ogg_vorbis nelmisc nelsound)
 NL_DEFAULT_PROPS(nl_sample_stream_ogg_vorbis "NeL, Samples: Sound: Stream OGG Vorbis")
 NL_ADD_RUNTIME_FLAGS(nl_sample_stream_ogg_vorbis)
diff --git a/code/nel/src/3d/CMakeLists.txt b/code/nel/src/3d/CMakeLists.txt
index 25f74889a..1f6ab4a41 100644
--- a/code/nel/src/3d/CMakeLists.txt
+++ b/code/nel/src/3d/CMakeLists.txt
@@ -716,7 +716,7 @@ SOURCE_GROUP(Stereo FILES
 NL_TARGET_LIB(nel3d ${HEADERS} ${SRC})
 
 INCLUDE_DIRECTORIES(BEFORE ${FREETYPE_INCLUDE_DIRS})
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${LIBOVR_INCLUDE_DIR} ${LIBVR_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBVR_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(nel3d nelmisc ${FREETYPE_LIBRARIES} ${LIBOVR_LIBRARIES} ${LIBVR_LIBRARY})
 NL_DEFAULT_PROPS(nel3d "NeL, Library: NeL 3D")
@@ -725,8 +725,6 @@ NL_ADD_STATIC_VID_DRIVERS(nel3d)
 
 NL_ADD_LIB_SUFFIX(nel3d)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 ADD_DEFINITIONS(${LIBOVR_DEFINITIONS})
 ADD_DEFINITIONS(${LIBVR_DEFINITIONS})
 
diff --git a/code/nel/tools/3d/ligo/plugin_max/CMakeLists.txt b/code/nel/tools/3d/ligo/plugin_max/CMakeLists.txt
index ddf009188..761537791 100644
--- a/code/nel/tools/3d/ligo/plugin_max/CMakeLists.txt
+++ b/code/nel/tools/3d/ligo/plugin_max/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h ../../ig_lighter_lib/*.cpp ../../ig_lighter_lib/*.h)
 
 ADD_LIBRARY(ligoscape_utility SHARED ligoscape_utility.rc ${SRC} ligoscape_utility.def)
 
-INCLUDE_DIRECTORIES(${MAXSDK_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${MAXSDK_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(ligoscape_utility 
 							nelmisc 
@@ -20,8 +20,6 @@ NL_DEFAULT_PROPS(ligoscape_utility "MAX Plugin: Ligoscape Utility")
 NL_ADD_RUNTIME_FLAGS(ligoscape_utility)
 NL_ADD_LIB_SUFFIX(ligoscape_utility)
   
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS ligoscape_utility RUNTIME DESTINATION maxplugin/plugins LIBRARY DESTINATION ${NL_LIB_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT libraries)
 INSTALL(FILES ligoscript.txt DESTINATION maxplugin/docs)
 INSTALL(DIRECTORY scripts/
diff --git a/code/nel/tools/3d/object_viewer/CMakeLists.txt b/code/nel/tools/3d/object_viewer/CMakeLists.txt
index f99f49c68..e8def63ff 100644
--- a/code/nel/tools/3d/object_viewer/CMakeLists.txt
+++ b/code/nel/tools/3d/object_viewer/CMakeLists.txt
@@ -2,8 +2,6 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_LIBRARY(object_viewer_dll SHARED ${SRC} object_viewer.rc)
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(object_viewer_dll 
 							nelmisc
 							nel3d
@@ -15,7 +13,7 @@ NL_DEFAULT_PROPS(object_viewer_dll "NeL, Tools, 3D: Object Viewer DLL")
 NL_ADD_RUNTIME_FLAGS(object_viewer_dll)
 NL_ADD_LIB_SUFFIX(object_viewer_dll)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${MFC_DEFINITIONS} -DOBJECT_VIEWER_LIB_EXPORTS)
+ADD_DEFINITIONS(${MFC_DEFINITIONS} -DOBJECT_VIEWER_LIB_EXPORTS)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(object_viewer_dll ${CMAKE_CURRENT_SOURCE_DIR}/std_afx.h ${CMAKE_CURRENT_SOURCE_DIR}/std_afx.cpp)
diff --git a/code/nel/tools/3d/plugin_max/nel_export/CMakeLists.txt b/code/nel/tools/3d/plugin_max/nel_export/CMakeLists.txt
index 93ae28370..dd91a3101 100644
--- a/code/nel/tools/3d/plugin_max/nel_export/CMakeLists.txt
+++ b/code/nel/tools/3d/plugin_max/nel_export/CMakeLists.txt
@@ -6,7 +6,7 @@ LIST(REMOVE_ITEM SRC	${CMAKE_CURRENT_SOURCE_DIR}/last_lightmap.cpp
 
 ADD_LIBRARY(nel_export SHARED ${SRC} nel_export.rc)
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MAXSDK_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${MAXSDK_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(nel_export
 							nelmisc 
@@ -25,8 +25,6 @@ NL_ADD_RUNTIME_FLAGS(nel_export)
 NL_ADD_LIB_SUFFIX(nel_export)
 SET_TARGET_PROPERTIES(nel_export PROPERTIES SUFFIX ".dlu")
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(nel_export ${CMAKE_CURRENT_SOURCE_DIR}/std_afx.h ${CMAKE_CURRENT_SOURCE_DIR}/std_afx.cpp)
 ENDIF(WITH_PCH)
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_paint/CMakeLists.txt b/code/nel/tools/3d/plugin_max/nel_patch_paint/CMakeLists.txt
index 628cb3120..de6310d18 100644
--- a/code/nel/tools/3d/plugin_max/nel_patch_paint/CMakeLists.txt
+++ b/code/nel/tools/3d/plugin_max/nel_patch_paint/CMakeLists.txt
@@ -4,7 +4,7 @@ LIST(REMOVE_ITEM SRC	${CMAKE_CURRENT_SOURCE_DIR}/nel_paint.cpp)
 
 ADD_LIBRARY(nel_patch_paint SHARED ${SRC} nel_patch_paint.rc)
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MAXSDK_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${MAXSDK_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(nel_patch_paint 
 							nelmisc
@@ -22,7 +22,5 @@ NL_DEFAULT_PROPS(nel_patch_paint "MAX Plugin: NeL Patch Painter")
 NL_ADD_RUNTIME_FLAGS(nel_patch_paint)
 NL_ADD_LIB_SUFFIX(nel_patch_paint)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS nel_patch_paint RUNTIME DESTINATION maxplugin/plugins LIBRARY DESTINATION ${NL_LIB_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT libraries)
 INSTALL(FILES keys.cfg DESTINATION maxplugin/plugins )
\ No newline at end of file
diff --git a/code/nelns/admin_executor_service/CMakeLists.txt b/code/nelns/admin_executor_service/CMakeLists.txt
index 620c1a78a..24a9efa2f 100644
--- a/code/nelns/admin_executor_service/CMakeLists.txt
+++ b/code/nelns/admin_executor_service/CMakeLists.txt
@@ -2,8 +2,6 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(admin_executor_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(admin_executor_service
 						nelmisc
 						nelnet)
@@ -11,7 +9,5 @@ TARGET_LINK_LIBRARIES(admin_executor_service
 NL_DEFAULT_PROPS(admin_executor_service "NelNS, Services: Admin Executor Service")
 NL_ADD_RUNTIME_FLAGS(admin_executor_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS admin_executor_service RUNTIME DESTINATION sbin COMPONENT aes)
 INSTALL(FILES admin_executor_service.cfg common.cfg DESTINATION ${NL_ETC_PREFIX}/nelns COMPONENT aes)
diff --git a/code/nelns/admin_service/CMakeLists.txt b/code/nelns/admin_service/CMakeLists.txt
index a7eee50a1..22dd846c9 100644
--- a/code/nelns/admin_service/CMakeLists.txt
+++ b/code/nelns/admin_service/CMakeLists.txt
@@ -2,10 +2,9 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(admin_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(admin_service
-						${LIBXML2_LIBRARIES}
 						${MYSQL_LIBRARIES}
 						${ZLIB_LIBRARIES}
 						nelmisc
@@ -14,7 +13,5 @@ TARGET_LINK_LIBRARIES(admin_service
 NL_DEFAULT_PROPS(admin_service "NelNS, Services: Admin Service")
 NL_ADD_RUNTIME_FLAGS(admin_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS admin_service RUNTIME DESTINATION sbin COMPONENT as)
 INSTALL(FILES admin_service.cfg common.cfg DESTINATION ${NL_ETC_PREFIX}/nelns COMPONENT as)
diff --git a/code/nelns/login_service/CMakeLists.txt b/code/nelns/login_service/CMakeLists.txt
index 1ee7260fe..31ba82143 100644
--- a/code/nelns/login_service/CMakeLists.txt
+++ b/code/nelns/login_service/CMakeLists.txt
@@ -2,10 +2,9 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(login_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(login_service
-						${LIBXML2_LIBRARIES}
 						${MYSQL_LIBRARIES}
 						${ZLIB_LIBRARIES}
 						nelmisc
@@ -14,7 +13,5 @@ TARGET_LINK_LIBRARIES(login_service
 NL_DEFAULT_PROPS(login_service "NelNS, Services: Login Service")
 NL_ADD_RUNTIME_FLAGS(login_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS login_service RUNTIME DESTINATION sbin COMPONENT ls)
 INSTALL(FILES login_service.cfg common.cfg DESTINATION ${NL_ETC_PREFIX}/nelns COMPONENT ls)
diff --git a/code/nelns/login_system/nel_launcher_qt/CMakeLists.txt b/code/nelns/login_system/nel_launcher_qt/CMakeLists.txt
index 7e128f1b7..92dac70f1 100644
--- a/code/nelns/login_system/nel_launcher_qt/CMakeLists.txt
+++ b/code/nelns/login_system/nel_launcher_qt/CMakeLists.txt
@@ -1,6 +1,5 @@
 INCLUDE_DIRECTORIES(    ${CMAKE_CURRENT_BINARY_DIR}
                                                 ${CMAKE_CURRENT_SOURCE_DIR}
-                                                ${LIBXML2_INCLUDE_DIR}
                                                 ${QT_INCLUDES})
 
 INCLUDE( ${QT_USE_FILE} )
@@ -19,10 +18,9 @@ QT4_WRAP_CPP( NEL_LAUNCHER_MOC_SRCS ${NEL_LAUNCHER_HDR})
 
 ADD_EXECUTABLE(nel_launcher_qt WIN32 ${NEL_LAUNCHER_SRC} ${NEL_LAUNCHER_MOC_SRCS} ${NEL_LAUNCHER_RC_SRCS} ${NEL_LAUNCHER_UI_HDRS})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${QT_INCLUDES})
+INCLUDE_DIRECTORIES(${QT_INCLUDES})
 
 TARGET_LINK_LIBRARIES(nel_launcher_qt
-						${LIBXML2_LIBRARIES}
 						${QT_LIBRARIES}
 						${QT_QTMAIN_LIBRARY}
 						nelmisc
@@ -31,7 +29,7 @@ TARGET_LINK_LIBRARIES(nel_launcher_qt
 NL_DEFAULT_PROPS(nel_launcher_qt "NelNS, Launcher: NeL Launcher Qt")
 NL_ADD_RUNTIME_FLAGS(nel_launcher_qt)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${QT_DEFINITIONS})
+ADD_DEFINITIONS(${QT_DEFINITIONS})
 
 INSTALL(TARGETS nel_launcher_qt RUNTIME DESTINATION bin COMPONENT launcher)
 IF(WIN32)
diff --git a/code/nelns/naming_service/CMakeLists.txt b/code/nelns/naming_service/CMakeLists.txt
index 9616ca957..596bb5b48 100644
--- a/code/nelns/naming_service/CMakeLists.txt
+++ b/code/nelns/naming_service/CMakeLists.txt
@@ -2,17 +2,12 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(naming_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(naming_service
-						${LIBXML2_LIBRARIES}
 						nelmisc
 						nelnet)
 
 NL_DEFAULT_PROPS(naming_service "NeLNS, Services: Naming Service")
 NL_ADD_RUNTIME_FLAGS(naming_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS naming_service RUNTIME DESTINATION sbin COMPONENT ns)
 INSTALL(FILES naming_service.cfg common.cfg DESTINATION ${NL_ETC_PREFIX}/nelns COMPONENT ns)
diff --git a/code/nelns/welcome_service/CMakeLists.txt b/code/nelns/welcome_service/CMakeLists.txt
index c6819d97d..3817b2076 100644
--- a/code/nelns/welcome_service/CMakeLists.txt
+++ b/code/nelns/welcome_service/CMakeLists.txt
@@ -2,17 +2,14 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(welcome_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${NELMISC_INCLUDE_DIRS})
 
 TARGET_LINK_LIBRARIES(welcome_service
-						${LIBXML2_LIBRARIES}
 						nelmisc
 						nelnet)
 
 NL_DEFAULT_PROPS(welcome_service "NeLNS, Services: Welcome Service")
 NL_ADD_RUNTIME_FLAGS(welcome_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS welcome_service RUNTIME DESTINATION sbin COMPONENT ws)
 INSTALL(FILES welcome_service.cfg common.cfg DESTINATION ${NL_ETC_PREFIX}/nelns COMPONENT ws)
diff --git a/code/ryzom/server/src/admin_modules/CMakeLists.txt b/code/ryzom/server/src/admin_modules/CMakeLists.txt
index d72c0558d..6f88214eb 100644
--- a/code/ryzom/server/src/admin_modules/CMakeLists.txt
+++ b/code/ryzom/server/src/admin_modules/CMakeLists.txt
@@ -2,15 +2,13 @@ FILE(GLOB SRC *.cpp *.h)
 
 NL_TARGET_LIB(ryzom_adminmodules ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 TARGET_LINK_LIBRARIES(ryzom_adminmodules nelmisc nelnet)
 NL_DEFAULT_PROPS(ryzom_adminmodules "Ryzom, Library: Service Admin Modules")
 NL_ADD_RUNTIME_FLAGS(ryzom_adminmodules)
 NL_ADD_LIB_SUFFIX(ryzom_adminmodules)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(ryzom_adminmodules ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
 ENDIF(WITH_PCH)
diff --git a/code/ryzom/server/src/ai_data_service/CMakeLists.txt b/code/ryzom/server/src/ai_data_service/CMakeLists.txt
index 22e601167..0292b2895 100644
--- a/code/ryzom/server/src/ai_data_service/CMakeLists.txt
+++ b/code/ryzom/server/src/ai_data_service/CMakeLists.txt
@@ -4,7 +4,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(ai_data_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${MYSQL_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(ai_data_service
 					admin_modules
@@ -20,7 +20,5 @@ TARGET_LINK_LIBRARIES(ai_data_service
 NL_DEFAULT_PROPS(ai_data_service "Ryzom, Services: AI Data Service (AIDS)")
 NL_ADD_RUNTIME_FLAGS(ai_data_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS ai_data_service RUNTIME DESTINATION sbin COMPONENT services)
 
diff --git a/code/ryzom/server/src/ai_service/CMakeLists.txt b/code/ryzom/server/src/ai_service/CMakeLists.txt
index c4bc79aeb..98d294db2 100644
--- a/code/ryzom/server/src/ai_service/CMakeLists.txt
+++ b/code/ryzom/server/src/ai_service/CMakeLists.txt
@@ -15,7 +15,7 @@ LIST(REMOVE_ITEM SRC
 
 ADD_EXECUTABLE(ryzom_ai_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${MYSQL_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(ryzom_ai_service
 					ryzom_adminmodules
@@ -30,8 +30,6 @@ TARGET_LINK_LIBRARIES(ryzom_ai_service
 NL_DEFAULT_PROPS(ryzom_ai_service "Ryzom, Services: AI Service (AIS)")
 NL_ADD_RUNTIME_FLAGS(ryzom_ai_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(ryzom_ai_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
 ENDIF(WITH_PCH)
diff --git a/code/ryzom/server/src/backup_service/CMakeLists.txt b/code/ryzom/server/src/backup_service/CMakeLists.txt
index c6eb4846e..bb8669e5c 100644
--- a/code/ryzom/server/src/backup_service/CMakeLists.txt
+++ b/code/ryzom/server/src/backup_service/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(ryzom_backup_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR})
 
 TARGET_LINK_LIBRARIES(ryzom_backup_service
 					ryzom_adminmodules
@@ -16,6 +16,4 @@ TARGET_LINK_LIBRARIES(ryzom_backup_service
 NL_DEFAULT_PROPS(ryzom_backup_service "Ryzom, Services: Backup Service (BS)")
 NL_ADD_RUNTIME_FLAGS(ryzom_backup_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS ryzom_backup_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/ryzom/server/src/dynamic_scenario_service/CMakeLists.txt b/code/ryzom/server/src/dynamic_scenario_service/CMakeLists.txt
index 51f8befd8..190ff9adf 100644
--- a/code/ryzom/server/src/dynamic_scenario_service/CMakeLists.txt
+++ b/code/ryzom/server/src/dynamic_scenario_service/CMakeLists.txt
@@ -4,7 +4,7 @@ LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/service.cpp ${CMAKE_CURRENT_SOU
 
 ADD_EXECUTABLE(ryzom_dynamic_scenario_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR})
 
 TARGET_LINK_LIBRARIES(ryzom_dynamic_scenario_service
 						ryzom_adminmodules
@@ -19,6 +19,4 @@ TARGET_LINK_LIBRARIES(ryzom_dynamic_scenario_service
 NL_DEFAULT_PROPS(ryzom_dynamic_scenario_service "Ryzom, Services: Dynamic Scenario Service (DSS)")
 NL_ADD_RUNTIME_FLAGS(ryzom_dynamic_scenario_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS ryzom_dynamic_scenario_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/ryzom/server/src/entity_view_service/CMakeLists.txt b/code/ryzom/server/src/entity_view_service/CMakeLists.txt
index a2d2c5a03..0aa8e7e41 100644
--- a/code/ryzom/server/src/entity_view_service/CMakeLists.txt
+++ b/code/ryzom/server/src/entity_view_service/CMakeLists.txt
@@ -4,7 +4,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(ryzom_entity_view_service ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${NEL_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(ryzom_entity_view_service
 						ryzom_adminmodules
@@ -19,7 +19,5 @@ TARGET_LINK_LIBRARIES(ryzom_entity_view_service
 NL_DEFAULT_PROPS(ryzom_entity_view_service "Ryzom, Services: Entity View Service (EVS)")
 NL_ADD_RUNTIME_FLAGS(ryzom_entity_view_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS ryzom_entity_view_service RUNTIME DESTINATION sbin COMPONENT services)
 
diff --git a/code/ryzom/server/src/frontend_service/CMakeLists.txt b/code/ryzom/server/src/frontend_service/CMakeLists.txt
index b1dcc6380..59217dadf 100644
--- a/code/ryzom/server/src/frontend_service/CMakeLists.txt
+++ b/code/ryzom/server/src/frontend_service/CMakeLists.txt
@@ -10,7 +10,7 @@ LIST(REMOVE_ITEM SRC
 
 ADD_EXECUTABLE(ryzom_frontend_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${MYSQL_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(ryzom_frontend_service
 						ryzom_adminmodules
@@ -24,8 +24,6 @@ TARGET_LINK_LIBRARIES(ryzom_frontend_service
 NL_DEFAULT_PROPS(ryzom_frontend_service "Ryzom, Services: Frontend Service (FS)")
 NL_ADD_RUNTIME_FLAGS(ryzom_frontend_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(ryzom_frontend_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
 ENDIF(WITH_PCH)
diff --git a/code/ryzom/server/src/gameplay_module_lib/CMakeLists.txt b/code/ryzom/server/src/gameplay_module_lib/CMakeLists.txt
index 68a101cf4..7b185ba4f 100644
--- a/code/ryzom/server/src/gameplay_module_lib/CMakeLists.txt
+++ b/code/ryzom/server/src/gameplay_module_lib/CMakeLists.txt
@@ -2,15 +2,11 @@ FILE(GLOB SRC *.cpp *.h)
 
 NL_TARGET_LIB(ryzom_gameplaymodule ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(ryzom_gameplaymodule nelmisc)
 NL_DEFAULT_PROPS(ryzom_gameplaymodule "Ryzom, Library: Gameplay Module")
 NL_ADD_RUNTIME_FLAGS(ryzom_gameplaymodule)
 NL_ADD_LIB_SUFFIX(ryzom_gameplaymodule)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS ryzom_gameplaymodule LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT libraries)
 ENDIF()
diff --git a/code/ryzom/server/src/general_utilities_service/CMakeLists.txt b/code/ryzom/server/src/general_utilities_service/CMakeLists.txt
index 50c6997f5..5a7dc047e 100644
--- a/code/ryzom/server/src/general_utilities_service/CMakeLists.txt
+++ b/code/ryzom/server/src/general_utilities_service/CMakeLists.txt
@@ -126,7 +126,7 @@ SOURCE_GROUP("GUS Core" FILES	gus_chat.cpp
 
 ADD_EXECUTABLE(ryzom_general_utilities_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${NEL_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(ryzom_general_utilities_service
 						ryzom_adminmodules
@@ -141,6 +141,4 @@ TARGET_LINK_LIBRARIES(ryzom_general_utilities_service
 NL_DEFAULT_PROPS(ryzom_general_utilities_service "Ryzom, Services: General Utilities Service (GUS)")
 NL_ADD_RUNTIME_FLAGS(ryzom_general_utilities_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS ryzom_general_utilities_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/ryzom/server/src/gpm_service/CMakeLists.txt b/code/ryzom/server/src/gpm_service/CMakeLists.txt
index 4c404ec0e..7deb2dfd1 100644
--- a/code/ryzom/server/src/gpm_service/CMakeLists.txt
+++ b/code/ryzom/server/src/gpm_service/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(ryzom_gpm_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${MYSQL_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(ryzom_gpm_service
 					ryzom_adminmodules
@@ -17,8 +17,6 @@ TARGET_LINK_LIBRARIES(ryzom_gpm_service
 NL_DEFAULT_PROPS(ryzom_gpm_service "Ryzom, Services: Global Position Manager Service (GPMS)")
 NL_ADD_RUNTIME_FLAGS(ryzom_gpm_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(ryzom_gpm_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
 ENDIF(WITH_PCH)
diff --git a/code/ryzom/server/src/input_output_service/CMakeLists.txt b/code/ryzom/server/src/input_output_service/CMakeLists.txt
index 6dbc220b8..33c941172 100644
--- a/code/ryzom/server/src/input_output_service/CMakeLists.txt
+++ b/code/ryzom/server/src/input_output_service/CMakeLists.txt
@@ -12,7 +12,8 @@ LIST(REMOVE_ITEM SRC
 
 ADD_EXECUTABLE(ryzom_ios_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${MYSQL_INCLUDE_DIR})
+
 TARGET_LINK_LIBRARIES(ryzom_ios_service
 					ryzom_adminmodules
 					ryzom_pd
@@ -27,8 +28,6 @@ TARGET_LINK_LIBRARIES(ryzom_ios_service
 NL_DEFAULT_PROPS(ryzom_ios_service "Ryzom, Services: Input Output Service (IOS)")
 NL_ADD_RUNTIME_FLAGS(ryzom_ios_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(ryzom_ios_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
 ENDIF(WITH_PCH)
diff --git a/code/ryzom/server/src/logger_service/CMakeLists.txt b/code/ryzom/server/src/logger_service/CMakeLists.txt
index dabfb7845..36cc92a2d 100644
--- a/code/ryzom/server/src/logger_service/CMakeLists.txt
+++ b/code/ryzom/server/src/logger_service/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(ryzom_logger_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${MYSQL_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(ryzom_logger_service
 						ryzom_adminmodules
@@ -14,6 +14,4 @@ TARGET_LINK_LIBRARIES(ryzom_logger_service
 NL_DEFAULT_PROPS(ryzom_logger_service "Ryzom, Services: Logger Service (LGS)")
 NL_ADD_RUNTIME_FLAGS(ryzom_logger_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS ryzom_logger_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/ryzom/server/src/mail_forum_service/CMakeLists.txt b/code/ryzom/server/src/mail_forum_service/CMakeLists.txt
index 7a24e91de..adc3b6dc7 100644
--- a/code/ryzom/server/src/mail_forum_service/CMakeLists.txt
+++ b/code/ryzom/server/src/mail_forum_service/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(ryzom_mail_forum_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${MYSQL_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(ryzom_mail_forum_service
 						ryzom_adminmodules
@@ -14,8 +14,6 @@ TARGET_LINK_LIBRARIES(ryzom_mail_forum_service
 NL_DEFAULT_PROPS(ryzom_mail_forum_service "Ryzom, Services: Mail Forum Service (MFS)")
 NL_ADD_RUNTIME_FLAGS(ryzom_mail_forum_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(ryzom_mail_forum_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
 ENDIF(WITH_PCH)
diff --git a/code/ryzom/server/src/mirror_service/CMakeLists.txt b/code/ryzom/server/src/mirror_service/CMakeLists.txt
index 734f8904c..f7555ac15 100644
--- a/code/ryzom/server/src/mirror_service/CMakeLists.txt
+++ b/code/ryzom/server/src/mirror_service/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(ryzom_mirror_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR})
 
 TARGET_LINK_LIBRARIES(ryzom_mirror_service
 					ryzom_adminmodules
@@ -14,6 +14,4 @@ TARGET_LINK_LIBRARIES(ryzom_mirror_service
 NL_DEFAULT_PROPS(ryzom_mirror_service "Ryzom, Services: Mirror Service (MS)")
 NL_ADD_RUNTIME_FLAGS(ryzom_mirror_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS ryzom_mirror_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/ryzom/server/src/monitor_service/CMakeLists.txt b/code/ryzom/server/src/monitor_service/CMakeLists.txt
index 5b656289d..3c061c884 100644
--- a/code/ryzom/server/src/monitor_service/CMakeLists.txt
+++ b/code/ryzom/server/src/monitor_service/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(ryzom_monitor_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${MYSQL_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(ryzom_monitor_service
 						ryzom_gameshare
@@ -14,8 +14,6 @@ TARGET_LINK_LIBRARIES(ryzom_monitor_service
 NL_DEFAULT_PROPS(ryzom_monitor_service "Ryzom, Services: Monitor Service (MOS)")
 NL_ADD_RUNTIME_FLAGS(ryzom_monitor_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(ryzom_monitor_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
 ENDIF(WITH_PCH)
diff --git a/code/ryzom/server/src/patchman_service/CMakeLists.txt b/code/ryzom/server/src/patchman_service/CMakeLists.txt
index b0a1235ad..a4a4f4c2a 100644
--- a/code/ryzom/server/src/patchman_service/CMakeLists.txt
+++ b/code/ryzom/server/src/patchman_service/CMakeLists.txt
@@ -20,7 +20,7 @@ LIST(REMOVE_ITEM SRC
 
 ADD_EXECUTABLE(ryzom_patchman_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${MYSQL_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(ryzom_patchman_service
 					ryzom_adminmodules
@@ -35,6 +35,4 @@ TARGET_LINK_LIBRARIES(ryzom_patchman_service
 NL_DEFAULT_PROPS(ryzom_patchman_service "Ryzom, Services: Patch Manager Service (PMS)")
 NL_ADD_RUNTIME_FLAGS(ryzom_patchman_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS ryzom_patchman_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/ryzom/server/src/pd_lib/CMakeLists.txt b/code/ryzom/server/src/pd_lib/CMakeLists.txt
index edb22a324..aeb3851ae 100644
--- a/code/ryzom/server/src/pd_lib/CMakeLists.txt
+++ b/code/ryzom/server/src/pd_lib/CMakeLists.txt
@@ -7,15 +7,11 @@ LIST(REMOVE_ITEM SRC
 
 NL_TARGET_LIB(ryzom_pd ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(ryzom_pd nelmisc nelnet ryzom_gameshare)
 NL_DEFAULT_PROPS(ryzom_pd "Ryzom, Library: PD Lib")
 NL_ADD_RUNTIME_FLAGS(ryzom_pd)
 NL_ADD_LIB_SUFFIX(ryzom_pd)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS ryzom_pd LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT libraries)
 ENDIF()
diff --git a/code/ryzom/server/src/pd_reference_builder/CMakeLists.txt b/code/ryzom/server/src/pd_reference_builder/CMakeLists.txt
index 6cf33d156..5e71da6dc 100644
--- a/code/ryzom/server/src/pd_reference_builder/CMakeLists.txt
+++ b/code/ryzom/server/src/pd_reference_builder/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(ryzom_reference_builder_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${MYSQL_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(ryzom_reference_builder_service
 						ryzom_gameshare
@@ -14,6 +14,4 @@ TARGET_LINK_LIBRARIES(ryzom_reference_builder_service
 NL_DEFAULT_PROPS(ryzom_reference_builder_service "Ryzom, Services: Reference Builder Service (RBS)")
 NL_ADD_RUNTIME_FLAGS(ryzom_reference_builder_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS ryzom_reference_builder_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/ryzom/server/src/pd_support_service/CMakeLists.txt b/code/ryzom/server/src/pd_support_service/CMakeLists.txt
index e26b65564..2c292a04c 100644
--- a/code/ryzom/server/src/pd_support_service/CMakeLists.txt
+++ b/code/ryzom/server/src/pd_support_service/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(ryzom_pd_support_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${MYSQL_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(ryzom_pd_support_service
 						ryzom_adminmodules
@@ -14,6 +14,4 @@ TARGET_LINK_LIBRARIES(ryzom_pd_support_service
 NL_DEFAULT_PROPS(ryzom_pd_support_service "Ryzom, Services: PD Support Service (PDSS)")
 NL_ADD_RUNTIME_FLAGS(ryzom_pd_support_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS ryzom_pd_support_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/ryzom/server/src/persistant_data_service/CMakeLists.txt b/code/ryzom/server/src/persistant_data_service/CMakeLists.txt
index b1f25df7a..e7b173e7d 100644
--- a/code/ryzom/server/src/persistant_data_service/CMakeLists.txt
+++ b/code/ryzom/server/src/persistant_data_service/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(ryzom_persistant_data_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${MYSQL_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(ryzom_persistant_data_service
 						ryzom_adminmodules
@@ -14,6 +14,4 @@ TARGET_LINK_LIBRARIES(ryzom_persistant_data_service
 NL_DEFAULT_PROPS(ryzom_persistant_data_service "Ryzom, Services: Persistent Data Service (PDS)")
 NL_ADD_RUNTIME_FLAGS(ryzom_persistant_data_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS ryzom_persistant_data_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/ryzom/server/src/ryzom_admin_service/CMakeLists.txt b/code/ryzom/server/src/ryzom_admin_service/CMakeLists.txt
index c0b6abafc..1bc0cc8e5 100644
--- a/code/ryzom/server/src/ryzom_admin_service/CMakeLists.txt
+++ b/code/ryzom/server/src/ryzom_admin_service/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(ryzom_admin_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${MYSQL_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(ryzom_admin_service
 						ryzom_adminmodules
@@ -12,8 +12,6 @@ TARGET_LINK_LIBRARIES(ryzom_admin_service
 NL_DEFAULT_PROPS(ryzom_admin_service "Ryzom, Services: Ryzom Admin Service (AS)")
 NL_ADD_RUNTIME_FLAGS(ryzom_admin_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS ryzom_admin_service RUNTIME DESTINATION sbin COMPONENT services)
 
 
diff --git a/code/ryzom/server/src/ryzom_naming_service/CMakeLists.txt b/code/ryzom/server/src/ryzom_naming_service/CMakeLists.txt
index f9d703c99..bbcaf64cd 100644
--- a/code/ryzom/server/src/ryzom_naming_service/CMakeLists.txt
+++ b/code/ryzom/server/src/ryzom_naming_service/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(ryzom_naming_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${MYSQL_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(ryzom_naming_service
 						ryzom_adminmodules
@@ -12,8 +12,6 @@ TARGET_LINK_LIBRARIES(ryzom_naming_service
 NL_DEFAULT_PROPS(ryzom_naming_service "Ryzom, Services: Ryzom Naming Service (NS)")
 NL_ADD_RUNTIME_FLAGS(ryzom_naming_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS ryzom_naming_service RUNTIME DESTINATION sbin COMPONENT services)
 
 
diff --git a/code/ryzom/server/src/ryzom_welcome_service/CMakeLists.txt b/code/ryzom/server/src/ryzom_welcome_service/CMakeLists.txt
index cc6bf952f..8a4e0cf64 100644
--- a/code/ryzom/server/src/ryzom_welcome_service/CMakeLists.txt
+++ b/code/ryzom/server/src/ryzom_welcome_service/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(ryzom_welcome_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${MYSQL_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(ryzom_welcome_service
 						ryzom_adminmodules
@@ -13,8 +13,6 @@ TARGET_LINK_LIBRARIES(ryzom_welcome_service
 NL_DEFAULT_PROPS(ryzom_welcome_service "Ryzom, Services: Ryzom Welcome Service (WS)")
 NL_ADD_RUNTIME_FLAGS(ryzom_welcome_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS ryzom_welcome_service RUNTIME DESTINATION sbin COMPONENT services)
 
 
diff --git a/code/ryzom/server/src/session_browser_server/CMakeLists.txt b/code/ryzom/server/src/session_browser_server/CMakeLists.txt
index 4ca2edd05..069afff77 100644
--- a/code/ryzom/server/src/session_browser_server/CMakeLists.txt
+++ b/code/ryzom/server/src/session_browser_server/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(ryzom_session_browser_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${MYSQL_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(ryzom_session_browser_service
 						ryzom_adminmodules
@@ -15,6 +15,4 @@ TARGET_LINK_LIBRARIES(ryzom_session_browser_service
 NL_DEFAULT_PROPS(ryzom_session_browser_service "Ryzom, Services: Session Browser Service (SBS)")
 NL_ADD_RUNTIME_FLAGS(ryzom_session_browser_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS ryzom_session_browser_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/ryzom/server/src/tick_service/CMakeLists.txt b/code/ryzom/server/src/tick_service/CMakeLists.txt
index 9cd8ce82d..515e968fc 100644
--- a/code/ryzom/server/src/tick_service/CMakeLists.txt
+++ b/code/ryzom/server/src/tick_service/CMakeLists.txt
@@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(ryzom_tick_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${MYSQL_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(ryzom_tick_service
 						ryzom_adminmodules
@@ -14,6 +14,4 @@ TARGET_LINK_LIBRARIES(ryzom_tick_service
 NL_DEFAULT_PROPS(ryzom_tick_service "Ryzom, Services: Tick Service (TS)")
 NL_ADD_RUNTIME_FLAGS(ryzom_tick_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS ryzom_tick_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/CMakeLists.txt b/code/ryzom/tools/leveldesign/georges_editor_qt/src/CMakeLists.txt
index 81327442a..b56322b2a 100644
--- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/CMakeLists.txt
@@ -1,7 +1,6 @@
 INCLUDE_DIRECTORIES(
 		${CMAKE_CURRENT_BINARY_DIR} 
 		${CMAKE_CURRENT_SOURCE_DIR} 
-		${LIBXML2_INCLUDE_DIR} 
 		${NEL_INCLUDE_DIR}
 		../../../../../nel/tools/3d/object_viewer_widget/src
 		${QT_INCLUDES})
@@ -63,7 +62,7 @@ TARGET_LINK_LIBRARIES(georges_editor_qt
 		${QT_QTOPENGL_LIBRARY}
 		${QT_QTMAIN_LIBRARY})
 
-ADD_DEFINITIONS(-DQT_NO_KEYWORDS ${LIBXML2_DEFINITIONS} ${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DQT_NO_KEYWORDS ${QT_DEFINITIONS})
 NL_DEFAULT_PROPS(georges_editor_qt "Ryzom, Tools, World: Georges Editor Qt")
 NL_ADD_RUNTIME_FLAGS(georges_editor_qt)
 
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/CMakeLists.txt b/code/ryzom/tools/leveldesign/world_editor/world_editor/CMakeLists.txt
index e4790eeea..c1364751b 100644
--- a/code/ryzom/tools/leveldesign/world_editor/world_editor/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/world_editor/world_editor/CMakeLists.txt
@@ -10,15 +10,12 @@ ADD_EXECUTABLE(world_editor WIN32 ${SRC} world_editor.rc)
 
 SOURCE_GROUP(Resources FILES world_editor.rc)
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(world_editor	
 					nelmisc
 					nelligo
 					nel3d
 					nelgeorges
-					nelpacs
-					${LIBXML2_LIBRARIES})
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
+					nelpacs)
 
 NL_DEFAULT_PROPS(world_editor "Ryzom, Tools, World: World Editor")
 NL_ADD_RUNTIME_FLAGS(world_editor)
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/CMakeLists.txt b/code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/CMakeLists.txt
index 3d1f18473..e9990a7dd 100644
--- a/code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/CMakeLists.txt
@@ -2,8 +2,6 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_LIBRARY(world_editor_fauna_graph_plugin SHARED ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(world_editor_fauna_graph_plugin 
 							nelmisc
 							nel3d
@@ -14,7 +12,7 @@ NL_DEFAULT_PROPS(world_editor_fauna_graph_plugin "Ryzom, Tools, World: World Edi
 NL_ADD_RUNTIME_FLAGS(world_editor_fauna_graph_plugin)
 NL_ADD_LIB_SUFFIX(world_editor_fauna_graph_plugin)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${MFC_DEFINITIONS} -DWIN32_DLL_EXPORTS)
+ADD_DEFINITIONS(${MFC_DEFINITIONS} -DWIN32_DLL_EXPORTS)
 
 
 INSTALL(TARGETS world_editor_fauna_graph_plugin LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT tools3d)
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/CMakeLists.txt b/code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/CMakeLists.txt
index 8895ac93b..e6b5d4609 100644
--- a/code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/CMakeLists.txt
@@ -2,8 +2,6 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_LIBRARY(world_editor_graph_plugin SHARED ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(world_editor_graph_plugin 
 							nelmisc
 							nel3d
@@ -15,7 +13,7 @@ NL_DEFAULT_PROPS(world_editor_graph_plugin "Ryzom, Tools, World: World Editor Gr
 NL_ADD_RUNTIME_FLAGS(world_editor_graph_plugin)
 NL_ADD_LIB_SUFFIX(world_editor_graph_plugin)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${MFC_DEFINITIONS} -DWIN32_DLL_EXPORTS)
+ADD_DEFINITIONS(${MFC_DEFINITIONS} -DWIN32_DLL_EXPORTS)
 
 
 INSTALL(TARGETS world_editor_graph_plugin LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT tools3d)
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/CMakeLists.txt b/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/CMakeLists.txt
index 81b77c4f1..83151f6fe 100644
--- a/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/CMakeLists.txt
@@ -2,8 +2,6 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_LIBRARY(world_editor_plugin SHARED ${SRC} world_editor_plugin.rc)
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(world_editor_plugin 
 							nelmisc
 							nel3d
@@ -15,7 +13,7 @@ NL_DEFAULT_PROPS(world_editor_plugin "Ryzom, Tools, World: World Editor Plugin D
 NL_ADD_RUNTIME_FLAGS(world_editor_plugin)
 NL_ADD_LIB_SUFFIX(world_editor_plugin)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${MFC_DEFINITIONS} -DOBJECT_VIEWER_LIB_EXPORTS)
+ADD_DEFINITIONS(${MFC_DEFINITIONS} -DOBJECT_VIEWER_LIB_EXPORTS)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(world_editor_plugin ${CMAKE_CURRENT_SOURCE_DIR}/StdAfx.h ${CMAKE_CURRENT_SOURCE_DIR}/StdAfx.cpp)
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/CMakeLists.txt b/code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/CMakeLists.txt
index d33bd7032..eb559898b 100644
--- a/code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/CMakeLists.txt
@@ -2,8 +2,6 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_LIBRARY(world_editor_primitive_plugin SHARED ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(world_editor_primitive_plugin 
 							nelmisc
 							nel3d
@@ -14,7 +12,7 @@ NL_DEFAULT_PROPS(world_editor_primitive_plugin "Ryzom, Tools, World: World Edito
 NL_ADD_RUNTIME_FLAGS(world_editor_primitive_plugin)
 NL_ADD_LIB_SUFFIX(world_editor_primitive_plugin)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${MFC_DEFINITIONS} -DWIN32_DLL_EXPORTS)
+ADD_DEFINITIONS(${MFC_DEFINITIONS} -DWIN32_DLL_EXPORTS)
 
 
 INSTALL(TARGETS world_editor_primitive_plugin LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT tools3d)
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/CMakeLists.txt b/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/CMakeLists.txt
index c821f5de9..654012812 100644
--- a/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/CMakeLists.txt
@@ -2,8 +2,6 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_LIBRARY(world_editor_shard_monitor_plugin SHARED ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(world_editor_shard_monitor_plugin 
 							nelmisc
 							nel3d
@@ -15,7 +13,7 @@ NL_DEFAULT_PROPS(world_editor_shard_monitor_plugin "Ryzom, Tools, World: World E
 NL_ADD_RUNTIME_FLAGS(world_editor_shard_monitor_plugin)
 NL_ADD_LIB_SUFFIX(world_editor_shard_monitor_plugin)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${MFC_DEFINITIONS} -DWIN32_DLL_EXPORTS)
+ADD_DEFINITIONS(${MFC_DEFINITIONS} -DWIN32_DLL_EXPORTS)
 
 
 INSTALL(TARGETS world_editor_shard_monitor_plugin LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT tools3d)
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/CMakeLists.txt b/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/CMakeLists.txt
index 997777d56..8d263efc1 100644
--- a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/CMakeLists.txt
@@ -2,8 +2,6 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_LIBRARY(world_editor_sound_plugin SHARED ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(world_editor_sound_plugin 
 							nelmisc
 							nel3d
@@ -14,7 +12,7 @@ NL_DEFAULT_PROPS(world_editor_sound_plugin "Ryzom, Tools, World: World Editor So
 NL_ADD_RUNTIME_FLAGS(world_editor_sound_plugin)
 NL_ADD_LIB_SUFFIX(world_editor_sound_plugin)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${MFC_DEFINITIONS} -DWIN32_DLL_EXPORTS)
+ADD_DEFINITIONS(${MFC_DEFINITIONS} -DWIN32_DLL_EXPORTS)
 
 
 INSTALL(TARGETS world_editor_sound_plugin LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT tools3d)
diff --git a/code/ryzom/tools/occ2huff/CMakeLists.txt b/code/ryzom/tools/occ2huff/CMakeLists.txt
index 6be696d60..42b15e630 100644
--- a/code/ryzom/tools/occ2huff/CMakeLists.txt
+++ b/code/ryzom/tools/occ2huff/CMakeLists.txt
@@ -2,15 +2,9 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(occ2huff ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
-TARGET_LINK_LIBRARIES(occ2huff
-						${LIBXML2_LIBRARIES}
-						nelmisc)
+TARGET_LINK_LIBRARIES(occ2huff nelmisc)
 
 NL_DEFAULT_PROPS(occ2huff "Ryzom, Tools: occ2huff")
 NL_ADD_RUNTIME_FLAGS(occ2huff)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS occ2huff RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT tools)
diff --git a/code/ryzom/tools/phrase_generator/CMakeLists.txt b/code/ryzom/tools/phrase_generator/CMakeLists.txt
index 8e06c8f26..7595919c5 100644
--- a/code/ryzom/tools/phrase_generator/CMakeLists.txt
+++ b/code/ryzom/tools/phrase_generator/CMakeLists.txt
@@ -2,16 +2,11 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(phrase_generator ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(phrase_generator
-						${LIBXML2_LIBRARIES}
 						nelmisc
 						nelgeorges)
 
 NL_DEFAULT_PROPS(phrase_generator "Ryzom, Tools: Phrase Generator")
 NL_ADD_RUNTIME_FLAGS(phrase_generator)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS phrase_generator RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT tools)
diff --git a/code/ryzom/tools/server/build_world_packed_col/CMakeLists.txt b/code/ryzom/tools/server/build_world_packed_col/CMakeLists.txt
index a693108ce..f2d416abd 100644
--- a/code/ryzom/tools/server/build_world_packed_col/CMakeLists.txt
+++ b/code/ryzom/tools/server/build_world_packed_col/CMakeLists.txt
@@ -2,15 +2,14 @@ FILE(GLOB SRC *.cpp *.h ${RZ_SERVER_SRC_DIR}/ai_data_service/pacs_scan.h ${RZ_SE
 
 ADD_EXECUTABLE(build_world_packed_col ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR})
+
 TARGET_LINK_LIBRARIES(build_world_packed_col	
 					ryzom_gameshare
 					ryzom_servershare 
 					ryzom_aishare 
-					${LIBXML2_LIBRARIES} 
 					nelmisc
 					nel3d)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(build_world_packed_col "Ryzom, Tools, Server: Build World Packed Collisions")
 NL_ADD_RUNTIME_FLAGS(build_world_packed_col)
diff --git a/code/ryzom/tools/sheet_random_generator/CMakeLists.txt b/code/ryzom/tools/sheet_random_generator/CMakeLists.txt
index 5b80507c0..07e77b52f 100644
--- a/code/ryzom/tools/sheet_random_generator/CMakeLists.txt
+++ b/code/ryzom/tools/sheet_random_generator/CMakeLists.txt
@@ -2,18 +2,13 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(sheet_random_generator ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(sheet_random_generator
-						${LIBXML2_LIBRARIES}
 						nelmisc
 						nelgeorges)
 
 NL_DEFAULT_PROPS(sheet_random_generator "Ryzom, Tools: Sheets Random Generator")
 NL_ADD_RUNTIME_FLAGS(sheet_random_generator)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(sheet_random_generator ${CMAKE_CURRENT_SOURCE_DIR}/StdAfx.h ${CMAKE_CURRENT_SOURCE_DIR}/StdAfx.cpp)
 ENDIF(WITH_PCH)
diff --git a/code/snowballs2/server/chat/src/CMakeLists.txt b/code/snowballs2/server/chat/src/CMakeLists.txt
index 425242df7..dd04941b2 100644
--- a/code/snowballs2/server/chat/src/CMakeLists.txt
+++ b/code/snowballs2/server/chat/src/CMakeLists.txt
@@ -2,16 +2,11 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(snowballs_chat_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(snowballs_chat_service
-						${LIBXML2_LIBRARIES}
 						nelmisc
 						nelnet)
 
 NL_DEFAULT_PROPS(snowballs_chat_service "Snowballs, Services: Chat")
 NL_ADD_RUNTIME_FLAGS(snowballs_chat_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS snowballs_chat_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/snowballs2/server/collision/src/CMakeLists.txt b/code/snowballs2/server/collision/src/CMakeLists.txt
index 773bd65d8..47f4b13f6 100644
--- a/code/snowballs2/server/collision/src/CMakeLists.txt
+++ b/code/snowballs2/server/collision/src/CMakeLists.txt
@@ -2,10 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(snowballs_collision_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(snowballs_collision_service
-						${LIBXML2_LIBRARIES}
 						nelmisc
 						nelnet
 						nelpacs
@@ -14,6 +11,4 @@ TARGET_LINK_LIBRARIES(snowballs_collision_service
 NL_DEFAULT_PROPS(snowballs_collision_service "Snowballs, Services: Collision")
 NL_ADD_RUNTIME_FLAGS(snowballs_collision_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS snowballs_collision_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/snowballs2/server/frontend/src/CMakeLists.txt b/code/snowballs2/server/frontend/src/CMakeLists.txt
index 19d2c7165..3c4894ab9 100644
--- a/code/snowballs2/server/frontend/src/CMakeLists.txt
+++ b/code/snowballs2/server/frontend/src/CMakeLists.txt
@@ -2,16 +2,11 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(snowballs_frontend_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(snowballs_frontend_service
-						${LIBXML2_LIBRARIES}
 						nelmisc
 						nelnet)
 
 NL_DEFAULT_PROPS(snowballs_frontend_service "Snowballs, Services: Frontend Service")
 NL_ADD_RUNTIME_FLAGS(snowballs_frontend_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS snowballs_frontend_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/studio/src/CMakeLists.txt b/code/studio/src/CMakeLists.txt
index 510f0f93b..65a68a4dc 100644
--- a/code/studio/src/CMakeLists.txt
+++ b/code/studio/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 ADD_SUBDIRECTORY(3rdparty)
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR} ${QT_INCLUDES})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${NEL_INCLUDE_DIR} ${QT_INCLUDES})
 INCLUDE( ${QT_USE_FILE} )
 
 CONFIGURE_FILE(translations/translations.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc COPYONLY)
@@ -51,7 +51,7 @@ TARGET_LINK_LIBRARIES(studio
 		${QT_LIBRARIES}
 		${QT_QTMAIN_LIBRARY})
 
-ADD_DEFINITIONS(-DQT_NO_KEYWORDS ${LIBXML2_DEFINITIONS} ${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DQT_NO_KEYWORDS ${QT_DEFINITIONS})
 NL_DEFAULT_PROPS(studio "Tools: Studio")
 NL_ADD_RUNTIME_FLAGS(studio)
 
diff --git a/code/studio/src/plugins/bnp_manager/CMakeLists.txt b/code/studio/src/plugins/bnp_manager/CMakeLists.txt
index 406a927b8..883d10fd2 100644
--- a/code/studio/src/plugins/bnp_manager/CMakeLists.txt
+++ b/code/studio/src/plugins/bnp_manager/CMakeLists.txt
@@ -1,6 +1,5 @@
 INCLUDE_DIRECTORIES(  ${CMAKE_CURRENT_BINARY_DIR}
                       ${CMAKE_CURRENT_SOURCE_DIR}
-                      ${LIBXML2_INCLUDE_DIR}
                       ${QT_INCLUDES})
 
 FILE(GLOB SRC *.cpp *.h)
@@ -42,7 +41,7 @@ NL_DEFAULT_PROPS(studio_plugin_bnp_manager "Tools: Studio Plugin: BNP Manager")
 NL_ADD_RUNTIME_FLAGS(studio_plugin_bnp_manager)
 NL_ADD_LIB_SUFFIX(studio_plugin_bnp_manager)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
 
 INSTALL(TARGETS studio_plugin_bnp_manager LIBRARY DESTINATION ${OVQT_PLUGIN_DIR} RUNTIME DESTINATION ${NL_BIN_PREFIX} ARCHIVE DESTINATION ${OVQT_PLUGIN_DIR} COMPONENT tools3d)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/studio_plugin_bnp_manager.xml DESTINATION ${OVQT_PLUGIN_SPECS_DIR} COMPONENT tools3d)
diff --git a/code/studio/src/plugins/core/CMakeLists.txt b/code/studio/src/plugins/core/CMakeLists.txt
index db99b807c..992f602d4 100644
--- a/code/studio/src/plugins/core/CMakeLists.txt
+++ b/code/studio/src/plugins/core/CMakeLists.txt
@@ -1,6 +1,5 @@
 INCLUDE_DIRECTORIES(	${CMAKE_CURRENT_BINARY_DIR}
 			${CMAKE_CURRENT_SOURCE_DIR}
-			${LIBXML2_INCLUDE_DIR}
 			${QT_INCLUDES})
 
 FILE(GLOB SRC *.cpp *.h)
@@ -63,7 +62,7 @@ NL_DEFAULT_PROPS(studio_plugin_core "Tools: Studio Plugin: Core")
 NL_ADD_RUNTIME_FLAGS(studio_plugin_core)
 NL_ADD_LIB_SUFFIX(studio_plugin_core)
 
-ADD_DEFINITIONS(-DCORE_LIBRARY ${LIBXML2_DEFINITIONS} -DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DCORE_LIBRARY -DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
 
 IF(WIN32)
   IF(WITH_INSTALL_LIBRARIES)
diff --git a/code/studio/src/plugins/disp_sheet_id/CMakeLists.txt b/code/studio/src/plugins/disp_sheet_id/CMakeLists.txt
index bce24b667..048a4fba3 100644
--- a/code/studio/src/plugins/disp_sheet_id/CMakeLists.txt
+++ b/code/studio/src/plugins/disp_sheet_id/CMakeLists.txt
@@ -1,6 +1,5 @@
 INCLUDE_DIRECTORIES(	${CMAKE_CURRENT_BINARY_DIR}
 			${CMAKE_CURRENT_SOURCE_DIR}
-			${LIBXML2_INCLUDE_DIR}
 			${QT_INCLUDES})
 
 FILE(GLOB SRC *.cpp *.h)
@@ -38,7 +37,7 @@ NL_DEFAULT_PROPS(studio_plugin_disp_sheet_id "Tools: Studio Plugin: Display shee
 NL_ADD_RUNTIME_FLAGS(studio_plugin_disp_sheet_id)
 NL_ADD_LIB_SUFFIX(studio_plugin_disp_sheet_id)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
 
 
 IF(WIN32)
diff --git a/code/studio/src/plugins/example/CMakeLists.txt b/code/studio/src/plugins/example/CMakeLists.txt
index fd4008fc4..bfdfc78ec 100644
--- a/code/studio/src/plugins/example/CMakeLists.txt
+++ b/code/studio/src/plugins/example/CMakeLists.txt
@@ -1,6 +1,5 @@
 INCLUDE_DIRECTORIES(	${CMAKE_CURRENT_BINARY_DIR}
 						${CMAKE_CURRENT_SOURCE_DIR}
-						${LIBXML2_INCLUDE_DIR}
 						${QT_INCLUDES})
 
 FILE(GLOB SRC *.cpp *.h)
@@ -36,7 +35,7 @@ NL_DEFAULT_PROPS(studio_plugin_example "Tools: Studio Plugin: Example")
 NL_ADD_RUNTIME_FLAGS(studio_plugin_example)
 NL_ADD_LIB_SUFFIX(studio_plugin_example)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
 
 IF(WIN32)
   IF(WITH_INSTALL_LIBRARIES)
diff --git a/code/studio/src/plugins/georges_editor/CMakeLists.txt b/code/studio/src/plugins/georges_editor/CMakeLists.txt
index bf7e6e0c9..68b37421d 100644
--- a/code/studio/src/plugins/georges_editor/CMakeLists.txt
+++ b/code/studio/src/plugins/georges_editor/CMakeLists.txt
@@ -1,6 +1,5 @@
 INCLUDE_DIRECTORIES(  ${CMAKE_CURRENT_BINARY_DIR}
                       ${CMAKE_CURRENT_SOURCE_DIR}
-                      ${LIBXML2_INCLUDE_DIR}
                       ${QT_INCLUDES}
 					  ${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/qtpropertybrowser)
 
@@ -56,7 +55,7 @@ NL_DEFAULT_PROPS(studio_plugin_georges_editor "Tools: Studio Plugin: Georges Edi
 NL_ADD_RUNTIME_FLAGS(studio_plugin_georges_editor)
 NL_ADD_LIB_SUFFIX(studio_plugin_georges_editor)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
 
 
 IF(WITH_PCH)
diff --git a/code/studio/src/plugins/gui_editor/CMakeLists.txt b/code/studio/src/plugins/gui_editor/CMakeLists.txt
index f2f5bfcb1..0826a7028 100644
--- a/code/studio/src/plugins/gui_editor/CMakeLists.txt
+++ b/code/studio/src/plugins/gui_editor/CMakeLists.txt
@@ -89,7 +89,6 @@ TARGET_LINK_LIBRARIES(
 						nelgui
 						${QT_LIBRARIES}
 						${QT_QTOPENGL_LIBRARY}
-						${LIBXML2_LIBRARIES}
 						qt_property_browser
 						)
 
diff --git a/code/studio/src/plugins/landscape_editor/CMakeLists.txt b/code/studio/src/plugins/landscape_editor/CMakeLists.txt
index 448d86a48..dcdd288b9 100644
--- a/code/studio/src/plugins/landscape_editor/CMakeLists.txt
+++ b/code/studio/src/plugins/landscape_editor/CMakeLists.txt
@@ -1,6 +1,5 @@
 INCLUDE_DIRECTORIES(	${CMAKE_CURRENT_BINARY_DIR}
 			${CMAKE_CURRENT_SOURCE_DIR}
-			${LIBXML2_INCLUDE_DIR}
 			${QT_INCLUDES})
 
 FILE(GLOB SRC *.cpp *.h)
@@ -53,7 +52,7 @@ NL_DEFAULT_PROPS(studio_plugin_landscape_editor "Tools: Studio Plugin: Landscape
 NL_ADD_RUNTIME_FLAGS(studio_plugin_landscape_editor)
 NL_ADD_LIB_SUFFIX(studio_plugin_landscape_editor)
 
-ADD_DEFINITIONS(-DLANDSCAPE_EDITOR_LIBRARY ${LIBXML2_DEFINITIONS} -DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DLANDSCAPE_EDITOR_LIBRARY -DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
 
 
 
diff --git a/code/studio/src/plugins/log/CMakeLists.txt b/code/studio/src/plugins/log/CMakeLists.txt
index 7a27f370a..a550f4354 100644
--- a/code/studio/src/plugins/log/CMakeLists.txt
+++ b/code/studio/src/plugins/log/CMakeLists.txt
@@ -1,7 +1,4 @@
-INCLUDE_DIRECTORIES(	${CMAKE_CURRENT_BINARY_DIR}
-			            ${CMAKE_CURRENT_SOURCE_DIR}
-			            ${LIBXML2_INCLUDE_DIR}
-                        ${QT_INCLUDES})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES})
 
 FILE(GLOB SRC *.cpp *.h)
 SET(OVQT_EXT_SYS_SRC	${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin.h
@@ -34,7 +31,7 @@ NL_DEFAULT_PROPS(studio_plugin_log "Tools: Studio Plugin: Log")
 NL_ADD_RUNTIME_FLAGS(studio_plugin_log)
 NL_ADD_LIB_SUFFIX(studio_plugin_log)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
 
 
 IF(WIN32)
diff --git a/code/studio/src/plugins/mission_compiler/CMakeLists.txt b/code/studio/src/plugins/mission_compiler/CMakeLists.txt
index cbf35b9c7..d47821af0 100644
--- a/code/studio/src/plugins/mission_compiler/CMakeLists.txt
+++ b/code/studio/src/plugins/mission_compiler/CMakeLists.txt
@@ -1,6 +1,5 @@
 INCLUDE_DIRECTORIES(	${CMAKE_CURRENT_BINARY_DIR}
 						${CMAKE_CURRENT_SOURCE_DIR}
-						${LIBXML2_INCLUDE_DIR}
 						${QT_INCLUDES})
 
 FILE(GLOB SRC *.cpp *.h)
@@ -44,7 +43,7 @@ NL_DEFAULT_PROPS(studio_plugin_mission_compiler "Tools: Studio Plugin: Mission C
 NL_ADD_RUNTIME_FLAGS(studio_plugin_mission_compiler)
 NL_ADD_LIB_SUFFIX(studio_plugin_mission_compiler)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
 
 
 
diff --git a/code/studio/src/plugins/object_viewer/CMakeLists.txt b/code/studio/src/plugins/object_viewer/CMakeLists.txt
index 3a4ce9c65..256aac760 100644
--- a/code/studio/src/plugins/object_viewer/CMakeLists.txt
+++ b/code/studio/src/plugins/object_viewer/CMakeLists.txt
@@ -1,6 +1,5 @@
 INCLUDE_DIRECTORIES(	${CMAKE_CURRENT_BINARY_DIR}
 			${CMAKE_CURRENT_SOURCE_DIR}
-			${LIBXML2_INCLUDE_DIR}
 			${QT_INCLUDES}
 			${CMAKE_CURRENT_SOURCE_DIR}/scene/
 			${CMAKE_CURRENT_SOURCE_DIR}/particle_system/
@@ -190,7 +189,7 @@ NL_DEFAULT_PROPS(studio_plugin_object_viewer "Tools: Studio Plugin: Object Viewe
 NL_ADD_RUNTIME_FLAGS(studio_plugin_object_viewer)
 NL_ADD_LIB_SUFFIX(studio_plugin_object_viewer)
 
-ADD_DEFINITIONS(-DQT_NO_KEYWORDS ${LIBXML2_DEFINITIONS} -DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DQT_NO_KEYWORDS -DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(studio_plugin_object_viewer ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
diff --git a/code/studio/src/plugins/ovqt_sheet_builder/CMakeLists.txt b/code/studio/src/plugins/ovqt_sheet_builder/CMakeLists.txt
index a543421c5..8c75715e7 100644
--- a/code/studio/src/plugins/ovqt_sheet_builder/CMakeLists.txt
+++ b/code/studio/src/plugins/ovqt_sheet_builder/CMakeLists.txt
@@ -1,6 +1,5 @@
 INCLUDE_DIRECTORIES(	${CMAKE_CURRENT_BINARY_DIR}
 			${CMAKE_CURRENT_SOURCE_DIR}
-			${LIBXML2_INCLUDE_DIR}
 			${QT_INCLUDES})
 
 FILE(GLOB SRC *.cpp *.h)
@@ -27,7 +26,7 @@ NL_DEFAULT_PROPS(studio_plugin_sheet_builder "Tools: Studio Plugin: Sheet builde
 NL_ADD_RUNTIME_FLAGS(studio_plugin_sheet_builder)
 NL_ADD_LIB_SUFFIX(studio_plugin_sheet_builder)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
 
 
 IF(WIN32)
diff --git a/code/studio/src/plugins/tile_editor/CMakeLists.txt b/code/studio/src/plugins/tile_editor/CMakeLists.txt
index bfb9f3440..e265e3d6f 100644
--- a/code/studio/src/plugins/tile_editor/CMakeLists.txt
+++ b/code/studio/src/plugins/tile_editor/CMakeLists.txt
@@ -1,6 +1,5 @@
 INCLUDE_DIRECTORIES(	${CMAKE_CURRENT_BINARY_DIR}
 			${CMAKE_CURRENT_SOURCE_DIR}
-			${LIBXML2_INCLUDE_DIR}
 			${QT_INCLUDES})
 
 FILE(GLOB SRC *.cpp *.h)
@@ -44,7 +43,7 @@ NL_DEFAULT_PROPS(studio_plugin_tile_editor "Tools: Studio Plugin: Tile Editor")
 NL_ADD_RUNTIME_FLAGS(studio_plugin_tile_editor)
 NL_ADD_LIB_SUFFIX(studio_plugin_tile_editor)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
 
 IF(WIN32)
   IF(WITH_INSTALL_LIBRARIES)
diff --git a/code/studio/src/plugins/translation_manager/CMakeLists.txt b/code/studio/src/plugins/translation_manager/CMakeLists.txt
index b35c64735..966ae9fbf 100644
--- a/code/studio/src/plugins/translation_manager/CMakeLists.txt
+++ b/code/studio/src/plugins/translation_manager/CMakeLists.txt
@@ -1,6 +1,5 @@
 INCLUDE_DIRECTORIES(	${CMAKE_CURRENT_BINARY_DIR}
 						${CMAKE_CURRENT_SOURCE_DIR}
-						${LIBXML2_INCLUDE_DIR}
 						${QT_INCLUDES})
 
 FILE(GLOB SRC *.cpp *.h)
@@ -47,7 +46,7 @@ NL_DEFAULT_PROPS(studio_plugin_translation_manager "Tools: Studio Plugin: Transl
 NL_ADD_RUNTIME_FLAGS(studio_plugin_translation_manager)
 NL_ADD_LIB_SUFFIX(studio_plugin_translation_manager)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
 
 IF(WIN32)
   IF(WITH_INSTALL_LIBRARIES)
diff --git a/code/studio/src/plugins/world_editor/CMakeLists.txt b/code/studio/src/plugins/world_editor/CMakeLists.txt
index 441ff5d02..1a7ff652d 100644
--- a/code/studio/src/plugins/world_editor/CMakeLists.txt
+++ b/code/studio/src/plugins/world_editor/CMakeLists.txt
@@ -1,6 +1,5 @@
 INCLUDE_DIRECTORIES(	${CMAKE_CURRENT_BINARY_DIR}
 			${CMAKE_CURRENT_SOURCE_DIR}
-			${LIBXML2_INCLUDE_DIR}
 			${QT_INCLUDES}
 			${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/qtpropertybrowser
 			)
@@ -60,14 +59,13 @@ TARGET_LINK_LIBRARIES(	studio_plugin_world_editor
 						qt_property_browser
 						${QT_LIBRARIES} 
 						${QT_QTOPENGL_LIBRARY}
-						${LIBXML2_LIBRARIES}
 )
 
 NL_DEFAULT_PROPS(studio_plugin_world_editor "Tools: Studio Plugin: World Editor")
 NL_ADD_RUNTIME_FLAGS(studio_plugin_world_editor)
 NL_ADD_LIB_SUFFIX(studio_plugin_world_editor)
 
-ADD_DEFINITIONS(-DWORLD_EDITOR_LIBRARY ${LIBXML2_DEFINITIONS} -DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DWORLD_EDITOR_LIBRARY -DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
 
 IF(WIN32)
   IF(WITH_INSTALL_LIBRARIES)
diff --git a/code/studio/src/plugins/zone_painter/CMakeLists.txt b/code/studio/src/plugins/zone_painter/CMakeLists.txt
index 94f5e85f7..658fa9bbc 100644
--- a/code/studio/src/plugins/zone_painter/CMakeLists.txt
+++ b/code/studio/src/plugins/zone_painter/CMakeLists.txt
@@ -1,6 +1,5 @@
 INCLUDE_DIRECTORIES(	${CMAKE_CURRENT_BINARY_DIR}
 						${CMAKE_CURRENT_SOURCE_DIR}
-						${LIBXML2_INCLUDE_DIR}
 						${QT_INCLUDES})
 
 FILE(GLOB SRC *.cpp *.h)
@@ -40,7 +39,7 @@ NL_DEFAULT_PROPS(studio_plugin_zone_painter "Tools: Studio Plugin: Zone Painter"
 NL_ADD_RUNTIME_FLAGS(studio_plugin_zone_painter)
 NL_ADD_LIB_SUFFIX(studio_plugin_zone_painter)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
+ADD_DEFINITIONS(-DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
 
 
 IF(WIN32)