diff -r -u exif-tools-0.0.7/dump-exif.cc exif-tools-0.0.7a/dump-exif.cc
--- exif-tools-0.0.7/dump-exif.cc	2000-06-12 04:49:44.000000000 +0200
+++ exif-tools-0.0.7a/dump-exif.cc	2005-08-29 20:43:39.000000000 +0200
@@ -7,8 +7,8 @@
 // Start Editing Here:
 
 #include <fcntl.h>
-#include <iostream.h>
-#include <strstream.h>
+#include <iostream>
+#include <strstream>
 #include <string>
 #include <sys/mman.h>
 #include <sys/stat.h>
@@ -35,6 +35,8 @@
 #include "plainHandlers.h"
 #include "fancyHandlers.h"
 
+using namespace std;
+
 const char *
 endian_string(exif::endian_t e)
 {
@@ -91,7 +93,7 @@
 
 void dump(exif *e, int mask, bool raw)
 {
-  textHandlerMap *map = (raw ? &plainHandlers::map : &fancyHandlers::map);
+  textHandlerMap *map = (raw ? (textHandlerMap *)&plainHandlers::map : (textHandlerMap *)&fancyHandlers::map);
 
   if (mask == 0)
     {
diff -r -u exif-tools-0.0.7/exceptions.h exif-tools-0.0.7a/exceptions.h
--- exif-tools-0.0.7/exceptions.h	2000-05-24 05:18:06.000000000 +0200
+++ exif-tools-0.0.7a/exceptions.h	2005-08-29 20:39:28.000000000 +0200
@@ -11,6 +11,8 @@
 
 // Start Editing Here: 
 
+using namespace std;
+
 class misc_error
 {
 public:
diff -r -u exif-tools-0.0.7/exif/jfif-marker.cc exif-tools-0.0.7a/exif/jfif-marker.cc
--- exif-tools-0.0.7/exif/jfif-marker.cc	2000-04-10 17:07:54.000000000 +0200
+++ exif-tools-0.0.7a/exif/jfif-marker.cc	2005-08-29 20:40:17.000000000 +0200
@@ -4,11 +4,14 @@
 // This software is distributed under the terms of the GNU General
 // Public License.  See the file LICENSE for details.
 
-#include <strstream.h>
+#include <iostream>
+#include <strstream>
 #include "jfif-marker.h"
 
 // Start Editing Here:
 
+using namespace std;
+
 jfif_marker jfif_marker::null(jm_nada, 0, 0, 0);
 
 jfif_marker::jfif_marker()
Only in exif-tools-0.0.7a/exif: make.stub
diff -r -u exif-tools-0.0.7/exif/tagMapByTag.h exif-tools-0.0.7a/exif/tagMapByTag.h
--- exif-tools-0.0.7/exif/tagMapByTag.h	2000-06-12 02:20:59.000000000 +0200
+++ exif-tools-0.0.7a/exif/tagMapByTag.h	2005-08-29 20:29:27.000000000 +0200
@@ -10,6 +10,8 @@
 #include <map>
 
 // Start Editing Here: 
+
+using namespace std;
   
 struct tagcmp
 {
@@ -20,8 +22,7 @@
 };
 
 template <class T>
-class tagMapByTag
-  : public map<const tag *, T, tagcmp>
+class tagMapByTag : public map<const tag *, T, tagcmp>
 {
 };
 
Only in exif-tools-0.0.7a/text-handlers: make.stub
diff -r -u exif-tools-0.0.7/text-handlers/textHandlerExposureTime.cc exif-tools-0.0.7a/text-handlers/textHandlerExposureTime.cc
--- exif-tools-0.0.7/text-handlers/textHandlerExposureTime.cc	2000-04-13 19:53:59.000000000 +0200
+++ exif-tools-0.0.7a/text-handlers/textHandlerExposureTime.cc	2005-08-29 20:32:18.000000000 +0200
@@ -4,12 +4,15 @@
 // This software is distributed under the terms of the GNU General
 // Public License.  See the file LICENSE for details.
 
-#include <strstream.h>
+#include <iostream>
+#include <strstream>
 #include "urationalField.h"
 #include "textHandlerExposureTime.h"
 
 // Start Editing Here:
 
+using namespace std;
+
 const char *
 textHandlerExposureTime::toText(const ifd &, const field &f) const
 {
diff -r -u exif-tools-0.0.7/text-handlers/textHandlerMap.h exif-tools-0.0.7a/text-handlers/textHandlerMap.h
--- exif-tools-0.0.7/text-handlers/textHandlerMap.h	2000-06-12 02:21:45.000000000 +0200
+++ exif-tools-0.0.7a/text-handlers/textHandlerMap.h	2005-08-29 20:15:49.000000000 +0200
@@ -7,7 +7,7 @@
 #if !defined(_textHandlerMap_h_)
 #define _textHandlerMap_h_
 
-#include <map.h>
+#include <map>
 #include "tag.h"
 
 #include "tagMapByTag.h"
diff -r -u exif-tools-0.0.7/text-handlers/textHandlerSRational.cc exif-tools-0.0.7a/text-handlers/textHandlerSRational.cc
--- exif-tools-0.0.7/text-handlers/textHandlerSRational.cc	2000-04-12 05:35:42.000000000 +0200
+++ exif-tools-0.0.7a/text-handlers/textHandlerSRational.cc	2005-08-29 20:33:41.000000000 +0200
@@ -4,13 +4,16 @@
 // This software is distributed under the terms of the GNU General
 // Public License.  See the file LICENSE for details.
 
-#include <strstream.h>
+#include <iostream>
+#include <strstream>
 
 #include "srationalField.h"
 #include "textHandlerSRational.h"
 
 // Start Editing Here:
 
+using namespace std;
+
 const char *
 textHandlerSRational::toText(const ifd &, const field &f) const
 {
diff -r -u exif-tools-0.0.7/text-handlers/textHandlerShutterSpeedValue.cc exif-tools-0.0.7a/text-handlers/textHandlerShutterSpeedValue.cc
--- exif-tools-0.0.7/text-handlers/textHandlerShutterSpeedValue.cc	2000-04-13 20:08:36.000000000 +0200
+++ exif-tools-0.0.7a/text-handlers/textHandlerShutterSpeedValue.cc	2005-08-29 20:34:22.000000000 +0200
@@ -5,13 +5,16 @@
 // Public License.  See the file LICENSE for details.
 
 #include <math.h>
-#include <strstream.h>
+#include <iostream>
+#include <strstream>
 
 #include "srationalField.h"
 #include "textHandlerShutterSpeedValue.h"
 
 // Start Editing Here: 
 
+using namespace std;
+
 const char *
 textHandlerShutterSpeedValue::toText(const ifd &, const field &f) const
 {
diff -r -u exif-tools-0.0.7/text-handlers/textHandlerURational.cc exif-tools-0.0.7a/text-handlers/textHandlerURational.cc
--- exif-tools-0.0.7/text-handlers/textHandlerURational.cc	2000-04-10 04:42:21.000000000 +0200
+++ exif-tools-0.0.7a/text-handlers/textHandlerURational.cc	2005-08-29 20:35:21.000000000 +0200
@@ -4,13 +4,16 @@
 // This software is distributed under the terms of the GNU General
 // Public License.  See the file LICENSE for details.
 
-#include <strstream.h>
+#include <iostream>
+#include <strstream>
 
 #include "urationalField.h"
 #include "textHandlerURational.h"
 
 // Start Editing Here:
 
+using namespace std;
+
 const char *
 textHandlerURational::toText(const ifd &, const field &f) const
 {
diff -r -u exif-tools-0.0.7/text-handlers/textHandlerUndefined.cc exif-tools-0.0.7a/text-handlers/textHandlerUndefined.cc
--- exif-tools-0.0.7/text-handlers/textHandlerUndefined.cc	2000-04-10 04:42:28.000000000 +0200
+++ exif-tools-0.0.7a/text-handlers/textHandlerUndefined.cc	2005-08-29 20:36:23.000000000 +0200
@@ -4,8 +4,9 @@
 // This software is distributed under the terms of the GNU General
 // Public License.  See the file LICENSE for details.
 
-#include <iomanip.h>
-#include <strstream.h>
+#include <iomanip>
+#include <iostream>
+#include <strstream>
 
 #include "format-mem.h"
 
@@ -14,6 +15,8 @@
 
 // Start Editing Here:
 
+using namespace std;
+
 const char *
 textHandlerUndefined::toText(const ifd &, const field &f) const
 {
diff -r -u exif-tools-0.0.7/text-handlers/textHandlerUnsigned.cc exif-tools-0.0.7a/text-handlers/textHandlerUnsigned.cc
--- exif-tools-0.0.7/text-handlers/textHandlerUnsigned.cc	2000-04-10 04:42:34.000000000 +0200
+++ exif-tools-0.0.7a/text-handlers/textHandlerUnsigned.cc	2005-08-29 20:36:49.000000000 +0200
@@ -4,13 +4,16 @@
 // This software is distributed under the terms of the GNU General
 // Public License.  See the file LICENSE for details.
 
-#include <strstream.h>
+#include <iostream>
+#include <strstream>
 
 #include "unsignedField.h"
 #include "textHandlerUnsigned.h"
 
 // Start Editing Here:
 
+using namespace std;
+
 const char *
 textHandlerUnsigned::toText(const ifd &, const field &f) const
 {
Only in exif-tools-0.0.7a/tiff-fields: make.stub
diff -r -u exif-tools-0.0.7/util.cc exif-tools-0.0.7a/util.cc
--- exif-tools-0.0.7/util.cc	2000-06-11 13:18:06.000000000 +0200
+++ exif-tools-0.0.7a/util.cc	2005-08-29 20:48:38.000000000 +0200
@@ -8,8 +8,8 @@
 #include <stdio.h>
 
 #include "exif.h"
-#include "util.h"
 #include "exceptions.h"
+#include "util.h"
 #include "ifd.h"
 #include "field.h"
 #include "tag.h"