refactor: update includes for improved clarity and organization

Author: henryborchers

src/py3exiv2bind/core/glue/ExifStrategy.cpp

@@ -4,7 +4,10 @@
 
 #include "ExifStrategy.h"
 #include "make_dictionary.h"
-#include <iostream>
+#include <string>
+#include <unordered_map>
+
+#include <exiv2/image.hpp>
 
 std::unordered_map<std::string, std::string> ExifStrategy::load(const Exiv2::Image &image){
     return make_dictionary(image.exifData());

src/py3exiv2bind/core/glue/IPTC_Strategy.cpp

@@ -4,8 +4,12 @@
 
 #include "IPTC_Strategy.h"
 #include "make_dictionary.h"
-#include <exiv2/error.hpp>
-#include <iostream>
+
+#include <exiv2/image.hpp>
+
+#include <string>
+#include <unordered_map>
+
 
 std::unordered_map<std::string, std::string> IPTC_Strategy::load(const Exiv2::Image &image){
     return make_dictionary(image.iptcData());

src/py3exiv2bind/core/glue/Image.cpp

@@ -3,14 +3,22 @@
 //
 
 #include "Image.h"
-#include "MetadataProcessor.h"
-#include "glue.h"
 #include "glue_execeptions.h"
-#include <cassert>
+#include "MetadataProcessor.h"
+#include "MetadataStrategies.h"
+
 #include <exiv2/error.hpp>
+#include <exiv2/image.hpp>
+#include <exiv2/types.hpp>
+
+#include <cassert>
 #include <iostream>
+#include <list>
+#include <memory>
 #include <sstream>
+#include <stdexcept>
 #include <string>
+#include <unordered_map>
 
 std::ostringstream warning_log;
 std::ostringstream error_log;

src/py3exiv2bind/core/glue/MetadataProcessor.cpp

@@ -2,11 +2,18 @@
 // Created by hborcher on 10/11/2017.
 //
 
-#include "MetadataProcessor.h"
 #include "ExifStrategy.h"
 #include "IPTC_Strategy.h"
+#include "MetadataProcessor.h"
+#include "MetadataStrategies.h"
 #include "XmpStrategy.h"
 
+#include <exiv2/image.hpp>
+
+#include <memory>
+#include <string>
+#include <unordered_map>
+
 const std::unordered_map<std::string, std::string> &MetadataProcessor::getMetadata() const {
     return metadata;
 }

src/py3exiv2bind/core/glue/MetadataProcessor.h

@@ -6,9 +6,10 @@
 #define PYEXIV2BIND_METADATA_PROCESSOR_H
 
 
-#include <string>
-#include <map>
 #include <memory>
+#include <string>
+#include <unordered_map>
+
 #include "AbsMetadataStrategy.h"
 #include "MetadataStrategies.h"
 
@@ -19,7 +20,7 @@ struct MetadataProcessor {
 public:
     void build(const Exiv2::Image &image);
     const std::unordered_map<std::string, std::string> &getMetadata() const;
-    void set_output_format(MetadataStrategies);
+    void set_output_format(MetadataStrategies metadata_type);
 };
 
 

src/py3exiv2bind/core/glue/XmpStrategy.cpp

@@ -4,7 +4,12 @@
 
 #include "XmpStrategy.h"
 #include "make_dictionary.h"
-#include <iostream>
+
+#include <exiv2/image.hpp>
+
+#include <string>
+#include <unordered_map>
+
 std::unordered_map<std::string, std::string> XmpStrategy::load(const Exiv2::Image &image){
     return make_dictionary(image.xmpData());
 }

src/py3exiv2bind/core/glue/glue.cpp

@@ -2,9 +2,18 @@
 // Created by hborcher on 10/4/2017.
 //
 #include "glue.h"
-#include <exiv2/exiv2.hpp>
+
+
+#include <exiv2/exif.hpp>
+#include <exiv2/image.hpp>
+#include <exiv2/version.hpp>
+
+#include <memory>
+#include <string>
+
 using Exiv2::Image;
 using Exiv2::ImageFactory;
+
 std::string exiv2_version() {
     return Exiv2::versionString();
 }

src/py3exiv2bind/core/glue/glue.h

@@ -5,8 +5,8 @@
 #ifndef SUPERBUILD_GLUE_H
 #define SUPERBUILD_GLUE_H
 
-#include <string>
 #include <map>
+#include <string>
 
 struct metadata_chunk {