diff --git a/ChangeLog b/ChangeLog
index cd3448b6..87188c7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+March 7, 2010
+* [FOD] Fixed small compatibility issues with win32 in codec (moved include <strings.h>)
+
 March 5,2010
 ! [FOD] Updated makefiles for v1.4 and v2.0
 
diff --git a/codec/image_to_j2k.c b/codec/image_to_j2k.c
index 15621489..998d3782 100644
--- a/codec/image_to_j2k.c
+++ b/codec/image_to_j2k.c
@@ -43,8 +43,8 @@
 #include "index.h"
 
 #ifndef WIN32
-#define stricmp strcasecmp
-#define strnicmp strncasecmp
+#define _stricmp strcasecmp
+#define _strnicmp strncasecmp
 #endif
 
 /* ----------------------------------------------------------------------- */
@@ -400,7 +400,7 @@ int get_file_format(char *filename) {
 		return -1;
 	ext++;
 	for(i = 0; i < sizeof(format)/sizeof(*format); i++) {
-		if(strnicmp(ext, extension[i], 3) == 0) {
+		if(_strnicmp(ext, extension[i], 3) == 0) {
 			return format[i];
 		}
 	}
diff --git a/codec/j2k_to_image.c b/codec/j2k_to_image.c
index 523cb5c4..c5b9120e 100644
--- a/codec/j2k_to_image.c
+++ b/codec/j2k_to_image.c
@@ -43,8 +43,8 @@
 #include "index.h"
 
 #ifndef WIN32
-#define stricmp strcasecmp
-#define strnicmp strncasecmp
+#define _stricmp strcasecmp
+#define _strnicmp strncasecmp
 #endif
 
 /* ----------------------------------------------------------------------- */
@@ -198,7 +198,7 @@ int get_file_format(char *filename) {
 	ext++;
 	if(ext) {
 		for(i = 0; i < sizeof(format)/sizeof(*format); i++) {
-			if(strnicmp(ext, extension[i], 3) == 0) {
+			if(_strnicmp(ext, extension[i], 3) == 0) {
 				return format[i];
 			}
 		}