diff --git a/src/ifd.cpp b/src/ifd.cpp
index 0f2dadd0..9d7fe890 100644
--- a/src/ifd.cpp
+++ b/src/ifd.cpp
@@ -20,14 +20,14 @@
  */
 /*
   File:      ifd.cpp
-  Version:   $Name:  $ $Revision: 1.6 $
+  Version:   $Name:  $ $Revision: 1.7 $
   Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
   History:   26-Jan-04, ahu: created
              11-Feb-04, ahu: isolated as a component
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.6 $ $RCSfile: ifd.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.7 $ $RCSfile: ifd.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -307,9 +307,9 @@ namespace Exif {
 
     void Ifd::clear()
     {
-        offset_ = 0;
-        next_ = 0;
         entries_.clear();
+        next_ = 0;
+        offset_ = 0;
     } // Ifd::clear
 
     void Ifd::add(const Entry& entry)
diff --git a/src/ifd.hpp b/src/ifd.hpp
index 9ccc3ddd..d9e5e977 100644
--- a/src/ifd.hpp
+++ b/src/ifd.hpp
@@ -21,7 +21,7 @@
 /*!
   @file    ifd.hpp
   @brief   Encoding and decoding of IFD (Image File Directory) data
-  @version $Name:  $ $Revision: 1.8 $
+  @version $Name:  $ $Revision: 1.9 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
   @date    09-Jan-04, ahu: created
@@ -43,6 +43,8 @@
 // namespace extensions
 namespace Exif {
 
+// *****************************************************************************
+// class declarations
     class MakerNote;
 
 // *****************************************************************************