diff --git a/src/convert.cpp b/src/convert.cpp
index 61e632a6..11aae7b6 100644
--- a/src/convert.cpp
+++ b/src/convert.cpp
@@ -26,8 +26,8 @@
 #endif
 
 #ifdef EXV_HAVE_ICONV
-#include <errno.h>
 #include <iconv.h>
+#include <cerrno>
 #endif
 
 // Adobe XMP Toolkit
diff --git a/src/http.cpp b/src/http.cpp
index 0e32ab3c..04e83e74 100644
--- a/src/http.cpp
+++ b/src/http.cpp
@@ -23,12 +23,12 @@
 #define closesocket close
 
 #include <arpa/inet.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <unistd.h>
+#include <cerrno>
 
 #define fopen_S(f, n, o) f = fopen(n, o)
 #define WINAPI
diff --git a/unitTests/test_slice.cpp b/unitTests/test_slice.cpp
index ac9b90f3..575a2bcc 100644
--- a/unitTests/test_slice.cpp
+++ b/unitTests/test_slice.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <gtest/gtest.h>
-#include <stdint.h>
+#include <cstdint>
 #include <exiv2/exiv2.hpp>
 #include "slice.hpp"
 #include "types.hpp"