Exiv2 · neheb · Oct 4, 2025 · Oct 7, 2025 · Oct 16, 2025
diff --git a/include/exiv2/basicio.hpp b/include/exiv2/basicio.hpp
@@ -3,8 +3,6 @@
 #ifndef EXIV2_BASICIO_HPP
 #define EXIV2_BASICIO_HPP
 
-#include "config.h"
-
 // *****************************************************************************
 #include "exiv2lib_export.h"
 

diff --git a/include/exiv2/bmffimage.hpp b/include/exiv2/bmffimage.hpp
@@ -3,8 +3,6 @@
 #ifndef EXIV2_BMFFIMAGE_HPP
 #define EXIV2_BMFFIMAGE_HPP
 
-#include "config.h"
-
 // *****************************************************************************
 #include "exiv2lib_export.h"
 

diff --git a/include/exiv2/exif.hpp b/include/exiv2/exif.hpp
@@ -13,8 +13,6 @@
 // *****************************************************************************
 #include "exiv2lib_export.h"
 
-#include "config.h"
-
 // included header files
 #include "config.h"
 #include "metadatum.hpp"

diff --git a/include/exiv2/image.hpp b/include/exiv2/image.hpp
@@ -3,8 +3,6 @@
 #ifndef EXIV2_IMAGE_HPP
 #define EXIV2_IMAGE_HPP
 
-#include "config.h"
-
 // *****************************************************************************
 #include "exiv2lib_export.h"
 

diff --git a/src/bmffimage.cpp b/src/bmffimage.cpp
@@ -10,14 +10,14 @@
 #include "futils.hpp"
 #include "image.hpp"
 #include "image_int.hpp"
-#include "safe_op.hpp"
 #include "tiffcomposite_int.hpp"
 #include "tiffimage_int.hpp"
 #include "types.hpp"
 #include "utils.hpp"
 
 #ifdef EXV_HAVE_BROTLI
 #include <brotli/decode.h>  // for JXL brob
+#include "safe_op.hpp"
 #endif
 
 // + standard includes

diff --git a/src/bmpimage.cpp b/src/bmpimage.cpp
@@ -7,6 +7,7 @@
 
 #include "bmpimage.hpp"
 #include "basicio.hpp"
+#include "config.h"
 #include "error.hpp"
 #include "futils.hpp"
 #include "image.hpp"

diff --git a/src/convert.cpp b/src/convert.cpp
@@ -7,13 +7,11 @@
              20-May-08, vn:  added actual conversion logic
  */
 // *****************************************************************************
-#include "config.h"
-
 // included header files
 #include "convert.hpp"
+#include "config.h"
 #include "error.hpp"
 #include "exif.hpp"
-#include "futils.hpp"
 #include "image_int.hpp"
 #include "iptc.hpp"
 #include "properties.hpp"
@@ -25,6 +23,9 @@
 #include <functional>
 
 #ifdef EXV_HAVE_ICONV
+#ifndef SUPPRESS_WARNINGS
+#include "futils.hpp"
+#endif
 #include <iconv.h>
 #elif defined _WIN32
 #include <windows.h>

diff --git a/src/cr2header_int.cpp b/src/cr2header_int.cpp
@@ -2,11 +2,13 @@
 
 #include "cr2header_int.hpp"
 
+#include "tags.hpp"
 #include "tiffimage_int.hpp"
 #include "types.hpp"
 
 #include <algorithm>
 #include <cstdint>
