diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 0cda00c1..1b9d6f6d 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -17,9 +17,9 @@ set(SYSCONFDIR ${SYSCONF_INSTALL_DIR})
 set(BINARYDIR ${CMAKE_BINARY_DIR})
 set(SOURCEDIR ${CMAKE_SOURCE_DIR})
 
-if(CMAKE_COMPILER_IS_GNUCC)
+if(CMAKE_COMPILER_IS_GNUCC AND NOT MINGW)
 check_c_compiler_flag("-fvisibility=hidden" WITH_VISIBILITY_HIDDEN)
-endif(CMAKE_COMPILER_IS_GNUCC)
+endif(CMAKE_COMPILER_IS_GNUCC AND NOT MINGW)
 
 # HEADER FILES
 check_include_file(argp.h HAVE_ARGP_H)
diff --git a/include/libssh/priv.h b/include/libssh/priv.h
index dd3546d6..63c99acc 100644
--- a/include/libssh/priv.h
+++ b/include/libssh/priv.h
@@ -35,7 +35,9 @@
 #ifdef _WIN32
 
 /* Imitate define of inttypes.h */
-#define PRIdS "Id"
+# ifndef PRIdS
+#  define PRIdS "Id"
+# endif
 
 # ifdef _MSC_VER
 #  include <stdio.h>