diff --git a/CMakeLists.txt b/CMakeLists.txt
index 321fcfe4c922ea4bb640031ac7aa02b943a6f257..00b599d76a7e244cae19b40ce04a25de86c14432 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,6 +112,9 @@ ELSE(OTB_USE_EXTERNAL_EXPAT)
         ADD_DEFINITIONS(-DOTB_USE_INTERNAL_EXPAT)
         INCLUDE_DIRECTORIES(BEFORE "${OTB_SOURCE_DIR}/Utilities/otbexpat")
         INCLUDE_DIRECTORIES(BEFORE "${OTB_BINARY_DIR}/Utilities/otbexpat")
+	IF(NOT BUILD_SHARED_LIBS)
+        	ADD_DEFINITIONS(-DXML_STATIC)
+        ENDIF(NOT BUILD_SHARED_LIBS)
 ENDIF(OTB_USE_EXTERNAL_EXPAT)
 
 #-------------------------------
diff --git a/Utilities/otbexpat/lib/xmlparse.c b/Utilities/otbexpat/lib/xmlparse.c
index 94e31de9da3f3ce3d52755923e98602844b1330d..94b4fc287667631d1c1f6b82de95cd51be09d449 100644
--- a/Utilities/otbexpat/lib/xmlparse.c
+++ b/Utilities/otbexpat/lib/xmlparse.c
@@ -21,7 +21,8 @@
 #endif /* ndef COMPILED_FROM_DSP */
 
 #include "ascii.h"
-#include "expat.h"
+// OTB Modifications
+#include "otb_expat.h"
 
 #ifdef XML_UNICODE
 #define XML_ENCODE_MAX XML_UTF16_ENCODE_MAX