diff --git a/src/actions.hpp b/src/actions.hpp
index a9564dce..2316face 100644
--- a/src/actions.hpp
+++ b/src/actions.hpp
@@ -317,13 +317,13 @@ namespace Action {
         Modify(const Modify& /*src*/) : Task() {}
 
         //! Add a metadatum to \em pImage according to \em modifyCmd
-        static void addMetadatum(Exiv2::Image* pImage, 
+        static void addMetadatum(Exiv2::Image* pImage,
                                  const ModifyCmd& modifyCmd);
         //! Set a metadatum in \em pImage according to \em modifyCmd
-        static void setMetadatum(Exiv2::Image* pImage, 
+        static void setMetadatum(Exiv2::Image* pImage,
                                  const ModifyCmd& modifyCmd);
         //! Delete a metadatum from \em pImage according to \em modifyCmd
-        static void delMetadatum(Exiv2::Image* pImage, 
+        static void delMetadatum(Exiv2::Image* pImage,
                                  const ModifyCmd& modifyCmd);
 
     }; // class Modify
diff --git a/src/exif.hpp b/src/exif.hpp
index 5f2c4217..5f6cc761 100644
--- a/src/exif.hpp
+++ b/src/exif.hpp
@@ -586,8 +586,8 @@ namespace Exiv2 {
         //! End of the metadata
         iterator end() { return exifMetadata_.end(); }
         /*!
-          @brief Find the first Exifdatum with the given \em key, return an 
-                 iterator to it.  
+          @brief Find the first Exifdatum with the given \em key, return an
+                 iterator to it.
          */
         iterator findKey(const ExifKey& key);
         /*!
diff --git a/src/image.hpp b/src/image.hpp
index b41eb4bb..3b31f48f 100644
--- a/src/image.hpp
+++ b/src/image.hpp
@@ -237,7 +237,7 @@ namespace Exiv2 {
          */
         virtual BasicIo& io() const =0;
         /*!
-          @brief Returns the access mode, i.e., the metadata functions, which 
+          @brief Returns the access mode, i.e., the metadata functions, which
              this image supports for the metadata type \em metadataId.
           @param metadataId The metadata identifier.
           @return Access mode for the requested image type and metadata identifier.
@@ -382,7 +382,7 @@ namespace Exiv2 {
          */
         static int getType(BasicIo& io);
         /*!
-          @brief Returns the access mode or supported metadata functions for an 
+          @brief Returns the access mode or supported metadata functions for an
               image type and a metadata type.
           @param imageType  The image type.
           @param metadataId The metadata identifier.
diff --git a/src/iptc.hpp b/src/iptc.hpp
index b1667da2..09874d8a 100644
--- a/src/iptc.hpp
+++ b/src/iptc.hpp
@@ -340,7 +340,7 @@ namespace Exiv2 {
         iterator begin() { return iptcMetadata_.begin(); }
         //! End of the metadata
         iterator end() { return iptcMetadata_.end(); }
-        /*!  
+        /*!
           @brief Find the first Iptcdatum with the given key, return an iterator
                  to it.
          */
@@ -367,12 +367,12 @@ namespace Exiv2 {
          */
         DataBuf copy() const;
         /*!
-          @brief Find the first Iptcdatum with the given key, return a const 
+          @brief Find the first Iptcdatum with the given key, return a const
                  iterator to it.
          */
         const_iterator findKey(const IptcKey& key) const;
         /*!
-          @brief Find the first Iptcdatum with the given record and dataset 
+          @brief Find the first Iptcdatum with the given record and dataset
                  number, return a const iterator to it.
          */
         const_iterator findId(uint16_t dataset,
diff --git a/src/tiffvisitor.cpp b/src/tiffvisitor.cpp
index 2820b691..10b5f6e8 100644
--- a/src/tiffvisitor.cpp
+++ b/src/tiffvisitor.cpp
@@ -243,7 +243,7 @@ namespace Exiv2 {
             byte const* record = 0;
             uint32_t sizeHdr = 0;
             uint32_t sizeData = 0;
-            if (0 != Photoshop::locateIptcIrb(pData, size, 
+            if (0 != Photoshop::locateIptcIrb(pData, size,
                                               &record, &sizeHdr, &sizeData)) {
                 return;
             }
diff --git a/src/tiffvisitor.hpp b/src/tiffvisitor.hpp
index a23ede33..3dc10143 100644
--- a/src/tiffvisitor.hpp
+++ b/src/tiffvisitor.hpp
@@ -252,11 +252,11 @@ namespace Exiv2 {
         //! Set an Exif tag in the image. Overwrites existing tags
         void setExifTag(const ExifKey& key, const Value* pValue);
         /*!
-          @brief Get the data for a \em tag and \em group, either from the 
-                 \em object provided, if it matches or from the matching element 
+          @brief Get the data for a \em tag and \em group, either from the
+                 \em object provided, if it matches or from the matching element
                  in the hierarchy.
 
-          Populates \em pData and \em size with the result. If no matching 
+          Populates \em pData and \em size with the result. If no matching
           element is found the function leaves both of these parameters unchanged.
         */
         void getObjData(byte const*&         pData,