diff -aprNU5 lcms-1.16.orig/include/icc34.h.in lcms-1.16/include/icc34.h.in
--- lcms-1.16.orig/include/icc34.h.in	2006-08-11 17:29:14 +0000
+++ lcms-1.16/include/icc34.h.in	2007-03-01 14:10:04 +0000
@@ -204,11 +204,11 @@ typedef short           icInt16Number;
 typedef __int32_t       icInt32Number;
 typedef __int32_t       icInt64Number[2];
 
 
 #else   
-#if defined(__GNUC__) || defined(__unix__) || defined(__unix)
+#if (defined(__GNUC__) || defined(__unix__) || defined(__unix)) && !defined(__DJGPP__)
 
 #include <sys/types.h>
 
 #if defined(__sun) || defined(__hpux) || defined (__MINGW) || defined(__MINGW32__)
 
diff -aprNU5 lcms-1.16.orig/testbed/testcms.c lcms-1.16/testbed/testcms.c
--- lcms-1.16.orig/testbed/testcms.c	2006-12-13 11:39:40 +0000
+++ lcms-1.16/testbed/testcms.c	2007-03-01 14:10:04 +0000
@@ -1208,11 +1208,11 @@ int GetInfoTest(void)
     const char* Product;
     LPGAMMATABLE Shapes[3];
 
 
     printf("Testing profile decoding (sRGB)");
-    hProfile = cmsOpenProfileFromFile("sRGB Color Space Profile.icm", "rb");
+    hProfile = cmsOpenProfileFromFile("sRGB_Color_Space_Profile.icm", "rb");
     cmsTakeMediaWhitePoint(&WhitePoint, hProfile);
 
     Dot();
     if (!CheckXYZ(&WhitePoint, 0.95045, 1.0, 1.08905)) {
         printf("White point read failed!\n");
@@ -1272,11 +1272,11 @@ int Test_sRGB(void)
        cmsHTRANSFORM xform1, xform2;
        int nMaxErr;
 
        printf("Testing sRGB built-in space");
        
-       In1   = cmsOpenProfileFromFile("sRGB Color Space Profile.icm", "rb");
+       In1   = cmsOpenProfileFromFile("sRGB_Color_Space_Profile.icm", "rb");
        Out1  = cmsCreateXYZProfile();
 
        In2   = cmsCreate_sRGBProfile();
        Out2  = cmsCreateXYZProfile();
 
@@ -1312,11 +1312,11 @@ int RealProfilesTest(void)
 
        // Using LAB identity as output profile, I'm forcing an
        // implicit XYZ => L*a*b conversion in xform1.
        // xform2 is 8 bits - LUT based, and PCS is L*a*b
 
-       In1   = cmsOpenProfileFromFile("sRGB Color Space Profile.icm", "rb");
+       In1   = cmsOpenProfileFromFile("sRGB_Color_Space_Profile.icm", "rb");
        Out1  = cmsCreateXYZProfile();
 
        In2   = cmsOpenProfileFromFile("sRGBSpac.icm", "rb");
        Out2  = cmsCreateXYZProfile();
 
@@ -1516,11 +1516,11 @@ int TestDeviceLinkGeneration()
     int nMaxErr;
 
 
     printf("Testing devicelink generation");
 
-    hsRGB     = cmsOpenProfileFromFile("sRGB Color Space Profile.icm", "r");
+    hsRGB     = cmsOpenProfileFromFile("sRGB_Color_Space_Profile.icm", "r");
     hIdentity = cmsCreateTransform(hsRGB, TYPE_RGBA_16, hsRGB, TYPE_RGBA_16, INTENT_RELATIVE_COLORIMETRIC, 0);
     hDevLink  = cmsTransform2DeviceLink(hIdentity, 0);
     _cmsSaveProfile(hDevLink, "devicelink.icm");
 
     cmsCloseProfile(hDevLink);
@@ -1840,11 +1840,11 @@ void SpeedTest(void)
     cmsHPROFILE hlcmsProfileIn, hlcmsProfileOut;
     cmsHTRANSFORM hlcmsxform;
     Scanline_rgb0 *In;
 	size_t Mb;
    	
-    hlcmsProfileIn  = cmsOpenProfileFromFile("sRGB Color Space Profile.icm", "r");
+    hlcmsProfileIn  = cmsOpenProfileFromFile("sRGB_Color_Space_Profile.icm", "r");
     hlcmsProfileOut = cmsOpenProfileFromFile("sRGBSpac.icm", "r");
 
     hlcmsxform  = cmsCreateTransform(hlcmsProfileIn, TYPE_RGB_16, hlcmsProfileOut, TYPE_RGB_16, INTENT_PERCEPTUAL, cmsFLAGS_NOTCACHE);
 
 	Mb = 256*256*256*sizeof(Scanline_rgb0);
@@ -1896,11 +1896,11 @@ void SpeedTest2(void)
     cmsHTRANSFORM hlcmsxform;
     Scanline_rgb8 *In;
 	size_t Mb;
    
    
-    hlcmsProfileIn  = cmsOpenProfileFromFile("sRGB Color Space Profile.icm", "r");
+    hlcmsProfileIn  = cmsOpenProfileFromFile("sRGB_Color_Space_Profile.icm", "r");
     hlcmsProfileOut = cmsOpenProfileFromFile("sRGBSpac.icm", "r");
 
     hlcmsxform  = cmsCreateTransform(hlcmsProfileIn, TYPE_RGB_8, hlcmsProfileOut, TYPE_RGB_8, INTENT_PERCEPTUAL, cmsFLAGS_NOTCACHE);
 
 	Mb = 256*256*256*sizeof(Scanline_rgb8);
@@ -2263,12 +2263,12 @@ void GenerateCRD(const char* cOutProf)
 }
 
 static 
 int TestPostScript()
 {
-	GenerateCSA("sRGB Color Space Profile.icm");
-	GenerateCRD("sRGB Color Space Profile.icm");
+	GenerateCSA("sRGB_Color_Space_Profile.icm");
+	GenerateCRD("sRGB_Color_Space_Profile.icm");
 	GenerateCSA(NULL);
 	GenerateCRD(NULL);
 
 	return 1;
 }