diff --git a/src/canonmn.hpp b/src/canonmn.hpp
index c71011f4..ababf633 100644
--- a/src/canonmn.hpp
+++ b/src/canonmn.hpp
@@ -23,7 +23,7 @@
   @brief   Canon MakerNote implemented according to the specification
            <a href="http://www.burren.cx/david/canon.html">
            EXIF MakerNote of Canon</a> by David Burren
-  @version $Name:  $ $Revision: 1.13 $
+  @version $Name:  $ $Revision: 1.14 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    18-Feb-04, ahu: created<BR>
@@ -103,7 +103,7 @@ namespace Exiv2 {
 
         //! @name Accessors
         //@{
-        CanonMakerNote::AutoPtr clone(bool alloc =true) const;
+        AutoPtr clone(bool alloc =true) const;
         //! Return the name of the makernote item ("Canon")
         std::string ifdItem() const { return ifdItem_; }
         std::ostream& printTag(std::ostream& os,
diff --git a/src/fujimn.hpp b/src/fujimn.hpp
index 32744fcc..5592a06e 100644
--- a/src/fujimn.hpp
+++ b/src/fujimn.hpp
@@ -24,7 +24,7 @@
            in Appendix 4: Makernote of Fujifilm of the document 
            <a href="http://park2.wakwak.com/%7Etsuruzoh/Computer/Digicams/exif-e.html">
            Exif file format</a> by TsuruZoh Tachibanaya
-  @version $Name:  $ $Revision: 1.10 $
+  @version $Name:  $ $Revision: 1.11 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    11-Feb-04, ahu: created
@@ -111,7 +111,7 @@ namespace Exiv2 {
         //! @name Accessors
         //@{
         int checkHeader() const;
-        FujiMakerNote::AutoPtr clone(bool alloc =true) const;
+        AutoPtr clone(bool alloc =true) const;
         //! Return the name of the makernote item ("Fujifilm")
         std::string ifdItem() const { return ifdItem_; }
         std::ostream& printTag(std::ostream& os,
diff --git a/src/makernote.hpp b/src/makernote.hpp
index 07379570..0d15a965 100644
--- a/src/makernote.hpp
+++ b/src/makernote.hpp
@@ -22,7 +22,7 @@
   @file    makernote.hpp
   @brief   Contains the Exif %MakerNote interface, IFD %MakerNote and a 
            MakerNote factory
-  @version $Name:  $ $Revision: 1.25 $
+  @version $Name:  $ $Revision: 1.26 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    18-Feb-04, ahu: created
@@ -177,7 +177,7 @@ namespace Exiv2 {
                  provided to read() will be kept. See Ifd for more background on 
                  this concept.
          */
-        MakerNote::AutoPtr clone(bool alloc =true) const;
+        AutoPtr clone(bool alloc =true) const;
         /*!
           @brief Return the name of a makernote tag. The default implementation
                  looks up the makernote info tag array if one is set, else
@@ -309,7 +309,7 @@ namespace Exiv2 {
         Entries::const_iterator end() const { return ifd_.end(); }
         Entries::const_iterator findIdx(int idx) const;
         long size() const;
-        IfdMakerNote::AutoPtr clone(bool alloc =true) const;
+        AutoPtr clone(bool alloc =true) const;
         /*!
           @brief Check the makernote header. This will typically check if a
                  required prefix string is present in the header. Return 0 if
diff --git a/src/nikonmn.hpp b/src/nikonmn.hpp
index 6596a587..97fb66c4 100644
--- a/src/nikonmn.hpp
+++ b/src/nikonmn.hpp
@@ -28,7 +28,7 @@
            <a href="http://park2.wakwak.com/%7Etsuruzoh/Computer/Digicams/exif-e.html">
            Exif file format</a> by TsuruZoh Tachibanaya.<BR>
            Format 3: "EXIFutils Field Reference Guide".
-  @version $Name:  $ $Revision: 1.7 $
+  @version $Name:  $ $Revision: 1.8 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    17-May-04, ahu: created<BR>
@@ -108,7 +108,7 @@ namespace Exiv2 {
 
         //! @name Accessors
         //@{
-        Nikon1MakerNote::AutoPtr clone(bool alloc =true) const;
+        AutoPtr clone(bool alloc =true) const;
         //! Return the name of the makernote item ("Nikon1")
         std::string ifdItem() const { return ifdItem_; }
         std::ostream& printTag(std::ostream& os,
@@ -194,7 +194,7 @@ namespace Exiv2 {
         //! @name Accessors
         //@{
         int checkHeader() const;
-        Nikon2MakerNote::AutoPtr clone(bool alloc =true) const;
+        AutoPtr clone(bool alloc =true) const;
         //! Return the name of the makernote item ("Nikon2")
         std::string ifdItem() const { return ifdItem_; }
         std::ostream& printTag(std::ostream& os,
@@ -278,7 +278,7 @@ namespace Exiv2 {
         //! @name Accessors
         //@{
         int checkHeader() const;
-        Nikon3MakerNote::AutoPtr clone(bool alloc =true) const;
+        AutoPtr clone(bool alloc =true) const;
         //! Return the name of the makernote item ("Nikon3")
         std::string ifdItem() const { return ifdItem_; }
         std::ostream& printTag(std::ostream& os,
diff --git a/src/sigmamn.hpp b/src/sigmamn.hpp
index c1797f18..9cfbf7af 100644
--- a/src/sigmamn.hpp
+++ b/src/sigmamn.hpp
@@ -23,7 +23,7 @@
   @brief   Sigma and Foveon MakerNote implemented according to the specification
            <a href="http://www.x3f.info/technotes/FileDocs/MakerNoteDoc.html">
            SIGMA and FOVEON EXIF MakerNote Documentation</a> by Foveon.           
-  @version $Name:  $ $Revision: 1.10 $
+  @version $Name:  $ $Revision: 1.11 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    02-Apr-04, ahu: created
@@ -110,7 +110,7 @@ namespace Exiv2 {
         //! @name Accessors
         //@{
         int checkHeader() const;
-        SigmaMakerNote::AutoPtr clone(bool alloc =true) const;
+        AutoPtr clone(bool alloc =true) const;
         //! Return the name of the makernote item ("Sigma")
         std::string ifdItem() const { return ifdItem_; }
         std::ostream& printTag(std::ostream& os,