diff --git a/include/exiv2/asfvideo.hpp b/include/exiv2/asfvideo.hpp
index f3345876..e1b57e12 100644
--- a/include/exiv2/asfvideo.hpp
+++ b/include/exiv2/asfvideo.hpp
@@ -28,8 +28,9 @@
 #define ASFVIDEO_HPP
 
 // *****************************************************************************
+#include "exiv2lib_export.h"
+
 // included header files
-#include "exif.hpp"
 #include "image.hpp"
 
 namespace Exiv2 {
diff --git a/include/exiv2/basicio.hpp b/include/exiv2/basicio.hpp
index e726e6e1..bd580b0e 100644
--- a/include/exiv2/basicio.hpp
+++ b/include/exiv2/basicio.hpp
@@ -24,17 +24,13 @@
 #define BASICIO_HPP_
 
 // *****************************************************************************
+#include "exiv2lib_export.h"
+
 // included header files
 #include "types.hpp"
-#include "futils.hpp"
 
 // + standard includes
-#include <string>
 #include <memory>       // for std::auto_ptr
-#include <fstream>      // write the temporary file
-#include <fcntl.h>      // _O_BINARY in FileIo::FileIo
-#include <ctime>        // timestamp for the name of temporary file
-#include <cstring>      // std::memcpy
 
 // The way to handle data from stdin or data uri path. If EXV_XPATH_MEMIO = 1,
 // it uses MemIo. Otherwises, it uses FileIo.
diff --git a/include/exiv2/bmpimage.hpp b/include/exiv2/bmpimage.hpp
index 07b0f3a3..d5f8b8c3 100644
--- a/include/exiv2/bmpimage.hpp
+++ b/include/exiv2/bmpimage.hpp
@@ -28,14 +28,10 @@
 #define BMPIMAGE_HPP_
 
 // *****************************************************************************
-// included header files
-#include "exif.hpp"
-#include "iptc.hpp"
-#include "image.hpp"
-#include "types.hpp"
+#include "exiv2lib_export.h"
 
-// + standard includes
-#include <string>
+// included header files
+#include "image.hpp"
 
 // *****************************************************************************
 // namespace extensions
diff --git a/include/exiv2/convert.hpp b/include/exiv2/convert.hpp
index 1102be6e..ce43594d 100644
--- a/include/exiv2/convert.hpp
+++ b/include/exiv2/convert.hpp
@@ -30,6 +30,8 @@
 #ifndef CONVERT_HPP_
 #define CONVERT_HPP_
 
+#include "exiv2lib_export.h"
+
 // included header files
 #include "config.h"
 
diff --git a/include/exiv2/cr2image.hpp b/include/exiv2/cr2image.hpp
index 34323ce6..42ab5509 100644
--- a/include/exiv2/cr2image.hpp
+++ b/include/exiv2/cr2image.hpp
@@ -28,13 +28,10 @@
 #define CR2IMAGE_HPP_
 
 // *****************************************************************************
+#include "exiv2lib_export.h"
+
 // included header files
 #include "image.hpp"
-#include "basicio.hpp"
-#include "types.hpp"
-
-// + standard includes
-#include <string>
 
 // *****************************************************************************
 // namespace extensions
diff --git a/include/exiv2/crwimage.hpp b/include/exiv2/crwimage.hpp
index a9bbe5ba..6b142602 100644
--- a/include/exiv2/crwimage.hpp
+++ b/include/exiv2/crwimage.hpp
@@ -30,14 +30,10 @@
 #define CRWIMAGE_HPP_
 
 // *****************************************************************************
-// included header files
-#include "types.hpp"
-#include "image.hpp"
-#include "basicio.hpp"
+#include "exiv2lib_export.h"
 
-// + standard includes
-#include <iosfwd>
-#include <string>
+// included header files
+#include "image.hpp"
 
 // *****************************************************************************
 // namespace extensions
diff --git a/include/exiv2/datasets.hpp b/include/exiv2/datasets.hpp
index 34e907a0..2ac98c3a 100644
--- a/include/exiv2/datasets.hpp
+++ b/include/exiv2/datasets.hpp
@@ -27,15 +27,12 @@
 #define DATASETS_HPP_
 
 // *****************************************************************************
+#include "exiv2lib_export.h"
+
 // included header files
-#include "types.hpp"
 #include "metadatum.hpp"
 
 // + standard includes
-#include <string>
-#include <utility>                              // for std::pair
-#include <iosfwd>
-#include <memory>
 #include <set>
 #include <vector>
 #include <map>
diff --git a/include/exiv2/easyaccess.hpp b/include/exiv2/easyaccess.hpp
index 31ca3b30..a77809b4 100644
--- a/include/exiv2/easyaccess.hpp
+++ b/include/exiv2/easyaccess.hpp
@@ -27,6 +27,8 @@
 #define EASYACCESS_HPP_
 
 // *****************************************************************************
+#include "exiv2lib_export.h"
+
 // included header files
 #include "exif.hpp"
 
diff --git a/include/exiv2/epsimage.hpp b/include/exiv2/epsimage.hpp
index 363bda6e..069b9ad9 100644
--- a/include/exiv2/epsimage.hpp
+++ b/include/exiv2/epsimage.hpp
@@ -35,12 +35,10 @@
 #define EPSIMAGE_HPP_
 
 // *****************************************************************************
+#include "exiv2lib_export.h"
+
 // included header files
 #include "image.hpp"
-#include "types.hpp"
-
-// + standard includes
-#include <string>
 
 // *****************************************************************************
 // namespace extensions
diff --git a/include/exiv2/error.hpp b/include/exiv2/error.hpp
index 0be812af..0f9714e5 100644
--- a/include/exiv2/error.hpp
+++ b/include/exiv2/error.hpp
@@ -29,14 +29,14 @@
 #define ERROR_HPP_
 
 // *****************************************************************************
+#include "exiv2lib_export.h"
+
 // included header files
 #include "types.hpp"
 
 // + standard includes
 #include <exception>
 #include <string>
-#include <iosfwd>
-#include <sstream>
 
 // *****************************************************************************
 // namespace extensions
diff --git a/include/exiv2/exif.hpp b/include/exiv2/exif.hpp
index a0f15d97..8f5eb7c6 100644
--- a/include/exiv2/exif.hpp
+++ b/include/exiv2/exif.hpp
@@ -28,16 +28,14 @@
 #define EXIF_HPP_
 
 // *****************************************************************************
+#include "exiv2lib_export.h"
+
 // included header files
 #include "metadatum.hpp"
 #include "tags.hpp"
-#include "value.hpp"
-#include "types.hpp"
 
 // + standard includes
-#include <string>
 #include <list>
-#include <memory>
 
 // *****************************************************************************
 // namespace extensions
diff --git a/include/exiv2/futils.hpp b/include/exiv2/futils.hpp
index 4d0ea6d5..9e450282 100644
--- a/include/exiv2/futils.hpp
+++ b/include/exiv2/futils.hpp
@@ -28,8 +28,8 @@
 #ifndef FUTILS_HPP_
 #define FUTILS_HPP_
 
-#include "config.h"
 #include "exiv2lib_export.h"
+#include "config.h"
 
 #include <string>
 
diff --git a/include/exiv2/gifimage.hpp b/include/exiv2/gifimage.hpp
index 479edc74..bec7b1ad 100644
--- a/include/exiv2/gifimage.hpp
+++ b/include/exiv2/gifimage.hpp
@@ -29,14 +29,10 @@
 #define GIFIMAGE_HPP_
 
 // *****************************************************************************
-// included header files
-#include "exif.hpp"
-#include "iptc.hpp"
-#include "image.hpp"
-#include "types.hpp"
+#include "exiv2lib_export.h"
 
-// + standard includes
-#include <string>
+// included header files
+#include "image.hpp"
 
 // *****************************************************************************
 // namespace extensions
diff --git a/include/exiv2/http.hpp b/include/exiv2/http.hpp
index f6793049..e0c08c74 100644
--- a/include/exiv2/http.hpp
+++ b/include/exiv2/http.hpp
@@ -1,13 +1,13 @@
 #ifndef HTTP_HPP_
 #define HTTP_HPP_
 
-#include "config.h"
-#include <string>
-#include <map>
-#include <algorithm>
+#include "exiv2lib_export.h"
 
 #include "datasets.hpp"
 
+#include <string>
+
+
 namespace Exiv2 {
     /*!
      @brief execute an HTTP request
diff --git a/include/exiv2/image.hpp b/include/exiv2/image.hpp
index 3683a61d..7b0ac555 100644
--- a/include/exiv2/image.hpp
+++ b/include/exiv2/image.hpp
@@ -24,8 +24,9 @@
 #define IMAGE_HPP_
 
 // *****************************************************************************
+#include "exiv2lib_export.h"
+
 // included header files
-#include "types.hpp"
 #include "basicio.hpp"
 #include "exif.hpp"
 #include "iptc.hpp"
diff --git a/include/exiv2/iptc.hpp b/include/exiv2/iptc.hpp
index f1ecee6e..add74138 100644
--- a/include/exiv2/iptc.hpp
+++ b/include/exiv2/iptc.hpp
@@ -28,17 +28,12 @@
 #define IPTC_HPP_
 
 // *****************************************************************************
+#include "exiv2lib_export.h"
+
 // included header files
 #include "metadatum.hpp"
-#include "types.hpp"
-#include "error.hpp"
-#include "value.hpp"
 #include "datasets.hpp"
 
-// + standard includes
-#include <string>
-#include <vector>
-
 // *****************************************************************************
 // namespace extensions
 namespace Exiv2 {
diff --git a/include/exiv2/jp2image.hpp b/include/exiv2/jp2image.hpp
index 6b30d068..308c76bf 100644
--- a/include/exiv2/jp2image.hpp
+++ b/include/exiv2/jp2image.hpp
@@ -26,14 +26,10 @@
 #define JP2IMAGE_HPP_
 
 // *****************************************************************************
-// included header files
-#include "exif.hpp"
-#include "iptc.hpp"
-#include "image.hpp"
-#include "types.hpp"
+#include "exiv2lib_export.h"
 
-// + standard includes
-#include <string>
+// included header files
+#include "image.hpp"
 
 // *****************************************************************************
 // namespace extensions
diff --git a/include/exiv2/jpgimage.hpp b/include/exiv2/jpgimage.hpp
index 373d83bc..27dd53b1 100644
--- a/include/exiv2/jpgimage.hpp
+++ b/include/exiv2/jpgimage.hpp
@@ -34,13 +34,10 @@
 #define JPGIMAGE_HPP_
 
 // *****************************************************************************
+#include "exiv2lib_export.h"
+
 // included header files
 #include "image.hpp"
-#include "basicio.hpp"
-#include "types.hpp"
-
-// + standard includes
-#include <string>
 
 // *****************************************************************************
 // namespace extensions
diff --git a/include/exiv2/matroskavideo.hpp b/include/exiv2/matroskavideo.hpp
index 5db1bfce..dc87fee6 100644
--- a/include/exiv2/matroskavideo.hpp
+++ b/include/exiv2/matroskavideo.hpp
@@ -28,8 +28,9 @@
 #define MATROSKAVIDEO_HPP_
 
 // *****************************************************************************
+#include "exiv2lib_export.h"
+
 // included header files
-#include "exif.hpp"
 #include "image.hpp"
 
 // *****************************************************************************
diff --git a/include/exiv2/metadatum.hpp b/include/exiv2/metadatum.hpp
index f707760f..41640e28 100644
--- a/include/exiv2/metadatum.hpp
+++ b/include/exiv2/metadatum.hpp
@@ -32,13 +32,10 @@
 #define METADATUM_HPP_
 
 // *****************************************************************************
-// included header files
-#include "types.hpp"
-#include "value.hpp"
+#include "exiv2lib_export.h"
 
-// + standard includes
-#include <string>
-#include <memory>
+// included header files
+#include "value.hpp"
 
 // *****************************************************************************
 // namespace extensions
diff --git a/include/exiv2/mrwimage.hpp b/include/exiv2/mrwimage.hpp
index 079fccee..7e5af656 100644
--- a/include/exiv2/mrwimage.hpp
+++ b/include/exiv2/mrwimage.hpp
@@ -29,13 +29,10 @@
 #define MRWIMAGE_HPP_
 
 // *****************************************************************************
+#include "exiv2lib_export.h"
+
 // included header files
 #include "image.hpp"
-#include "basicio.hpp"
-#include "types.hpp"
-
-// + standard includes
-#include <string>
 
 // *****************************************************************************
 // namespace extensions
diff --git a/include/exiv2/orfimage.hpp b/include/exiv2/orfimage.hpp
index b21479b3..2cbf2d61 100644
--- a/include/exiv2/orfimage.hpp
+++ b/include/exiv2/orfimage.hpp
@@ -28,14 +28,10 @@
 #define ORFIMAGE_HPP_
 
 // *****************************************************************************
-// included header files
-#include "image.hpp"
-#include "tiffimage.hpp"
-#include "basicio.hpp"
-#include "types.hpp"
+#include "exiv2lib_export.h"
 
-// + standard includes
-#include <string>
+// included header files
+#include "tiffimage.hpp"
 
 // *****************************************************************************
 // namespace extensions
diff --git a/include/exiv2/pgfimage.hpp b/include/exiv2/pgfimage.hpp
index 5648e732..96127809 100644
--- a/include/exiv2/pgfimage.hpp
+++ b/include/exiv2/pgfimage.hpp
@@ -31,13 +31,10 @@
 #define PGFIMAGE_HPP_
 
 // *****************************************************************************
+#include "exiv2lib_export.h"
+
 // included header files
 #include "image.hpp"
-#include "basicio.hpp"
-#include "types.hpp"
-
-// + standard includes
-#include <string>
 
 // *****************************************************************************
 // namespace extensions
diff --git a/include/exiv2/pngimage.hpp b/include/exiv2/pngimage.hpp
index 94336b60..ed538902 100644
--- a/include/exiv2/pngimage.hpp
+++ b/include/exiv2/pngimage.hpp
@@ -32,13 +32,10 @@
 #define PNGIMAGE_HPP_
 
 // *****************************************************************************
+#include "exiv2lib_export.h"
+
 // included header files
 #include "image.hpp"
-#include "basicio.hpp"
-#include "types.hpp"
-
-// + standard includes
-#include <string>
 
 // *****************************************************************************
 // namespace extensions
diff --git a/include/exiv2/preview.hpp b/include/exiv2/preview.hpp
index b18d0a49..b1391857 100644
--- a/include/exiv2/preview.hpp
+++ b/include/exiv2/preview.hpp
@@ -28,13 +28,9 @@
 #define PREVIEW_HPP_
 
 // *****************************************************************************
-// included header files
-#include "types.hpp"
-#include "image.hpp"
-#include "basicio.hpp"
+#include "exiv2lib_export.h"
 
-#include <string>
-#include <vector>
+#include "image.hpp"
 
 // *****************************************************************************
 // namespace extensions
diff --git a/include/exiv2/properties.hpp b/include/exiv2/properties.hpp
index ab6d01eb..09db134d 100644
--- a/include/exiv2/properties.hpp
+++ b/include/exiv2/properties.hpp
@@ -32,18 +32,12 @@
 #define PROPERTIES_HPP_
 
 // *****************************************************************************
+#include "exiv2lib_export.h"
+
 // included header files
-#include "types.hpp"
-#include "metadatum.hpp"
-#include "tags.hpp"
 #include "datasets.hpp"
 #include "rwlock.hpp"
 
-// + standard includes
-#include <string>
-#include <iosfwd>
-#include <memory>
-
 // *****************************************************************************
 // namespace extensions
 namespace Exiv2 {
diff --git a/include/exiv2/psdimage.hpp b/include/exiv2/psdimage.hpp
index cbe1ff28..a087f879 100644
--- a/include/exiv2/psdimage.hpp
+++ b/include/exiv2/psdimage.hpp
@@ -31,14 +31,10 @@
 #define PSDIMAGE_HPP_
 
 // *****************************************************************************
-// included header files
-#include "exif.hpp"
-#include "iptc.hpp"
-#include "image.hpp"
-#include "types.hpp"
+#include "exiv2lib_export.h"
 
-// + standard includes
-#include <string>
+// included header files
+#include "image.hpp"
 
 // *****************************************************************************
 // namespace extensions
diff --git a/include/exiv2/quicktimevideo.hpp b/include/exiv2/quicktimevideo.hpp
index d8b23f0d..f22a7eff 100644
--- a/include/exiv2/quicktimevideo.hpp
+++ b/include/exiv2/quicktimevideo.hpp
@@ -28,6 +28,8 @@
 #define QUICKTIMEVIDEO_HPP
 
 // *****************************************************************************
+#include "exiv2lib_export.h"
+
 // included header files
 #include "exif.hpp"
 #include "image.hpp"
diff --git a/include/exiv2/rafimage.hpp b/include/exiv2/rafimage.hpp
index 62934a9b..aade5ea6 100644
--- a/include/exiv2/rafimage.hpp
+++ b/include/exiv2/rafimage.hpp
@@ -28,6 +28,8 @@
 #define RAFIMAGE_HPP_
 
 // *****************************************************************************
+#include "exiv2lib_export.h"
+
 // included header files
 #include "image.hpp"
 #include "basicio.hpp"
diff --git a/include/exiv2/riffvideo.hpp b/include/exiv2/riffvideo.hpp
index 25a3f891..a7072f29 100644
--- a/include/exiv2/riffvideo.hpp
+++ b/include/exiv2/riffvideo.hpp
@@ -28,6 +28,8 @@
 #define RIFFVIDEO_HPP
 
 // *****************************************************************************
+#include "exiv2lib_export.h"
+
 // included header files
 #include "exif.hpp"
 #include "image.hpp"
diff --git a/include/exiv2/rw2image.hpp b/include/exiv2/rw2image.hpp
index 21f49d5b..4bca3717 100644
--- a/include/exiv2/rw2image.hpp
+++ b/include/exiv2/rw2image.hpp
@@ -28,13 +28,10 @@
 #define RW2IMAGE_HPP_
 
 // *****************************************************************************
+#include "exiv2lib_export.h"
+
 // included header files
 #include "image.hpp"
-#include "basicio.hpp"
-#include "types.hpp"
-
-// + standard includes
-#include <string>
 
 // *****************************************************************************
 // namespace extensions
diff --git a/include/exiv2/tags.hpp b/include/exiv2/tags.hpp
index 7844f7b4..6482c39b 100644
--- a/include/exiv2/tags.hpp
+++ b/include/exiv2/tags.hpp
@@ -29,9 +29,10 @@
 #define TAGS_HPP_
 
 // *****************************************************************************
+#include "exiv2lib_export.h"
+
 // included header files
 #include "metadatum.hpp"
-#include "types.hpp"
 
 // + standard includes
 #include <string>
diff --git a/include/exiv2/tgaimage.hpp b/include/exiv2/tgaimage.hpp
index 2c40f0bf..d7fc4abe 100644
--- a/include/exiv2/tgaimage.hpp
+++ b/include/exiv2/tgaimage.hpp
@@ -30,14 +30,10 @@
 #define TGAIMAGE_HPP_
 
 // *****************************************************************************
-// included header files
-#include "exif.hpp"
-#include "iptc.hpp"
-#include "image.hpp"
-#include "types.hpp"
+#include "exiv2lib_export.h"
 
-// + standard includes
-#include <string>
+// included header files
+#include "image.hpp"
 
 // *****************************************************************************
 // namespace extensions
diff --git a/include/exiv2/tiffimage.hpp b/include/exiv2/tiffimage.hpp
index a2595284..3c849a4b 100644
--- a/include/exiv2/tiffimage.hpp
+++ b/include/exiv2/tiffimage.hpp
@@ -25,13 +25,10 @@
 #define TIFFIMAGE_HPP_
 
 // *****************************************************************************
+#include "exiv2lib_export.h"
+
 // included header files
 #include "image.hpp"
-#include "basicio.hpp"
-#include "types.hpp"
-
-// + standard includes
-#include <string>
 
 // *****************************************************************************
 // namespace extensions
diff --git a/include/exiv2/types.hpp b/include/exiv2/types.hpp
index 5775a561..33ee3720 100644
--- a/include/exiv2/types.hpp
+++ b/include/exiv2/types.hpp
@@ -29,18 +29,16 @@
 #ifndef TYPES_HPP_
 #define TYPES_HPP_
 
+#include "exiv2lib_export.h"
+
 // included header files
 #include "config.h"
 #include "slice.hpp"
-#include "exiv2lib_export.h"
-#include "slice.hpp"
 
 // + standard includes
 #include <string>
 #include <vector>
-#include <iosfwd>
 #include <limits>
-#include <utility>
 #include <algorithm>
 #include <sstream>
 
diff --git a/include/exiv2/value.hpp b/include/exiv2/value.hpp
index ea61b1a6..7ca57f36 100644
--- a/include/exiv2/value.hpp
+++ b/include/exiv2/value.hpp
@@ -30,16 +30,14 @@
 #define VALUE_HPP_
 
 // *****************************************************************************
+#include "exiv2lib_export.h"
+
 // included header files
 #include "types.hpp"
 
 // + standard includes
-#include <string>
-#include <vector>
 #include <map>
-#include <iostream>
 #include <iomanip>
-#include <sstream>
 #include <memory>
 #include <cstring>
 #include <climits>
diff --git a/include/exiv2/version.hpp b/include/exiv2/version.hpp
index 93b15400..f5df8150 100644
--- a/include/exiv2/version.hpp
+++ b/include/exiv2/version.hpp
@@ -30,8 +30,8 @@
 #ifndef VERSION_HPP_
 #define VERSION_HPP_
 
-#include "exv_conf.h"
 #include "exiv2lib_export.h"
+#include "exv_conf.h"
 
 // *****************************************************************************
 // included header files
diff --git a/include/exiv2/webpimage.hpp b/include/exiv2/webpimage.hpp
index f1325596..6da08396 100644
--- a/include/exiv2/webpimage.hpp
+++ b/include/exiv2/webpimage.hpp
@@ -28,8 +28,9 @@
 #define WEBPIMAGE_HPP
 
 // *****************************************************************************
+#include "exiv2lib_export.h"
+
 // included header files
-#include "exif.hpp"
 #include "image.hpp"
 
 // *****************************************************************************
diff --git a/include/exiv2/xmp_exiv2.hpp b/include/exiv2/xmp_exiv2.hpp
index 029e46ae..88a05c37 100644
--- a/include/exiv2/xmp_exiv2.hpp
+++ b/include/exiv2/xmp_exiv2.hpp
@@ -28,17 +28,11 @@
 #define XMP_HPP_
 
 // *****************************************************************************
+#include "exiv2lib_export.h"
+
 // included header files
 #include "metadatum.hpp"
 #include "properties.hpp"
-#include "value.hpp"
-#include "types.hpp"
-#include "datasets.hpp"
-#include "properties.hpp"
-
-// + standard includes
-#include <string>
-#include <vector>
 
 // *****************************************************************************
 // namespace extensions
diff --git a/include/exiv2/xmpsidecar.hpp b/include/exiv2/xmpsidecar.hpp
index 782abc79..6cb7e306 100644
--- a/include/exiv2/xmpsidecar.hpp
+++ b/include/exiv2/xmpsidecar.hpp
@@ -28,13 +28,10 @@
 #define XMPSIDECAR_HPP_
 
 // *****************************************************************************
+#include "exiv2lib_export.h"
+
 // included header files
 #include "image.hpp"
-#include "basicio.hpp"
-#include "types.hpp"
-
-// + standard includes
-#include <string>
 
 // *****************************************************************************
 // namespace extensions
diff --git a/samples/mrwthumb.cpp b/samples/mrwthumb.cpp
index 323f61e6..2157ea98 100644
--- a/samples/mrwthumb.cpp
+++ b/samples/mrwthumb.cpp
@@ -2,11 +2,13 @@
 // mrwthumb.cpp
 // Sample program to extract a Minolta thumbnail from the makernote
 
-#include <cassert>
 #include "error.hpp"
 #include "exif.hpp"
 #include "image.hpp"
 
+#include <cassert>
+#include <iostream>
+
 int main(int argc, char* const argv[])
 {
     try {
diff --git a/samples/xmpdump.cpp b/samples/xmpdump.cpp
index 6231bad0..5f035c46 100644
--- a/samples/xmpdump.cpp
+++ b/samples/xmpdump.cpp
@@ -5,6 +5,8 @@
 #include <cassert>
 #include <iostream>
 #include <string>
+
+#include "error.hpp"
 #include "image.hpp"
 
 int main(int argc, char* const argv[])
diff --git a/src/actions.hpp b/src/actions.hpp
index 93eef6c6..0e4fc062 100644
--- a/src/actions.hpp
+++ b/src/actions.hpp
@@ -30,15 +30,7 @@
 
 // *****************************************************************************
 // included header files
-
-// + standard includes
-#include <string>
-#include <map>
-
 #include "exiv2app.hpp"
-#include "image.hpp"
-#include "exif.hpp"
-#include "iptc.hpp"
 
 // *****************************************************************************
 // class declarations
diff --git a/src/asfvideo.cpp b/src/asfvideo.cpp
index b385088c..6fd9060b 100644
--- a/src/asfvideo.cpp
+++ b/src/asfvideo.cpp
@@ -28,6 +28,7 @@
 #include "config.h"
 
 #ifdef EXV_ENABLE_VIDEO
+#include "error.hpp"
 #include "tags.hpp"
 #include "tags_int.hpp"
 #include "asfvideo.hpp"
diff --git a/src/basicio.cpp b/src/basicio.cpp
index b58e7ffd..feb198b3 100644
--- a/src/basicio.cpp
+++ b/src/basicio.cpp
@@ -35,10 +35,13 @@
 #include <string>
 #include <memory>
 #include <iostream>
-#include <cstring>
+#include <cstring>                      // std::memcpy
 #include <cassert>
+#include <fstream>                      // write the temporary file
+#include <fcntl.h>                      // _O_BINARY in FileIo::FileIo
 #include <cstdio>                       // for remove, rename
 #include <cstdlib>                      // for alloc, realloc, free
+#include <ctime>                        // timestamp for the name of temporary file
 #include <sys/types.h>                  // for stat, chmod
 #include <sys/stat.h>                   // for stat, chmod
 
diff --git a/src/bigtiffimage.cpp b/src/bigtiffimage.cpp
index cb4ace63..5d4a5944 100644
--- a/src/bigtiffimage.cpp
+++ b/src/bigtiffimage.cpp
@@ -1,15 +1,14 @@
-
 #include "bigtiffimage.hpp"
 
-#include <cassert>
-#include <limits>
-
 #include "safe_op.hpp"
 #include "exif.hpp"
 #include "error.hpp"
 #include "image_int.hpp"
 #include "enforce.hpp"
 
+#include <cassert>
+#include <limits>
+#include <iostream>
 
 namespace Exiv2
 {
diff --git a/src/convert.cpp b/src/convert.cpp
index 96c3146d..be8bdbc7 100644
--- a/src/convert.cpp
+++ b/src/convert.cpp
@@ -28,6 +28,7 @@
 // included header files
 #include "config.h"
 #include "types.hpp"
+#include "error.hpp"
 #include "exif.hpp"
 #include "iptc.hpp"
 #include "xmp_exiv2.hpp"
diff --git a/src/crwimage_int.cpp b/src/crwimage_int.cpp
index 704338bd..c2fd5f3a 100644
--- a/src/crwimage_int.cpp
+++ b/src/crwimage_int.cpp
@@ -3,8 +3,10 @@
 #include "i18n.h"                // NLS support.
 #include "timegm.h"
 #include "unused.h"
+#include "error.hpp"
 
 #include <cassert>
+#include <ctime>
 
 // *****************************************************************************
 // local declarations
diff --git a/src/iptc.cpp b/src/iptc.cpp
index e1bece47..a00e489e 100644
--- a/src/iptc.cpp
+++ b/src/iptc.cpp
@@ -36,6 +36,7 @@
 #include <iostream>
 #include <algorithm>
 #include <iterator>
+#include <fstream>      // write the temporary file
 
 // *****************************************************************************
 namespace {
diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index 208067d8..63c70fb6 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -47,6 +47,7 @@
 #include <cstring>
 #include <cassert>
 #include <stdexcept>
+#include <iostream>
 
 // *****************************************************************************
 // class member definitions
diff --git a/src/matroskavideo.cpp b/src/matroskavideo.cpp
index 531d2f8c..1ea60c1f 100644
--- a/src/matroskavideo.cpp
+++ b/src/matroskavideo.cpp
@@ -29,6 +29,7 @@
 
 #ifdef EXV_ENABLE_VIDEO
 #include "matroskavideo.hpp"
+#include "error.hpp"
 #include "futils.hpp"
 #include "basicio.hpp"
 #include "tags.hpp"
diff --git a/src/quicktimevideo.cpp b/src/quicktimevideo.cpp
index c063d17c..1b2880e8 100644
--- a/src/quicktimevideo.cpp
+++ b/src/quicktimevideo.cpp
@@ -28,6 +28,7 @@
 #include "config.h"
 
 #ifdef EXV_ENABLE_VIDEO
+#include "error.hpp"
 #include "tags.hpp"
 #include "tags_int.hpp"
 #include "quicktimevideo.hpp"
diff --git a/src/riffvideo.cpp b/src/riffvideo.cpp
index 16610a19..658c51f4 100644
--- a/src/riffvideo.cpp
+++ b/src/riffvideo.cpp
@@ -28,6 +28,7 @@
 #include "config.h"
 
 #ifdef EXV_ENABLE_VIDEO
+#include "error.hpp"
 #include "riffvideo.hpp"
 #include "futils.hpp"
 #include "basicio.hpp"
diff --git a/src/tiffimage_int.cpp b/src/tiffimage_int.cpp
index 7cd6656d..42a076e9 100644
--- a/src/tiffimage_int.cpp
+++ b/src/tiffimage_int.cpp
@@ -1,5 +1,6 @@
 #include "tiffimage_int.hpp"
 
+#include "error.hpp"
 #include "makernote_int.hpp"
 #include "tiffvisitor_int.hpp"
 #include "i18n.h"                // NLS support.