diff --git a/include/exiv2/config.h b/include/exiv2/config.h
index 73fd2095..b31ceb1f 100644
--- a/include/exiv2/config.h
+++ b/include/exiv2/config.h
@@ -93,8 +93,5 @@ typedef int pid_t;
 #endif
 //////////////////////////////////////
 
-#ifdef   EXV_HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 
 #endif // _CONFIG_H_
diff --git a/include/exiv2/types.hpp b/include/exiv2/types.hpp
index 391a4a2b..5775a561 100644
--- a/include/exiv2/types.hpp
+++ b/include/exiv2/types.hpp
@@ -45,10 +45,6 @@
 #include <sstream>
 
 #ifdef _MSC_VER
-// Don't assume the value of EXV_HAVE_STDINT_H in exv_msvc.h has been set correctly
-# ifdef  EXV_HAVE_STDINT_H
-#  undef EXV_HAVE_STDINT_H
-# endif
 // Visual Studio 2010 and later has stdint.h
 # if   _MSC_VER >= _MSC_VER_2010
 #  include <stdint.h>
@@ -63,11 +59,12 @@
    typedef          __int32 int32_t;
    typedef          __int64 int64_t;
 # endif
+#else
+  #ifdef EXV_HAVE_STDINT_H
+  # include <stdint.h>
+  #endif
 #endif
 
-#ifdef EXV_HAVE_STDINT_H
-# include <stdint.h>
-#endif
 
 // MSVC macro to convert a string to a wide string
 #ifdef EXV_UNICODE_PATH
diff --git a/src/exiv2app.hpp b/src/exiv2app.hpp
index f924c20d..b71fe9b5 100644
--- a/src/exiv2app.hpp
+++ b/src/exiv2app.hpp
@@ -41,7 +41,7 @@
 #include <set>
 #include <iostream>
 
-#ifdef EXV_HAVE_STDINT_H
+#ifdef EXV_HAVE_UNISTD_H
 #include <unistd.h>
 #endif