Clean more header inclusions

include/exiv2/bmffimage.hpp

@@ -25,7 +25,8 @@
 
 // included header files
 #include "image.hpp"
-#include "iostream"
+
+#include <set>
 
 // *****************************************************************************
 // namespace extensions

include/exiv2/datasets.hpp

@@ -32,11 +32,6 @@
 // included header files
 #include "metadatum.hpp"
 
-// + standard includes
-#include <set>
-#include <vector>
-#include <map>
-
 // *****************************************************************************
 // namespace extensions
 namespace Exiv2 {

include/exiv2/error.hpp

@@ -34,10 +34,6 @@
 // included header files
 #include "types.hpp"
 
-// + standard includes
-#include <exception>
-#include <string>
-
 // *****************************************************************************
 // namespace extensions
 namespace Exiv2 {

include/exiv2/http.hpp

@@ -25,8 +25,6 @@
 
 #include "datasets.hpp"
 
-#include <string>
-
 
 namespace Exiv2 {
     /*!

include/exiv2/image.hpp

@@ -30,10 +30,6 @@
 #include "image_types.hpp"
 #include "xmp_exiv2.hpp"
 
-// + standard includes
-#include <string>
-#include <vector>
-
 // *****************************************************************************
 // namespace extensions
 namespace Exiv2 {

include/exiv2/types.hpp

@@ -27,11 +27,9 @@
 #include "slice.hpp"
 
 // + standard includes
-#include <cstdint>
 #include <string>
 #include <vector>
 #include <limits>
-#include <algorithm>
 #include <sstream>
 
 

include/exiv2/value.hpp

@@ -29,9 +29,6 @@
 // + standard includes
 #include <map>
 #include <iomanip>
-#include <memory>
-#include <cstring>
-#include <climits>
 
 // *****************************************************************************
 // namespace extensions

src/convert.cpp

@@ -37,13 +37,14 @@
 #include "unused.h"
 
 // + standard includes
-#include <utility>
-#include <iostream>
+#include <stdio.h>  // for snprintf (C99)
+#include <algorithm>
+#include <cstring>
 #include <iomanip>
 #include <ios>
+#include <iostream>
 #include <sstream>
-#include <stdio.h> // for snprintf (C99)
-#include <cstring>
+#include <utility>
 
 #if defined WIN32 && !defined __CYGWIN__
 # include <windows.h>

src/crwimage_int.cpp

@@ -21,7 +21,6 @@
 #include "crwimage_int.hpp"
 #include "canonmn_int.hpp"
 #include "i18n.h"                // NLS support.
-#include "timegm.h"
 #include "unused.h"
 #include "error.hpp"
 #include "enforce.hpp"

src/pngimage.cpp

@@ -35,6 +35,7 @@
 #include "types.hpp"
 
 // + standard includes
+#include <algorithm>
 #include <array>
 #include <string>
 #include <cstring>

src/preview.cpp

@@ -21,6 +21,7 @@
 // included header files
 #include "config.h"
 
+#include <algorithm>
 #include <array>
 #include <climits>
 #include <string>

src/tags_int.cpp

@@ -40,6 +40,7 @@
 #include "sonymn_int.hpp"
 
 #include <cmath>
+#include <algorithm>
 
 // *****************************************************************************
 // local declarations

src/version.cpp

@@ -36,13 +36,10 @@
 #endif
 
 // + standard includes
-#include <iomanip>
-#include <sstream>
-#include <string>
-#include <stdio.h>
-#include <iostream>
 #include <fstream>
 #include <regex>
+#include <set>
+#include <sstream>
 
 // #1147
 #ifndef WIN32

src/xmpsidecar.cpp

@@ -30,6 +30,7 @@
 #include "convert.hpp"
 
 // + standard includes
+#include <algorithm>
 #include <string>
 #include <iostream>
 #include <cassert>