--- libemf/libemf.cpp
+++ libemf/libemf.cpp	2008/02/29 11:14:38
@@ -48,7 +48,7 @@
       be32 = !be16;
 
     if ( be32 != be16 ) {
-      cerr << "endian-ness not consistent between short's and int's!" << endl;
+      std::cerr << "endian-ness not consistent between short's and int's!" << std::endl;
       ::abort();
     }
 
@@ -849,7 +849,7 @@
     if ( dc->fp ) {
 
       std::for_each( dc->records.begin(), dc->records.end(),
-		     std::bind2nd( std::mem_fun1( &EMF::METARECORD::serialize ),
+		     std::bind2nd( std::mem_fun( &EMF::METARECORD::serialize ),
 				   dc->ds ) );
       fclose( dc->fp );
 
@@ -896,7 +896,7 @@
     if ( dc->fp ) {
 
       std::for_each( dc->records.begin(), dc->records.end(),
-		     std::bind2nd( std::mem_fun1( &EMF::METARECORD::serialize ),
+		     std::bind2nd( std::mem_fun( &EMF::METARECORD::serialize ),
 				   dc->ds ) );
     }
 
@@ -1032,7 +1032,7 @@
       if ( feof( fp ) ) break;
 
       if ( emr.nSize == 0 ) {
-	cerr << "GetEnhMetaFileW error: record size == 0. cannot continue" << endl;
+	std::cerr << "GetEnhMetaFileW error: record size == 0. cannot continue" << std::endl;
 	fclose( fp );
 	return 0;
       }
@@ -1050,8 +1050,8 @@
 	dc->appendRecord( record );
       }
       else
-	cerr << "GetEnhMetaFileW warning: read unknown record type " << emr.iType
-	     << " of size " << emr.nSize << endl;
+	std::cerr << "GetEnhMetaFileW warning: read unknown record type " << emr.iType
+	     << " of size " << emr.nSize << std::endl;
 
       // Regardless, position ourselves at the next record.
       fseek( fp, next_position, SEEK_SET );
--- libemf/libemf.h
+++ libemf/libemf.h	2008/02/29 11:14:38
@@ -21,11 +21,13 @@
 #ifndef _LIBEMF_H
 #define _LIBEMF_H 1
 
+#include <iostream>
 #include <cmath>
 #include <vector>
 #include <map>
 #include <functional>
 #include <algorithm>
+#include <climits>
 
 #include <config.h>
 #include <emf.h>