From c0a3242e73035e246843a7473bb8d68e005ab247 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com>
Date: Tue, 8 Mar 2022 10:05:27 +0100
Subject: [PATCH] C++-style headers

---
 samples/geotag.cpp       | 3 ---
 src/helper_functions.cpp | 3 ++-
 src/http.cpp             | 1 -
 src/image_int.hpp        | 4 ++--
 src/ini.cpp              | 3 +--
 src/minoltamn_int.cpp    | 4 +---
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/samples/geotag.cpp b/samples/geotag.cpp
index 9a377c87..f05c115a 100644
--- a/samples/geotag.cpp
+++ b/samples/geotag.cpp
@@ -4,11 +4,8 @@
 #include <exiv2/exiv2.hpp>
 #include <expat.h>
 
-#include <stdio.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <time.h>
 
 #include <algorithm>
 #include <filesystem>
diff --git a/src/helper_functions.cpp b/src/helper_functions.cpp
index 07820fc1..42915352 100644
--- a/src/helper_functions.cpp
+++ b/src/helper_functions.cpp
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "helper_functions.hpp"
-#include <string.h>
+
+#include <cstring>
 
 std::string string_from_unterminated(const char* data, size_t data_length)
 {
diff --git a/src/http.cpp b/src/http.cpp
index 52b00d39..90fffc03 100644
--- a/src/http.cpp
+++ b/src/http.cpp
@@ -10,7 +10,6 @@
 #include "http.hpp"
 #include "futils.hpp"
 
-#include <stdio.h>
 #include <array>
 
 ////////////////////////////////////////
diff --git a/src/image_int.hpp b/src/image_int.hpp
index 3158b3de..4278b307 100644
--- a/src/image_int.hpp
+++ b/src/image_int.hpp
@@ -7,8 +7,8 @@
 // included header files
 #include "slice.hpp"  // for Slice
 
-#include <stddef.h>   // for size_t
-#include <stdint.h>   // for int32_t
+#include <cstddef>    // for size_t
+#include <cstdint>    // for int32_t
 #include <ostream>    // for ostream, basic_ostream::put
 #include <string>
 
diff --git a/src/ini.cpp b/src/ini.cpp
index c3527653..036d7797 100755
--- a/src/ini.cpp
+++ b/src/ini.cpp
@@ -16,8 +16,7 @@
 using std::string;
 using namespace Exiv2;
 
-#include <stdio.h>
-#include <string.h>
+#include <cstring>
 
 #if !INI_USE_STACK
 #include <cstdlib>
diff --git a/src/minoltamn_int.cpp b/src/minoltamn_int.cpp
index 2e549447..89bd0988 100644
--- a/src/minoltamn_int.cpp
+++ b/src/minoltamn_int.cpp
@@ -8,11 +8,9 @@
 #include "exif.hpp"
 #include "i18n.h"                // NLS support.
 
-#include <string>
 #include <sstream>
-#include <iomanip>
 
-#include <stdio.h> // popen to call exiftool
+#include <cstdio> // popen to call exiftool
 
 // *****************************************************************************
 // class member definitions