more header reductions and forward declarations

Signed-off-by: Rosen Penev <[email protected]>

Author: neheb

include/exiv2/basicio.hpp

@@ -3,8 +3,6 @@
 #ifndef EXIV2_BASICIO_HPP
 #define EXIV2_BASICIO_HPP
 
-#include "config.h"
-
 // *****************************************************************************
 #include "exiv2lib_export.h"
 

include/exiv2/bmffimage.hpp

@@ -3,8 +3,6 @@
 #ifndef EXIV2_BMFFIMAGE_HPP
 #define EXIV2_BMFFIMAGE_HPP
 
-#include "config.h"
-
 // *****************************************************************************
 #include "exiv2lib_export.h"
 

include/exiv2/exif.hpp

@@ -13,8 +13,6 @@
 // *****************************************************************************
 #include "exiv2lib_export.h"
 
-#include "config.h"
-
 // included header files
 #include "config.h"
 #include "metadatum.hpp"

include/exiv2/image.hpp

@@ -3,8 +3,6 @@
 #ifndef EXIV2_IMAGE_HPP
 #define EXIV2_IMAGE_HPP
 
-#include "config.h"
-
 // *****************************************************************************
 #include "exiv2lib_export.h"
 

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>

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>

src/olympusmn_int.cpp

@@ -12,8 +12,6 @@
 #include "utils.hpp"
 #include "value.hpp"
 
-#include <array>
-
 // *****************************************************************************
 // class member definitions
 namespace Exiv2::Internal {

src/pgfimage.cpp

@@ -11,7 +11,6 @@
 #include "image.hpp"
 
 #include <array>
-#include <bit>
 
 #ifdef EXIV2_DEBUG_MESSAGES
 #include <iostream>

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"
 

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_