+#include <cstring>
 
 namespace Exiv2::Internal {
 Cr2Header::Cr2Header(ByteOrder byteOrder) : TiffHeaderBase(42, 16, byteOrder, 0x00000010) {

diff --git a/src/crwimage.cpp b/src/crwimage.cpp
@@ -5,9 +5,8 @@
   History:   28-Aug-05, ahu: created
  */
 // included header files
-#include "config.h"
-
 #include "crwimage.hpp"
+#include "config.h"
 #include "crwimage_int.hpp"
 #include "error.hpp"
 #include "futils.hpp"

diff --git a/src/crwimage_int.cpp b/src/crwimage_int.cpp
@@ -1,9 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "config.h"
-
-#include "canonmn_int.hpp"
 #include "crwimage_int.hpp"
+#include "canonmn_int.hpp"
+#include "config.h"
 #include "enforce.hpp"
 #include "error.hpp"
 #include "i18n.h"  // NLS support.

diff --git a/src/crwimage_int.hpp b/src/crwimage_int.hpp
@@ -5,7 +5,6 @@
 
 // *****************************************************************************
 // included header files
-#include "tags.hpp"
 #include "types.hpp"
 
 // + standard includes
@@ -18,6 +17,8 @@
 // *****************************************************************************
 // namespace extensions
 namespace Exiv2 {
+enum class IfdId : uint32_t;
+class ExifData;
 class Image;
 
 namespace Internal {

diff --git a/src/datasets.cpp b/src/datasets.cpp
@@ -9,9 +9,8 @@
 #include "datasets.hpp"
 #include "error.hpp"
 #include "i18n.h"  // NLS support.
-#include "types.hpp"
-
 #include "image_int.hpp"
+#include "types.hpp"
 
 #include <iomanip>
 

diff --git a/src/easyaccess.cpp b/src/easyaccess.cpp
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 // included header files
 #include "easyaccess.hpp"
+
 #include "utils.hpp"
 
 #include <sstream>

diff --git a/src/epsimage.cpp b/src/epsimage.cpp
@@ -8,11 +8,11 @@
  */
 // *****************************************************************************
 // included header files
-#include "config.h"
+#include "epsimage.hpp"
 
 #include "basicio.hpp"
+#include "config.h"
 #include "enforce.hpp"
-#include "epsimage.hpp"
 #include "error.hpp"
 #include "futils.hpp"
 #include "image.hpp"

diff --git a/src/fujimn_int.cpp b/src/fujimn_int.cpp
@@ -10,6 +10,7 @@
 // included header files
 #include "fujimn_int.hpp"
 #include "i18n.h"  // NLS support.
+#include "tags.hpp"
 #include "tags_int.hpp"
 #include "types.hpp"
 

diff --git a/src/http.cpp b/src/http.cpp
@@ -1,9 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "http.hpp"
 #include "config.h"
-
 #include "futils.hpp"
-#include "http.hpp"
 
 #include <array>
 #include <cerrno>

diff --git a/src/image_int.cpp b/src/image_int.cpp
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "config.h"
-
 #include "image_int.hpp"
 
 #include <cstddef>

diff --git a/src/iptc.cpp b/src/iptc.cpp
@@ -1,10 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "config.h"
-
 // included header files
 #include "iptc.hpp"
-
+#include "config.h"
 #include "datasets.hpp"
 #include "enforce.hpp"
 #include "error.hpp"

diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
@@ -1,17 +1,15 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 // included header files
+#include "jpgimage.hpp"
 #include "config.h"
-
 #include "enforce.hpp"
 #include "error.hpp"
 #include "futils.hpp"
 #include "helper_functions.hpp"
 #include "i18n.h"  // NLS support.
 #include "image_int.hpp"
-#include "jpgimage.hpp"
 #include "photoshop.hpp"
-#include "safe_op.hpp"
 #include "tags_int.hpp"
 
 #include <array>

diff --git a/src/makernote_int.cpp b/src/makernote_int.cpp
@@ -5,9 +5,8 @@
   History:   11-Apr-06, ahu: created
  */
 // included header files
-#include "config.h"
-
 #include "makernote_int.hpp"
+#include "config.h"
 #include "safe_op.hpp"
 #include "tiffcomposite_int.hpp"
 #include "tiffimage_int.hpp"

diff --git a/src/makernote_int.hpp b/src/makernote_int.hpp
@@ -5,12 +5,14 @@
 
 // *****************************************************************************
 // included header files
-#include "tags.hpp"
+#include "types.hpp"
 
 #include <memory>
 
 // namespace extensions
-namespace Exiv2::Internal {
+namespace Exiv2 {
+enum class IfdId : uint32_t;
+namespace Internal {
 class IoWrapper;
 class TiffComponent;
 // *****************************************************************************
@@ -673,6 +675,7 @@ int nikonSelector(uint16_t tag, const byte* pData, size_t size, TiffComponent* p
  */
 DataBuf nikonCrypt(uint16_t tag, const byte* pData, size_t size, TiffComponent* pRoot);
 
-}  // namespace Exiv2::Internal
+}  // namespace Internal
+}  // namespace Exiv2
 
 #endif  // EXIV2_MAKERNOTE_INT_HPP
diff --git a/src/matroskavideo.cpp b/src/matroskavideo.cpp
@@ -19,14 +19,13 @@
  */
 // *****************************************************************************
 // included header files
-#include "config.h"
-
+#include "matroskavideo.hpp"
 #include "basicio.hpp"
+#include "config.h"
 #include "enforce.hpp"
 #include "error.hpp"
 #include "futils.hpp"
 #include "helper_functions.hpp"
-#include "matroskavideo.hpp"
 
 // + standard includes
 #include <cmath>

diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp
@@ -1,10 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "config.h"
-
 // included header files
 #include "nikonmn_int.hpp"
-
+#include "config.h"
 #include "exif.hpp"
 #include "i18n.h"  // NLS support.
 #include "image_int.hpp"

diff --git a/src/olympusmn_int.cpp b/src/olympusmn_int.cpp
@@ -12,8 +12,6 @@
 #include "utils.hpp"
 #include "value.hpp"
 
-#include <array>
-
 // *****************************************************************************
 // class member definitions
 namespace Exiv2::Internal {

diff --git a/src/pgfimage.cpp b/src/pgfimage.cpp
@@ -11,7 +11,6 @@
 #include "image.hpp"
 
 #include <array>
-#include <bit>
 
 #ifdef EXIV2_DEBUG_MESSAGES
 #include <iostream>

diff --git a/src/pngchunk_int.cpp b/src/pngchunk_int.cpp
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 // included header files
+#include "pngchunk_int.hpp"
 #include "config.h"
 
 #ifdef EXV_HAVE_LIBZ
@@ -14,7 +15,6 @@
 #include "image_int.hpp"
 #include "iptc.hpp"
 #include "photoshop.hpp"
-#include "pngchunk_int.hpp"
 #include "safe_op.hpp"
 #include "tiffimage.hpp"
 

diff --git a/src/pngchunk_int.hpp b/src/pngchunk_int.hpp
@@ -5,11 +5,15 @@
 
 // *****************************************************************************
 // included header files
-#include "pngimage.hpp"
+#include "types.hpp"
 
 // *****************************************************************************
 // namespace extensions
-namespace Exiv2::Internal {
+namespace Exiv2 {
+struct DataBuf;
+class Image;
+class PngImage;
+namespace Internal {
 // *****************************************************************************
 // class definitions
 
@@ -136,6 +140,7 @@ class PngChunk {
 
 };  // class PngChunk
 
-}  // namespace Exiv2::Internal
+}  // namespace Internal
+}  // namespace Exiv2
 
 #endif  // #ifndef PNGCHUNK_INT_HPP_
diff --git a/src/properties.cpp b/src/properties.cpp
@@ -1,13 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "config.h"
-
 // included header files
 #include "properties.hpp"
-
+#include "config.h"
 #include "error.hpp"
 #include "i18n.h"  // NLS support.
 #include "image_int.hpp"
+#include "tags.hpp"
 #include "tags_int.hpp"
 #include "types.hpp"
 #include "value.hpp"

diff --git a/src/quicktimevideo.cpp b/src/quicktimevideo.cpp
@@ -19,16 +19,15 @@
  */
 // *****************************************************************************
 // included header files
-#include "config.h"
-
+#include "quicktimevideo.hpp"
 #include "basicio.hpp"
+#include "config.h"
 #include "enforce.hpp"
 #include "error.hpp"
 #include "futils.hpp"
 #include "helper_functions.hpp"
 #include "image_int.hpp"
 #include "properties.hpp"
-#include "quicktimevideo.hpp"
 #include "safe_op.hpp"
 #include "tags.hpp"
 #include "tags_int.hpp"

diff --git a/src/riffvideo.cpp b/src/riffvideo.cpp
@@ -8,6 +8,7 @@
 
 // included header files
 #include "riffvideo.hpp"
+#include "config.h"
 #include "enforce.hpp"
 #include "error.hpp"
 #include "futils.hpp"