more header reductions and forward declarations

neheb · neheb · commit 497e0a281c78 · 2025-10-15T18:39:49.000-07:00
Signed-off-by: Rosen Penev &lt;rosenp@gmail.com&gt;
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/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_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/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/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/jpgimage.cpp b/src/jpgimage.cpp
@@ -11,7 +11,6 @@
 #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.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/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
@@ -8,6 +8,7 @@
 #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/sonymn_int.hpp b/src/sonymn_int.hpp
@@ -9,7 +9,11 @@
 
 // *****************************************************************************
 // namespace extensions
-namespace Exiv2::Internal {
+namespace Exiv2 {
+class ExifData;
+class Value;
+struct TagInfo;
+namespace Internal {
 // *****************************************************************************
 // class definitions
 
@@ -125,6 +129,7 @@ class SonyMakerNote {
 DataBuf sonyTagDecipher(uint16_t, const byte*, size_t, TiffComponent*);
 DataBuf sonyTagEncipher(uint16_t, const byte*, size_t, TiffComponent*);
 
-}  // namespace Exiv2::Internal
+}  // namespace Internal
+}  // namespace Exiv2
 
 #endif  // #ifndef SONYMN_INT_HPP_
diff --git a/src/tags_int.cpp b/src/tags_int.cpp
@@ -6,6 +6,7 @@
 #include "convert.hpp"
 #include "enforce.hpp"
 #include "i18n.h"  // NLS support.
+#include "tags.hpp"
 
 #include "canonmn_int.hpp"
 #include "casiomn_int.hpp"
diff --git a/src/tags_int.hpp b/src/tags_int.hpp
@@ -5,16 +5,20 @@
 
 // *****************************************************************************
 // included header files
-#include "tags.hpp"
+#include "types.hpp"
+#include "value.hpp"
 
 #include "i18n.h"
 
 // *****************************************************************************
 // namespace extensions
 
 namespace Exiv2 {
+enum class IfdId : uint32_t;
+enum class SectionId;
 class ExifData;
-class Value;
+struct GroupInfo;
+struct TagInfo;
 
 namespace Internal {
 // *****************************************************************************
diff --git a/src/tiffcomposite_int.hpp b/src/tiffcomposite_int.hpp
@@ -13,6 +13,7 @@
 // namespace extensions
 namespace Exiv2 {
 class BasicIo;
+class Value;
 
 namespace Internal {
 // *****************************************************************************
diff --git a/src/tifffwd_int.hpp b/src/tifffwd_int.hpp
@@ -5,7 +5,7 @@
 
 // *****************************************************************************
 // included header files
-#include "tags.hpp"
+#include "types.hpp"
 
 // + standard includes
 #include <memory>
@@ -16,6 +16,7 @@
 // *****************************************************************************
 // Exiv2 namespace extensions
 namespace Exiv2 {
+enum class IfdId : uint32_t;
 class Exifdatum;
 
 namespace Internal {
diff --git a/src/tiffimage_int.cpp b/src/tiffimage_int.cpp
@@ -1,15 +1,14 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "config.h"
-
+#include "tiffimage_int.hpp"
 #include "basicio.hpp"
+#include "config.h"
 #include "error.hpp"
 #include "i18n.h"  // NLS support.
 #include "image_int.hpp"
 #include "makernote_int.hpp"
 #include "sonymn_int.hpp"
 #include "tiffcomposite_int.hpp"
-#include "tiffimage_int.hpp"
 #include "tiffvisitor_int.hpp"
 
 #ifdef EXIV2_DEBUG_MESSAGES
@@ -25,6 +24,9 @@
 #define EXV_COMPLEX_BINARY_ARRAY(arraySet, cfgSelFct) &newTiffBinaryArray2<std::size(arraySet), arraySet, cfgSelFct>
 
 namespace Exiv2::Internal {
+bool FindExifdatum::operator()(const Exiv2::Exifdatum& md) const {
+  return ifdId_ == md.ifdId();
+}
 //! Constant for non-encrypted binary arrays
 constexpr CryptFct notEncrypted = nullptr;
 
diff --git a/src/tiffimage_int.hpp b/src/tiffimage_int.hpp
@@ -5,15 +5,16 @@
 
 // *****************************************************************************
 // included header files
-#include "exif.hpp"
 #include "tifffwd_int.hpp"
 
+#include <map>
 #include <unordered_map>
 
 // *****************************************************************************
 // namespace extensions
 namespace Exiv2 {
 class BasicIo;
+class ExifData;
 class IptcData;
 class XmpData;
 
@@ -348,9 +349,7 @@ class FindExifdatum {
   explicit FindExifdatum(Exiv2::IfdId ifdId) : ifdId_(ifdId) {
   }
   //! Returns true if IFD id matches.
-  bool operator()(const Exiv2::Exifdatum& md) const {
-    return ifdId_ == md.ifdId();
-  }
+  bool operator()(const Exiv2::Exifdatum& md) const;
 
  private:
   Exiv2::IfdId ifdId_;
diff --git a/src/types.cpp b/src/types.cpp
@@ -7,7 +7,6 @@
 
 #include "enforce.hpp"
 #include "futils.hpp"
-#include "i18n.h"  // for _exvGettext
 #include "utils.hpp"
 
 // + standard includes
diff --git a/src/version.cpp b/src/version.cpp
@@ -13,7 +13,6 @@
 // Adobe XMP Toolkit
 #ifdef EXV_HAVE_XMP_TOOLKIT
 #include "properties.hpp"
-#include "xmp_exiv2.hpp"
 #endif
 
 // + standard includes
