diff --git a/include/exiv2/asfvideo.hpp b/include/exiv2/asfvideo.hpp index 4a8e843e..e1b57e12 100644 --- a/include/exiv2/asfvideo.hpp +++ b/include/exiv2/asfvideo.hpp @@ -31,7 +31,6 @@ #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 8c415728..bd580b0e 100644 --- a/include/exiv2/basicio.hpp +++ b/include/exiv2/basicio.hpp @@ -28,15 +28,9 @@ // included header files #include "types.hpp" -#include "futils.hpp" // + standard includes -#include #include // for std::auto_ptr -#include // write the temporary file -#include // _O_BINARY in FileIo::FileIo -#include // timestamp for the name of temporary file -#include // 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 ea8bb71d..d5f8b8c3 100644 --- a/include/exiv2/bmpimage.hpp +++ b/include/exiv2/bmpimage.hpp @@ -31,13 +31,7 @@ #include "exiv2lib_export.h" // included header files -#include "exif.hpp" -#include "iptc.hpp" #include "image.hpp" -#include "types.hpp" - -// + standard includes -#include // ***************************************************************************** // namespace extensions diff --git a/include/exiv2/cr2image.hpp b/include/exiv2/cr2image.hpp index 121b9293..42ab5509 100644 --- a/include/exiv2/cr2image.hpp +++ b/include/exiv2/cr2image.hpp @@ -32,11 +32,6 @@ // included header files #include "image.hpp" -#include "basicio.hpp" -#include "types.hpp" - -// + standard includes -#include // ***************************************************************************** // namespace extensions diff --git a/include/exiv2/crwimage.hpp b/include/exiv2/crwimage.hpp index 13a3a9b7..6b142602 100644 --- a/include/exiv2/crwimage.hpp +++ b/include/exiv2/crwimage.hpp @@ -33,13 +33,7 @@ #include "exiv2lib_export.h" // included header files -#include "types.hpp" #include "image.hpp" -#include "basicio.hpp" - -// + standard includes -#include -#include // ***************************************************************************** // namespace extensions diff --git a/include/exiv2/datasets.hpp b/include/exiv2/datasets.hpp index f0b67bed..2ac98c3a 100644 --- a/include/exiv2/datasets.hpp +++ b/include/exiv2/datasets.hpp @@ -30,14 +30,9 @@ #include "exiv2lib_export.h" // included header files -#include "types.hpp" #include "metadatum.hpp" // + standard includes -#include -#include // for std::pair -#include -#include #include #include #include diff --git a/include/exiv2/epsimage.hpp b/include/exiv2/epsimage.hpp index f9bff5bc..069b9ad9 100644 --- a/include/exiv2/epsimage.hpp +++ b/include/exiv2/epsimage.hpp @@ -39,10 +39,6 @@ // included header files #include "image.hpp" -#include "types.hpp" - -// + standard includes -#include // ***************************************************************************** // namespace extensions diff --git a/include/exiv2/error.hpp b/include/exiv2/error.hpp index 2b51cf64..0f9714e5 100644 --- a/include/exiv2/error.hpp +++ b/include/exiv2/error.hpp @@ -37,8 +37,6 @@ // + standard includes #include #include -#include -#include // ***************************************************************************** // namespace extensions diff --git a/include/exiv2/exif.hpp b/include/exiv2/exif.hpp index 7cf8cabb..8f5eb7c6 100644 --- a/include/exiv2/exif.hpp +++ b/include/exiv2/exif.hpp @@ -33,13 +33,9 @@ // included header files #include "metadatum.hpp" #include "tags.hpp" -#include "value.hpp" -#include "types.hpp" // + standard includes -#include #include -#include // ***************************************************************************** // 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 diff --git a/include/exiv2/gifimage.hpp b/include/exiv2/gifimage.hpp index 6603920b..bec7b1ad 100644 --- a/include/exiv2/gifimage.hpp +++ b/include/exiv2/gifimage.hpp @@ -32,13 +32,7 @@ #include "exiv2lib_export.h" // included header files -#include "exif.hpp" -#include "iptc.hpp" #include "image.hpp" -#include "types.hpp" - -// + standard includes -#include // ***************************************************************************** // namespace extensions diff --git a/include/exiv2/http.hpp b/include/exiv2/http.hpp index 5ae597ac..e0c08c74 100644 --- a/include/exiv2/http.hpp +++ b/include/exiv2/http.hpp @@ -3,12 +3,9 @@ #include "exiv2lib_export.h" -#include "config.h" #include "datasets.hpp" #include -#include -#include namespace Exiv2 { diff --git a/include/exiv2/image.hpp b/include/exiv2/image.hpp index 7c6eb21a..7b0ac555 100644 --- a/include/exiv2/image.hpp +++ b/include/exiv2/image.hpp @@ -27,7 +27,6 @@ #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 722c7c99..add74138 100644 --- a/include/exiv2/iptc.hpp +++ b/include/exiv2/iptc.hpp @@ -32,15 +32,8 @@ // included header files #include "metadatum.hpp" -#include "types.hpp" -#include "error.hpp" -#include "value.hpp" #include "datasets.hpp" -// + standard includes -#include -#include - // ***************************************************************************** // namespace extensions namespace Exiv2 { diff --git a/include/exiv2/jp2image.hpp b/include/exiv2/jp2image.hpp index 62a99640..308c76bf 100644 --- a/include/exiv2/jp2image.hpp +++ b/include/exiv2/jp2image.hpp @@ -29,13 +29,7 @@ #include "exiv2lib_export.h" // included header files -#include "exif.hpp" -#include "iptc.hpp" #include "image.hpp" -#include "types.hpp" - -// + standard includes -#include // ***************************************************************************** // namespace extensions diff --git a/include/exiv2/jpgimage.hpp b/include/exiv2/jpgimage.hpp index 2ce280d8..27dd53b1 100644 --- a/include/exiv2/jpgimage.hpp +++ b/include/exiv2/jpgimage.hpp @@ -38,11 +38,6 @@ // included header files #include "image.hpp" -#include "basicio.hpp" -#include "types.hpp" - -// + standard includes -#include // ***************************************************************************** // namespace extensions diff --git a/include/exiv2/matroskavideo.hpp b/include/exiv2/matroskavideo.hpp index 7a7b1f56..dc87fee6 100644 --- a/include/exiv2/matroskavideo.hpp +++ b/include/exiv2/matroskavideo.hpp @@ -31,7 +31,6 @@ #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 4f2fbbc9..41640e28 100644 --- a/include/exiv2/metadatum.hpp +++ b/include/exiv2/metadatum.hpp @@ -35,13 +35,8 @@ #include "exiv2lib_export.h" // included header files -#include "types.hpp" #include "value.hpp" -// + standard includes -#include -#include - // ***************************************************************************** // namespace extensions namespace Exiv2 { diff --git a/include/exiv2/mrwimage.hpp b/include/exiv2/mrwimage.hpp index ca2372e5..7e5af656 100644 --- a/include/exiv2/mrwimage.hpp +++ b/include/exiv2/mrwimage.hpp @@ -33,11 +33,6 @@ // included header files #include "image.hpp" -#include "basicio.hpp" -#include "types.hpp" - -// + standard includes -#include // ***************************************************************************** // namespace extensions diff --git a/include/exiv2/orfimage.hpp b/include/exiv2/orfimage.hpp index 840f9922..2cbf2d61 100644 --- a/include/exiv2/orfimage.hpp +++ b/include/exiv2/orfimage.hpp @@ -31,13 +31,7 @@ #include "exiv2lib_export.h" // included header files -#include "image.hpp" #include "tiffimage.hpp" -#include "basicio.hpp" -#include "types.hpp" - -// + standard includes -#include // ***************************************************************************** // namespace extensions diff --git a/include/exiv2/pgfimage.hpp b/include/exiv2/pgfimage.hpp index e9239f48..96127809 100644 --- a/include/exiv2/pgfimage.hpp +++ b/include/exiv2/pgfimage.hpp @@ -35,11 +35,6 @@ // included header files #include "image.hpp" -#include "basicio.hpp" -#include "types.hpp" - -// + standard includes -#include // ***************************************************************************** // namespace extensions diff --git a/include/exiv2/pngimage.hpp b/include/exiv2/pngimage.hpp index 93d47599..ed538902 100644 --- a/include/exiv2/pngimage.hpp +++ b/include/exiv2/pngimage.hpp @@ -36,11 +36,6 @@ // included header files #include "image.hpp" -#include "basicio.hpp" -#include "types.hpp" - -// + standard includes -#include // ***************************************************************************** // namespace extensions diff --git a/include/exiv2/preview.hpp b/include/exiv2/preview.hpp index 4fd76390..b1391857 100644 --- a/include/exiv2/preview.hpp +++ b/include/exiv2/preview.hpp @@ -30,13 +30,7 @@ // ***************************************************************************** #include "exiv2lib_export.h" -// included header files -#include "types.hpp" #include "image.hpp" -#include "basicio.hpp" - -#include -#include // ***************************************************************************** // namespace extensions diff --git a/include/exiv2/properties.hpp b/include/exiv2/properties.hpp index 9a680299..09db134d 100644 --- a/include/exiv2/properties.hpp +++ b/include/exiv2/properties.hpp @@ -35,17 +35,9 @@ #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 -#include -#include - // ***************************************************************************** // namespace extensions namespace Exiv2 { diff --git a/include/exiv2/psdimage.hpp b/include/exiv2/psdimage.hpp index fd2c45d8..a087f879 100644 --- a/include/exiv2/psdimage.hpp +++ b/include/exiv2/psdimage.hpp @@ -34,13 +34,7 @@ #include "exiv2lib_export.h" // included header files -#include "exif.hpp" -#include "iptc.hpp" #include "image.hpp" -#include "types.hpp" - -// + standard includes -#include // ***************************************************************************** // namespace extensions diff --git a/include/exiv2/rw2image.hpp b/include/exiv2/rw2image.hpp index eafca9e5..4bca3717 100644 --- a/include/exiv2/rw2image.hpp +++ b/include/exiv2/rw2image.hpp @@ -32,11 +32,6 @@ // included header files #include "image.hpp" -#include "basicio.hpp" -#include "types.hpp" - -// + standard includes -#include // ***************************************************************************** // namespace extensions diff --git a/include/exiv2/tags.hpp b/include/exiv2/tags.hpp index 19ce2bd1..6482c39b 100644 --- a/include/exiv2/tags.hpp +++ b/include/exiv2/tags.hpp @@ -33,7 +33,6 @@ // included header files #include "metadatum.hpp" -#include "types.hpp" // + standard includes #include diff --git a/include/exiv2/tgaimage.hpp b/include/exiv2/tgaimage.hpp index 3696a5e4..d7fc4abe 100644 --- a/include/exiv2/tgaimage.hpp +++ b/include/exiv2/tgaimage.hpp @@ -33,13 +33,7 @@ #include "exiv2lib_export.h" // included header files -#include "exif.hpp" -#include "iptc.hpp" #include "image.hpp" -#include "types.hpp" - -// + standard includes -#include // ***************************************************************************** // namespace extensions diff --git a/include/exiv2/tiffimage.hpp b/include/exiv2/tiffimage.hpp index 99bc8f01..3c849a4b 100644 --- a/include/exiv2/tiffimage.hpp +++ b/include/exiv2/tiffimage.hpp @@ -29,11 +29,6 @@ // included header files #include "image.hpp" -#include "basicio.hpp" -#include "types.hpp" - -// + standard includes -#include // ***************************************************************************** // 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 #include -#include #include -#include #include #include diff --git a/include/exiv2/value.hpp b/include/exiv2/value.hpp index e5450cb4..7ca57f36 100644 --- a/include/exiv2/value.hpp +++ b/include/exiv2/value.hpp @@ -36,12 +36,8 @@ #include "types.hpp" // + standard includes -#include -#include #include -#include #include -#include #include #include #include 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 3174a094..6da08396 100644 --- a/include/exiv2/webpimage.hpp +++ b/include/exiv2/webpimage.hpp @@ -31,7 +31,6 @@ #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 02a936b8..88a05c37 100644 --- a/include/exiv2/xmp_exiv2.hpp +++ b/include/exiv2/xmp_exiv2.hpp @@ -33,14 +33,6 @@ // included header files #include "metadatum.hpp" #include "properties.hpp" -#include "value.hpp" -#include "types.hpp" -#include "datasets.hpp" -#include "properties.hpp" - -// + standard includes -#include -#include // ***************************************************************************** // namespace extensions diff --git a/include/exiv2/xmpsidecar.hpp b/include/exiv2/xmpsidecar.hpp index dcec7c63..6cb7e306 100644 --- a/include/exiv2/xmpsidecar.hpp +++ b/include/exiv2/xmpsidecar.hpp @@ -32,11 +32,6 @@ // included header files #include "image.hpp" -#include "basicio.hpp" -#include "types.hpp" - -// + standard includes -#include // ***************************************************************************** // 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 #include "error.hpp" #include "exif.hpp" #include "image.hpp" +#include +#include + 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 #include #include + +#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 -#include - #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 #include #include -#include +#include // std::memcpy #include +#include // write the temporary file +#include // _O_BINARY in FileIo::FileIo #include // for remove, rename #include // for alloc, realloc, free +#include // timestamp for the name of temporary file #include // for stat, chmod #include // 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 -#include - #include "safe_op.hpp" #include "exif.hpp" #include "error.hpp" #include "image_int.hpp" #include "enforce.hpp" +#include +#include +#include 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 +#include // ***************************************************************************** // 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 #include #include +#include // 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 #include #include +#include // ***************************************************************************** // 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.