diff --git a/samples/addmoddel.cpp b/samples/addmoddel.cpp
index 5a92f7534d..59d2e02d91 100644
--- a/samples/addmoddel.cpp
+++ b/samples/addmoddel.cpp
@@ -2,11 +2,10 @@
 // addmoddel.cpp
 // Sample program showing how to add, modify and delete Exif metadata.
 
+#include <cassert>
 #include <exiv2/exiv2.hpp>
-
-#include <iostream>
 #include <iomanip>
-#include <cassert>
+#include <iostream>
 
 int main(int argc, char* const argv[])
 try {
diff --git a/samples/conntest.cpp b/samples/conntest.cpp
index 8900a8bf23..c454b6cb45 100644
--- a/samples/conntest.cpp
+++ b/samples/conntest.cpp
@@ -8,8 +8,8 @@
     #include <curl/curl.h>
 #endif
 
-#include <iostream>
 #include <cstdlib>
+#include <iostream>
 
 void httpcon(const std::string& url, bool useHttp1_0 = false) {
     Exiv2::Dictionary response;
diff --git a/samples/convert-test.cpp b/samples/convert-test.cpp
index 85fd5e8ece..280b5ca160 100644
--- a/samples/convert-test.cpp
+++ b/samples/convert-test.cpp
@@ -2,11 +2,10 @@
 // convert-test.cpp
 // Conversion test driver - make sure you have a copy of the input file around!
 
+#include <cassert>
 #include <exiv2/exiv2.hpp>
-
-#include <iostream>
 #include <iomanip>
-#include <cassert>
+#include <iostream>
 
 int main(int argc, char* const argv[])
 try {
diff --git a/samples/easyaccess-test.cpp b/samples/easyaccess-test.cpp
index 65f3f0208d..49ec8d6fc1 100644
--- a/samples/easyaccess-test.cpp
+++ b/samples/easyaccess-test.cpp
@@ -3,11 +3,10 @@
 // Sample program using high-level metadata access functions
 
 // included header files
+#include <cassert>
 #include <exiv2/exiv2.hpp>
-
-#include <iostream>
 #include <iomanip>
-#include <cassert>
+#include <iostream>
 
 using EasyAccessFct = Exiv2::ExifData::const_iterator (*)(const Exiv2::ExifData&);
 
diff --git a/samples/exifcomment.cpp b/samples/exifcomment.cpp
index 621a78d7d9..ece2921112 100644
--- a/samples/exifcomment.cpp
+++ b/samples/exifcomment.cpp
@@ -10,10 +10,9 @@
  */
 // *****************************************************************************
 // included header files
+#include <cassert>
 #include <exiv2/exiv2.hpp>
-
 #include <iostream>
-#include <cassert>
 
 // *****************************************************************************
 // Main
diff --git a/samples/exifdata-test.cpp b/samples/exifdata-test.cpp
index e3a95a0172..f2cb8caf80 100644
--- a/samples/exifdata-test.cpp
+++ b/samples/exifdata-test.cpp
@@ -9,12 +9,11 @@
  */
 // *****************************************************************************
 // included header files
+#include <cassert>
 #include <exiv2/exiv2.hpp>
-
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 #include <string>
-#include <cassert>
 
 void write(const std::string& file, Exiv2::ExifData& ed);
 void print(const std::string& file);
diff --git a/samples/exifdata.cpp b/samples/exifdata.cpp
index 4472722bfc..9603001a7b 100644
--- a/samples/exifdata.cpp
+++ b/samples/exifdata.cpp
@@ -2,11 +2,10 @@
 // exifdata.cpp
 // Sample program to format exif data in various external formats
 
+#include <cassert>
 #include <exiv2/exiv2.hpp>
-
-#include <iostream>
 #include <iomanip>
-#include <cassert>
+#include <iostream>
 #include <string>
 
 using format_t = std::map<std::string, int>;
diff --git a/samples/exifprint.cpp b/samples/exifprint.cpp
index 2a1e4911cf..8a1569912d 100644
--- a/samples/exifprint.cpp
+++ b/samples/exifprint.cpp
@@ -2,11 +2,10 @@
 // exifprint.cpp
 // Sample program to print the Exif metadata of an image
 
+#include <cassert>
 #include <exiv2/exiv2.hpp>
-
-#include <iostream>
 #include <iomanip>
-#include <cassert>
+#include <iostream>
 
 // https://github.com/Exiv2/exiv2/issues/468
 #if defined(EXV_UNICODE_PATH) && defined(__MINGW__)
diff --git a/samples/exifvalue.cpp b/samples/exifvalue.cpp
index 85c8132673..9864afcccb 100644
--- a/samples/exifvalue.cpp
+++ b/samples/exifvalue.cpp
@@ -2,11 +2,10 @@
 // exifvalue.cpp
 // Sample program to print value of an exif key in an image
 
+#include <cassert>
 #include <exiv2/exiv2.hpp>
-
-#include <iostream>
 #include <iomanip>
-#include <cassert>
+#include <iostream>
 #include <string>
 
 int main(int argc, char* const argv[])
diff --git a/samples/geotag.cpp b/samples/geotag.cpp
index e2338e17ae..d6c1e49b0d 100644
--- a/samples/geotag.cpp
+++ b/samples/geotag.cpp
@@ -47,8 +47,8 @@ char*    realpath(const char* file,char* path);
 
 #if ! defined(_MSC_VER)
 #include <dirent.h>
-#include <unistd.h>
 #include <sys/param.h>
+#include <unistd.h>
 #define  stricmp strcasecmp
 #endif
 
diff --git a/samples/getopt-test.cpp b/samples/getopt-test.cpp
index c40863d6a7..5471baea34 100644
--- a/samples/getopt-test.cpp
+++ b/samples/getopt-test.cpp
@@ -29,9 +29,9 @@
 #ifdef EXV_HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include <iostream>
-#include <iomanip>
 #include <cassert>
+#include <iomanip>
+#include <iostream>
 
 #define Safe(x) (x?x:"unknown")
 const char* optstring = ":hVvqfbuktTFa:Y:O:D:r:p:P:d:e:i:c:m:M:l:S:g:K:n:Q:";
diff --git a/samples/iptceasy.cpp b/samples/iptceasy.cpp
index ae0687f467..080b385f8d 100644
--- a/samples/iptceasy.cpp
+++ b/samples/iptceasy.cpp
@@ -2,11 +2,10 @@
 // iptceasy.cpp
 // The quickest way to access, set or modify IPTC metadata.
 
+#include <cassert>
 #include <exiv2/exiv2.hpp>
-
-#include <iostream>
 #include <iomanip>
-#include <cassert>
+#include <iostream>
 
 int main(int argc, char* const argv[])
 try {
diff --git a/samples/iptcprint.cpp b/samples/iptcprint.cpp
index 8ee4770334..3e03cde4d1 100644
--- a/samples/iptcprint.cpp
+++ b/samples/iptcprint.cpp
@@ -2,11 +2,10 @@
 // iptcprint.cpp
 // Sample program to print the IPTC metadata of an image
 
+#include <cassert>
 #include <exiv2/exiv2.hpp>
-
-#include <iostream>
 #include <iomanip>
-#include <cassert>
+#include <iostream>
 
 int main(int argc, char* const argv[])
 try {
diff --git a/samples/iptctest.cpp b/samples/iptctest.cpp
index 33bb0b614c..6ff7896e94 100644
--- a/samples/iptctest.cpp
+++ b/samples/iptctest.cpp
@@ -9,11 +9,10 @@
  */
 // *****************************************************************************
 // included header files
+#include <cassert>
 #include <exiv2/exiv2.hpp>
-
-#include <iostream>
 #include <iomanip>
-#include <cassert>
+#include <iostream>
 
 using namespace Exiv2;
 
diff --git a/samples/key-test.cpp b/samples/key-test.cpp
index 3516e7e980..7dfbaddc07 100644
--- a/samples/key-test.cpp
+++ b/samples/key-test.cpp
@@ -9,11 +9,10 @@
  */
 // *****************************************************************************
 // included header files
+#include <cstring>
 #include <exiv2/exiv2.hpp>
-
 #include <iostream>
 #include <string>
-#include <cstring>
 
 using namespace Exiv2;
 
diff --git a/samples/metacopy.cpp b/samples/metacopy.cpp
index 31048dfbf7..a96ffc5f82 100644
--- a/samples/metacopy.cpp
+++ b/samples/metacopy.cpp
@@ -25,11 +25,10 @@
  */
 // *****************************************************************************
 // included header files
+#include <cassert>
 #include <exiv2/exiv2.hpp>
-
-#include <iostream>
 #include <fstream>
-#include <cassert>
+#include <iostream>
 
 // include local header files which are not part of libexiv2
 #include "getopt.hpp"
diff --git a/samples/mmap-test.cpp b/samples/mmap-test.cpp
index dc19099698..2b00bcdb76 100644
--- a/samples/mmap-test.cpp
+++ b/samples/mmap-test.cpp
@@ -2,10 +2,9 @@
 // mmap-test.cpp
 // Simple mmap tests
 
+#include <cstring>
 #include <exiv2/exiv2.hpp>
-
 #include <iostream>
-#include <cstring>
 
 using namespace Exiv2;
 
diff --git a/samples/path-test.cpp b/samples/path-test.cpp
index a1bf8e1bc1..32054ecd55 100644
--- a/samples/path-test.cpp
+++ b/samples/path-test.cpp
@@ -2,9 +2,8 @@
 // path-test.cpp
 
 #include <exiv2/exiv2.hpp>
-
-#include <iostream>
 #include <fstream>
+#include <iostream>
 #include <sstream>
 #include <string>
 
diff --git a/samples/prevtest.cpp b/samples/prevtest.cpp
index 4e67eac8dd..73dcf4fe9b 100644
--- a/samples/prevtest.cpp
+++ b/samples/prevtest.cpp
@@ -2,11 +2,10 @@
 // prevtest.cpp
 // Test access to preview images
 
+#include <cassert>
 #include <exiv2/exiv2.hpp>
-
-#include <string>
 #include <iostream>
-#include <cassert>
+#include <string>
 
 int main(int argc, char* const argv[])
 try {
diff --git a/samples/remotetest.cpp b/samples/remotetest.cpp
index 1d019029b8..b85ef63669 100644
--- a/samples/remotetest.cpp
+++ b/samples/remotetest.cpp
@@ -4,11 +4,10 @@
 // It makes some modifications on the metadata of remote file, reads new metadata from that file
 // and reset the metadata back to the original status.
 
+#include <cassert>
 #include <exiv2/exiv2.hpp>
-
-#include <iostream>
 #include <iomanip>
-#include <cassert>
+#include <iostream>
 
 int main(int argc, char* const argv[])
 try {
diff --git a/samples/stringto-test.cpp b/samples/stringto-test.cpp
index 1e5a355c20..b8b2533741 100644
--- a/samples/stringto-test.cpp
+++ b/samples/stringto-test.cpp
@@ -3,9 +3,8 @@
 // Test conversions from string to long, float and Rational types.
 
 #include <exiv2/exiv2.hpp>
-
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 
 const char* testcases[] = {
     // bool
diff --git a/samples/taglist.cpp b/samples/taglist.cpp
index b65009b66a..e4617f401a 100644
--- a/samples/taglist.cpp
+++ b/samples/taglist.cpp
@@ -9,10 +9,9 @@
 // *****************************************************************************
 
 #include <exiv2/exiv2.hpp>
-
 #include <iostream>
-#include <string>
 #include <sstream>
+#include <string>
 
 using namespace Exiv2;
 
diff --git a/samples/tiff-test.cpp b/samples/tiff-test.cpp
index 0d8b18dfa1..116a4afee9 100644
--- a/samples/tiff-test.cpp
+++ b/samples/tiff-test.cpp
@@ -2,13 +2,12 @@
 // tiff-test.cpp
 // First and very simple TIFF write test.
 
-#include <exiv2/exiv2.hpp>
+#include <cassert>
 #include <enforce.hpp>
-
-#include <string>
-#include <iostream>
+#include <exiv2/exiv2.hpp>
 #include <iomanip>
-#include <cassert>
+#include <iostream>
+#include <string>
 
 using namespace Exiv2;
 
diff --git a/samples/write-test.cpp b/samples/write-test.cpp
index 274262179d..190dc04a61 100644
--- a/samples/write-test.cpp
+++ b/samples/write-test.cpp
@@ -14,14 +14,13 @@
  */
 // *****************************************************************************
 // included header files
+#include <cassert>
 #include <exiv2/exiv2.hpp>
-
+#include <iomanip>
 #include <iostream>
 #include <sstream>
-#include <iomanip>
 #include <string>
 #include <utility>
-#include <cassert>
 
 // *****************************************************************************
 // local declarations
diff --git a/samples/write2-test.cpp b/samples/write2-test.cpp
index a08fff21e2..8188fbe721 100644
--- a/samples/write2-test.cpp
+++ b/samples/write2-test.cpp
@@ -9,12 +9,11 @@
  */
 // *****************************************************************************
 // included header files
+#include <cassert>
 #include <exiv2/exiv2.hpp>
-
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 #include <string>
-#include <cassert>
 
 void write(const std::string& file, Exiv2::ExifData& ed);
 void print(const std::string& file);
diff --git a/samples/xmpparse.cpp b/samples/xmpparse.cpp
index 98c83b31f6..d645ad3e63 100644
--- a/samples/xmpparse.cpp
+++ b/samples/xmpparse.cpp
@@ -3,10 +3,9 @@
 // Read an XMP packet from a file, parse it and print all (known) properties.
 
 #include <exiv2/exiv2.hpp>
-
-#include <string>
-#include <iostream>
 #include <iomanip>
+#include <iostream>
+#include <string>
 
 int main(int argc, char* const argv[])
 try {
diff --git a/samples/xmpparser-test.cpp b/samples/xmpparser-test.cpp
index 0c91d6e197..874f1540c3 100644
--- a/samples/xmpparser-test.cpp
+++ b/samples/xmpparser-test.cpp
@@ -3,10 +3,9 @@
 // Read an XMP packet from a file, parse and re-serialize it.
 
 #include <exiv2/exiv2.hpp>
-
-#include <string>
-#include <iostream>
 #include <iomanip>
+#include <iostream>
+#include <string>
 
 int main(int argc, char* const argv[])
 try {
diff --git a/samples/xmpprint.cpp b/samples/xmpprint.cpp
index 77cd4d3074..dcb370ea1e 100644
--- a/samples/xmpprint.cpp
+++ b/samples/xmpprint.cpp
@@ -7,12 +7,11 @@
 //      g++ -o xmprint xmprint.cpp `pkg-config --cflags --libs exiv2`
 // ========================================================================
 
+#include <cassert>
 #include <exiv2/exiv2.hpp>
-
-#include <string>
-#include <iostream>
 #include <iomanip>
-#include <cassert>
+#include <iostream>
+#include <string>
 
 int main(int argc, char** argv)
 {
diff --git a/samples/xmpsample.cpp b/samples/xmpsample.cpp
index 3f99bc99fe..b6078f6ef4 100644
--- a/samples/xmpsample.cpp
+++ b/samples/xmpsample.cpp
@@ -2,14 +2,14 @@
 // xmpsample.cpp
 // Sample/test for high level XMP classes. See also addmoddel.cpp
 
-#include <exiv2/exiv2.hpp>
-#include "unused.h"
-
-#include <string>
-#include <iostream>
-#include <iomanip>
 #include <cassert>
 #include <cmath>
+#include <exiv2/exiv2.hpp>
+#include <iomanip>
+#include <iostream>
+#include <string>
+
+#include "unused.h"
 
 bool isEqual(float a, float b)
 {
diff --git a/src/MemIo.cpp b/src/MemIo.cpp
index bac804c2fb..7fe2ca3043 100644
--- a/src/MemIo.cpp
+++ b/src/MemIo.cpp
@@ -17,13 +17,13 @@
  * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <cassert>  /// \todo check usages of assert and try to cover the negative case with unit tests.
+#include <cstring>  // std::memcpy
+
 #include "basicio.hpp"
 #include "error.hpp"
 #include "futils.hpp"
 
-#include <cstring>  // std::memcpy
-#include <cassert>      /// \todo check usages of assert and try to cover the negative case with unit tests.
-
 namespace Exiv2
 {
     //! Internal Pimpl structure of class MemIo.
diff --git a/src/RemoteIo.cpp b/src/RemoteIo.cpp
index 09fcd83eb5..a7055f21ce 100644
--- a/src/RemoteIo.cpp
+++ b/src/RemoteIo.cpp
@@ -27,8 +27,8 @@
 #include <curl/curl.h>
 #endif
 
-#include <cstring>  // std::memcpy
 #include <cassert>      /// \todo check usages of assert and try to cover the negative case with unit tests.
+#include <cstring>      // std::memcpy
 #include <iostream>
 
 namespace Exiv2
diff --git a/src/actions.cpp b/src/actions.cpp
index d997bcb09c..98883ca85d 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -24,18 +24,19 @@
 // included header files
 #include "actions.hpp"
 
-#include "config.h"
-#include "i18n.h"  // NLS support.
-
 #include <exiv2/easyaccess.hpp>
+#include <exiv2/error.hpp>
 #include <exiv2/exif.hpp>
 #include <exiv2/futils.hpp>
 #include <exiv2/types.hpp>
-#include <exiv2/error.hpp>
+
+#include "config.h"
+#include "i18n.h"  // NLS support.
 
 // + standard includes
 #include <sys/stat.h>   // for stat()
 #include <sys/types.h>  // for stat()
+
 #include <fstream>
 #ifdef EXV_HAVE_UNISTD_H
 #include <unistd.h>  // for stat()
diff --git a/src/bigtiffimage.cpp b/src/bigtiffimage.cpp
index a2110a2307..87aeebb308 100644
--- a/src/bigtiffimage.cpp
+++ b/src/bigtiffimage.cpp
@@ -1,14 +1,14 @@
 #include "bigtiffimage.hpp"
 
-#include "safe_op.hpp"
-#include "exif.hpp"
-#include "error.hpp"
-#include "image_int.hpp"
-#include "enforce.hpp"
-
 #include <cassert>
-#include <limits>
 #include <iostream>
+#include <limits>
+
+#include "enforce.hpp"
+#include "error.hpp"
+#include "exif.hpp"
+#include "image_int.hpp"
+#include "safe_op.hpp"
 
 namespace Exiv2
 {
diff --git a/src/canonmn_int.cpp b/src/canonmn_int.cpp
index 47be9de0de..e36325e305 100644
--- a/src/canonmn_int.cpp
+++ b/src/canonmn_int.cpp
@@ -25,23 +25,24 @@
  */
 // *****************************************************************************
 // included header files
-#include "types.hpp"
-#include "makernote_int.hpp"
 #include "canonmn_int.hpp"
-#include "tags_int.hpp"
-#include "value.hpp"
+
 #include "exif.hpp"
 #include "i18n.h"                // NLS support.
+#include "makernote_int.hpp"
+#include "tags_int.hpp"
+#include "types.hpp"
+#include "value.hpp"
 
 // + standard includes
-#include <string>
-#include <sstream>
-#include <iomanip>
-#include <ios>
 #include <algorithm>
 #include <cassert>
-#include <cstring>
 #include <cmath>
+#include <cstring>
+#include <iomanip>
+#include <ios>
+#include <sstream>
+#include <string>
 
 // *****************************************************************************
 // class member definitions
diff --git a/src/casiomn_int.cpp b/src/casiomn_int.cpp
index 943ac3edc9..325885b715 100644
--- a/src/casiomn_int.cpp
+++ b/src/casiomn_int.cpp
@@ -24,18 +24,19 @@
  */
 // *****************************************************************************
 // included header files
-#include "types.hpp"
 #include "casiomn_int.hpp"
+
+#include "i18n.h"  // NLS support.
 #include "tags_int.hpp"
+#include "types.hpp"
 #include "value.hpp"
-#include "i18n.h"                // NLS support.
 
 // + standard includes
-#include <string>
-#include <sstream>
-#include <iomanip>
 #include <cassert>
 #include <cstring>
+#include <iomanip>
+#include <sstream>
+#include <string>
 #include <vector>
 
 // *****************************************************************************
diff --git a/src/convert.cpp b/src/convert.cpp
index 5274368ea1..2237156b05 100644
--- a/src/convert.cpp
+++ b/src/convert.cpp
@@ -26,15 +26,16 @@
  */
 // *****************************************************************************
 // included header files
+#include "convert.hpp"
+
 #include "config.h"
-#include "types.hpp"
 #include "error.hpp"
 #include "exif.hpp"
-#include "iptc.hpp"
-#include "xmp_exiv2.hpp"
 #include "futils.hpp"
-#include "convert.hpp"
+#include "iptc.hpp"
+#include "types.hpp"
 #include "unused.h"
+#include "xmp_exiv2.hpp"
 
 // + standard includes
 #include <cstdio>  // for snprintf (C99)
diff --git a/src/cr2image.cpp b/src/cr2image.cpp
index 7a2c780ba6..ac7840685e 100644
--- a/src/cr2image.cpp
+++ b/src/cr2image.cpp
@@ -22,23 +22,23 @@
  */
 // *****************************************************************************
 // included header files
-#include "config.h"
-
 #include "cr2image.hpp"
-#include "tiffimage.hpp"
+
+#include "config.h"
 #include "cr2header_int.hpp"
-#include "tiffcomposite_int.hpp"
-#include "tiffimage_int.hpp"
-#include "image.hpp"
 #include "error.hpp"
 #include "futils.hpp"
 #include "i18n.h"                // NLS support.
+#include "image.hpp"
+#include "tiffcomposite_int.hpp"
+#include "tiffimage.hpp"
+#include "tiffimage_int.hpp"
 
 // + standard includes
-#include <iostream>
-#include <iomanip>
 #include <cassert>
 #include <cstring>
+#include <iomanip>
+#include <iostream>
 
 // *****************************************************************************
 // class member definitions
diff --git a/src/crwimage.cpp b/src/crwimage.cpp
index be0c20745f..7abcec71c7 100644
--- a/src/crwimage.cpp
+++ b/src/crwimage.cpp
@@ -25,26 +25,25 @@
  */
 // *****************************************************************************
 // included header files
-#include "config.h"
-
 #include "crwimage.hpp"
+
+#include "config.h"
 #include "crwimage_int.hpp"
 #include "error.hpp"
 #include "futils.hpp"
-#include "value.hpp"
 #include "tags.hpp"
 #include "tags_int.hpp"
+#include "value.hpp"
 
 // + standard includes
-#include <iostream>
-#include <iomanip>
-#include <stack>
+#include <cassert>
+#include <cmath>
 #include <cstdlib>
 #include <cstring>
 #include <ctime>
-#include <cmath>
-#include <cassert>
-
+#include <iomanip>
+#include <iostream>
+#include <stack>
 
 // *****************************************************************************
 // class member definitions
diff --git a/src/crwimage_int.cpp b/src/crwimage_int.cpp
index 66d4d0ca5f..9c42c621d4 100644
--- a/src/crwimage_int.cpp
+++ b/src/crwimage_int.cpp
@@ -1,13 +1,14 @@
 #include "crwimage_int.hpp"
+
+#include <cassert>
+#include <ctime>
+
 #include "canonmn_int.hpp"
+#include "enforce.hpp"
+#include "error.hpp"
 #include "i18n.h"                // NLS support.
 #include "timegm.h"
 #include "unused.h"
-#include "error.hpp"
-#include "enforce.hpp"
-
-#include <cassert>
-#include <ctime>
 
 // *****************************************************************************
 // local declarations
diff --git a/src/error.cpp b/src/error.cpp
index 030e8d0417..251f8ccd02 100644
--- a/src/error.cpp
+++ b/src/error.cpp
@@ -26,9 +26,9 @@
 #include "i18n.h"                // NLS support.
 
 // + standard includes
+#include <cassert>
 #include <iostream>
 #include <string>
-#include <cassert>
 
 // *****************************************************************************
 namespace {
diff --git a/src/exif.cpp b/src/exif.cpp
index 3b0f9b8512..9973209282 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -25,21 +25,21 @@
  */
 // *****************************************************************************
 // included header files
-#include "config.h"
-
 #include "exif.hpp"
+
+#include <iostream>
+
+#include "basicio.hpp"
+#include "config.h"
+#include "error.hpp"
 #include "metadatum.hpp"
 #include "tags.hpp"
 #include "tags_int.hpp"
-#include "value.hpp"
-#include "types.hpp"
-#include "error.hpp"
-#include "basicio.hpp"
+#include "tiffcomposite_int.hpp"  // for Tag::root
 #include "tiffimage.hpp"
 #include "tiffimage_int.hpp"
-#include "tiffcomposite_int.hpp" // for Tag::root
-
-#include <iostream>
+#include "types.hpp"
+#include "value.hpp"
 
 // *****************************************************************************
 namespace {
diff --git a/src/exiv2.cpp b/src/exiv2.cpp
index 4a14bfe92e..7ee0d80568 100644
--- a/src/exiv2.cpp
+++ b/src/exiv2.cpp
@@ -27,11 +27,11 @@
 // *****************************************************************************
 
 // include local header files which are not part of libexiv2
+#include <exiv2/futils.hpp>
+
 #include "actions.hpp"
-#include "params.hpp"
 #include "i18n.h"  // NLS support.
-
-#include <exiv2/futils.hpp>
+#include "params.hpp"
 
 int main(int argc, char* const argv[])
 {
diff --git a/src/fujimn_int.cpp b/src/fujimn_int.cpp
index 5771e46ae8..4bce1cca94 100644
--- a/src/fujimn_int.cpp
+++ b/src/fujimn_int.cpp
@@ -27,18 +27,19 @@
  */
 // *****************************************************************************
 // included header files
-#include "types.hpp"
 #include "fujimn_int.hpp"
+
+#include "i18n.h"  // NLS support.
 #include "tags_int.hpp"
+#include "types.hpp"
 #include "value.hpp"
-#include "i18n.h"                // NLS support.
 
 // + standard includes
-#include <string>
-#include <sstream>
-#include <iomanip>
 #include <cassert>
 #include <cstring>
+#include <iomanip>
+#include <sstream>
+#include <string>
 
 // *****************************************************************************
 // class member definitions
diff --git a/src/futils.cpp b/src/futils.cpp
index df2f880244..ae29827840 100644
--- a/src/futils.cpp
+++ b/src/futils.cpp
@@ -19,22 +19,23 @@
  */
 // *****************************************************************************
 // included header files
-#include "config.h"
-
 #include "futils.hpp"
+
+#include "config.h"
 #include "enforce.hpp"
 
 // + standard includes
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <cstdio>
+#include <sys/types.h>
+
+#include <algorithm>
 #include <cerrno>
-#include <sstream>
+#include <cstdio>
 #include <cstring>
-#include <algorithm>
-#include <stdexcept>
-#include <set>
 #include <fstream>
+#include <set>
+#include <sstream>
+#include <stdexcept>
 #ifdef   EXV_HAVE_UNISTD_H
 #include <unistd.h>                     // for stat()
 #endif
diff --git a/src/gifimage.cpp b/src/gifimage.cpp
index 57ee0944cd..69a6275914 100644
--- a/src/gifimage.cpp
+++ b/src/gifimage.cpp
@@ -24,18 +24,18 @@
  */
 // *****************************************************************************
 // included header files
-#include "config.h"
-
 #include "gifimage.hpp"
-#include "image.hpp"
+
 #include "basicio.hpp"
+#include "config.h"
 #include "error.hpp"
 #include "futils.hpp"
+#include "image.hpp"
 
 // + standard includes
-#include <string>
 #include <cstring>
 #include <iostream>
+#include <string>
 
 // *****************************************************************************
 // class member definitions
diff --git a/src/image.cpp b/src/image.cpp
index 2eea9e0644..3867f11af8 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -22,52 +22,50 @@
  */
 // *****************************************************************************
 // included header files
-#include "config.h"
-
 #include "image.hpp"
-#include "image_int.hpp"
-#include "error.hpp"
-#include "futils.hpp"
-#include "safe_op.hpp"
-#include "slice.hpp"
-#include "unused.h"
 
+#include "config.h"
 #include "cr2image.hpp"
 #include "crwimage.hpp"
+#include "error.hpp"
+#include "futils.hpp"
+#include "image_int.hpp"
 #include "jpgimage.hpp"
 #include "mrwimage.hpp"
+#include "safe_op.hpp"
+#include "slice.hpp"
+#include "unused.h"
 #ifdef EXIV2_ENABLE_PNG
 # include "pngimage.hpp"
 #endif
-#include "rafimage.hpp"
-#include "tiffimage.hpp"
-#include "tiffimage_int.hpp"
-#include "tiffcomposite_int.hpp"
-#include "tiffvisitor_int.hpp"
 #include "bigtiffimage.hpp"
-#include "webpimage.hpp"
-#include "orfimage.hpp"
-#include "gifimage.hpp"
-#include "psdimage.hpp"
-#include "tgaimage.hpp"
 #include "bmpimage.hpp"
+#include "gifimage.hpp"
 #include "jp2image.hpp"
 #include "nikonmn_int.hpp"
-
-#include "rw2image.hpp"
+#include "orfimage.hpp"
 #include "pgfimage.hpp"
+#include "psdimage.hpp"
+#include "rafimage.hpp"
+#include "rw2image.hpp"
+#include "tgaimage.hpp"
+#include "tiffcomposite_int.hpp"
+#include "tiffimage.hpp"
+#include "tiffimage_int.hpp"
+#include "tiffvisitor_int.hpp"
+#include "webpimage.hpp"
 #include "xmpsidecar.hpp"
 
 // + standard includes
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include <cassert>
 #include <cerrno>
 #include <cstdio>
 #include <cstring>
-#include <cassert>
 #include <iostream>
 #include <limits>
-
-#include <sys/types.h>
-#include <sys/stat.h>
 #ifdef _MSC_VER
 # define S_ISREG(m)      (((m) & S_IFMT) == S_IFREG)
 #endif
diff --git a/src/image_int.cpp b/src/image_int.cpp
index b3d2cb2398..c910772189 100644
--- a/src/image_int.cpp
+++ b/src/image_int.cpp
@@ -21,9 +21,9 @@
 
 #include <cstdarg>
 #include <cstddef>
+#include <cstdio>
 #include <cstring>
 #include <vector>
-#include <cstdio>
 
 namespace Exiv2
 {
diff --git a/src/iptc.cpp b/src/iptc.cpp
index cf53e44834..61a8ec16fd 100644
--- a/src/iptc.cpp
+++ b/src/iptc.cpp
@@ -25,18 +25,19 @@
 // *****************************************************************************
 // included header files
 #include "iptc.hpp"
-#include "types.hpp"
-#include "error.hpp"
-#include "value.hpp"
+
 #include "datasets.hpp"
-#include "jpgimage.hpp"
+#include "error.hpp"
 #include "image_int.hpp"
+#include "jpgimage.hpp"
+#include "types.hpp"
+#include "value.hpp"
 
 // + standard includes
-#include <iostream>
 #include <algorithm>
-#include <iterator>
 #include <fstream>      // write the temporary file
+#include <iostream>
+#include <iterator>
 
 // *****************************************************************************
 namespace {
diff --git a/src/jp2image.cpp b/src/jp2image.cpp
index 6125bd2c17..62ffc1b52f 100644
--- a/src/jp2image.cpp
+++ b/src/jp2image.cpp
@@ -21,25 +21,25 @@
 // *****************************************************************************
 
 // included header files
-#include "config.h"
-
 #include "jp2image.hpp"
-#include "tiffimage.hpp"
-#include "image.hpp"
-#include "image_int.hpp"
+
 #include "basicio.hpp"
+#include "config.h"
 #include "error.hpp"
 #include "futils.hpp"
-#include "types.hpp"
+#include "image.hpp"
+#include "image_int.hpp"
 #include "safe_op.hpp"
+#include "tiffimage.hpp"
+#include "types.hpp"
 
 // + standard includes
 #include <array>
-#include <string>
-#include <cstring>
-#include <iostream>
 #include <cassert>
 #include <cstdio>
+#include <cstring>
+#include <iostream>
+#include <string>
 
 // JPEG-2000 box types
 const uint32_t kJp2BoxTypeJp2Header   = 0x6a703268; // 'jp2h'
diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index 83f7bd7a54..2259a46d8c 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -22,16 +22,16 @@
  */
 // *****************************************************************************
 // included header files
-#include "config.h"
-
 #include "jpgimage.hpp"
-#include "tiffimage.hpp"
-#include "image_int.hpp"
+
+#include "config.h"
+#include "enforce.hpp"
 #include "error.hpp"
 #include "futils.hpp"
 #include "helper_functions.hpp"
-#include "enforce.hpp"
+#include "image_int.hpp"
 #include "safe_op.hpp"
+#include "tiffimage.hpp"
 
 #ifdef WIN32
 #include <windows.h>
@@ -44,11 +44,11 @@
 #include "fff.h"
 
 // + standard includes
+#include <cassert>
 #include <cstdio>                               // for EOF
 #include <cstring>
-#include <cassert>
-#include <stdexcept>
 #include <iostream>
+#include <stdexcept>
 
 // *****************************************************************************
 // class member definitions
diff --git a/src/makernote_int.cpp b/src/makernote_int.cpp
index 2f63671281..8be2d28eaa 100644
--- a/src/makernote_int.cpp
+++ b/src/makernote_int.cpp
@@ -24,18 +24,18 @@
  */
 // *****************************************************************************
 // included header files
-#include "config.h"
-
 #include "makernote_int.hpp"
+
+#include "config.h"
 #include "ini.hpp"
 #include "tiffcomposite_int.hpp"
-#include "tiffvisitor_int.hpp"
 #include "tiffimage.hpp"
 #include "tiffimage_int.hpp"
+#include "tiffvisitor_int.hpp"
 
 // + standard includes
-#include <string>
 #include <cstring>
+#include <string>
 
 #if defined(__MINGW32__) || defined(__MINGW64__)
 #ifndef __MINGW__
@@ -44,9 +44,9 @@
 #endif
 
 #if !defined(_MSC_VER) && !defined(__MINGW__)
-#include <unistd.h>
-#include <sys/types.h>
 #include <pwd.h>
+#include <sys/types.h>
+#include <unistd.h>
 #else
 #include <windows.h>
 #include <shlobj.h>
diff --git a/src/metadatum.cpp b/src/metadatum.cpp
index 7952b99efb..1758dd81a4 100644
--- a/src/metadatum.cpp
+++ b/src/metadatum.cpp
@@ -29,9 +29,8 @@
 #include "metadatum.hpp"
 
 // + standard includes
-#include <iostream>
 #include <iomanip>
-
+#include <iostream>
 
 // *****************************************************************************
 // class member definitions
diff --git a/src/mrwimage.cpp b/src/mrwimage.cpp
index 754ebdf451..fb0c32d80a 100644
--- a/src/mrwimage.cpp
+++ b/src/mrwimage.cpp
@@ -25,21 +25,21 @@
  */
 // *****************************************************************************
 // included header files
-#include "config.h"
-
 #include "mrwimage.hpp"
-#include "tiffimage.hpp"
-#include "image.hpp"
+
 #include "basicio.hpp"
-#include "error.hpp"
+#include "config.h"
 #include "enforce.hpp"
+#include "error.hpp"
 #include "futils.hpp"
+#include "image.hpp"
+#include "tiffimage.hpp"
 
 // + standard includes
-#include <string>
+#include <cassert>
 #include <cstring>
 #include <iostream>
-#include <cassert>
+#include <string>
 
 // *****************************************************************************
 // class member definitions
diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp
index e8a8b9f9ca..f464f1b7b3 100644
--- a/src/nikonmn_int.cpp
+++ b/src/nikonmn_int.cpp
@@ -30,14 +30,15 @@
  */
 // *****************************************************************************
 // included header files
-#include "types.hpp"
 #include "nikonmn_int.hpp"
-#include "value.hpp"
-#include "image.hpp"
-#include "tags_int.hpp"
-#include "makernote_int.hpp"
+
 #include "error.hpp"
 #include "i18n.h"                // NLS support.
+#include "image.hpp"
+#include "makernote_int.hpp"
+#include "tags_int.hpp"
+#include "types.hpp"
+#include "value.hpp"
 
 // + standard includes
 #include <cassert>
diff --git a/src/olympusmn_int.cpp b/src/olympusmn_int.cpp
index 99ff95c8b9..57737f9978 100644
--- a/src/olympusmn_int.cpp
+++ b/src/olympusmn_int.cpp
@@ -29,20 +29,21 @@
 
 // *****************************************************************************
 // included header files
-#include "types.hpp"
 #include "olympusmn_int.hpp"
-#include "value.hpp"
+
+#include "i18n.h"  // NLS support.
 #include "image.hpp"
-#include "tags_int.hpp"
 #include "makernote_int.hpp"
-#include "i18n.h"                // NLS support.
+#include "tags_int.hpp"
+#include "types.hpp"
+#include "value.hpp"
 
 // + standard includes
-#include <string>
-#include <sstream>
-#include <iomanip>
 #include <cassert>
 #include <cstring>
+#include <iomanip>
+#include <sstream>
+#include <string>
 
 // *****************************************************************************
 // class member definitions
diff --git a/src/orfimage.cpp b/src/orfimage.cpp
index b3cefbb67b..baa7bfc075 100644
--- a/src/orfimage.cpp
+++ b/src/orfimage.cpp
@@ -25,23 +25,23 @@
  */
 // *****************************************************************************
 // included header files
-#include "config.h"
-
 #include "orfimage.hpp"
-#include "orfimage_int.hpp"
-#include "tiffimage.hpp"
-#include "tiffcomposite_int.hpp"
-#include "tiffimage_int.hpp"
-#include "image.hpp"
+
 #include "basicio.hpp"
+#include "config.h"
 #include "error.hpp"
 #include "futils.hpp"
+#include "image.hpp"
+#include "orfimage_int.hpp"
+#include "tiffcomposite_int.hpp"
+#include "tiffimage.hpp"
+#include "tiffimage_int.hpp"
 
 // + standard includes
-#include <string>
+#include <cassert>
 #include <cstring>
 #include <iostream>
-#include <cassert>
+#include <string>
 
 // *****************************************************************************
 // class member definitions
diff --git a/src/panasonicmn_int.cpp b/src/panasonicmn_int.cpp
index f243525ebc..659d36556e 100644
--- a/src/panasonicmn_int.cpp
+++ b/src/panasonicmn_int.cpp
@@ -26,18 +26,19 @@
  */
 // *****************************************************************************
 // included header files
-#include "types.hpp"
 #include "panasonicmn_int.hpp"
+
+#include "i18n.h"  // NLS support.
 #include "tags_int.hpp"
+#include "types.hpp"
 #include "value.hpp"
-#include "i18n.h"                // NLS support.
 
 // + standard includes
-#include <string>
-#include <sstream>
-#include <iomanip>
 #include <cassert>
 #include <cstring>
+#include <iomanip>
+#include <sstream>
+#include <string>
 
 // *****************************************************************************
 // class member definitions
diff --git a/src/pentaxmn_int.cpp b/src/pentaxmn_int.cpp
index 2b2a276066..c6163459a4 100644
--- a/src/pentaxmn_int.cpp
+++ b/src/pentaxmn_int.cpp
@@ -22,14 +22,15 @@
  */
 // *****************************************************************************
 // included header files
-#include "types.hpp"
 #include "pentaxmn_int.hpp"
-#include "makernote_int.hpp"
-#include "value.hpp"
+
 #include "exif.hpp"
-#include "tags.hpp"
-#include "metadatum.hpp"
 #include "i18n.h"                // NLS support.
+#include "makernote_int.hpp"
+#include "metadatum.hpp"
+#include "tags.hpp"
+#include "types.hpp"
+#include "value.hpp"
 
 // + standard includes
 #include <string>
diff --git a/src/pgfimage.cpp b/src/pgfimage.cpp
index 5c448d5163..d465fc0d65 100644
--- a/src/pgfimage.cpp
+++ b/src/pgfimage.cpp
@@ -25,22 +25,22 @@
  */
 // *****************************************************************************
 // included header files
-#include "config.h"
-
 #include "pgfimage.hpp"
-#include "image.hpp"
-#include "pngimage.hpp"
+
 #include "basicio.hpp"
+#include "config.h"
 #include "enforce.hpp"
 #include "error.hpp"
 #include "futils.hpp"
+#include "image.hpp"
+#include "pngimage.hpp"
 
 // + standard includes
+#include <cassert>
 #include <cstdio>                               // for EOF
-#include <string>
 #include <cstring>
 #include <iostream>
-#include <cassert>
+#include <string>
 
 // Signature from front of PGF file
 const unsigned char pgfSignature[3] = { 0x50, 0x47, 0x46 };
diff --git a/src/pngimage.cpp b/src/pngimage.cpp
index 246f2b194c..6ba55c3bcb 100644
--- a/src/pngimage.cpp
+++ b/src/pngimage.cpp
@@ -22,17 +22,17 @@
  */
 // *****************************************************************************
 // included header files
-#include "config.h"
+#include "pngimage.hpp"
 
 #include "basicio.hpp"
-#include "error.hpp"
+#include "config.h"
 #include "enforce.hpp"
+#include "error.hpp"
 #include "futils.hpp"
 #include "image.hpp"
 #include "image_int.hpp"
 #include "jpgimage.hpp"
 #include "pngchunk_int.hpp"
-#include "pngimage.hpp"
 #include "tiffimage.hpp"
 #include "types.hpp"
 
diff --git a/src/psdimage.cpp b/src/psdimage.cpp
index 2c430ec7fd..c5c9284bb1 100644
--- a/src/psdimage.cpp
+++ b/src/psdimage.cpp
@@ -25,25 +25,24 @@
  */
 // *****************************************************************************
 // included header files
-#include "config.h"
-
 #include "psdimage.hpp"
-#include "jpgimage.hpp"
-#include "image.hpp"
+
 #include "basicio.hpp"
+#include "config.h"
+#include "enforce.hpp"
 #include "error.hpp"
 #include "futils.hpp"
-
+#include "image.hpp"
+#include "jpgimage.hpp"
 #include "safe_op.hpp"
-#include "enforce.hpp"
 
 // + standard includes
-#include <string>
+#include <cassert>
 #include <cstring>
-#include <iostream>
 #include <iomanip>
-#include <cassert>
+#include <iostream>
 #include <memory>
+#include <string>
 
 // Todo: Consolidate with existing code in struct Photoshop (jpgimage.hpp):
 //       Extend this helper to a proper class with all required functionality,
diff --git a/src/rafimage.cpp b/src/rafimage.cpp
index e1295af2f0..0d0071f472 100644
--- a/src/rafimage.cpp
+++ b/src/rafimage.cpp
@@ -25,23 +25,23 @@
  */
 // *****************************************************************************
 // included header files
-#include "config.h"
-
 #include "rafimage.hpp"
-#include "tiffimage.hpp"
-#include "image_int.hpp"
-#include "image.hpp"
+
 #include "basicio.hpp"
+#include "config.h"
+#include "enforce.hpp"
 #include "error.hpp"
 #include "futils.hpp"
-#include "enforce.hpp"
+#include "image.hpp"
+#include "image_int.hpp"
 #include "safe_op.hpp"
+#include "tiffimage.hpp"
 
 // + standard includes
-#include <string>
+#include <cassert>
 #include <cstring>
 #include <iostream>
-#include <cassert>
+#include <string>
 
 // *****************************************************************************
 // class member definitions
diff --git a/src/rw2image.cpp b/src/rw2image.cpp
index b122903e05..41a6efe3e0 100644
--- a/src/rw2image.cpp
+++ b/src/rw2image.cpp
@@ -25,16 +25,16 @@
  */
 // *****************************************************************************
 // included header files
-#include "config.h"
-
 #include "rw2image.hpp"
+
+#include "config.h"
+#include "error.hpp"
+#include "futils.hpp"
+#include "image.hpp"
+#include "preview.hpp"
 #include "rw2image_int.hpp"
 #include "tiffcomposite_int.hpp"
 #include "tiffimage_int.hpp"
-#include "image.hpp"
-#include "preview.hpp"
-#include "error.hpp"
-#include "futils.hpp"
 
 // + standard includes
 #ifdef EXIV2_DEBUG_MESSAGES
diff --git a/src/samsungmn_int.cpp b/src/samsungmn_int.cpp
index d320238f73..7efb737685 100644
--- a/src/samsungmn_int.cpp
+++ b/src/samsungmn_int.cpp
@@ -24,18 +24,19 @@
  */
 // *****************************************************************************
 // included header files
-#include "types.hpp"
 #include "samsungmn_int.hpp"
+
+#include "i18n.h"  // NLS support.
 #include "tags_int.hpp"
+#include "types.hpp"
 #include "value.hpp"
-#include "i18n.h"                // NLS support.
 
 // + standard includes
-#include <string>
-#include <sstream>
-#include <iomanip>
 #include <cassert>
 #include <cstring>
+#include <iomanip>
+#include <sstream>
+#include <string>
 
 // *****************************************************************************
 // class member definitions
diff --git a/src/sigmamn_int.cpp b/src/sigmamn_int.cpp
index edc863dfb6..223d72885f 100644
--- a/src/sigmamn_int.cpp
+++ b/src/sigmamn_int.cpp
@@ -27,18 +27,19 @@
  */
 // *****************************************************************************
 // included header files
-#include "types.hpp"
 #include "sigmamn_int.hpp"
+
+#include "i18n.h"  // NLS support.
 #include "tags_int.hpp"
+#include "types.hpp"
 #include "value.hpp"
-#include "i18n.h"                // NLS support.
 
 // + standard includes
-#include <string>
-#include <sstream>
-#include <iomanip>
 #include <cassert>
 #include <cstring>
+#include <iomanip>
+#include <sstream>
+#include <string>
 
 // *****************************************************************************
 // class member definitions
diff --git a/src/sonymn_int.cpp b/src/sonymn_int.cpp
index 1d188a30b1..44b968d08e 100644
--- a/src/sonymn_int.cpp
+++ b/src/sonymn_int.cpp
@@ -24,20 +24,21 @@
  */
 // *****************************************************************************
 // included header files
-#include "types.hpp"
-#include "minoltamn_int.hpp"
 #include "sonymn_int.hpp"
+
+#include "i18n.h"  // NLS support.
+#include "minoltamn_int.hpp"
 #include "tags_int.hpp"
 #include "tiffcomposite_int.hpp"
+#include "types.hpp"
 #include "value.hpp"
-#include "i18n.h"                // NLS support.
 
 // + standard includes
-#include <string>
-#include <sstream>
-#include <iomanip>
 #include <cassert>
 #include <cstring>
+#include <iomanip>
+#include <sstream>
+#include <string>
 
 // *****************************************************************************
 // class member definitions
diff --git a/src/tags.cpp b/src/tags.cpp
index b7562975d7..88dce17c38 100644
--- a/src/tags.cpp
+++ b/src/tags.cpp
@@ -26,18 +26,24 @@
  */
 // *****************************************************************************
 // included header files
-#include "types.hpp"
 #include "tags.hpp"
-#include "tags_int.hpp"
-#include "error.hpp"
-#include "futils.hpp"
-#include "value.hpp"
-#include "convert.hpp"
-#include "i18n.h"                // NLS support.
+
+#include <cassert>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
+#include <iomanip>
+#include <iostream>
+#include <sstream>
+#include <utility>
 
 #include "canonmn_int.hpp"
 #include "casiomn_int.hpp"
+#include "convert.hpp"
+#include "error.hpp"
 #include "fujimn_int.hpp"
+#include "futils.hpp"
+#include "i18n.h"  // NLS support.
 #include "minoltamn_int.hpp"
 #include "nikonmn_int.hpp"
 #include "olympusmn_int.hpp"
@@ -46,16 +52,9 @@
 #include "samsungmn_int.hpp"
 #include "sigmamn_int.hpp"
 #include "sonymn_int.hpp"
-
-#include <iostream>
-#include <iomanip>
-#include <sstream>
-#include <utility>
-#include <cstdlib>
-#include <cassert>
-#include <cmath>
-#include <cstring>
-
+#include "tags_int.hpp"
+#include "types.hpp"
+#include "value.hpp"
 
 // *****************************************************************************
 // class member definitions
diff --git a/src/tgaimage.cpp b/src/tgaimage.cpp
index 7dc9005105..e9a7354f51 100644
--- a/src/tgaimage.cpp
+++ b/src/tgaimage.cpp
@@ -24,18 +24,18 @@
  */
 // *****************************************************************************
 // included header files
-#include "config.h"
-
 #include "tgaimage.hpp"
-#include "image.hpp"
+
 #include "basicio.hpp"
+#include "config.h"
 #include "error.hpp"
 #include "futils.hpp"
+#include "image.hpp"
 
 // + standard includes
-#include <string>
 #include <cstring>
 #include <iostream>
+#include <string>
 
 // *****************************************************************************
 // class member definitions
diff --git a/src/tiffcomposite_int.cpp b/src/tiffcomposite_int.cpp
index f4ae9c418d..676c953b2b 100644
--- a/src/tiffcomposite_int.cpp
+++ b/src/tiffcomposite_int.cpp
@@ -24,22 +24,22 @@
  */
 // *****************************************************************************
 // included header files
-#include "config.h"
+#include "tiffcomposite_int.hpp"
 
+#include "config.h"
+#include "enforce.hpp"
+#include "error.hpp"
+#include "makernote_int.hpp"
 #include "tiffimage_int.hpp"
-#include "tiffcomposite_int.hpp"
 #include "tiffvisitor_int.hpp"
-#include "makernote_int.hpp"
 #include "value.hpp"
-#include "error.hpp"
-#include "enforce.hpp"
 
 // + standard includes
-#include <string>
+#include <algorithm>
 #include <cstring>
-#include <iostream>
 #include <iomanip>
-#include <algorithm>
+#include <iostream>
+#include <string>
 
 // *****************************************************************************
 namespace {
diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
index b989180677..7ec89facce 100644
--- a/src/tiffimage.cpp
+++ b/src/tiffimage.cpp
@@ -22,29 +22,29 @@
  */
 // *****************************************************************************
 // included header files
-#include "config.h"
-
 #include "tiffimage.hpp"
-#include "tiffimage_int.hpp"
-#include "tiffcomposite_int.hpp"
-#include "tiffvisitor_int.hpp"
-#include "orfimage.hpp"
-#include "makernote_int.hpp"
-#include "nikonmn_int.hpp"
-#include "image.hpp"
-#include "image_int.hpp"
+
+#include "basicio.hpp"
+#include "config.h"
 #include "error.hpp"
 #include "futils.hpp"
-#include "types.hpp"
-#include "basicio.hpp"
 #include "i18n.h"                // NLS support.
+#include "image.hpp"
+#include "image_int.hpp"
+#include "makernote_int.hpp"
+#include "nikonmn_int.hpp"
+#include "orfimage.hpp"
+#include "tiffcomposite_int.hpp"
+#include "tiffimage_int.hpp"
+#include "tiffvisitor_int.hpp"
+#include "types.hpp"
 
 // + standard includes
-#include <string>
-#include <iostream>
-#include <iomanip>
 #include <cassert>
 #include <cstdarg>
+#include <iomanip>
+#include <iostream>
+#include <string>
 
 /* --------------------------------------------------------------------------
 
diff --git a/src/tiffimage_int.cpp b/src/tiffimage_int.cpp
index 391e95ba46..a949c79dab 100644
--- a/src/tiffimage_int.cpp
+++ b/src/tiffimage_int.cpp
@@ -1,10 +1,10 @@
 #include "tiffimage_int.hpp"
 
 #include "error.hpp"
+#include "i18n.h"  // NLS support.
 #include "makernote_int.hpp"
 #include "sonymn_int.hpp"
 #include "tiffvisitor_int.hpp"
-#include "i18n.h"                // NLS support.
 
 // Shortcuts for the newTiffBinaryArray templates.
 #define EXV_BINARY_ARRAY(arrayCfg, arrayDef) (newTiffBinaryArray0<&arrayCfg, EXV_COUNTOF(arrayDef), arrayDef>)
diff --git a/src/tiffvisitor_int.cpp b/src/tiffvisitor_int.cpp
index 32d835bd61..8ce1aade0e 100644
--- a/src/tiffvisitor_int.cpp
+++ b/src/tiffvisitor_int.cpp
@@ -25,19 +25,18 @@
 // *****************************************************************************
 // included header files
 #include "config.h"
-
-#include "tiffcomposite_int.hpp" // Do not change the order of these 2 includes,
-#include "tiffvisitor_int.hpp"   // see bug #487
-#include "tiffimage_int.hpp"
-#include "makernote_int.hpp"
-#include "exif.hpp"
 #include "enforce.hpp"
-#include "iptc.hpp"
-#include "value.hpp"
+#include "exif.hpp"
+#include "i18n.h"  // NLS support.
 #include "image.hpp"
+#include "iptc.hpp"
 #include "jpgimage.hpp"
+#include "makernote_int.hpp"
 #include "sonymn_int.hpp"
-#include "i18n.h"             // NLS support.
+#include "tiffcomposite_int.hpp"  // Do not change the order of these 2 includes,
+#include "tiffimage_int.hpp"
+#include "tiffvisitor_int.hpp"   // see bug #487
+#include "value.hpp"
 
 // + standard includes
 #include <cassert>
diff --git a/src/value.cpp b/src/value.cpp
index 69162a9915..90066c87f5 100644
--- a/src/value.cpp
+++ b/src/value.cpp
@@ -27,10 +27,11 @@
 // *****************************************************************************
 // included header files
 #include "value.hpp"
-#include "types.hpp"
+
+#include "convert.hpp"
 #include "enforce.hpp"
 #include "error.hpp"
-#include "convert.hpp"
+#include "types.hpp"
 #include "unused.h"
 
 // + standard includes
diff --git a/src/version.cpp b/src/version.cpp
index b9abeea65d..470b7293c7 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -25,10 +25,10 @@
 #include <curl/curl.h>
 #endif
 
+#include "futils.hpp"
 #include "http.hpp"
-#include "version.hpp"
 #include "makernote_int.hpp"
-#include "futils.hpp"
+#include "version.hpp"
 
 // Adobe XMP Toolkit
 #ifdef EXV_HAVE_XMP_TOOLKIT
@@ -43,8 +43,8 @@
 #include <string>
 
 #if ! defined(WIN32) && ! defined(__CYGWIN__) && ! defined(__MINGW__)
-#include <unistd.h>
 #include <sys/types.h>
+#include <unistd.h>
 #endif
 
 std::string Exiv2::versionString()
diff --git a/src/webpimage.cpp b/src/webpimage.cpp
index 5e63e75e0d..d766a394ab 100644
--- a/src/webpimage.cpp
+++ b/src/webpimage.cpp
@@ -27,29 +27,29 @@
 
 // *****************************************************************************
 // included header files
-#include "config.h"
-
 #include "webpimage.hpp"
-#include "image_int.hpp"
+
+#include <cassert>
+#include <cmath>
+#include <cstdio>
+#include <cstring>
+#include <iomanip>
+#include <iostream>
+#include <sstream>
+#include <string>
+
+#include "basicio.hpp"
+#include "config.h"
+#include "convert.hpp"
 #include "enforce.hpp"
 #include "futils.hpp"
-#include "basicio.hpp"
+#include "image_int.hpp"
+#include "safe_op.hpp"
 #include "tags.hpp"
 #include "tags_int.hpp"
-#include "types.hpp"
 #include "tiffimage.hpp"
 #include "tiffimage_int.hpp"
-#include "convert.hpp"
-#include "safe_op.hpp"
-
-#include <cmath>
-#include <iomanip>
-#include <string>
-#include <cstring>
-#include <iostream>
-#include <sstream>
-#include <cassert>
-#include <cstdio>
+#include "types.hpp"
 
 #define CHECK_BIT(var,pos) ((var) & (1<<(pos)))
 
diff --git a/src/xmp.cpp b/src/xmp.cpp
index 6c752d75a3..69f75e9886 100644
--- a/src/xmp.cpp
+++ b/src/xmp.cpp
@@ -24,16 +24,16 @@
  */
 // *****************************************************************************
 // included header files
-#include "xmp_exiv2.hpp"
-#include "types.hpp"
 #include "error.hpp"
-#include "value.hpp"
 #include "properties.hpp"
+#include "types.hpp"
+#include "value.hpp"
+#include "xmp_exiv2.hpp"
 
 // + standard includes
-#include <iostream>
 #include <algorithm>
 #include <cassert>
+#include <iostream>
 #include <string>
 
 // Adobe XMP Toolkit
diff --git a/src/xmpsidecar.cpp b/src/xmpsidecar.cpp
index a9f13e2730..bf46859d0a 100644
--- a/src/xmpsidecar.cpp
+++ b/src/xmpsidecar.cpp
@@ -25,20 +25,20 @@
  */
 // *****************************************************************************
 // included header files
-#include "config.h"
-
 #include "xmpsidecar.hpp"
-#include "image.hpp"
+
 #include "basicio.hpp"
+#include "config.h"
+#include "convert.hpp"
 #include "error.hpp"
-#include "xmp_exiv2.hpp"
 #include "futils.hpp"
-#include "convert.hpp"
+#include "image.hpp"
+#include "xmp_exiv2.hpp"
 
 // + standard includes
-#include <string>
-#include <iostream>
 #include <cassert>
+#include <iostream>
+#include <string>
 
 // *****************************************************************************
 namespace {