diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index f4f6928ae..2817c5728 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -450,8 +450,7 @@ IF(WITH_NEL)
     ENDIF()
   ENDIF()
 
-  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/nel/include ${LIBXML2_INCLUDE_DIR})
-  ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
+  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/nel/include)
   ADD_SUBDIRECTORY(nel)
 ENDIF(WITH_NEL)
 
diff --git a/code/nel/include/nel/georges/header.h b/code/nel/include/nel/georges/header.h
index 21b05445e..343b2baa1 100644
--- a/code/nel/include/nel/georges/header.h
+++ b/code/nel/include/nel/georges/header.h
@@ -19,8 +19,12 @@
 
 #include "nel/misc/types_nl.h"
 
-// Include from libxml2
-#include <libxml/parser.h>
+// Forward declarations for libxml2
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
+
+typedef struct _xmlDoc xmlDoc;
+typedef xmlDoc *xmlDocPtr;
 
 namespace NLGEORGES
 {
diff --git a/code/nel/include/nel/gui/action_handler.h b/code/nel/include/nel/gui/action_handler.h
index 48b49e451..f0f4c46f8 100644
--- a/code/nel/include/nel/gui/action_handler.h
+++ b/code/nel/include/nel/gui/action_handler.h
@@ -17,13 +17,16 @@
 #ifndef NL_ACTION_HANDLER_H
 #define NL_ACTION_HANDLER_H
 
-#include "nel/misc/types_nl.h"
-#include <libxml/parser.h>
 #include "nel/misc/types_nl.h"
 #include "nel/misc/debug.h"
 #include "nel/misc/xml_auto_ptr.h"
+
 #include <map>
 
+// Forward declarations for libxml2
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
+
 namespace NLGUI
 {
 
diff --git a/code/nel/include/nel/gui/interface_options.h b/code/nel/include/nel/gui/interface_options.h
index da0ea7de8..4ee0f52ee 100644
--- a/code/nel/include/nel/gui/interface_options.h
+++ b/code/nel/include/nel/gui/interface_options.h
@@ -22,9 +22,12 @@
 #include "nel/misc/debug.h"
 #include "nel/misc/smart_ptr.h"
 #include "nel/misc/rgba.h"
-#include "libxml/globals.h"
 #include "nel/misc/xml_auto_ptr.h"
 
+// Forward declarations for libxml2
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
+
 namespace NL3D
 {
 	class UAnimationSet;
diff --git a/code/nel/include/nel/ligo/primitive.h b/code/nel/include/nel/ligo/primitive.h
index c050f14b6..c5aa26b02 100644
--- a/code/nel/include/nel/ligo/primitive.h
+++ b/code/nel/include/nel/ligo/primitive.h
@@ -20,8 +20,13 @@
 #include "nel/misc/vector.h"
 #include "nel/misc/rgba.h"
 
-// Include from libxml2
-#include <libxml/parser.h>
+// Forward declarations for libxml2
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
+
+typedef struct _xmlDoc xmlDoc;
+typedef xmlDoc *xmlDocPtr;
+
 
 #include <vector>
 
diff --git a/code/nel/include/nel/ligo/primitive_class.h b/code/nel/include/nel/ligo/primitive_class.h
index 71d2021f2..24b46d1f4 100644
--- a/code/nel/include/nel/ligo/primitive_class.h
+++ b/code/nel/include/nel/ligo/primitive_class.h
@@ -22,8 +22,9 @@
 #include <map>
 #include <set>
 
-// Include from libxml2
-#include <libxml/parser.h>
+// Forward declarations for libxml2
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
 
 namespace NLLIGO
 {
diff --git a/code/nel/include/nel/ligo/primitive_configuration.h b/code/nel/include/nel/ligo/primitive_configuration.h
index dc58a5979..41d149811 100644
--- a/code/nel/include/nel/ligo/primitive_configuration.h
+++ b/code/nel/include/nel/ligo/primitive_configuration.h
@@ -21,8 +21,9 @@
 #include "nel/misc/rgba.h"
 #include <vector>
 
-// Include from libxml2
-#include <libxml/parser.h>
+// Forward declarations for libxml2
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
 
 namespace NLLIGO
 {
diff --git a/code/nel/include/nel/misc/cdb.h b/code/nel/include/nel/misc/cdb.h
index ec77d151d..bc02dc85b 100644
--- a/code/nel/include/nel/misc/cdb.h
+++ b/code/nel/include/nel/misc/cdb.h
@@ -25,7 +25,9 @@
 #include "string_mapper.h"
 #include "sstring.h"
 
-#include <libxml/parser.h>
+// Forward declarations for libxml2
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
 
 namespace NLMISC
 {
diff --git a/code/nel/include/nel/misc/i_xml.h b/code/nel/include/nel/misc/i_xml.h
index cf2527e21..20ee8a7e0 100644
--- a/code/nel/include/nel/misc/i_xml.h
+++ b/code/nel/include/nel/misc/i_xml.h
@@ -25,8 +25,12 @@
 #include "types_nl.h"
 #include "stream.h"
 
-// Include from libxml2
-#include <libxml/parser.h>
+// Forward declarations for libxml2
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
+
+typedef struct _xmlParserCtxt xmlParserCtxt;
+typedef xmlParserCtxt *xmlParserCtxtPtr;
 
 namespace NLMISC {
 
@@ -124,11 +128,11 @@ public:
 
 	/** Get the first child node pointer of type. NULL if no node of type.
 	  */
-	static xmlNodePtr getFirstChildNode (xmlNodePtr parent, xmlElementType type);
+	static xmlNodePtr getFirstChildNode (xmlNodePtr parent, sint /* xmlElementType */ type);
 
 	/** Get the next child node pointer of type. NULL if no node of type.
 	  */
-	static xmlNodePtr getNextChildNode (xmlNodePtr last, xmlElementType type);
+	static xmlNodePtr getNextChildNode (xmlNodePtr last, sint /* xmlElementType */ type);
 
 	/** Count number of sub node named with a given name for a given node.
 	  */
@@ -136,7 +140,7 @@ public:
 
 	/** Count number of sub node of type for a given node.
 	  */
-	static uint		countChildren (xmlNodePtr node, xmlElementType type);
+	static uint		countChildren (xmlNodePtr node, sint /* xmlElementType */ type);
 
 	/**
 	  * Read a property string
diff --git a/code/nel/include/nel/misc/o_xml.h b/code/nel/include/nel/misc/o_xml.h
index a532f0342..8346a6884 100644
--- a/code/nel/include/nel/misc/o_xml.h
+++ b/code/nel/include/nel/misc/o_xml.h
@@ -25,9 +25,12 @@
 #include "types_nl.h"
 #include "stream.h"
 
-// Include from libxml2
-#include <libxml/parser.h>
+// Forward declarations for libxml2
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
 
+typedef struct _xmlDoc xmlDoc;
+typedef xmlDoc *xmlDocPtr;
 
 namespace NLMISC {
 
diff --git a/code/nel/src/gui/stdpch.h b/code/nel/src/gui/stdpch.h
index 3270e6482..51f1b1657 100644
--- a/code/nel/src/gui/stdpch.h
+++ b/code/nel/src/gui/stdpch.h
@@ -30,6 +30,8 @@
 #include "nel/misc/uv.h"
 #include "nel/misc/hierarchical_timer.h"
 
+#include <libxml/parser.h>
+
 #ifdef NL_OS_WINDOWS
 	#ifndef NL_COMP_MINGW
 	#	define NOMINMAX
diff --git a/code/nel/src/misc/i_xml.cpp b/code/nel/src/misc/i_xml.cpp
index ee3f39a89..e722f3eee 100644
--- a/code/nel/src/misc/i_xml.cpp
+++ b/code/nel/src/misc/i_xml.cpp
@@ -1030,12 +1030,12 @@ xmlNodePtr CIXml::getNextChildNode (xmlNodePtr last, const char *childName)
 
 // ***************************************************************************
 
-xmlNodePtr CIXml::getFirstChildNode (xmlNodePtr parent, xmlElementType type)
+xmlNodePtr CIXml::getFirstChildNode (xmlNodePtr parent, sint /* xmlElementType */ type)
 {
 	xmlNodePtr child = parent->children;
 	while (child)
 	{
-		if (child->type == type)
+		if (child->type == (xmlElementType)type)
 			return child;
 		child = child->next;
 	}
@@ -1044,12 +1044,12 @@ xmlNodePtr CIXml::getFirstChildNode (xmlNodePtr parent, xmlElementType type)
 
 // ***************************************************************************
 
-xmlNodePtr CIXml::getNextChildNode (xmlNodePtr last, xmlElementType type)
+xmlNodePtr CIXml::getNextChildNode (xmlNodePtr last, sint /* xmlElementType */ type)
 {
 	last = last->next;
 	while (last)
 	{
-		if (last->type == type)
+		if (last->type == (xmlElementType)type)
 			return last;
 		last = last->next;
 	}
@@ -1072,7 +1072,7 @@ uint CIXml::countChildren (xmlNodePtr node, const char *childName)
 
 // ***************************************************************************
 
-uint CIXml::countChildren (xmlNodePtr node, xmlElementType type)
+uint CIXml::countChildren (xmlNodePtr node, sint /* xmlElementType */ type)
 {
 	uint count=0;
 	xmlNodePtr child = getFirstChildNode (node, type);
diff --git a/code/nel/tools/3d/ig_elevation/CMakeLists.txt b/code/nel/tools/3d/ig_elevation/CMakeLists.txt
index eb59adf22..fc584883c 100644
--- a/code/nel/tools/3d/ig_elevation/CMakeLists.txt
+++ b/code/nel/tools/3d/ig_elevation/CMakeLists.txt
@@ -2,12 +2,8 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(ig_elevation ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(ig_elevation nelmisc nel3d nelligo)
 NL_DEFAULT_PROPS(ig_elevation "NeL, Tools, 3D: ig_elevation")
 NL_ADD_RUNTIME_FLAGS(ig_elevation)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS ig_elevation RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT tools3d)
diff --git a/code/nel/tools/3d/object_viewer_widget/src/CMakeLists.txt b/code/nel/tools/3d/object_viewer_widget/src/CMakeLists.txt
index 2fc61f15f..028775114 100644
--- a/code/nel/tools/3d/object_viewer_widget/src/CMakeLists.txt
+++ b/code/nel/tools/3d/object_viewer_widget/src/CMakeLists.txt
@@ -1,11 +1,8 @@
 INCLUDE_DIRECTORIES(
 		${CMAKE_CURRENT_BINARY_DIR}
 		${CMAKE_CURRENT_SOURCE_DIR}
-		${LIBXML2_INCLUDE_DIR}
 		${NEL_INCLUDE_DIR})
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 FILE(GLOB OBJECT_VIEWER_WIDGET_SRC *.cpp *.h)
 SET(OBJECT_VIEWER_WIDGET_HDR object_viewer_widget.h)
 
diff --git a/code/nel/tools/georges/georges2csv/CMakeLists.txt b/code/nel/tools/georges/georges2csv/CMakeLists.txt
index b52de14ea..efb489f82 100644
--- a/code/nel/tools/georges/georges2csv/CMakeLists.txt
+++ b/code/nel/tools/georges/georges2csv/CMakeLists.txt
@@ -2,12 +2,8 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(georges2csv ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(georges2csv nelmisc nelgeorges)
 NL_DEFAULT_PROPS(georges2csv "NeL, Tools, Georges: georges2csv")
 NL_ADD_RUNTIME_FLAGS(georges2csv)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS georges2csv RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT toolsgeorges)
diff --git a/code/nel/tools/georges/georges2csv/georges2csv.cpp b/code/nel/tools/georges/georges2csv/georges2csv.cpp
index f400a2976..018a6abff 100644
--- a/code/nel/tools/georges/georges2csv/georges2csv.cpp
+++ b/code/nel/tools/georges/georges2csv/georges2csv.cpp
@@ -44,10 +44,6 @@
 #include "nel/georges/u_form_loader.h"
 #include "nel/georges/load_form.h"
 
-// Include from libxml2
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-
 // Georges, bypassing interface
 #include "nel/georges/form.h"
 
diff --git a/code/nel/tools/nel_unit_test/CMakeLists.txt b/code/nel/tools/nel_unit_test/CMakeLists.txt
index 8c53ff1c6..7e26a2498 100644
--- a/code/nel/tools/nel_unit_test/CMakeLists.txt
+++ b/code/nel/tools/nel_unit_test/CMakeLists.txt
@@ -2,12 +2,12 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(nel_unit_test ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${CPPTEST_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${CPPTEST_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(nel_unit_test ${CPPTEST_LIBRARIES} nelmisc nelnet nelligo)
 NL_DEFAULT_PROPS(nel_unit_test "Unit Tests")
 NL_ADD_RUNTIME_FLAGS(nel_unit_test)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -DNEL_UNIT_BASE="${PROJECT_SOURCE_DIR}/tools/nel_unit_test/")
+ADD_DEFINITIONS(-DNEL_UNIT_BASE="${PROJECT_SOURCE_DIR}/tools/nel_unit_test/")
 
 INSTALL(TARGETS nel_unit_test RUNTIME DESTINATION ${NL_BIN_PREFIX})
diff --git a/code/ryzom/client/src/CMakeLists.txt b/code/ryzom/client/src/CMakeLists.txt
index 20243d2f9..e54b90737 100644
--- a/code/ryzom/client/src/CMakeLists.txt
+++ b/code/ryzom/client/src/CMakeLists.txt
@@ -139,13 +139,14 @@ IF(WITH_RYZOM_CLIENT)
               ryzom_clientsheets
               ryzom_gameshare
               nelpacs
-              ${LIBXML2_LIBRARIES}
               ${LUA_LIBRARIES}
               ${LUABIND_LIBRARIES}
               ${CURL_LIBRARIES}
               ${SEVENZIP_LIBRARY}
   )
 
+  ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
+
   IF(NOT APPLE AND NOT WIN32)
     TARGET_LINK_LIBRARIES(ryzom_client ${X11_LIBRARIES})
   ENDIF()
diff --git a/code/ryzom/server/src/ai_share/CMakeLists.txt b/code/ryzom/server/src/ai_share/CMakeLists.txt
index 190034c73..7396ec21d 100644
--- a/code/ryzom/server/src/ai_share/CMakeLists.txt
+++ b/code/ryzom/server/src/ai_share/CMakeLists.txt
@@ -2,8 +2,6 @@ FILE(GLOB SRC *.cpp *.h)
 
 NL_TARGET_LIB(ryzom_aishare ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(ryzom_aishare
 						ryzom_gameshare
 						ryzom_servershare
@@ -16,8 +14,6 @@ NL_DEFAULT_PROPS(ryzom_aishare "Ryzom, Library: AI Shared")
 NL_ADD_RUNTIME_FLAGS(ryzom_aishare)
 NL_ADD_LIB_SUFFIX(ryzom_aishare)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(ryzom_aishare ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
 ENDIF(WITH_PCH)
diff --git a/code/ryzom/server/src/tick_service/CMakeLists.txt b/code/ryzom/server/src/tick_service/CMakeLists.txt
index fbf01d86f..9cd8ce82d 100644
--- a/code/ryzom/server/src/tick_service/CMakeLists.txt
+++ b/code/ryzom/server/src/tick_service/CMakeLists.txt
@@ -2,11 +2,11 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(ryzom_tick_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR})
+
 TARGET_LINK_LIBRARIES(ryzom_tick_service
 						ryzom_adminmodules
 						ryzom_gameshare
-						${LIBXML2_LIBRARIES}
 						nelmisc
 						nelnet
 						nelgeorges)
diff --git a/code/ryzom/tools/assoc_mem/CMakeLists.txt b/code/ryzom/tools/assoc_mem/CMakeLists.txt
index 6b0a26372..9dacfd380 100644
--- a/code/ryzom/tools/assoc_mem/CMakeLists.txt
+++ b/code/ryzom/tools/assoc_mem/CMakeLists.txt
@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(assoc_mem ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(assoc_mem nelmisc)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(assoc_mem "Ryzom, Tools, Misc: assoc_mem")
 NL_ADD_RUNTIME_FLAGS(assoc_mem)
diff --git a/code/ryzom/tools/client/client_patcher/CMakeLists.txt b/code/ryzom/tools/client/client_patcher/CMakeLists.txt
index ee6f34eb1..dbdb90829 100644
--- a/code/ryzom/tools/client/client_patcher/CMakeLists.txt
+++ b/code/ryzom/tools/client/client_patcher/CMakeLists.txt
@@ -15,7 +15,6 @@ ADD_DEFINITIONS(-DRZ_USE_CUSTOM_PATCH_SERVER)
 ADD_EXECUTABLE(ryzom_client_patcher ${SRC})
 
 INCLUDE_DIRECTORIES(
-			${LIBXML2_INCLUDE_DIR}
 			${CURL_INCLUDE_DIRS}
 			${ZLIB_INCLUDE_DIR}
 			${CMAKE_SOURCE_DIR}/ryzom/client/src
@@ -34,7 +33,7 @@ IF(APPLE)
   TARGET_LINK_LIBRARIES(ryzom_client_patcher ${FOUNDATION_LIBRARY})
 ENDIF(APPLE)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${CURL_DEFINITIONS} -DRZ_NO_CLIENT -DNL_USE_SEVENZIP)
+ADD_DEFINITIONS(${CURL_DEFINITIONS} -DRZ_NO_CLIENT -DNL_USE_SEVENZIP)
 
 NL_DEFAULT_PROPS(ryzom_client_patcher "Ryzom, Tools: Ryzom Client Patcher")
 NL_ADD_RUNTIME_FLAGS(ryzom_client_patcher)
diff --git a/code/ryzom/tools/client/r2_islands_textures/CMakeLists.txt b/code/ryzom/tools/client/r2_islands_textures/CMakeLists.txt
index 0fc6c65a2..76be43bc8 100644
--- a/code/ryzom/tools/client/r2_islands_textures/CMakeLists.txt
+++ b/code/ryzom/tools/client/r2_islands_textures/CMakeLists.txt
@@ -2,14 +2,13 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(r2_islands_textures ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR})
+
 TARGET_LINK_LIBRARIES(r2_islands_textures
 					ryzom_gameshare
 					ryzom_aishare
-					${LIBXML2_LIBRARIES} 
 					nelmisc
 					nel3d)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(r2_islands_textures "Ryzom, Tools, Server: R2 Islands Textures")
 NL_ADD_RUNTIME_FLAGS(r2_islands_textures)
diff --git a/code/ryzom/tools/leveldesign/alias_synchronizer/CMakeLists.txt b/code/ryzom/tools/leveldesign/alias_synchronizer/CMakeLists.txt
index 7a9a4b160..fccc25a39 100644
--- a/code/ryzom/tools/leveldesign/alias_synchronizer/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/alias_synchronizer/CMakeLists.txt
@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(alias_synchronizer ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(alias_synchronizer nelmisc nelligo)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(alias_synchronizer "Ryzom, Tools, Misc: Alias Synchronizer")
 NL_ADD_RUNTIME_FLAGS(alias_synchronizer)
diff --git a/code/ryzom/tools/leveldesign/export/CMakeLists.txt b/code/ryzom/tools/leveldesign/export/CMakeLists.txt
index 74bf81cf5..5199fc275 100644
--- a/code/ryzom/tools/leveldesign/export/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/export/CMakeLists.txt
@@ -3,15 +3,11 @@ FILE(GLOB PRIV_H *.h)
 
 NL_TARGET_LIB(ryzom_export ${PRIV_H} ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(ryzom_export nelmisc nelligo nelgeorges nel3d nelpacs)
 NL_DEFAULT_PROPS(ryzom_export "Ryzom, Library, World: Export Tools")
 NL_ADD_RUNTIME_FLAGS(ryzom_export)
 NL_ADD_LIB_SUFFIX(ryzom_export)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS ryzom_export LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT libraries)
 ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
diff --git a/code/ryzom/tools/leveldesign/mp_generator/CMakeLists.txt b/code/ryzom/tools/leveldesign/mp_generator/CMakeLists.txt
index 7d177bd02..789a36bed 100644
--- a/code/ryzom/tools/leveldesign/mp_generator/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/mp_generator/CMakeLists.txt
@@ -2,15 +2,9 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(mp_generator ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
-TARGET_LINK_LIBRARIES(mp_generator
-						${LIBXML2_LIBRARIES}
-						nelmisc)
+TARGET_LINK_LIBRARIES(mp_generator nelmisc)
 
 NL_DEFAULT_PROPS(mp_generator "Ryzom, Tools: MP Generator")
 NL_ADD_RUNTIME_FLAGS(mp_generator)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS mp_generator RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT tools)
diff --git a/code/ryzom/tools/leveldesign/named_items_2_csv/CMakeLists.txt b/code/ryzom/tools/leveldesign/named_items_2_csv/CMakeLists.txt
index 990c1dd08..7143f22ae 100644
--- a/code/ryzom/tools/leveldesign/named_items_2_csv/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/named_items_2_csv/CMakeLists.txt
@@ -2,15 +2,9 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(named2csv ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
-TARGET_LINK_LIBRARIES(named2csv
-						${LIBXML2_LIBRARIES}
-						nelmisc)
+TARGET_LINK_LIBRARIES(named2csv nelmisc)
 
 NL_DEFAULT_PROPS(named2csv "Ryzom, Tools: Named Items to CSV")
 NL_ADD_RUNTIME_FLAGS(named2csv)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS named2csv RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT tools)
diff --git a/code/ryzom/tools/leveldesign/prim_export/CMakeLists.txt b/code/ryzom/tools/leveldesign/prim_export/CMakeLists.txt
index 21fe7166b..8fbd3912e 100644
--- a/code/ryzom/tools/leveldesign/prim_export/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/prim_export/CMakeLists.txt
@@ -2,14 +2,11 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(prim_export ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(prim_export	
 					nelmisc
 					nelligo
 					nel3d
-					nelgeorges
-					${LIBXML2_LIBRARIES})
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
+					nelgeorges)
 
 NL_DEFAULT_PROPS(prim_export "Ryzom, Tools, World: Primitive Export")
 NL_ADD_RUNTIME_FLAGS(prim_export)
diff --git a/code/ryzom/tools/leveldesign/uni_conv/CMakeLists.txt b/code/ryzom/tools/leveldesign/uni_conv/CMakeLists.txt
index 8bacab6e5..2d41461d2 100644
--- a/code/ryzom/tools/leveldesign/uni_conv/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/uni_conv/CMakeLists.txt
@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(uni_conv ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(uni_conv nelmisc)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(uni_conv "Ryzom, Tools, Misc: Unicode Conversion Tool")
 NL_ADD_RUNTIME_FLAGS(uni_conv)
diff --git a/code/ryzom/tools/leveldesign/world_editor/land_export/CMakeLists.txt b/code/ryzom/tools/leveldesign/world_editor/land_export/CMakeLists.txt
index 7869a751e..e1f7fe88c 100644
--- a/code/ryzom/tools/leveldesign/world_editor/land_export/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/world_editor/land_export/CMakeLists.txt
@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(land_export ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(land_export nelmisc nelligo ryzom_landexport)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(land_export "Ryzom, Tools, World: Land Export")
 NL_ADD_RUNTIME_FLAGS(land_export)
diff --git a/code/ryzom/tools/leveldesign/world_editor/land_export_lib/CMakeLists.txt b/code/ryzom/tools/leveldesign/world_editor/land_export_lib/CMakeLists.txt
index 6510c4bca..a9f5f0765 100644
--- a/code/ryzom/tools/leveldesign/world_editor/land_export_lib/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/world_editor/land_export_lib/CMakeLists.txt
@@ -3,15 +3,11 @@ FILE(GLOB PRIV_H *.h)
 
 NL_TARGET_LIB(ryzom_landexport ${PRIV_H} ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(ryzom_landexport ryzom_export nelmisc nelligo nelgeorges nel3d nelpacs)
 NL_DEFAULT_PROPS(ryzom_landexport "Ryzom, Library, World: Land Export")
 NL_ADD_RUNTIME_FLAGS(ryzom_landexport)
 NL_ADD_LIB_SUFFIX(ryzom_landexport)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS ryzom_landexport LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT libraries)
 ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
diff --git a/code/ryzom/tools/make_alias_file/CMakeLists.txt b/code/ryzom/tools/make_alias_file/CMakeLists.txt
index 2170efd14..8bba1e8a0 100644
--- a/code/ryzom/tools/make_alias_file/CMakeLists.txt
+++ b/code/ryzom/tools/make_alias_file/CMakeLists.txt
@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(make_alias_file ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(make_alias_file nelmisc nelgeorges)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(make_alias_file "Ryzom, Tools, Misc: Make Alias File")
 NL_ADD_RUNTIME_FLAGS(make_alias_file)
diff --git a/code/ryzom/tools/make_anim_by_race/CMakeLists.txt b/code/ryzom/tools/make_anim_by_race/CMakeLists.txt
index fb00ddae5..497b6c05e 100644
--- a/code/ryzom/tools/make_anim_by_race/CMakeLists.txt
+++ b/code/ryzom/tools/make_anim_by_race/CMakeLists.txt
@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(make_anim_by_race ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(make_anim_by_race nelmisc)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(make_anim_by_race "Ryzom, Tools, Misc: Make Anim By Race")
 NL_ADD_RUNTIME_FLAGS(make_anim_by_race)
diff --git a/code/ryzom/tools/patch_gen/CMakeLists.txt b/code/ryzom/tools/patch_gen/CMakeLists.txt
index 7a5117a60..d7d864f9a 100644
--- a/code/ryzom/tools/patch_gen/CMakeLists.txt
+++ b/code/ryzom/tools/patch_gen/CMakeLists.txt
@@ -1,8 +1,6 @@
 SET(MAIN_SRC patch_gen_common.cpp patch_gen_main.cpp patch_gen_main.h)
 SET(SERVICE_SRC patch_gen_common.cpp patch_gen_service.cpp patch_gen_service.h)
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 ADD_EXECUTABLE(patch_gen ${MAIN_SRC})
 TARGET_LINK_LIBRARIES(patch_gen ryzom_gameshare nelmisc nelnet nelligo nelgeorges)
 NL_DEFAULT_PROPS(patch_gen "Ryzom, Tools: Patch Generator")
@@ -13,7 +11,5 @@ TARGET_LINK_LIBRARIES(patch_gen_service ryzom_gameshare nelmisc nelnet nelligo n
 NL_DEFAULT_PROPS(patch_gen_service "Ryzom, Tools: Patch Generator Service")
 NL_ADD_RUNTIME_FLAGS(patch_gen_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS patch_gen RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT tools)
 INSTALL(TARGETS patch_gen_service RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT tools)
diff --git a/code/ryzom/tools/pd_parser/CMakeLists.txt b/code/ryzom/tools/pd_parser/CMakeLists.txt
index 86d87c0b4..3d43da484 100644
--- a/code/ryzom/tools/pd_parser/CMakeLists.txt
+++ b/code/ryzom/tools/pd_parser/CMakeLists.txt
@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(pd_parser ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(pd_parser nelmisc)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(pd_parser "Ryzom, Tools: PD Parser")
 NL_ADD_RUNTIME_FLAGS(pd_parser)
diff --git a/code/ryzom/tools/pdr_util/CMakeLists.txt b/code/ryzom/tools/pdr_util/CMakeLists.txt
index 2dfa06e89..d5ac0850d 100644
--- a/code/ryzom/tools/pdr_util/CMakeLists.txt
+++ b/code/ryzom/tools/pdr_util/CMakeLists.txt
@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(pdr_util ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(pdr_util ryzom_gameshare nelmisc nelnet nelligo nelgeorges)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(pdr_util "Ryzom, Tools: PDR Utility")
 NL_ADD_RUNTIME_FLAGS(pdr_util)
diff --git a/code/ryzom/tools/server/ai_build_wmap/CMakeLists.txt b/code/ryzom/tools/server/ai_build_wmap/CMakeLists.txt
index 9cdf3c8cc..f6417611f 100644
--- a/code/ryzom/tools/server/ai_build_wmap/CMakeLists.txt
+++ b/code/ryzom/tools/server/ai_build_wmap/CMakeLists.txt
@@ -2,17 +2,14 @@ FILE(GLOB SRC *.cpp *.h ${RZ_SERVER_SRC_DIR}/ai_data_service/pacs_scan.h ${RZ_SE
 
 ADD_EXECUTABLE(ai_build_wmap ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(ai_build_wmap	
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR})
+
+TARGET_LINK_LIBRARIES(ai_build_wmap
 					ryzom_gameshare
 					ryzom_aishare
-					${LIBXML2_LIBRARIES} 
 					nelmisc)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(ai_build_wmap "Ryzom, Tools, Server: AI Build World Map")
 NL_ADD_RUNTIME_FLAGS(ai_build_wmap)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS ai_build_wmap RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT tools)
diff --git a/code/ryzom/tools/sheets_packer/CMakeLists.txt b/code/ryzom/tools/sheets_packer/CMakeLists.txt
index 9726ac0e6..201aa6a0c 100644
--- a/code/ryzom/tools/sheets_packer/CMakeLists.txt
+++ b/code/ryzom/tools/sheets_packer/CMakeLists.txt
@@ -7,14 +7,14 @@ ADD_EXECUTABLE(sheets_packer	${SRC}
 				${CMAKE_SOURCE_DIR}/ryzom/client/src/sheet_manager.h)
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/ryzom/client/src)
+
 TARGET_LINK_LIBRARIES(sheets_packer	
 					ryzom_clientsheets
 					ryzom_gameshare
 					nelmisc
 					nelgeorges
 					nelnet
-					nelligo
-					${LIBXML2_LIBRARIES})
+					nelligo)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
diff --git a/code/ryzom/tools/sheets_packer_shard/CMakeLists.txt b/code/ryzom/tools/sheets_packer_shard/CMakeLists.txt
index a16353cdd..9fcbd20c0 100644
--- a/code/ryzom/tools/sheets_packer_shard/CMakeLists.txt
+++ b/code/ryzom/tools/sheets_packer_shard/CMakeLists.txt
@@ -13,7 +13,8 @@ ADD_EXECUTABLE(sheets_packer_shard	${SRC} ${EGSSHEETS}
 				${CMAKE_SOURCE_DIR}/ryzom/server/src/ai_service/commands_mlf.cpp)
 
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/ryzom/common/src ${CMAKE_SOURCE_DIR}/ryzom/server/src ${CMAKE_SOURCE_DIR}/ryzom/tools/sheets_packer_shard ${CMAKE_SOURCE_DIR}/ryzom/server/src/entities_game_service)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ryzom/common/src ${CMAKE_SOURCE_DIR}/ryzom/server/src ${CMAKE_SOURCE_DIR}/ryzom/tools/sheets_packer_shard ${CMAKE_SOURCE_DIR}/ryzom/server/src/entities_game_service)
+
 TARGET_LINK_LIBRARIES(sheets_packer_shard
 					ryzom_gameshare
 					ryzom_servershare
@@ -21,10 +22,7 @@ TARGET_LINK_LIBRARIES(sheets_packer_shard
 					nelmisc
 					nelgeorges
 					nelnet
-					nelligo
-					${LIBXML2_LIBRARIES})
-
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
+					nelligo)
 
 NL_DEFAULT_PROPS(sheets_packer_shard "Ryzom, Tools: Sheets Packer Shard")
 NL_ADD_RUNTIME_FLAGS(sheets_packer_shard)
diff --git a/code/ryzom/tools/skill_extractor/CMakeLists.txt b/code/ryzom/tools/skill_extractor/CMakeLists.txt
index a1cbc5c6e..b2905a5c2 100644
--- a/code/ryzom/tools/skill_extractor/CMakeLists.txt
+++ b/code/ryzom/tools/skill_extractor/CMakeLists.txt
@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(skill_extractor ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(skill_extractor nelmisc)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(skill_extractor "Ryzom, Tools, Misc: Skill Extractor")
 NL_ADD_RUNTIME_FLAGS(skill_extractor)
diff --git a/code/ryzom/tools/stats_scan/CMakeLists.txt b/code/ryzom/tools/stats_scan/CMakeLists.txt
index fcb7278bf..77204217f 100644
--- a/code/ryzom/tools/stats_scan/CMakeLists.txt
+++ b/code/ryzom/tools/stats_scan/CMakeLists.txt
@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(stats_scan WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(stats_scan ryzom_gameshare nelmisc nelnet nelligo nelgeorges)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(stats_scan "Ryzom, Tools, Misc: Stats Scan")
 NL_ADD_RUNTIME_FLAGS(stats_scan)
diff --git a/code/ryzom/tools/translation_tools/CMakeLists.txt b/code/ryzom/tools/translation_tools/CMakeLists.txt
index 8937bb038..1db05b3ec 100644
--- a/code/ryzom/tools/translation_tools/CMakeLists.txt
+++ b/code/ryzom/tools/translation_tools/CMakeLists.txt
@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(translation_tools ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(translation_tools nelmisc nelligo nelgeorges)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(translation_tools "Ryzom, Tools, Misc: Translation Tools")
 NL_ADD_RUNTIME_FLAGS(translation_tools)