diff --git a/ChangeLog b/ChangeLog
index c2ee8678..51dd1187 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+November 5, 2009
+* [antonin] fixed "tiffio" header inclusion to use user version on Win32 system only (otherwise assume its existence in system headers).
+
 September 10, 2009
 * [antonin] fixed minor bugs which were triggering warnings at compilation (different signedness, wrong pointer type, etc)
 
diff --git a/codec/convert.c b/codec/convert.c
index 465b0e0b..a9ffb0da 100644
--- a/codec/convert.c
+++ b/codec/convert.c
@@ -32,8 +32,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "openjpeg.h"
+#ifdef WIN32
 #include "../libs/libtiff/tiffio.h"
+#else
+#include <tiffio.h>
+#endif /* WIN32 */
+#include "openjpeg.h"
 #include "convert.h"
 
 /*
diff --git a/openjpeg.xcodeproj/project.pbxproj b/openjpeg.xcodeproj/project.pbxproj
index 7bc8a945..4caa23b6 100644
--- a/openjpeg.xcodeproj/project.pbxproj
+++ b/openjpeg.xcodeproj/project.pbxproj
@@ -697,6 +697,7 @@
 		69F984AA0D40A3AE00C2791C /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
 				COPY_PHASE_STRIP = NO;
 			};
 			name = Debug;
@@ -704,6 +705,7 @@
 		69F984AB0D40A3AE00C2791C /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
 				COPY_PHASE_STRIP = YES;
 			};
 			name = Release;