diff --git a/Utilities/otbexpat/lib/expat.h b/Utilities/otbexpat/lib/expat.h
index 49a409cff40f6d0ca5aeed094882b163f59a75f6..b82bb83354b924b0beb479ac539e8fd478a62b98 100644
--- a/Utilities/otbexpat/lib/expat.h
+++ b/Utilities/otbexpat/lib/expat.h
@@ -3,7 +3,7 @@
 */
 
 /* OTB Modifications */
-# include "otb_expat_mangle.h"
+//# include "otb_expat_mangle.h"
 
 #ifndef Expat_INCLUDED
 #define Expat_INCLUDED 1
diff --git a/Utilities/otbexpat/lib/xmlparse.c b/Utilities/otbexpat/lib/xmlparse.c
index 94b4fc287667631d1c1f6b82de95cd51be09d449..4983cd27bef40b4ec72c6499fb5853a96569ecbf 100644
--- a/Utilities/otbexpat/lib/xmlparse.c
+++ b/Utilities/otbexpat/lib/xmlparse.c
@@ -22,7 +22,8 @@
 
 #include "ascii.h"
 // OTB Modifications
-#include "otb_expat.h"
+//#include "otb_expat.h"
+#include "expat.h"
 
 #ifdef XML_UNICODE
 #define XML_ENCODE_MAX XML_UTF16_ENCODE_MAX
diff --git a/Utilities/otbexpat/lib/xmltok.h b/Utilities/otbexpat/lib/xmltok.h
index 89bc2c9838318ac2187575c64296a58906ed4048..a2b243453705c1679b9fdc240522313277790fdd 100644
--- a/Utilities/otbexpat/lib/xmltok.h
+++ b/Utilities/otbexpat/lib/xmltok.h
@@ -1,5 +1,5 @@
 /* OTB Modifications */
-# include "otb_expat_mangle.h"
+//# include "otb_expat_mangle.h"
 
 /* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
    See the file COPYING for copying permission.
diff --git a/otbIncludeDirectories.cmake b/otbIncludeDirectories.cmake
index 385052b41f6893c5a9d81d49a338259ed2e1d52f..4b6be98eabc638b033a4618ca9dd61b8c72da435 100644
--- a/otbIncludeDirectories.cmake
+++ b/otbIncludeDirectories.cmake
@@ -202,7 +202,8 @@ IF(OTB_USE_EXTERNAL_EXPAT)
   	        ${EXPAT_INCLUDE_DIR} )
 ELSE(OTB_USE_EXTERNAL_EXPAT)
         SET(OTB_INCLUDE_DIRS_BUILD_TREE_CXX ${OTB_INCLUDE_DIRS_BUILD_TREE_CXX}
-                ${OTB_SOURCE_DIR}/Utilities/otbexpat)
+                ${OTB_SOURCE_DIR}/Utilities/otbexpat
+                ${OTB_SOURCE_DIR}/Utilities/otbexpat/lib)
 ENDIF(OTB_USE_EXTERNAL_EXPAT)
 
 # For OpenThreads