#1291 include header simplification

src/basicio.cpp

@@ -72,7 +72,6 @@ EXIV2_RCSID("@(#) $Id$")
 #if defined(__MINGW__) || (defined(WIN32) && !defined(__CYGWIN))
 // Windows doesn't provide nlink_t
 typedef short nlink_t;
-# include <windows.h>
 # include <io.h>
 #endif
 

src/convert.cpp

@@ -51,10 +51,6 @@ EXIV2_RCSID("@(#) $Id$")
 #endif
 #include <cstring>
 
-#if defined WIN32 && !defined __CYGWIN__
-# include <windows.h>
-#endif
-
 #ifdef EXV_HAVE_ICONV
 # include <iconv.h>
 # include <errno.h>

src/exiv2app.hpp

@@ -34,7 +34,6 @@
 #include <exiv2/exiv2.hpp>
 
 #include "utils.hpp"
-#include "types.hpp"
 
 // + standard includes
 #include <string>
@@ -55,9 +54,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#if defined(__CYGWIN__) || defined(__MINGW__)
-#include <windows.h>
-#else
+#if !defined(__CYGWIN__) && !defined(__MINGW__)
 #include <sys/select.h>
 #endif
 #endif

src/http.cpp

@@ -57,7 +57,6 @@
 // platform specific code
 #if defined(WIN32) || defined(_MSC_VER) || defined(__MINGW__)
 #include <string.h>
-#include <windows.h>
 #include <io.h>
 #ifndef  __MINGW__
 #define  snprintf sprintf_s

src/jpgimage.cpp

@@ -35,9 +35,7 @@ EXIV2_RCSID("@(#) $Id$")
 #include "error.hpp"
 #include "futils.hpp"
 
-#ifdef WIN32
-#include <windows.h>
-#else
+#ifndef WIN32
 #define BYTE   char
 #define USHORT uint16_t
 #define ULONG  uint32_t

src/makernote.cpp

@@ -53,7 +53,6 @@ EXIV2_RCSID("@(#) $Id$")
 #include <sys/types.h>
 #include <pwd.h>
 #else
-#include <windows.h>
 #include <shlobj.h>
   /* older SDKs not have these */
 # ifndef CSIDL_MYMUSIC

src/types.cpp

@@ -35,9 +35,6 @@ EXIV2_RCSID("@(#) $Id$")
 #include "i18n.h"                               // for _exvGettext
 
 // + standard includes
-#ifdef EXV_UNICODE_PATH
-# include <windows.h> // for MultiByteToWideChar etc
-#endif
 #include <string>
 #include <iostream>
 #include <iomanip>

src/version.cpp

@@ -146,7 +146,6 @@ namespace Exiv2 {
 
 // platform specific support for dumpLibraryInfo
 #if defined(WIN32)
-# include <windows.h>
 # include <psapi.h>
 
 // tell MSVC to link psapi.