--- openexr-1.6.1/exrmaketiled/Image.cpp~	2004-01-16 12:19:11 +0300
+++ openexr-1.6.1/exrmaketiled/Image.cpp	2008-12-02 17:29:12 +0300
@@ -39,6 +39,8 @@
 //
 //----------------------------------------------------------------------------
 
+#include <cstring>
+
 #include <Image.h>
 
 using namespace Imf;
--- openexr-1.6.1/exrmaketiled/main.cpp~	2007-04-25 05:08:45 +0400
+++ openexr-1.6.1/exrmaketiled/main.cpp	2008-12-02 17:30:27 +0300
@@ -44,8 +44,8 @@
 
 #include <iostream>
 #include <exception>
-#include <string>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 
 using namespace Imf;
 using namespace std;
--- openexr-1.6.1/exrenvmap/main.cpp~	2007-04-25 05:07:51 +0400
+++ openexr-1.6.1/exrenvmap/main.cpp	2008-12-02 17:32:03 +0300
@@ -44,7 +44,8 @@
 #include <ImfEnvmap.h>
 #include <iostream>
 #include <exception>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 
 using namespace Imf;
 using namespace std;