diff --git a/src/basicio.hpp b/src/basicio.hpp
index 8c2f6de1..64765942 100644
--- a/src/basicio.hpp
+++ b/src/basicio.hpp
@@ -35,7 +35,6 @@
 
 // + standard includes
 #include <string>
-#include <vector>
 #include <cstdio>
 
 // *****************************************************************************
diff --git a/src/crwimage.hpp b/src/crwimage.hpp
index 6d48c485..468f48c4 100644
--- a/src/crwimage.hpp
+++ b/src/crwimage.hpp
@@ -40,7 +40,7 @@
 #include "iptc.hpp"
 
 // + standard includes
-#include <iostream>
+#include <iosfwd>
 #include <string>
 #include <vector>
 #include <stack>
diff --git a/src/image.hpp b/src/image.hpp
index 40533d85..bbc5b54b 100644
--- a/src/image.hpp
+++ b/src/image.hpp
@@ -41,7 +41,7 @@
 
 // + standard includes
 #include <string>
-#include <map>
+#include <vector>
 
 // *****************************************************************************
 // namespace extensions
diff --git a/src/types.hpp b/src/types.hpp
index 44330e77..09890ab7 100644
--- a/src/types.hpp
+++ b/src/types.hpp
@@ -44,11 +44,9 @@
 #include <iosfwd>
 #include <utility>
 #include <sstream>
-#include <cstdio>
 #ifdef EXV_HAVE_STDINT_H
 # include <stdint.h>
 #endif
-#include <ctime>
 
 // MSVC doesn't provide C99 types, but it has MS specific variants
 #ifdef _MSC_VER
@@ -59,6 +57,10 @@ typedef __int16          int16_t;
 typedef __int32          int32_t;
 #endif
 
+// *****************************************************************************
+// forward declarations
+struct tm;
+
 // *****************************************************************************
 // namespace extensions
 namespace Exiv2 {