cleanup header inclusions in API

Exiv2 · Jan 11, 2019 · 6f8d8e3 · 6f8d8e3
1 parent 4bd7e9e
commit 6f8d8e3
Show file tree

Hide file tree

Showing 49 changed files with 26 additions and 169 deletions.
diff --git 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
@@ -28,15 +28,9 @@
 
 // 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
@@ -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 <string>
 
 // *****************************************************************************
 // namespace extensions

diff --git 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 <string>
 
 // *****************************************************************************
 // namespace extensions

diff --git 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 <iosfwd>
-#include <string>
 
 // *****************************************************************************
 // namespace extensions

diff --git 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 <string>
-#include <utility>                              // for std::pair
-#include <iosfwd>
-#include <memory>
 #include <set>
 #include <vector>
 #include <map>

diff --git 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 <string>
 
 // *****************************************************************************
 // namespace extensions

diff --git a/include/exiv2/error.hpp b/include/exiv2/error.hpp
@@ -37,8 +37,6 @@
 // + standard includes
 #include <exception>
 #include <string>
-#include <iosfwd>
-#include <sstream>
 
 // *****************************************************************************
 // namespace extensions

diff --git 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 <string>
 #include <list>
-#include <memory>
 
 // *****************************************************************************
 // namespace extensions

diff --git 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
@@ -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 <string>
 
 // *****************************************************************************
 // namespace extensions

diff --git 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 <string>
-#include <map>
-#include <algorithm>
 
 
 namespace Exiv2 {

diff --git 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
@@ -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 <string>
-#include <vector>
-
 // *****************************************************************************
 // namespace extensions
 namespace Exiv2 {

diff --git 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 <string>
 
 // *****************************************************************************
 // namespace extensions

diff --git 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 <string>
 
 // *****************************************************************************
 // namespace extensions

diff --git 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
@@ -35,13 +35,8 @@
 #include "exiv2lib_export.h"
 
 // included header files
-#include "types.hpp"
 #include "value.hpp"
 
-// + standard includes
-#include <string>
-#include <memory>
-
 // *****************************************************************************
 // namespace extensions
 namespace Exiv2 {

diff --git 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 <string>
 
 // *****************************************************************************
 // namespace extensions

diff --git 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 <string>
 
 // *****************************************************************************
 // namespace extensions

diff --git 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 <string>
 
 // *****************************************************************************
 // namespace extensions

diff --git 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 <string>
 
 // *****************************************************************************
 // namespace extensions

diff --git 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 <string>
-#include <vector>
 
 // *****************************************************************************
 // namespace extensions

diff --git 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 <string>
-#include <iosfwd>
-#include <memory>
-
 // *****************************************************************************
 // namespace extensions
 namespace Exiv2 {

diff --git 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 <string>
 
 // *****************************************************************************
 // namespace extensions

diff --git 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 <string>
 
 // *****************************************************************************
 // namespace extensions

diff --git 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 <string>

diff --git 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 <string>
 
 // *****************************************************************************
 // namespace extensions

diff --git 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 <string>
 
 // *****************************************************************************
 // namespace extensions

diff --git 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
@@ -36,12 +36,8 @@
 #include "types.hpp"
 
 // + standard includes
-#include <string>
-#include <vector>
 #include <map>
-#include <iostream>
 #include <iomanip>
-#include <sstream>
 #include <memory>
 #include <cstring>
 #include <climits>